An open source design system that's fully customizable and agent ready
TypeScript
feat(TabMenu): forward host attributes and DOM handlers to the trigger (#7295)
zakelstorm07f97c6686e7
diff --git a/.changeset/tab-menu-host-attributes.md b/.changeset/tab-menu-host-attributes.mdnew file mode 100644index 0000000000..73d0795fde--- /dev/null+++ b/.changeset/tab-menu-host-attributes.md@@ -0,0 +1,7 @@+---+'@astryxdesign/core': patch+---++[feat] `TabMenu` passes host attributes and DOM event handlers to its trigger button. The trigger keeps its button semantics, tab stop, and menu disclosure attributes; a caller's `onClick` runs after the menu toggle.++@korkt-kimdiff --git a/packages/core/src/TabList/TabList.test.tsx b/packages/core/src/TabList/TabList.test.tsxindex a238c11387..f196079ee0 100644--- a/packages/core/src/TabList/TabList.test.tsx+++ b/packages/core/src/TabList/TabList.test.tsx@@ -783,6 +783,73 @@ describe('TabMenu', () => {});});+describe('TabMenu host attributes', () => {+ const menuOptions = [+ {value: 'analytics', label: 'Analytics'},+ {value: 'reports', label: 'Reports'},+ ];++ it('forwards host attributes to the trigger, not the popup', () => {+ render(+ <TabList value="home" onChange={() => {}}>+ <Tab value="home" label="Home" />+ <TabMenu+ label="More"+ options={menuOptions}+ id="more-tabs"+ aria-label="More views"+ data-view="overflow"+ />+ </TabList>,+ );++ const trigger = screen.getByRole('button', {name: 'More views'});+ expect(trigger).toHaveAttribute('id', 'more-tabs');+ expect(trigger).toHaveAttribute('data-view', 'overflow');+ const menu = screen.getByRole('menu', {name: 'More', hidden: true});+ expect(trigger).toHaveAttribute('aria-controls', menu.id);+ });++ it('runs drag-and-drop handlers on the trigger', () => {+ const onDragOver = vi.fn();+ const onDrop = vi.fn();+ render(+ <TabList value="home" onChange={() => {}}>+ <Tab value="home" label="Home" />+ <TabMenu+ label="More"+ options={menuOptions}+ onDragOver={onDragOver}+ onDrop={onDrop}+ />+ </TabList>,+ );+ const trigger = screen.getByRole('button', {name: 'More'});+ fireEvent.dragOver(trigger);+ fireEvent.drop(trigger);+ expect(onDragOver).toHaveBeenCalledTimes(1);+ expect(onDrop).toHaveBeenCalledTimes(1);+ expect(trigger).toHaveAttribute('aria-expanded', 'false');+ });++ it('onClick preserves the toggle', async () => {+ const user = userEvent.setup();+ const onClick = vi.fn((event: React.MouseEvent<HTMLButtonElement>) => {+ event.preventDefault();+ });+ render(+ <TabList value="home" onChange={() => {}}>+ <Tab value="home" label="Home" />+ <TabMenu label="More" options={menuOptions} onClick={onClick} />+ </TabList>,+ );+ const trigger = screen.getByRole('button', {name: 'More'});+ await user.click(trigger);+ expect(onClick).toHaveBeenCalledTimes(1);+ expect(trigger).toHaveAttribute('aria-expanded', 'true');+ });+});+describe('TabMenu keyboard navigation (roving tabindex)', () => {const menuOptions = [{value: 'analytics', label: 'Analytics'},diff --git a/packages/core/src/TabList/TabMenu.doc.mjs b/packages/core/src/TabList/TabMenu.doc.mjsindex ff1d983ef7..d0dcd6e043 100644--- a/packages/core/src/TabList/TabMenu.doc.mjs+++ b/packages/core/src/TabList/TabMenu.doc.mjs@@ -7,7 +7,7 @@ export const docs = {subComponentOf: 'TabList',displayName: 'Tab Menu',isHiddenFromOverview: true,- description: "Overflow menu trigger that opens a dropdown of additional tab options, showing the selected option's label as the trigger text.",+ description: "Overflow menu trigger that opens a dropdown of additional tab options, showing the selected option's label as the trigger text. Host attributes and DOM event handlers (id, aria-*, data-*, drag and drop) reach the trigger button, not the popup or its options. The button keeps its role, tab stop, and menu disclosure attributes.",// TabMenu requires TabList context; wrap it so the preview doesn't throw.// The wrapper value matches none of the options, so the trigger shows its// own label (the idle overflow state).@@ -42,7 +42,7 @@ export const docsZh = {name: 'TabMenu',isHiddenFromOverview: true,displayName: 'Tab Menu',- description: '溢出菜单触发器,打开包含额外标签选项的下拉菜单,将选中选项的标签显示为触发器文本。',+ description: '溢出菜单触发器,打开包含额外标签选项的下拉菜单,将选中选项的标签显示为触发器文本。宿主属性和 DOM 事件处理器(id、aria-*、data-*、拖放)传递给触发按钮,而不是弹出菜单或选项。按钮保留自己的角色、Tab 停靠点及菜单展开属性。',props: [{name: 'label',@@ -63,7 +63,8 @@ export const docsDense = {name: 'TabMenu',isHiddenFromOverview: true,displayName: 'Tab Menu',- description: "Overflow menu trigger; dropdown of extra tab options, shows selected option's label as trigger text.",+ description:+ "Overflow menu trigger; shows selected option's label. Host attributes/DOM handlers reach the trigger button, not the popup/options; role, tab stop and disclosure attributes stay owned.",propDescriptions: {label: 'Trigger text (when no option selected) + dropdown heading.',options: 'Menu options array rendered in dropdown.',diff --git a/packages/core/src/TabList/TabMenu.tsx b/packages/core/src/TabList/TabMenu.tsxindex e2cb390a85..166a735eae 100644--- a/packages/core/src/TabList/TabMenu.tsx+++ b/packages/core/src/TabList/TabMenu.tsx@@ -37,7 +37,7 @@ import {useListFocus} from '../hooks/useListFocus';import {useTabListContext} from './TabListContext';import type {TabListSize} from './TabListContext';import {tabScope} from './tab.markers.stylex';-import {mergeProps} from '../utils';+import {composeEventHandlers, mergeProps} from '../utils';import {useMergedRefs} from '../hooks/useMergedRefs';import type {BaseProps} from '../BaseProps';import {themeProps} from '../utils/themeProps';@@ -51,9 +51,9 @@ export interface TabMenuOption {icon?: ReactNode | IconType;}-export interface TabMenuProps extends Pick<+export interface TabMenuProps extends Omit<BaseProps<HTMLButtonElement>,- 'xstyle' | 'className' | 'style'+ 'role' | 'tabIndex' | 'aria-haspopup' | 'aria-expanded' | 'aria-controls'> {ref?: React.Ref<HTMLButtonElement>;/**@@ -263,6 +263,8 @@ export function TabMenu({xstyle,className,style,+ onClick,+ ...rest}: TabMenuProps) {const tabListCtx = useTabListContext();const menuId = useId();@@ -346,6 +348,7 @@ export function TabMenu({return (<><button+ {...rest}ref={setButtonRef}type="button"aria-haspopup="menu"@@ -353,7 +356,7 @@ export function TabMenu({aria-controls={menuId}data-tab-menu=""tabIndex={hasSelectedOption ? 0 : -1}- onClick={handleToggle}+ onClick={composeEventHandlers(handleToggle, onClick)}{...mergeProps(themeProps('tab-menu'),focusOutlineProps.focusVisible(