fix(a11y): menu items, submenu items included, move with the arrow keys, Home and End (#33359)

This commit is contained in:
G30 2026-10-29 01:50:06 -04:00 • committed by GitHub
parent 9f696f3e63
commit 1de86d8d16
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 36 additions and 4 deletions

View file

@ -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

View file

@ -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<HTMLElement>('[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<HTMLElement>('[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 @@
<!-- svelte-ignore a11y-no-static-element-interactions -->
<div
use:trigger
use:trigger={open}
class="w-full {($settings?.highContrastMode ?? false)
? '[&>button:hover]:bg-gray-200! dark:[&>button:hover]:bg-gray-800!'
: '[&>button:hover]:bg-gray-50/60 dark:[&>button:hover]:bg-gray-800/60'}"