fix(ui-shell): fix HeaderNavMenu accessibility, undefined context (#1079)

Fixes:

* hotfix: remove toggle accessor from HeaderNavMenu

* hotfix(ui-shell): HeaderNavMenu context is possibly undefined

* fix: apply a11y navigation menubar attributes
This commit is contained in:
metonym 2022-02-10 08:11:56 -08:00 committed by GitHub
commit 1939e4328d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 12 deletions

View file

@ -13,7 +13,7 @@
</script> </script>
<nav {...props} class:bx--header__nav="{true}" {...$$restProps}> <nav {...props} class:bx--header__nav="{true}" {...$$restProps}>
<ul {...props} class:bx--header__menu-bar="{true}"> <ul {...props} role="menubar" class:bx--header__menu-bar="{true}">
<slot /> <slot />
</ul> </ul>
</nav> </nav>

View file

@ -17,16 +17,27 @@
/** Obtain a reference to the HTML anchor element */ /** Obtain a reference to the HTML anchor element */
export let ref = null; export let ref = null;
import { getContext } from "svelte"; import { getContext, onMount } from "svelte";
const id = "ccs-" + Math.random().toString(36); const id = "ccs-" + Math.random().toString(36);
const { selectedItems, updateSelectedItems, closeMenu } = const ctx = getContext("HeaderNavMenu");
getContext("HeaderNavMenu");
$: updateSelectedItems({ id, isSelected }); let selectedItemIds = [];
const unsubSelectedItems = ctx?.selectedItems.subscribe((_selectedItems) => {
selectedItemIds = Object.keys(_selectedItems);
});
$: ctx?.updateSelectedItems({ id, isSelected });
onMount(() => {
return () => {
if (unsubSelectedItems) unsubSelectedItems();
};
});
</script> </script>
<li> <li role="none">
<a <a
bind:this="{ref}" bind:this="{ref}"
role="menuitem" role="menuitem"
@ -45,8 +56,9 @@
on:focus on:focus
on:blur on:blur
on:blur="{() => { on:blur="{() => {
const ids = Object.keys($selectedItems); if (selectedItemIds.indexOf(id) === selectedItemIds.length - 1) {
if (ids.indexOf(id) === ids.length - 1) closeMenu(); ctx?.closeMenu();
}
}}" }}"
> >
<span class:bx--text-truncate--end="{true}">{text}</span> <span class:bx--text-truncate--end="{true}">{text}</span>

View file

@ -14,10 +14,6 @@
/** Obtain a reference to the HTML anchor element */ /** Obtain a reference to the HTML anchor element */
export let ref = null; export let ref = null;
export function toggle() {
expanded = !expanded;
}
import { setContext } from "svelte"; import { setContext } from "svelte";
import { writable } from "svelte/store"; import { writable } from "svelte/store";
import ChevronDown16 from "../../icons/ChevronDown16.svelte"; import ChevronDown16 from "../../icons/ChevronDown16.svelte";
@ -52,6 +48,7 @@
/> />
<li <li
role="none"
class:bx--header__submenu="{true}" class:bx--header__submenu="{true}"
class:bx--header__submenu--current="{isCurrentSubmenu}" class:bx--header__submenu--current="{isCurrentSubmenu}"
on:click="{(e) => { on:click="{(e) => {
@ -69,6 +66,7 @@
> >
<a <a
bind:this="{ref}" bind:this="{ref}"
role="menuitem"
tabindex="0" tabindex="0"
aria-haspopup="menu" aria-haspopup="menu"
aria-expanded="{expanded}" aria-expanded="{expanded}"