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

set the focus back to table after sort/filter (#16250)

Browse Source
This commit is contained in:
Alan Ren
2021-07-17 20:58:51 -07:00
committed by GitHub
parent 7a419426ad
commit 712633fadd
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts
View File

@@ -392,17 +392,17 @@ export class HeaderFilter<T extends Slick.SlickData> {
const buttonGroupContainer = append(this.menu, $('.filter-menu-button-container')); const buttonGroupContainer = append(this.menu, $('.filter-menu-button-container'));
this.okButton = this.createButton(buttonGroupContainer, 'filter-ok-button', localize('headerFilter.ok', "OK")); this.okButton = this.createButton(buttonGroupContainer, 'filter-ok-button', localize('headerFilter.ok', "OK"));
this.okButton.onDidClick(() => { this.okButton.onDidClick(async () => {
this.columnDef.filterValues = this.listData.filter(element => element.checked).map(element => element.value); this.columnDef.filterValues = this.listData.filter(element => element.checked).map(element => element.value);
this.setButtonImage($menuButton, this.columnDef.filterValues.length > 0); this.setButtonImage($menuButton, this.columnDef.filterValues.length > 0);
this.handleApply(this.columnDef); await this.handleApply(this.columnDef);
}); });
this.clearButton = this.createButton(buttonGroupContainer, 'filter-clear-button', localize('headerFilter.clear', "Clear"), { secondary: true }); this.clearButton = this.createButton(buttonGroupContainer, 'filter-clear-button', localize('headerFilter.clear', "Clear"), { secondary: true });
this.clearButton.onDidClick(() => { this.clearButton.onDidClick(async () => {
this.columnDef.filterValues!.length = 0; this.columnDef.filterValues!.length = 0;
this.setButtonImage($menuButton, false); this.setButtonImage($menuButton, false);
this.handleApply(this.columnDef); await this.handleApply(this.columnDef);
}); });
this.cancelButton = this.createButton(buttonGroupContainer, 'filter-cancel-button', localize('headerFilter.cancel', "Cancel"), { secondary: true }); this.cancelButton = this.createButton(buttonGroupContainer, 'filter-cancel-button', localize('headerFilter.cancel', "Cancel"), { secondary: true });
@@ -449,16 +449,17 @@ export class HeaderFilter<T extends Slick.SlickData> {
} }
} }
private handleApply(columnDef: Slick.Column<T>) { private async handleApply(columnDef: Slick.Column<T>) {
this.hideMenu(); this.hideMenu();
const dataView = this.grid.getData(); const dataView = this.grid.getData();
if (instanceOfIDisposableDataProvider(dataView)) { if (instanceOfIDisposableDataProvider(dataView)) {
dataView.filter(this.grid.getColumns()); await dataView.filter(this.grid.getColumns());
this.grid.invalidateAllRows(); this.grid.invalidateAllRows();
this.grid.updateRowCount(); this.grid.updateRowCount();
this.grid.render(); this.grid.render();
} }
this.onFilterApplied.notify({ grid: this.grid, column: columnDef }); this.onFilterApplied.notify({ grid: this.grid, column: columnDef });
this.setFocusToColumn(columnDef);
} }
private getFilterValues(dataView: Slick.DataProvider<T>, column: Slick.Column<T>): Array<any> { private getFilterValues(dataView: Slick.DataProvider<T>, column: Slick.Column<T>): Array<any> {
@@ -507,6 +508,17 @@ export class HeaderFilter<T extends Slick.SlickData> {
column: columnDef, column: columnDef,
command: command command: command
}); });
this.setFocusToColumn(columnDef);
}
private setFocusToColumn(columnDef): void {
if (this.grid.getDataLength() > 0) {
const column = this.grid.getColumns().findIndex(col => col.id === columnDef.id);
if (column >= 0) {
this.grid.setActiveCell(0, column);
}
}
} }
} }