ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

tableComponent restore focus after grid append command (#13561)

Browse Source
This commit is contained in:
Vladimir Chernov
2020-11-30 22:57:28 +03:00
committed by GitHub
parent 64dd0f0cad
commit 426f1ae99b
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/sql/workbench/browser/modelComponents/table.component.ts
View File

@@ -17,7 +17,7 @@ import { Table } from 'sql/base/browser/ui/table/table';
import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView';
import { attachTableStyler, attachButtonStyler } from 'sql/platform/theme/common/styler'; import { attachTableStyler, attachButtonStyler } from 'sql/platform/theme/common/styler';
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
import { getContentHeight, getContentWidth, Dimension } from 'vs/base/browser/dom'; import { getContentHeight, getContentWidth, Dimension, isAncestor } from 'vs/base/browser/dom';
import { RowSelectionModel } from 'sql/base/browser/ui/table/plugins/rowSelectionModel.plugin'; import { RowSelectionModel } from 'sql/base/browser/ui/table/plugins/rowSelectionModel.plugin';
import { CheckboxSelectColumn, ICheckboxCellActionEventArgs } from 'sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin'; import { CheckboxSelectColumn, ICheckboxCellActionEventArgs } from 'sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin';
import { Emitter, Event as vsEvent } from 'vs/base/common/event'; import { Emitter, Event as vsEvent } from 'vs/base/common/event';
@@ -530,10 +530,22 @@ export default class TableComponent extends ComponentBase<azdata.TableComponentP
this.appendData(args[0]); this.appendData(args[0]);
} }
} }
private appendData(data: any[][]) { private appendData(data: any[][]) {
const tableHasFocus = isAncestor(document.activeElement, <HTMLElement>this._inputContainer.nativeElement);
const currentActiveCell = this._table.grid.getActiveCell();
const wasFocused = tableHasFocus && this._table.grid.getDataLength() > 0 && currentActiveCell;
this._tableData.push(this.transformData(data, this.columns)); this._tableData.push(this.transformData(data, this.columns));
this.data = this._tableData.getItems().map(dataObject => Object.values(dataObject)); this.data = this._tableData.getItems().map(dataObject => Object.values(dataObject));
this.layoutTable(); this.layoutTable();
if (wasFocused) {
if (!this._table.grid.getActiveCell()) {
this._table.grid.setActiveCell(currentActiveCell.row, currentActiveCell.cell);
}
this._table.grid.getActiveCellNode().focus();
}
} }
} }