ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 09:35:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

use context view provider to show the filter (#15106)

Browse Source 
* use context view provider

* handle promise

* replace .then with .catch
This commit is contained in:
Alan Ren
2021-04-13 11:34:26 -07:00
committed by GitHub
parent 836da58c2c
commit 8d098c227d
9 changed files with 60 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,8 @@ import { addDisposableListener } from 'vs/base/browser/dom';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { withNullAsUndefined } from 'vs/base/common/types';
import { IDisposableDataProvider } from 'sql/base/common/dataProvider';
import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
import { onUnexpectedError } from 'vs/base/common/errors';
export type HeaderFilterCommands = 'sort-asc' | 'sort-desc';
export interface CommandEventArgs<T extends Slick.SlickData> {
@@ -39,7 +41,7 @@ export class HeaderFilter<T extends Slick.SlickData> {
private disposableStore = new DisposableStore();
private _enabled: boolean = true;
constructor() {
constructor(private readonly contextViewProvider: IContextViewProvider) {
}
public init(grid: Slick.Grid<T>): void {
@@ -77,10 +79,7 @@ export class HeaderFilter<T extends Slick.SlickData> {
}
private hideMenu() {
if (this.$menu) {
this.$menu.remove();
this.$menu = undefined;
}
this.contextViewProvider.hideContextView();
}
private handleHeaderCellRendered(e: Event, args: Slick.OnHeaderCellRenderedEventArgs<T>) {
@@ -172,8 +171,25 @@ export class HeaderFilter<T extends Slick.SlickData> {
});
}
private async showFilter(element: HTMLElement) {
const target = withNullAsUndefined(element);
private showFilter(filterButton: HTMLElement): void {
this.contextViewProvider.showContextView({
getAnchor: () => filterButton,
render: (container: HTMLElement) => {
this.renderFilter(filterButton, container).catch(onUnexpectedError);
return {
dispose: () => {
if (this.$menu) {
this.$menu.remove();
this.$menu = undefined;
}
}
};
}
});
}
private async renderFilter(filterButton: HTMLElement, container: HTMLElement) {
const target = withNullAsUndefined(filterButton);
const $menuButton = jQuery(target);
this.columnDef = $menuButton.data('column');
@@ -204,7 +220,7 @@ export class HeaderFilter<T extends Slick.SlickData> {
}
if (!this.$menu) {
this.$menu = jQuery('<div class="slick-header-menu">').appendTo(document.body);
this.$menu = jQuery('<div class="slick-header-menu">').appendTo(container);
}
this.$menu.empty();
@@ -265,16 +281,6 @@ export class HeaderFilter<T extends Slick.SlickData> {
jQuery(':checkbox', $filter).bind('click', (e) => {
this.workingFilters = this.changeWorkingFilter(filterItems, this.workingFilters, jQuery(e.target));
});
const offset = jQuery(target).offset();
const left = offset.left - this.$menu.width() + jQuery(target).width() - 8;
let menutop = offset.top + jQuery(target).height();
if (menutop + offset.top > jQuery(window).height()) {
menutop -= (this.$menu.height() + jQuery(target).height() + 8);
}
this.$menu.css('top', menutop).css('left', (left > 0 ? left : 0));
this.okButton.focus();
}