diff --git a/src/lib/components/common/Dropdown.svelte b/src/lib/components/common/Dropdown.svelte index 925a845ecc..01316cfd03 100644 --- a/src/lib/components/common/Dropdown.svelte +++ b/src/lib/components/common/Dropdown.svelte @@ -247,6 +247,9 @@ async function afterOpen() { await tick(); + contentEl + ?.querySelectorAll('button:not([role]), a[href]:not([role])') + .forEach((item) => item.setAttribute('role', 'menuitem')); positionContent(); // Re-check after transition renders real dimensions diff --git a/src/lib/components/common/DropdownSub.svelte b/src/lib/components/common/DropdownSub.svelte index 31185f156a..4349a58b59 100644 --- a/src/lib/components/common/DropdownSub.svelte +++ b/src/lib/components/common/DropdownSub.svelte @@ -18,8 +18,10 @@ let triggerEl: HTMLElement | null = null; let contentEl: HTMLElement | null = null; - function trigger(node: HTMLElement) { + function trigger(node: HTMLElement, expanded: boolean) { triggerEl = (node.firstElementChild as HTMLElement | null) || node; + triggerEl.setAttribute('aria-haspopup', 'menu'); + triggerEl.setAttribute('aria-expanded', String(expanded)); async function handleClick(event: MouseEvent) { event.preventDefault(); @@ -37,6 +39,9 @@ node.addEventListener('keydown', handleKeydown); return { + update(expanded: boolean) { + triggerEl?.setAttribute('aria-expanded', String(expanded)); + }, destroy() { node.removeEventListener('click', handleClick); node.removeEventListener('keydown', handleKeydown); @@ -110,8 +115,14 @@ // Re-position after transition starts rendering real dimensions setTimeout(positionContent, 50); + contentEl + ?.querySelectorAll('button:not([role]), a[href]:not([role])') + .forEach((item) => item.setAttribute('role', 'menuitem')); + if (focus) { - contentEl?.focus(); + ( + contentEl?.querySelector('[role^="menuitem"]:not([disabled])') ?? contentEl + )?.focus(); } } @@ -120,7 +131,25 @@ } function handleContentKeydown(event: KeyboardEvent) { - if (event.key !== 'Escape') return; + if (['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key) && contentEl) { + const items = [ + ...contentEl.querySelectorAll('[role^="menuitem"]:not([disabled])') + ].filter((item) => item.getClientRects().length > 0); + const index = items.indexOf(event.target as HTMLElement); + const nextIndex = + event.key === 'Home' + ? 0 + : event.key === 'End' + ? items.length - 1 + : (index + (event.key === 'ArrowDown' ? 1 : -1) + items.length) % items.length; + + event.preventDefault(); + event.stopPropagation(); + items[nextIndex]?.focus(); + return; + } + + if (event.key !== 'Escape' && event.key !== 'ArrowLeft') return; event.stopPropagation(); open = false; @@ -160,7 +189,7 @@