Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: expose closeOnSelect prop in S2 MenuItem #8035

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+29 −1
Open

feat: expose closeOnSelect prop in S2 MenuItem #8035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01dcb27
chore: ignore ts error in menu style macro
ToyWalrus Apr 4, 2025
02199f7
feat: add prop to control default menu closing behavior
ToyWalrus Apr 4, 2025
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
2 changes: 2 additions & 0 deletions packages/@react-spectrum/s2/src/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ export let menuitem = style({
},
paddingBottom: '--labelPadding',
backgroundColor: { // TODO: revisit color when I have access to dev mode again
// @ts-expect-error Expression produces a union type that is too complex to represent
default: {
default: 'transparent',
isFocused: baseColor('gray-100').isFocusVisible
Expand Down Expand Up @@ -301,6 +302,7 @@ let keyboard = style({
color: {
default: 'gray-600',
isDisabled: 'disabled',
// @ts-expect-error Expression produces a union type that is too complex to represent
forcedColors: {
isDisabled: 'GrayText'
}
Expand Down
21 changes: 21 additions & 0 deletions packages/@react-spectrum/s2/stories/Menu.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,27 @@ export const DynamicExample: Story = {
}
};

export const PreventDefaultClosingBehavior: Story = {
render: (args) => {
return (
<MenuTrigger {...args}>
<Button aria-label="Closing behavior"><More /></Button>
<Menu {...args}>
<MenuItem>I will close the menu by default</MenuItem>
<MenuItem closeOnSelect={false}>I will not close the menu</MenuItem>
<SubmenuTrigger>
<MenuItem>Submenu</MenuItem>
<Menu>
<MenuItem closeOnSelect>I will close the menu</MenuItem>
<MenuItem closeOnSelect={false}>I will not close the menu</MenuItem>
</Menu>
</SubmenuTrigger>
</Menu>
</MenuTrigger>
);
}
};

export const SelectionGroups = (args) => {
let [group1, setGroup1] = useState<Selection>(new Set([1]));
let [group2, setGroup2] = useState<Selection>(new Set());
Expand Down
7 changes: 6 additions & 1 deletion packages/react-aria-components/src/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,12 @@ export interface MenuItemProps<T = object> extends RenderProps<MenuItemRenderPro
/** Whether the item is disabled. */
isDisabled?: boolean,
/** Handler that is called when the item is selected. */
onAction?: () => void
onAction?: () => void,
/**
* Whether the menu should close when the menu item is selected.
* @default true
*/
closeOnSelect?: boolean
}

const MenuItemContext = createContext<ContextValue<MenuItemProps, HTMLDivElement>>(null);
Expand Down