Skip to content

Commit 57bbed2

Browse files
authored
fix: make first item focusable when selected is negative (#7574)
1 parent 64f6da7 commit 57bbed2

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

‎packages/a11y-base/src/list-mixin.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ export const ListMixin = (superClass) =>
166166
}
167167
});
168168

169-
this._setFocusable(selected || 0);
169+
// When selected is set to -1, focus the first available item.
170+
this._setFocusable(selected < 0 || !selected ? 0 : selected);
170171

171172
const itemToSelect = items[selected];
172173
items.forEach((item) => {

‎packages/a11y-base/test/list-mixin.test.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,12 @@ const runTests = (defineHelper, baseMixin) => {
269269
[-1, -1, 0, -1].forEach((val, idx) => expect(list.items[idx].tabIndex).to.equal(val));
270270
});
271271

272+
it('should have the first not disabled item focusable when selected set to -1', async () => {
273+
list.selected = -1;
274+
await nextUpdate(list);
275+
[-1, -1, 0, -1].forEach((val, idx) => expect(list.items[idx].tabIndex).to.equal(val));
276+
});
277+
272278
it('should set a not disabled item focusable', async () => {
273279
list._setFocusable(3);
274280
await nextUpdate(list);

0 commit comments

Comments
 (0)