mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-16 01:25:36 -05:00
Merge from vscode e3c4990c67c40213af168300d1cfeb71d680f877 (#16569)
This commit is contained in:
@@ -58,7 +58,7 @@ const tabbableElementsQuerySelector = 'a[href], area[href], input:not([disabled]
|
||||
*/
|
||||
export function getFocusableElements(container: HTMLElement): HTMLElement[] {
|
||||
const elements = [];
|
||||
container.querySelectorAll(tabbableElementsQuerySelector).forEach((element: HTMLElement) => {
|
||||
container.querySelectorAll<HTMLElement>(tabbableElementsQuerySelector).forEach((element: HTMLElement) => {
|
||||
const style = window.getComputedStyle(element);
|
||||
// We should only return the elements that are visible. There are many ways to hide an element, for example setting the
|
||||
// visibility attribute to hidden/collapse, setting the display property to none, or if one of its ancestors is invisible.
|
||||
|
||||
@@ -8,7 +8,7 @@ import { IAction, IActionRunner } from 'vs/base/common/actions';
|
||||
import { IDisposable } from 'vs/base/common/lifecycle';
|
||||
import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
|
||||
import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
|
||||
import { append, $, addClasses } from 'vs/base/browser/dom';
|
||||
import { append, $ } from 'vs/base/browser/dom';
|
||||
import { IDropdownMenuOptions, DropdownMenu, IActionProvider, ILabelRenderer } from 'vs/base/browser/ui/dropdown/dropdown';
|
||||
import { IContextMenuProvider } from 'vs/base/browser/contextmenu';
|
||||
import { BaseActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
|
||||
@@ -51,7 +51,7 @@ export class DropdownMenuActionViewItem extends BaseActionViewItem {
|
||||
const labelRenderer: ILabelRenderer = (el: HTMLElement): IDisposable | null => {
|
||||
this.element = append(el, $('a.action-label.button-menu'));
|
||||
if (this.cssClass) {
|
||||
addClasses(this.element, this.cssClass);
|
||||
this.element.classList.add(...this.cssClass.split(' '));
|
||||
}
|
||||
if (this.menuLabel) {
|
||||
this.element.innerText = this.menuLabel;
|
||||
|
||||
@@ -164,7 +164,7 @@ export class ScrollableView extends Disposable {
|
||||
for (const item of this.items) {
|
||||
if (item.domNode) {
|
||||
DOM.clearNode(item.domNode);
|
||||
DOM.removeNode(item.domNode);
|
||||
item.domNode.remove();
|
||||
item.domNode = undefined;
|
||||
}
|
||||
dispose(item.disposables);
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
import { IDisposable } from 'vs/base/common/lifecycle';
|
||||
import { ITableRenderer } from 'sql/base/browser/ui/table/highPerf/table';
|
||||
|
||||
import { $, removeClass } from 'vs/base/browser/dom';
|
||||
import { $ } from 'vs/base/browser/dom';
|
||||
export interface ICell {
|
||||
domNode: HTMLElement | null;
|
||||
templateData: any;
|
||||
@@ -64,7 +64,7 @@ export class CellCache<T> implements IDisposable {
|
||||
release(cell: ICell) {
|
||||
const { domNode, templateId } = cell;
|
||||
if (domNode) {
|
||||
removeClass(domNode, 'scrolling');
|
||||
domNode.classList.remove('scrolling');
|
||||
removeFromParent(domNode);
|
||||
}
|
||||
|
||||
|
||||
@@ -176,7 +176,7 @@ export class TableView<T> implements IDisposable {
|
||||
this.domNode.classList.add(this.domId);
|
||||
this.domNode.tabIndex = 0;
|
||||
|
||||
DOM.toggleClass(this.domNode, 'mouse-support', typeof options.mouseSupport === 'boolean' ? options.mouseSupport : true);
|
||||
this.domNode.classList.toggle('mouse-support', typeof options.mouseSupport === 'boolean' ? options.mouseSupport : true);
|
||||
|
||||
// this.ariaSetProvider = { getSetSize: (e, i, length) => length, getPosInSet: (_, index) => index + 1 };
|
||||
|
||||
|
||||
@@ -157,7 +157,7 @@ class Trait<T> implements IDisposable {
|
||||
constructor(private _trait: string) { }
|
||||
|
||||
renderIndex(index: GridPosition, container: HTMLElement): void {
|
||||
DOM.toggleClass(container, this._trait, this.contains(index));
|
||||
container.classList.toggle(this._trait, this.contains(index));
|
||||
}
|
||||
|
||||
unrender(container: HTMLElement): void {
|
||||
@@ -1035,15 +1035,15 @@ export class Table<T> implements IDisposable {
|
||||
}
|
||||
|
||||
this.view.domNode.setAttribute('role', 'tree');
|
||||
DOM.toggleClass(this.view.domNode, 'element-focused', focus.length > 0);
|
||||
this.view.domNode.classList.toggle('element-focused', focus.length > 0);
|
||||
}
|
||||
|
||||
private _onSelectionChange(): void {
|
||||
const selection = this.selection.get();
|
||||
|
||||
DOM.toggleClass(this.view.domNode, 'selection-none', selection.length === 0);
|
||||
DOM.toggleClass(this.view.domNode, 'selection-single', selection.length === 1);
|
||||
DOM.toggleClass(this.view.domNode, 'selection-multiple', selection.length > 1);
|
||||
this.view.domNode.classList.toggle('selection-none', selection.length === 0);
|
||||
this.view.domNode.classList.toggle('selection-single', selection.length === 1);
|
||||
this.view.domNode.classList.toggle('selection-multiple', selection.length > 1);
|
||||
}
|
||||
|
||||
dispose(): void {
|
||||
|
||||
@@ -9,7 +9,7 @@ import { FilterableColumn } from 'sql/base/browser/ui/table/interfaces';
|
||||
import { addDisposableListener, EventType, EventHelper, $, isAncestor, clearNode, append } from 'vs/base/browser/dom';
|
||||
import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
|
||||
import { withNullAsUndefined } from 'vs/base/common/types';
|
||||
import { instanceOfIDisposableDataProvider } from 'sql/base/common/dataProvider';
|
||||
import { IDisposableDataProvider, instanceOfIDisposableDataProvider } from 'sql/base/common/dataProvider';
|
||||
import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
|
||||
import { IInputBoxStyles, InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
|
||||
import { trapKeyboardNavigation } from 'sql/base/browser/dom';
|
||||
@@ -242,7 +242,7 @@ export class HeaderFilter<T extends Slick.SlickData> {
|
||||
let filterItems: Array<string>;
|
||||
const dataView = this.grid.getData() as Slick.DataProvider<T>;
|
||||
if (instanceOfIDisposableDataProvider(dataView)) {
|
||||
filterItems = await dataView.getColumnValues(this.columnDef);
|
||||
filterItems = await (dataView as IDisposableDataProvider<T>).getColumnValues(this.columnDef);
|
||||
} else {
|
||||
const filterApplied = this.grid.getColumns().findIndex((col) => {
|
||||
const filterableColumn = col as FilterableColumn<T>;
|
||||
@@ -467,7 +467,7 @@ export class HeaderFilter<T extends Slick.SlickData> {
|
||||
this.hideMenu();
|
||||
const dataView = this.grid.getData();
|
||||
if (instanceOfIDisposableDataProvider(dataView)) {
|
||||
await dataView.filter(this.grid.getColumns());
|
||||
await (dataView as IDisposableDataProvider<T>).filter(this.grid.getColumns());
|
||||
this.grid.invalidateAllRows();
|
||||
this.grid.updateRowCount();
|
||||
this.grid.render();
|
||||
|
||||
Reference in New Issue
Block a user