Skip to content

Commit 048c70d

Browse files
committed
Revert "always set aria-selected, even for listbox"
This reverts commit 1356392.
1 parent 7d47cd2 commit 048c70d

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/vs/base/browser/ui/list/listWidget.ts

+8-6
Original file line numberDiff line numberDiff line change
@@ -196,17 +196,19 @@ class Trait<T> implements ISpliceable<boolean>, IDisposable {
196196

197197
class SelectionTrait<T> extends Trait<T> {
198198

199-
constructor() {
199+
constructor(private setAriaSelected: boolean) {
200200
super('selected');
201201
}
202202

203203
override renderIndex(index: number, container: HTMLElement): void {
204204
super.renderIndex(index, container);
205205

206-
if (this.contains(index)) {
207-
container.setAttribute('aria-selected', 'true');
208-
} else {
209-
container.setAttribute('aria-selected', 'false');
206+
if (this.setAriaSelected) {
207+
if (this.contains(index)) {
208+
container.setAttribute('aria-selected', 'true');
209+
} else {
210+
container.setAttribute('aria-selected', 'false');
211+
}
210212
}
211213
}
212214
}
@@ -1315,7 +1317,7 @@ export class List<T> implements ISpliceable<T>, IThemable, IDisposable {
13151317
private _options: IListOptions<T> = DefaultOptions
13161318
) {
13171319
const role = this._options.accessibilityProvider && this._options.accessibilityProvider.getWidgetRole ? this._options.accessibilityProvider?.getWidgetRole() : 'list';
1318-
this.selection = new SelectionTrait();
1320+
this.selection = new SelectionTrait(role !== 'listbox');
13191321

13201322
mixin(_options, defaultStyles, false);
13211323

0 commit comments

Comments
 (0)