list: announce once element typing is done

isidorn · isidorn · commit 73bf9d35da69 · 2020-05-07T10:20:44.000+02:00
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
@@ -394,6 +394,7 @@ class TypeLabelController<T> implements IDisposable {
 		const onInput = Event.reduce<string | null, string | null>(Event.any(onChar, onClear), (r, i) => i === null ? null : ((r || '') + i));
 
 		onInput(this.onInput, this, this.enabledDisposables);
+		onClear(this.onClear, this, this.enabledDisposables);
 
 		this.enabled = true;
 		this.triggered = false;
@@ -409,6 +410,16 @@ class TypeLabelController<T> implements IDisposable {
 		this.triggered = false;
 	}
 
+	private onClear(): void {
+		const focus = this.list.getFocus();
+		if (focus.length > 0) {
+			const ariaLabel = this.list.options.accessibilityProvider?.getAriaLabel(this.list.element(focus[0]));
+			if (ariaLabel) {
+				alert(ariaLabel);
+			}
+		}
+	}
+
 	private onInput(word: string | null): void {
 		if (!word) {
 			this.state = TypeLabelControllerState.Idle;
@@ -429,14 +440,6 @@ class TypeLabelController<T> implements IDisposable {
 			if (typeof labelStr === 'undefined' || matchesPrefix(word, labelStr)) {
 				this.list.setFocus([index]);
 				this.list.reveal(index);
-
-				if (index === start) {
-					// Focus did not change with typing, re-announce element https://github.com/microsoft/vscode/issues/95961
-					const ariaLabel = this.list.options.accessibilityProvider?.getAriaLabel(this.list.element(index));
-					if (ariaLabel) {
-						alert(ariaLabel);
-					}
-				}
 				return;
 			}
 		}
