An open source design system that's fully customizable and agent ready
TypeScript
fix(Toolbar): scope navigation to its own focus boundary (#7446)
zakelstorm396e48759e34
diff --git a/.changeset/toolbar-popover-focus-boundary.md b/.changeset/toolbar-popover-focus-boundary.mdnew file mode 100644index 0000000000..92ed5cf583--- /dev/null+++ b/.changeset/toolbar-popover-focus-boundary.md@@ -0,0 +1,7 @@+---+'@astryxdesign/core': patch+---++[fix] Keep Toolbar keyboard navigation and roving tab stops outside nested popover menus, without disabling toolbar navigation inside an outer popover.++@korkt-kimdiff --git a/packages/core/src/Toolbar/Toolbar.test.tsx b/packages/core/src/Toolbar/Toolbar.test.tsxindex 56d0aea38d..77bbc20140 100644--- a/packages/core/src/Toolbar/Toolbar.test.tsx+++ b/packages/core/src/Toolbar/Toolbar.test.tsx@@ -2,18 +2,19 @@/*** @file Toolbar.test.tsx- * @input Uses vitest, @testing-library/react, Toolbar- * @output Unit tests for Toolbar component- * @position Testing; validates Toolbar implementation+ * @input Uses vitest, @testing-library/react, user-event, Toolbar, MoreMenu+ * @output Unit tests for Toolbar component and nested popover focus ownership+ * @position Testing; validates Toolbar implementation and post-dismissal tab stops** SYNC: When Toolbar component changes, update tests to match new behavior*/import {describe, it, expect, vi} from 'vitest';-import {render, screen} from '@testing-library/react';+import {act, fireEvent, render, screen, waitFor} from '@testing-library/react';import userEvent from '@testing-library/user-event';import * as stylex from '@stylexjs/stylex';import {Toolbar} from './Toolbar';+import {MoreMenu} from '../MoreMenu';import {paddingBlockStyles,paddingInlineStyles,@@ -377,6 +378,132 @@ describe('Toolbar', () => {expect(buttons[2]).toHaveAttribute('tabindex', '-1');});+ it('keeps its tab stop after outside dismissal of MoreMenu', async () => {+ const user = userEvent.setup();+ render(+ <>+ <button type="button">Before</button>+ <Toolbar+ label="Actions"+ startContent={<button type="button">Copy</button>}+ endContent={+ <MoreMenu+ label="More actions"+ items={[{label: 'Duplicate'}, {label: 'Delete'}]}+ />+ }+ />+ <button type="button">After</button>+ </>,+ );++ const trigger = screen.getByRole('button', {name: 'More actions'});+ // Seed the trigger's tab stop with keyboard navigation so this tests+ // boundary ownership independently of pointer-focus synchronization.+ act(() => screen.getByRole('button', {name: 'Copy'}).focus());+ await user.keyboard('{ArrowRight}');+ expect(trigger).toHaveFocus();+ await user.click(trigger);+ await waitFor(() =>+ expect(screen.getByRole('menu', {hidden: true})).toHaveFocus(),+ );++ const item = screen.getByRole('menuitem', {+ name: 'Duplicate',+ hidden: true,+ });+ act(() => item.focus());+ expect(item).toHaveFocus();+ expect(trigger.getAttribute('tabindex')).toBe('0');+ expect(+ screen.getByRole('button', {name: 'Copy'}).getAttribute('tabindex'),+ ).toBe('-1');+ expect(+ screen.getByRole('menu', {hidden: true}).getAttribute('tabindex'),+ ).not.toBe('0');++ await user.click(screen.getByRole('button', {name: 'After'}));+ // jsdom has no native light dismiss. Deliver the browser's close event+ // after focus has moved outside, without restoring it to the trigger.+ const popover = item.closest('[popover]');+ fireEvent(+ popover!,+ Object.assign(new Event('toggle'), {newState: 'closed'}),+ );+ await waitFor(() =>+ expect(trigger).toHaveAttribute('aria-expanded', 'false'),+ );+ expect(screen.getByRole('button', {name: 'After'})).toHaveFocus();+ await user.tab({shift: true});+ expect(trigger).toHaveFocus();+ await user.tab({shift: true});+ expect(screen.getByRole('button', {name: 'Before'})).toHaveFocus();+ });++ it('leaves navigation inside an open MoreMenu to the menu', async () => {+ const user = userEvent.setup();+ render(+ <Toolbar+ label="Actions"+ startContent={<button type="button">Copy</button>}+ endContent={+ <MoreMenu+ label="More actions"+ items={[{label: 'Duplicate'}, {label: 'Delete'}]}+ />+ }+ />,+ );+ const trigger = screen.getByRole('button', {name: 'More actions'});+ act(() => screen.getByRole('button', {name: 'Copy'}).focus());+ await user.keyboard('{ArrowRight}');+ expect(trigger).toHaveFocus();+ await user.click(trigger);+ await waitFor(() =>+ expect(screen.getByRole('menu', {hidden: true})).toHaveFocus(),+ );++ const first = screen.getByRole('menuitem', {+ name: 'Duplicate',+ hidden: true,+ });+ const last = screen.getByRole('menuitem', {name: 'Delete', hidden: true});+ act(() => first.focus());+ await user.keyboard('{ArrowLeft}');+ expect(first).toHaveFocus();+ await user.keyboard('{ArrowRight}');+ expect(first).toHaveFocus();++ await user.keyboard('{ArrowDown}');+ expect(last).toHaveFocus();++ expect(trigger).toHaveAttribute('tabindex', '0');+ });++ it('keeps its own arrow navigation when rendered inside a popover', async () => {+ const user = userEvent.setup();+ render(+ <div popover="manual">+ <Toolbar+ label="Actions"+ startContent={+ <>+ <button type="button">Copy</button>+ <button type="button">Paste</button>+ </>+ }+ />+ </div>,+ );+ // jsdom does not open native popovers; the ancestor still tests ownership.+ const copy = screen.getByRole('button', {name: 'Copy', hidden: true});+ const paste = screen.getByRole('button', {name: 'Paste', hidden: true});+ act(() => copy.focus());+ await user.keyboard('{ArrowRight}');+ expect(paste).toHaveFocus();+ expect(paste.getAttribute('tabindex')).toBe('0');+ });+it('does not steal caret keys from a text input mid-line (navigation-4)', async () => {const user = userEvent.setup();render(diff --git a/packages/core/src/Toolbar/Toolbar.tsx b/packages/core/src/Toolbar/Toolbar.tsxindex 5cd21a49f4..9c37d9f3c8 100644--- a/packages/core/src/Toolbar/Toolbar.tsx+++ b/packages/core/src/Toolbar/Toolbar.tsx@@ -6,7 +6,8 @@* @file Toolbar.tsx* @input Uses Section, SizeContext, useListFocus, useKeyboardHint, StyleX, spacingVars, sizeVars* @output Exports Toolbar component and ToolbarProps- * @position Core implementation; consumed by index.ts+ * @position Core implementation; consumed by index.ts. Owns toolbar focus and+ * keyboard navigation, excluding nested toolbars and popover contents.** SYNC: When modified, update these files to stay in sync:* - /packages/core/src/Toolbar/Toolbar.doc.mjs@@ -248,6 +249,7 @@ export function Toolbar({const {listRef, handleKeyDown, handleFocus} = useListFocus<HTMLDivElement>({itemSelector: 'button, input, [tabindex]',+ boundarySelector: '[role="toolbar"], [popover]',orientation,hasRovingTabIndex: true,hasCaretGuard: true,