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.

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

[Menu] Group and Separator components #535

Merged
merged 16 commits into from
Sep 27, 2024
Merged
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
19 changes: 19 additions & 0 deletions docs/data/api/menu-group-label.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"props": {
"className": { "type": { "name": "union", "description": "func<br>&#124;&nbsp;string" } },
"render": { "type": { "name": "union", "description": "element<br>&#124;&nbsp;func" } }
},
"name": "MenuGroupLabel",
"imports": [
"import * as Menu from '@base_ui/react/Menu';\nconst MenuGroupLabel = Menu.GroupLabel;"
],
"classes": [],
"spread": true,
"themeDefaultProps": true,
"muiName": "MenuGroupLabel",
"forwardsRefTo": "HTMLDivElement",
"filename": "/packages/mui-base/src/Menu/GroupLabel/MenuGroupLabel.tsx",
"inheritance": null,
"demos": "<ul><li><a href=\"/components/react-menu/\">Menu</a></li></ul>",
"cssComponent": false
}
18 changes: 18 additions & 0 deletions docs/data/api/menu-group.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"props": {
"children": { "type": { "name": "node" } },
"className": { "type": { "name": "union", "description": "func<br>&#124;&nbsp;string" } },
"render": { "type": { "name": "union", "description": "element<br>&#124;&nbsp;func" } }
},
"name": "MenuGroup",
"imports": ["import * as Menu from '@base_ui/react/Menu';\nconst MenuGroup = Menu.Group;"],
"classes": [],
"spread": true,
"themeDefaultProps": true,
"muiName": "MenuGroup",
"forwardsRefTo": "HTMLDivElement",
"filename": "/packages/mui-base/src/Menu/Group/MenuGroup.tsx",
"inheritance": null,
"demos": "<ul><li><a href=\"/components/react-menu/\">Menu</a></li></ul>",
"cssComponent": false
}
20 changes: 20 additions & 0 deletions docs/data/api/menu-separator.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"props": {
"children": { "type": { "name": "node" } },
"className": { "type": { "name": "union", "description": "func<br>&#124;&nbsp;string" } },
"render": { "type": { "name": "union", "description": "element<br>&#124;&nbsp;func" } }
},
"name": "MenuSeparator",
"imports": [
"import * as Menu from '@base_ui/react/Menu';\nconst MenuSeparator = Menu.Separator;"
],
"classes": [],
"spread": true,
"themeDefaultProps": true,
"muiName": "MenuSeparator",
"forwardsRefTo": "HTMLDivElement",
"filename": "/packages/mui-base/src/Menu/Separator/MenuSeparator.tsx",
"inheritance": null,
"demos": "<ul><li><a href=\"/components/react-menu/\">Menu</a></li></ul>",
"cssComponent": false
}
19 changes: 19 additions & 0 deletions docs/data/api/separator-root.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"props": {
"className": { "type": { "name": "union", "description": "func<br>&#124;&nbsp;string" } },
"render": { "type": { "name": "union", "description": "element<br>&#124;&nbsp;func" } }
},
"name": "SeparatorRoot",
"imports": [
"import * as Separator from '@base_ui/react/Separator';\nconst SeparatorRoot = Separator.Root;"
],
"classes": [],
"spread": true,
"themeDefaultProps": true,
"muiName": "SeparatorRoot",
"forwardsRefTo": "HTMLDivElement",
"filename": "/packages/mui-base/src/Separator/Root/SeparatorRoot.tsx",
"inheritance": null,
"demos": "<ul><li><a href=\"/components/react-separator/\">Separator</a></li></ul>",
"cssComponent": false
}
14 changes: 11 additions & 3 deletions docs/data/components/menu/MenuIntroduction/css-modules/Menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import PropTypes from 'prop-types';
import * as BaseMenu from '@base_ui/react/Menu';
import classes from './Menu.module.css';

export const Menu = function Menu(props) {
return <BaseMenu.Root {...props} />;
};
export const Menu = BaseMenu.Root;

export const MenuGroup = BaseMenu.Group;

