Skip to content

Commit 855f954

Browse files
Trigger select all only when Ctrl/Cmd+A originates from a grid cell.
1 parent 0f3257e commit 855f954

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/Editors.jsx

-8
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,6 @@ export function TextEditor({row, column, onRowChange, onClose}) {
251251
if(e.keyCode == 13 && !e.shiftKey) {
252252
onOK();
253253
}
254-
// Handle "Ctrl + A" or "Cmd + A".
255-
if ((e.ctrlKey || e.metaKey) && e.keyCode === 65) {
256-
e.stopPropagation();
257-
}
258254
};
259255

260256
return (
@@ -315,10 +311,6 @@ export function NumberEditor({row, column, onRowChange, onClose}) {
315311
return false;
316312
};
317313
const onKeyDown = (e)=>{
318-
// Handle "Ctrl + A" or "Cmd + A".
319-
if ((e.ctrlKey || e.metaKey) && e.keyCode === 65) {
320-
e.stopPropagation();
321-
}
322314
if(e.code === 'Tab' || e.code === 'Enter') {
323315
e.preventDefault();
324316
if(!onBlur()) {

web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ function CustomRow(props) {
109109
dataGridExtras.onSelectedCellChange?.(null);
110110
}
111111
const handleKeyDown = (e)=>{
112-
dataGridExtras.handleShortcuts(e);
112+
if (e.target.role == 'gridcell') dataGridExtras.handleShortcuts(e);
113113
if(e.code === 'Enter' && !props.isRowSelected && props.selectedCellIdx > 0) {
114114
props.selectCell(props.row, props.viewportColumns?.find(columns => columns.idx === props.selectedCellIdx), true);
115115
}

0 commit comments

Comments
 (0)