ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "table keyboard focus (#17903)" (#17946)

Browse Source 
This reverts commit 177663cc29.
This commit is contained in:
Alan Ren
2021-12-15 20:48:58 -08:00
committed by GitHub
parent f265146249
commit 4608a4714d
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/sql/base/browser/ui/table/table.ts
View File

@@ -80,20 +80,18 @@ export class Table<T extends Slick.SlickData> extends Widget implements IDisposa
this._container = document.createElement('div'); this._container = document.createElement('div');
this._container.className = 'monaco-table'; this._container.className = 'monaco-table';
this._register(DOM.addDisposableListener(this._container, DOM.EventType.FOCUS, (e: FocusEvent) => { this._register(DOM.addDisposableListener(this._container, DOM.EventType.FOCUS, (e: FocusEvent) => {
// Focus redirection should only happen when the event target is the container (using keyboard navigation) // the focus redirection should only happen when the event target is the container (using keyboard navigation)
if (e.target && this._container === e.target && this._data.getLength() > 0) { if (e.target && this._container === e.target && !this.grid.getActiveCell() && this._data.getLength() > 0) {
let cellToFocus = this.grid.getActiveCell(); // When the table receives focus and there are currently no active cell, the focus should go to the first focusable cell.
if (!cellToFocus) { let cellToFocus = undefined;
// When the table receives focus and there are currently no active cell, the focus should go to the first focusable cell. for (let col = 0; col < this.columns.length; col++) {
for (let col = 0; col < this.columns.length; col++) { // some cells are not keyboard focusable (e.g. row number column), we need to find the first focusable cell.
// some cells are not keyboard focusable (e.g. row number column), we need to find the first focusable cell. if (this.grid.canCellBeActive(0, col)) {
if (this.grid.canCellBeActive(0, col)) { cellToFocus = {
cellToFocus = { row: 0,
row: 0, cell: col
cell: col };
}; break;
break;
}
} }
} }
if (cellToFocus) { if (cellToFocus) {
@@ -142,14 +140,11 @@ export class Table<T extends Slick.SlickData> extends Widget implements IDisposa
this.mapMouseEvent(this._grid.onDblClick, this._onDoubleClick); this.mapMouseEvent(this._grid.onDblClick, this._onDoubleClick);
this._grid.onColumnsResized.subscribe(() => this._onColumnResize.fire()); this._grid.onColumnsResized.subscribe(() => this._onColumnResize.fire());
this._grid.onRendered.subscribe(() => { this._grid.onRendered.subscribe(() => {
// When there are data present and no cells are keyboard focusable, the container should be set to keyboard focusable to if (!this._grid.getActiveCell()) {
// leverage the focus redirection logic. this._container.tabIndex = this._data.getLength() > 0 ? 0 : -1;
this._container.tabIndex = this._container.querySelector('[tabindex = "0"]') || this._data.getLength() === 0 ? -1 : 0; }
}); });
this._grid.onActiveCellChanged.subscribe((e, data) => { this._grid.onActiveCellChanged.subscribe((e, data) => {
// When the active cell is changed, a cell will become focusable and we can make the container not focusable by user.
// later when the grid is rerendered (e.g. view switching), the active cell information is kept but the cell will become not keyboard focusable (tabindex changed from 0 to -1).
// we need to check and reset the tabIndex of the container in the onRendered handler.
this._container.tabIndex = -1; this._container.tabIndex = -1;
}); });
} }