Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: MenuSplitGroup provides its context to descendants via a new exported useMenuSplitGroupContextValues hook",
"packageName": "@fluentui/react-headless-components-preview",
"email": "array.knight@gmail.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,13 @@ export type MenuProps = Omit<MenuBaseProps, 'positioning'> & {
// @public (undocumented)
export const MenuSplitGroup: ForwardRefComponent<MenuSplitGroupProps>;

// @public
export type MenuSplitGroupContextValues = {
menuSplitGroup: {
setMultiline: (multiline: boolean) => void;
};
};

export { MenuSplitGroupProps }

export { MenuSplitGroupSlots }
Expand Down Expand Up @@ -279,6 +286,9 @@ export const useMenuPopover: (props: MenuPopoverProps, ref: React_2.Ref<HTMLElem
// @public
export const useMenuSplitGroup: (props: MenuSplitGroupProps, ref: React_2.Ref<HTMLElement>) => MenuSplitGroupState;

// @public
export const useMenuSplitGroupContextValues: (state: MenuSplitGroupState) => MenuSplitGroupContextValues;

// @public (undocumented)
export const useMenuTrigger: (props: MenuTriggerProps) => MenuTriggerState;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { MenuItemSwitch } from './MenuItemSwitch/MenuItemSwitch';
import { MenuDivider } from './MenuDivider/MenuDivider';
import { MenuGroup } from './MenuGroup/MenuGroup';
import { MenuGroupHeader } from './MenuGroupHeader/MenuGroupHeader';
import { MenuSplitGroup } from './MenuSplitGroup/MenuSplitGroup';

describe('Menu', () => {
it('renders trigger and surface children when open', () => {
Expand Down Expand Up @@ -502,4 +503,39 @@ describe('Menu', () => {
expect(header.getAttribute('id')).toBeTruthy();
});
});

describe('MenuSplitGroup', () => {
// Regression test for https://github.com/microsoft/fluentui/issues/36651 — MenuSplitGroup
// rendered without a contexts argument, so `useIsInMenuSplitGroup` could never return true and
// descendants kept the icon gutter that a split-group trigger is supposed to drop.
it('provides split group context so the trigger half drops the icon gutter', () => {
const { getByTestId } = render(
<Menu defaultOpen>
<MenuTrigger>
<button>Trigger</button>
</MenuTrigger>
<MenuPopover>
<MenuList hasIcons>
<MenuItem hasSubmenu data-testid="outside-item">
Outside
</MenuItem>
<MenuSplitGroup data-testid="split-group">
<MenuItem hasSubmenu data-testid="split-trigger">
Split main
</MenuItem>
<MenuItem data-testid="split-chevron">Chevron</MenuItem>
</MenuSplitGroup>
</MenuList>
</MenuPopover>
</Menu>,
);

expect(getByTestId('split-group')).toHaveAttribute('role', 'group');

// Outside the split group: default icon gutter + submenu indicator + content = 3 spans.
expect(getByTestId('outside-item').querySelectorAll('span')).toHaveLength(3);
// Inside the split group the trigger half suppresses the icon gutter: indicator + content.
expect(getByTestId('split-trigger').querySelectorAll('span')).toHaveLength(2);
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
import * as React from 'react';
import type { ForwardRefComponent } from '@fluentui/react-utilities';
import { useMenuSplitGroup } from './useMenuSplitGroup';
import { useMenuSplitGroupContextValues } from './useMenuSplitGroupContextValues';
import { renderMenuSplitGroup } from './renderMenuSplitGroup';
import type { MenuSplitGroupProps } from '@fluentui/react-menu';

export const MenuSplitGroup: ForwardRefComponent<MenuSplitGroupProps> = React.forwardRef((props, ref) => {
const state = useMenuSplitGroup(props, ref);
return renderMenuSplitGroup(state);
const contextValues = useMenuSplitGroupContextValues(state);

return renderMenuSplitGroup(state, contextValues);
});

MenuSplitGroup.displayName = 'MenuSplitGroup';
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
export { MenuSplitGroup } from './MenuSplitGroup';
export { useMenuSplitGroup } from './useMenuSplitGroup';
export { useMenuSplitGroupContextValues } from './useMenuSplitGroupContextValues';
export type { MenuSplitGroupContextValues } from './useMenuSplitGroupContextValues';
export { renderMenuSplitGroup } from './renderMenuSplitGroup';
export type { MenuSplitGroupProps, MenuSplitGroupSlots, MenuSplitGroupState } from '@fluentui/react-menu';
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
'use client';

import * as React from 'react';
import type { MenuSplitGroupState } from '@fluentui/react-menu';

/**
* Context values shared with the descendants of a MenuSplitGroup.
*
* Mirrors `@fluentui/react-menu`'s `MenuSplitGroupContextValues`, which that package does not
* export from its public API.
*/
export type MenuSplitGroupContextValues = {
menuSplitGroup: {
setMultiline: (multiline: boolean) => void;
};
};

/**
* Builds the context value shared with the descendants of a MenuSplitGroup.
*
* `useIsInMenuSplitGroup` compares the provided value against the module-level default by
* identity, so providing one is what lets a descendant tell it is inside a split group. The memo
* keeps that identity stable across renders; `setMultiline` stays the documented no-op.
*/
export const useMenuSplitGroupContextValues = (state: MenuSplitGroupState): MenuSplitGroupContextValues => {
const { setMultiline } = state;

const menuSplitGroup = React.useMemo(() => ({ setMultiline }), [setMultiline]);

return { menuSplitGroup };
};
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,11 @@ export type { MenuGroupProps, MenuGroupSlots, MenuGroupState, MenuGroupContextVa
export { MenuGroupHeader, useMenuGroupHeader, renderMenuGroupHeader } from './MenuGroupHeader';
export type { MenuGroupHeaderProps, MenuGroupHeaderSlots, MenuGroupHeaderState } from '@fluentui/react-menu';

export { MenuSplitGroup, useMenuSplitGroup, renderMenuSplitGroup } from './MenuSplitGroup';
export {
MenuSplitGroup,
useMenuSplitGroup,
useMenuSplitGroupContextValues,
renderMenuSplitGroup,
} from './MenuSplitGroup';
export type { MenuSplitGroupContextValues } from './MenuSplitGroup';
export type { MenuSplitGroupProps, MenuSplitGroupSlots, MenuSplitGroupState } from '@fluentui/react-menu';
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export {
renderMenuGroupHeader,
MenuSplitGroup,
useMenuSplitGroup,
useMenuSplitGroupContextValues,
renderMenuSplitGroup,
} from './components/Menu';
export type {
Expand Down Expand Up @@ -85,4 +86,5 @@ export type {
MenuSplitGroupProps,
MenuSplitGroupSlots,
MenuSplitGroupState,
MenuSplitGroupContextValues,
} from './components/Menu';