From 995a47450f212b2074e7fcf619700664c051af8d Mon Sep 17 00:00:00 2001
From: Eric Liu <ericyl.us@gmail.com>
Date: Thu, 10 Feb 2022 07:58:55 -0800
Subject: [PATCH] fix(ui-shell): apply a11y navigation menubar attributes

Ref: https://github.com/carbon-design-system/carbon-components-svelte/pull/1073#issuecomment-1035061334
---
 src/UIShell/GlobalHeader/HeaderNav.svelte     | 2 +-
 src/UIShell/GlobalHeader/HeaderNavItem.svelte | 2 +-
 src/UIShell/GlobalHeader/HeaderNavMenu.svelte | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/UIShell/GlobalHeader/HeaderNav.svelte b/src/UIShell/GlobalHeader/HeaderNav.svelte
index d7dd5e98..33b68399 100644
--- a/src/UIShell/GlobalHeader/HeaderNav.svelte
+++ b/src/UIShell/GlobalHeader/HeaderNav.svelte
@@ -13,7 +13,7 @@
 </script>
 
 <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 />
   </ul>
 </nav>
diff --git a/src/UIShell/GlobalHeader/HeaderNavItem.svelte b/src/UIShell/GlobalHeader/HeaderNavItem.svelte
index 60376fcf..37e57af0 100644
--- a/src/UIShell/GlobalHeader/HeaderNavItem.svelte
+++ b/src/UIShell/GlobalHeader/HeaderNavItem.svelte
@@ -26,7 +26,7 @@
   $: updateSelectedItems({ id, isSelected });
 </script>
 
-<li>
+<li role="none">
   <a
     bind:this="{ref}"
     role="menuitem"
diff --git a/src/UIShell/GlobalHeader/HeaderNavMenu.svelte b/src/UIShell/GlobalHeader/HeaderNavMenu.svelte
index 4833a40a..e170f2a3 100644
--- a/src/UIShell/GlobalHeader/HeaderNavMenu.svelte
+++ b/src/UIShell/GlobalHeader/HeaderNavMenu.svelte
@@ -48,6 +48,7 @@
 />
 
 <li
+  role="none"
   class:bx--header__submenu="{true}"
   class:bx--header__submenu--current="{isCurrentSubmenu}"
   on:click="{(e) => {
@@ -65,6 +66,7 @@
 >
   <a
     bind:this="{ref}"
+    role="menuitem"
     tabindex="0"
     aria-haspopup="menu"
     aria-expanded="{expanded}"