Skip to content

Fixed an issue where the query window moved to the left after opening the history tab or selecting a column header in the result grid on Firefox. #8756 #8994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityatoshniwal merged 1 commit into from
Jul 28, 2025
Merged

Fixed an issue where the query window moved to the left after opening the history tab or selecting a column header in the result grid on Firefox. #8756 #8994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions web/pgadmin/static/js/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,17 +560,6 @@ export function requestAnimationAndFocus(ele) {
});
}

export function measureText(text, font) {
if(!measureText.ele) {
measureText.ele = document.createElement('div');
measureText.ele.style.cssText = `position: absolute; visibility: hidden; white-space: nowrap; font: ${font}`;
document.body.appendChild(measureText.ele);
}
measureText.ele.textContent = text;
const dim = measureText.ele.getBoundingClientRect();
return {width: dim.width, height: dim.height};
}

const CHART_THEME_COLORS = {
'light':['#1F77B4', '#FF7F0E', '#2CA02C', '#D62728', '#9467BD', '#8C564B',
'#E377C2', '#7F7F7F', '#BCBD22', '#17BECF', '#3366CC', '#DC3912', '#FF9900',
Expand Down
7 changes: 3 additions & 4 deletions web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import PropTypes from 'prop-types';
import gettext from 'sources/gettext';
import PgReactDataGrid from '../../../../../../static/js/components/PgReactDataGrid';
import { isMac } from '../../../../../../static/js/keyboard_shortcuts';
import { measureText } from '../../../../../../static/js/utils';

export const ROWNUM_KEY = '$_pgadmin_rownum_key_$';
export const GRID_ROW_SELECT_KEY = '$_pgadmin_gridrowselect_key_$';
Expand Down Expand Up @@ -338,7 +337,7 @@ function formatColumns(columns, dataChangeStore, selectedColumns, onColumnSelect
return retColumns;
}

function getColumnWidth(column, rows, canvas, columnWidthBy, maxColumnDataDisplayLength) {
function getColumnWidth(column, rows, canvasContext, columnWidthBy, maxColumnDataDisplayLength) {
const dataWidthReducer = (longest, nextRow) => {
let value = nextRow[column.key];
if(_.isNull(value) || _.isUndefined(value)) {
Expand All @@ -353,7 +352,7 @@ function getColumnWidth(column, rows, canvas, columnWidthBy, maxColumnDataDispla
};

let columnHeaderLen = column.display_name.length > column.display_type.length ?
measureText(column.display_name, '12px Roboto').width : measureText(column.display_type, '12px Roboto').width;
canvasContext.measureText(column.display_name).width : canvasContext.measureText(column.display_type).width;
/* padding 12, margin 4, icon-width 15, */
columnHeaderLen += 15 + 12 + 4;
if(column.column_type_internal == 'geometry' || column.column_type_internal == 'geography') {
Expand All @@ -362,7 +361,7 @@ function getColumnWidth(column, rows, canvas, columnWidthBy, maxColumnDataDispla
let width = columnHeaderLen;
if(typeof(columnWidthBy) == 'number') {
/* padding 16, border 1px */
width = 16 + measureText(rows.reduce(dataWidthReducer, ''), '12px Roboto').width + 1;
width = 16 + canvasContext.measureText(rows.reduce(dataWidthReducer, '')).width + 1;
if(width > columnWidthBy && columnWidthBy > 0) {
width = columnWidthBy;
}
Expand Down