From 33371a88b4161d6b80c91130ef853966061204f5 Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Thu, 27 Sep 2018 15:43:51 +0200 Subject: [PATCH] 'Type to narrow down results' only for QuickPick (fixes #58105) --- src/vs/workbench/browser/parts/quickinput/quickInput.ts | 4 ++++ src/vs/workbench/browser/parts/quickinput/quickInputBox.ts | 7 +------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts index 0ce02af5ab2..791819e5955 100644 --- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts +++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts @@ -302,6 +302,8 @@ class QuickInput implements IQuickInput { class QuickPick extends QuickInput implements IQuickPick { + private static INPUT_BOX_ARIA_LABEL = localize('quickInputBox.ariaLabel', "Type to narrow down results."); + private _value = ''; private _placeholder; private onDidChangeValueEmitter = new Emitter(); @@ -622,6 +624,7 @@ class QuickPick extends QuickInput implements IQuickPi this.ui.list.matchOnDescription = this.matchOnDescription; this.ui.list.matchOnDetail = this.matchOnDetail; this.ui.setComboboxAccessibility(true); + this.ui.inputBox.setAttribute('aria-label', QuickPick.INPUT_BOX_ARIA_LABEL); this.ui.setVisibilities(this.canSelectMany ? { title: !!this.title || !!this.step, checkAll: true, inputBox: true, visibleCount: true, count: true, ok: true, list: true } : { title: !!this.title || !!this.step, inputBox: true, visibleCount: true, list: true }); } } @@ -1225,6 +1228,7 @@ export class QuickInputService extends Component implements IQuickInputService { this.ui.list.matchOnDetail = false; this.ui.ignoreFocusOut = false; this.setComboboxAccessibility(false); + this.ui.inputBox.removeAttribute('aria-label'); const keybinding = this.keybindingService.lookupKeybinding(BackAction.ID); backButton.tooltip = keybinding ? localize('quickInput.backWithKeybinding', "Back ({0})", keybinding.getLabel()) : localize('quickInput.back', "Back"); diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts index 5ec8b988067..67166491527 100644 --- a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts +++ b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts @@ -8,7 +8,6 @@ import 'vs/css!./quickInput'; import * as dom from 'vs/base/browser/dom'; import { InputBox, IRange, MessageType } from 'vs/base/browser/ui/inputbox/inputBox'; -import { localize } from 'vs/nls'; import { inputBackground, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoForeground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningForeground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorForeground, inputValidationErrorBorder } from 'vs/platform/theme/common/colorRegistry'; import { ITheme } from 'vs/platform/theme/common/themeService'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; @@ -17,8 +16,6 @@ import Severity from 'vs/base/common/severity'; const $ = dom.$; -const DEFAULT_INPUT_ARIA_LABEL = localize('quickInputBox.ariaLabel', "Type to narrow down results."); - export class QuickInputBox { private container: HTMLElement; @@ -29,9 +26,7 @@ export class QuickInputBox { private parent: HTMLElement ) { this.container = dom.append(this.parent, $('.quick-input-box')); - this.inputBox = new InputBox(this.container, null, { - ariaLabel: DEFAULT_INPUT_ARIA_LABEL - }); + this.inputBox = new InputBox(this.container, null); this.disposables.push(this.inputBox); } -- GitLab