fix: ensure menu keydown logic allows shift+tab to navigate as expect…

…ed (#31849)
microsoft · Jun 27, 2024 · 272dafa · 272dafa
1 parent c05bfd2
commit 272dafa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/change/@fluentui-web-components-d7ebd73e-6662-488f-a6c8-3715eea02229.json b/change/@fluentui-web-components-d7ebd73e-6662-488f-a6c8-3715eea02229.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "fix: ensure menu keydown logic allows shift+tab to navigate as expected",
+  "packageName": "@fluentui/web-components",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/web-components/src/menu/menu.ts b/packages/web-components/src/menu/menu.ts
@@ -349,7 +349,11 @@ export class Menu extends FASTElement {
         break;
       case keyTab:
         if (this._open) this.closeMenu();
-        if (e.shiftKey) this.focusTrigger();
+        if (e.shiftKey && e.composedPath()[0] !== this._trigger) {
+          this.focusTrigger();
+        } else if (e.shiftKey) {
+          return true;
+        }
       default:
         return true;
     }