const MenuItems = React.forwardRef(function MenuItems(props, ref) {
return (
Expand All @@ -29,3 +29,11 @@ export const MenuItem = React.forwardRef(function MenuItem(props, ref) {
export const MenuTrigger = React.forwardRef(function MenuTrigger(props, ref) {
return <BaseMenu.Trigger {...props} ref={ref} className={classes.trigger} />;
});

export const MenuSeparator = React.forwardRef(function MenuSeparator(props, ref) {
return <BaseMenu.Separator {...props} ref={ref} className={classes.separator} />;
});

export const MenuGroupLabel = React.forwardRef(function MenuGroupLabel(props, ref) {
return <BaseMenu.GroupLabel {...props} ref={ref} className={classes.groupLabel} />;
});
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
outline: 0;
background: #fff;
border: 1px solid var(--gray-200);
color: var(--gray-300);
color: var(--gray-900);
box-shadow: 0px 4px 30px var(--gray-200);
transform-origin: var(--transform-origin);

Expand Down Expand Up @@ -126,3 +126,25 @@
}
}
}

.separator {
border-top: 1px solid var(--gray-200);
margin: 8px 0;

:global(.dark) & {
border-color: var(--gray-700);
}
}

.groupLabel {
font-size: 0.75rem;
font-weight: 600;
text-transform: uppercase;
color: var(--gray-700);
padding: 8px;
user-select: none;

:global(.dark) & {
color: var(--gray-200);
}
}
20 changes: 17 additions & 3 deletions docs/data/components/menu/MenuIntroduction/css-modules/Menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import * as React from 'react';
import * as BaseMenu from '@base_ui/react/Menu';
import classes from './Menu.module.css';

export const Menu = function Menu(props: BaseMenu.Root.Props) {
return <BaseMenu.Root {...props} />;
};
export const Menu = BaseMenu.Root;

export const MenuGroup = BaseMenu.Group;

export const MenuItems = React.forwardRef(function MenuItems(
props: React.PropsWithChildren<{}>,
Expand All @@ -31,3 +31,17 @@ export const MenuTrigger = React.forwardRef(function MenuTrigger(
) {
return <BaseMenu.Trigger {...props} ref={ref} className={classes.trigger} />;
});

export const MenuSeparator = React.forwardRef(function MenuSeparator(
props: BaseMenu.Separator.Props,
ref: React.ForwardedRef<HTMLDivElement>,
) {
return <BaseMenu.Separator {...props} ref={ref} className={classes.separator} />;
});

export const MenuGroupLabel = React.forwardRef(function MenuGroupLabel(
props: BaseMenu.GroupLabel.Props,
ref: React.ForwardedRef<HTMLDivElement>,
) {
return <BaseMenu.GroupLabel {...props} ref={ref} className={classes.groupLabel} />;
});
22 changes: 17 additions & 5 deletions docs/data/components/menu/MenuIntroduction/css-modules/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
'use client';
import * as React from 'react';
import { Menu, MenuItems, MenuItem, MenuTrigger } from './Menu';
import {
Menu,
MenuItems,
MenuItem,
MenuTrigger,
MenuSeparator,
MenuGroup,
MenuGroupLabel,
} from './Menu';

export default function MenuIntroduction() {
const createHandleMenuClick = (menuItem) => {
Expand All @@ -14,10 +22,14 @@ export default function MenuIntroduction() {
<MenuTrigger>My account</MenuTrigger>

<MenuItems>
<MenuItem onClick={createHandleMenuClick('Profile')}>Profile</MenuItem>
<MenuItem onClick={createHandleMenuClick('Language settings')}>
Language settings
</MenuItem>
<MenuGroup>
<MenuGroupLabel>Settings</MenuGroupLabel>
<MenuItem onClick={createHandleMenuClick('Profile')}>Profile</MenuItem>
<MenuItem onClick={createHandleMenuClick('Language settings')}>
Language settings
</MenuItem>
</MenuGroup>
<MenuSeparator />
<MenuItem onClick={createHandleMenuClick('Log out')}>Log out</MenuItem>
</MenuItems>
</Menu>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
'use client';
import * as React from 'react';
import { Menu, MenuItems, MenuItem, MenuTrigger } from './Menu';
import {
Menu,
MenuItems,
MenuItem,
MenuTrigger,
MenuSeparator,
MenuGroup,
MenuGroupLabel,
} from './Menu';

export default function MenuIntroduction() {
const createHandleMenuClick = (menuItem: string) => {
Expand All @@ -14,10 +22,14 @@ export default function MenuIntroduction() {
<MenuTrigger>My account</MenuTrigger>

<MenuItems>
<MenuItem onClick={createHandleMenuClick('Profile')}>Profile</MenuItem>
<MenuItem onClick={createHandleMenuClick('Language settings')}>
Language settings
</MenuItem>
<MenuGroup>
<MenuGroupLabel>Settings</MenuGroupLabel>
<MenuItem onClick={createHandleMenuClick('Profile')}>Profile</MenuItem>
<MenuItem onClick={createHandleMenuClick('Language settings')}>
Language settings
</MenuItem>
</MenuGroup>
<MenuSeparator />
<MenuItem onClick={createHandleMenuClick('Log out')}>Log out</MenuItem>
</MenuItems>
</Menu>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@
<MenuTrigger>My account</MenuTrigger>

<MenuItems>
<MenuItem onClick={createHandleMenuClick('Profile')}>Profile</MenuItem>
<MenuItem onClick={createHandleMenuClick('Language settings')}>
Language settings
</MenuItem>
<MenuGroup>
<MenuGroupLabel>Settings</MenuGroupLabel>
<MenuItem onClick={createHandleMenuClick('Profile')}>Profile</MenuItem>
<MenuItem onClick={createHandleMenuClick('Language settings')}>
Language settings
</MenuItem>
</MenuGroup>
<MenuSeparator />
<MenuItem onClick={createHandleMenuClick('Log out')}>Log out</MenuItem>
</MenuItems>
</Menu>
30 changes: 26 additions & 4 deletions docs/data/components/menu/MenuIntroduction/system/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@ export default function MenuIntroduction() {
<MenuButton>My account</MenuButton>
<MenuPositioner alignment="start" sideOffset={8}>
<MenuPopup>
<MenuItem onClick={createHandleMenuClick('Profile')}>Profile</MenuItem>
<MenuItem onClick={createHandleMenuClick('Language settings')}>
Language settings
</MenuItem>
<Menu.Group>
<MenuGroupLabel>Settings</MenuGroupLabel>
<MenuItem onClick={createHandleMenuClick('Profile')}>Profile</MenuItem>
<MenuItem onClick={createHandleMenuClick('Language settings')}>
Language settings
</MenuItem>
</Menu.Group>
<MenuSeparator />
<MenuItem onClick={createHandleMenuClick('Log out')}>Log out</MenuItem>
<MenuArrow />
</MenuPopup>
Expand Down Expand Up @@ -184,3 +188,21 @@ export const MenuArrow = styled(Menu.Arrow)(
}
`,
);

const MenuSeparator = styled(Menu.Separator)(
({ theme }) => `
border-top: 1px solid ${theme.palette.mode === 'dark' ? grey[700] : grey[200]};
margin: 8px 0;
`,
);

const MenuGroupLabel = styled(Menu.GroupLabel)(
({ theme }) => `
font-size: 0.75rem;
font-weight: 600;
text-transform: uppercase;
color: ${theme.palette.mode === 'dark' ? grey[200] : grey[700]};
padding: 8px;
user-select: none;
`,
);
30 changes: 26 additions & 4 deletions docs/data/components/menu/MenuIntroduction/system/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@ export default function MenuIntroduction() {
<MenuButton>My account</MenuButton>
<MenuPositioner alignment="start" sideOffset={8}>
<MenuPopup>
<MenuItem onClick={createHandleMenuClick('Profile')}>Profile</MenuItem>
<MenuItem onClick={createHandleMenuClick('Language settings')}>
Language settings
</MenuItem>
<Menu.Group>
<MenuGroupLabel>Settings</MenuGroupLabel>
<MenuItem onClick={createHandleMenuClick('Profile')}>Profile</MenuItem>
<MenuItem onClick={createHandleMenuClick('Language settings')}>
Language settings
</MenuItem>
</Menu.Group>
<MenuSeparator />
<MenuItem onClick={createHandleMenuClick('Log out')}>Log out</MenuItem>
<MenuArrow />
</MenuPopup>
Expand Down Expand Up @@ -184,3 +188,21 @@ export const MenuArrow = styled(Menu.Arrow)(
}
`,
);

const MenuSeparator = styled(Menu.Separator)(
({ theme }) => `
border-top: 1px solid ${theme.palette.mode === 'dark' ? grey[700] : grey[200]};
margin: 8px 0;
`,
);

const MenuGroupLabel = styled(Menu.GroupLabel)(
({ theme }) => `
font-size: 0.75rem;
font-weight: 600;
text-transform: uppercase;
color: ${theme.palette.mode === 'dark' ? grey[200] : grey[700]};
padding: 8px;
user-select: none;
`,
);

This file was deleted.

Loading