From 31dea2f5eea78f1a0c00a902e8a650048f3dd52e Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Thu, 16 Jun 2022 13:24:35 -0700 Subject: [PATCH] port vscode changes (#19754) * add aria-description support for selectbox * type check --- src/vs/base/browser/ui/selectBox/selectBox.ts | 2 +- src/vs/base/browser/ui/selectBox/selectBoxCustom.ts | 1 - src/vs/base/browser/ui/selectBox/selectBoxNative.ts | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/vs/base/browser/ui/selectBox/selectBox.ts b/src/vs/base/browser/ui/selectBox/selectBox.ts index e603440dbe..2e6d27f259 100644 --- a/src/vs/base/browser/ui/selectBox/selectBox.ts +++ b/src/vs/base/browser/ui/selectBox/selectBox.ts @@ -40,7 +40,7 @@ export interface ISelectBoxDelegate extends IDisposable { export interface ISelectBoxOptions { useCustomDrawn?: boolean; ariaLabel?: string; - ariaDescription?: string; // {{SQL CARBON EDIT}} - Add aria description + ariaDescription?: string; minBottomMargin?: number; optionsAsChildren?: boolean; } diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts index 010aa7e2a8..381590566a 100644 --- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts +++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts @@ -127,7 +127,6 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi this.selectElement.setAttribute('aria-label', this.selectBoxOptions.ariaLabel); } - // {{SQL CARBON EDIT}} if (typeof this.selectBoxOptions.ariaDescription === 'string') { this.selectElement.setAttribute('aria-description', this.selectBoxOptions.ariaDescription); } diff --git a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts index 97961720a7..986175c885 100644 --- a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts +++ b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts @@ -36,7 +36,6 @@ export class SelectBoxNative extends Disposable implements ISelectBoxDelegate { this.selectElement.setAttribute('aria-label', this.selectBoxOptions.ariaLabel); } - // {{SQL CARBON EDIT}} if (typeof this.selectBoxOptions.ariaDescription === 'string') { this.selectElement.setAttribute('aria-description', this.selectBoxOptions.ariaDescription); }