Merge branch 'master' into users/bheston/foundation-accordion-update

microsoft · Oct 11, 2023 · 7aeadd1 · 7aeadd1
2 parents 17c43be + a7144c6
commit 7aeadd1
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 4 deletions.
diff --git a/change/@microsoft-fast-foundation-903a969b-3de3-4090-974a-3423344c571c.json b/change/@microsoft-fast-foundation-903a969b-3de3-4090-974a-3423344c571c.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Fix focus issue when clicking on an element in the toolbar",
+  "packageName": "@microsoft/fast-foundation",
+  "email": "[email protected]",
+  "dependentChangeType": "prerelease"
+}
diff --git a/packages/web-components/fast-foundation/docs/api-report.md b/packages/web-components/fast-foundation/docs/api-report.md
@@ -2092,8 +2092,6 @@ export class FASTToolbar extends FASTElement {
     childItems: Element[];
     // (undocumented)
     protected childItemsChanged(prev: undefined | Element[], next: Element[]): void;
-    // @internal
-    clickHandler(e: MouseEvent): boolean | void;
     // @internal (undocumented)
     connectedCallback(): void;
     // @internal
@@ -2102,6 +2100,8 @@ export class FASTToolbar extends FASTElement {
     focusinHandler(e: FocusEvent): boolean | void;
     // @internal
     keydownHandler(e: KeyboardEvent): boolean | void;
+    // @internal
+    mouseDownHandler(e: MouseEvent): boolean | void;
     orientation: ToolbarOrientation;
     // @internal
     protected reduceFocusableElements(): void;

diff --git a/packages/web-components/fast-foundation/src/toolbar/toolbar.pw.spec.ts b/packages/web-components/fast-foundation/src/toolbar/toolbar.pw.spec.ts
@@ -418,4 +418,65 @@ test.describe("Toolbar", () => {
 
         await expect(element).toHaveJSProperty("activeIndex", 2);
     });
+
+    test("should focus most recently focused item when toolbar receives focus", async () => {
+        await root.evaluate(node => {
+            node.innerHTML = /* html */ `
+                <fast-toolbar>
+                    <button slot="start">Start Slot Button</button>
+                    <button>Button 1</button>
+                    <button>Button 2</button>
+                    <button>Button 3</button>
+                    <button>Button 4</button>
+                    <button>Button 5</button>
+                    <button slot="end">End Slot Button</button>
+                </fast-toolbar>
+                <button>Button Outside Toolbar</button>
+            `;
+        });
+        const button2 = element.locator("button", { hasText: "Button 2" });
+
+        const buttonOutsideToolbar = page.locator("button", { hasText: "Button Outside Toolbar"});
+
+        await button2.click();
+        await expect(button2).toBeFocused();
+
+        await buttonOutsideToolbar.click();
+        await expect(buttonOutsideToolbar).toBeFocused();
+
+        await element.focus();
+
+        await expect(button2).toBeFocused();
+    });
+
+    test("should focus clicked item when focus enters toolbar by clicking an item that is not the most recently focused item", async () => {
+        await root.evaluate(node => {
+            node.innerHTML = /* html */ `
+                <fast-toolbar>
+                    <button slot="start">Start Slot Button</button>
+                    <button>Button 1</button>
+                    <button>Button 2</button>
+                    <button>Button 3</button>
+                    <button>Button 4</button>
+                    <button>Button 5</button>
+                    <button slot="end">End Slot Button</button>
+                </fast-toolbar>
+                <button>Button Outside Toolbar</button>
+            `;
+        });
+        const button2 = element.locator("button", { hasText: "Button 2" });
+
+        const button3 = element.locator("button", { hasText: "Button 3" });
+
+        const buttonOutsideToolbar = page.locator("button", { hasText: "Button Outside Toolbar"});
+
+        await button2.click();
+        await expect(button2).toBeFocused();
+
+        await buttonOutsideToolbar.click();
+        await expect(buttonOutsideToolbar).toBeFocused();
+
+        await button3.click();
+        await expect(button3).toBeFocused();
+    });
 });
diff --git a/packages/web-components/fast-foundation/src/toolbar/toolbar.template.ts b/packages/web-components/fast-foundation/src/toolbar/toolbar.template.ts
@@ -24,7 +24,7 @@ export function toolbarTemplate<T extends FASTToolbar>(
             aria-orientation="${x => x.orientation}"
             orientation="${x => x.orientation}"
             role="toolbar"
-            @click="${(x, c) => x.clickHandler(c.event as MouseEvent)}"
+            @mousedown="${(x, c) => x.mouseDownHandler(c.event as MouseEvent)}"
             @focusin="${(x, c) => x.focusinHandler(c.event as FocusEvent)}"
             @keydown="${(x, c) => x.keydownHandler(c.event as KeyboardEvent)}"
             ${children({

diff --git a/packages/web-components/fast-foundation/src/toolbar/toolbar.ts b/packages/web-components/fast-foundation/src/toolbar/toolbar.ts
@@ -121,7 +121,7 @@ export class FASTToolbar extends FASTElement {
      *
      * @internal
      */
-    public clickHandler(e: MouseEvent): boolean | void {
+    public mouseDownHandler(e: MouseEvent): boolean | void {
         const activeIndex = this.focusableElements?.findIndex(x =>
             x.contains(e.target as HTMLElement)
         );