zoriya/v10
1
0
Fork 0
mirror of https://github.com/zoriya/v10.git synced 2026-08-16 02:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): focus selected radio menu items (#1645)

Browse Source
This commit is contained in:
Sam Potts
2026-06-02 16:40:11 +10:00
committed by GitHub
parent efc7c23b7b
commit e9a619e03a
2 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/core/src/dom/ui/menu/create-menu.ts
+5 -1
View File
@@ -192,7 +192,11 @@ export function createMenu(options: MenuOptions): MenuApi {
}
function getInitialHighlightItem(): HTMLElement | null {
return items.find((item) => item.matches('[aria-checked="true"], [aria-selected="true"]')) ?? items[0] ?? null;
return (
items.find((item) => item.matches('[role="menuitemradio"][aria-checked="true"], [aria-selected="true"]')) ??
items[0] ??
null
);
}
// --- Type-ahead ---
packages/core/src/dom/ui/menu/tests/create-menu.test.ts
+31 -2
View File
@@ -144,13 +144,15 @@ describe('createMenu', () => {
vi.useRealTimers();
});
it('highlights the checked item when opening', () => {
it('focuses the checked radio item when opening', () => {
vi.useFakeTimers();
const { menu } = createTestMenu();
const a = addItem('Alpha');
const b = addItem('Beta');
b.setAttribute('role', 'menuitemradio');
b.setAttribute('aria-checked', 'true');
const focus = vi.spyOn(b, 'focus');
menu.registerItem(a);
menu.registerItem(b);
@@ -160,17 +162,20 @@ describe('createMenu', () => {
expect(b.getAttribute(MenuItemDataAttrs.highlighted)).toBe('');
expect(a.hasAttribute(MenuItemDataAttrs.highlighted)).toBe(false);
expect(focus).toHaveBeenCalledOnce();
vi.useRealTimers();
});
it('highlights the checked item when items register after opening', () => {
it('focuses the checked radio item when items register after opening', () => {
vi.useFakeTimers();
const { menu } = createTestMenu();
const a = addItem('Alpha');
const b = addItem('Beta');
b.setAttribute('role', 'menuitemradio');
b.setAttribute('aria-checked', 'true');
const focus = vi.spyOn(b, 'focus');
menu.open();
menu.registerItem(a);
@@ -180,6 +185,30 @@ describe('createMenu', () => {
expect(b.getAttribute(MenuItemDataAttrs.highlighted)).toBe('');
expect(a.hasAttribute(MenuItemDataAttrs.highlighted)).toBe(false);
expect(focus).toHaveBeenCalledOnce();
vi.useRealTimers();
});
it('does not initially focus a checked checkbox item over a checked radio item', () => {
vi.useFakeTimers();
const { menu } = createTestMenu();
const checkbox = addItem('Loop');
const radio = addItem('Auto');
checkbox.setAttribute('role', 'menuitemcheckbox');
checkbox.setAttribute('aria-checked', 'true');
radio.setAttribute('role', 'menuitemradio');
radio.setAttribute('aria-checked', 'true');
menu.registerItem(checkbox);
menu.registerItem(radio);
menu.open();
vi.runAllTimers();
expect(radio.getAttribute(MenuItemDataAttrs.highlighted)).toBe('');
expect(checkbox.hasAttribute(MenuItemDataAttrs.highlighted)).toBe(false);
vi.useRealTimers();
});