An open source design system that's fully customizable and agent ready
TypeScript
fix(navmenu): activate onClick-only menu items via Enter/Space (#3334)
Cindy Zhang7832a35bbe71
diff --git a/.changeset/navheadingmenu-keyboard-activation.md b/.changeset/navheadingmenu-keyboard-activation.mdnew file mode 100644index 0000000000..75ee51b3ef--- /dev/null+++ b/.changeset/navheadingmenu-keyboard-activation.md@@ -0,0 +1,6 @@+---+'@astryxdesign/core': patch+---++[fix] NavHeadingMenu: `onClick`-only items (rendered without an `href`) now activate on Enter and Space. Previously these `role="menuitem"` elements had no keyboard activation, so keyboard and screen-reader users could focus them but not trigger them (#3333)+@cixzhangdiff --git a/packages/core/src/NavMenu/NavHeadingMenu.test.tsx b/packages/core/src/NavMenu/NavHeadingMenu.test.tsxindex 493b6ee8e9..a9c3c75d87 100644--- a/packages/core/src/NavMenu/NavHeadingMenu.test.tsx+++ b/packages/core/src/NavMenu/NavHeadingMenu.test.tsx@@ -204,6 +204,51 @@ describe('keyboard navigation', () => {await user.keyboard('{End}');expect(document.activeElement).toBe(items[2]);});++ it('activates a focused onClick-only item with Enter', async () => {+ const user = userEvent.setup();+ const onClick = vi.fn();+ render(+ <NavHeadingMenu>+ <NavHeadingMenuItem label="Action" onClick={onClick} />+ </NavHeadingMenu>,+ );+ const item = screen.getByRole('menuitem');+ item.focus();++ await user.keyboard('{Enter}');+ expect(onClick).toHaveBeenCalledOnce();+ });++ it('activates a focused onClick-only item with Space', async () => {+ const user = userEvent.setup();+ const onClick = vi.fn();+ render(+ <NavHeadingMenu>+ <NavHeadingMenuItem label="Action" onClick={onClick} />+ </NavHeadingMenu>,+ );+ const item = screen.getByRole('menuitem');+ item.focus();++ await user.keyboard('{ }');+ expect(onClick).toHaveBeenCalledOnce();+ });++ it('does not activate a disabled item with Enter', async () => {+ const user = userEvent.setup();+ const onClick = vi.fn();+ render(+ <NavHeadingMenu>+ <NavHeadingMenuItem label="Action" onClick={onClick} isDisabled />+ </NavHeadingMenu>,+ );+ const item = screen.getByRole('menuitem');+ item.focus();++ await user.keyboard('{Enter}');+ expect(onClick).not.toHaveBeenCalled();+ });});describe('context forwarding', () => {diff --git a/packages/core/src/NavMenu/NavHeadingMenu.tsx b/packages/core/src/NavMenu/NavHeadingMenu.tsxindex 4d321d2c88..154d277fb1 100644--- a/packages/core/src/NavMenu/NavHeadingMenu.tsx+++ b/packages/core/src/NavMenu/NavHeadingMenu.tsx@@ -12,7 +12,7 @@* - /packages/core/src/NavMenu/index.ts*/-import React, {useMemo, type ReactNode} from 'react';+import React, {useCallback, useMemo, type ReactNode} from 'react';import * as stylex from '@stylexjs/stylex';import {spacingVars} from '../theme/tokens.stylex';import {mergeProps, mergeRefs} from '../utils';@@ -102,6 +102,25 @@ export function NavHeadingMenu({onEscape: closeMenu,});+ // Extend useListFocus with Enter/Space activation. Items rendered without an+ // `href` are `<div role="menuitem">` elements, which have no native keyboard+ // activation — without this, Enter/Space on a focused onClick-only item does+ // nothing. Anchor items (with `href`) already activate on Enter natively.+ const listKeyDown = useCallback(+ (e: React.KeyboardEvent) => {+ if (e.key === 'Enter' || e.key === ' ') {+ const focused = document.activeElement as HTMLElement | null;+ if (focused?.getAttribute('role') === 'menuitem') {+ e.preventDefault();+ focused.click();+ return;+ }+ }+ handleKeyDown(e);+ },+ [handleKeyDown],+ );+const ctx = useMemo(() => ({closeMenu: closeMenu ?? (() => {}),@@ -117,7 +136,7 @@ export function NavHeadingMenu({<divref={mergeRefs(ref, listRef)}role="menu"- onKeyDown={handleKeyDown}+ onKeyDown={listKeyDown}data-testid={testId}{...mergeProps(themeProps('nav-heading-menu', {size}),