Change files

microsoft · Apr 5, 2024 · 588e78f · 588e78f
1 parent ea3e9f0
commit 588e78f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/change/@microsoft-fast-foundation-452bb1d9-58ef-4cb0-a6fa-0ed41d1ad057.json b/change/@microsoft-fast-foundation-452bb1d9-58ef-4cb0-a6fa-0ed41d1ad057.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: prevent toolbar from stealing focus when focus has already been moved in the document",
+  "packageName": "@microsoft/fast-foundation",
+  "email": "=",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/web-components/fast-foundation/src/toolbar/toolbar.ts b/packages/web-components/fast-foundation/src/toolbar/toolbar.ts
@@ -242,8 +242,9 @@ export class Toolbar extends FoundationElement {
 
         // If the previously active item is still focusable, adjust the active index to the
         // index of that item.
-        const adjustedActiveIndex =
-            this.focusableElements.indexOf(previousFocusedElement);
+        const adjustedActiveIndex = this.focusableElements.indexOf(
+            previousFocusedElement
+        );
         this.activeIndex = Math.max(0, adjustedActiveIndex);
 
         this.setFocusableElements();