Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into react-19-compatib…
Browse files Browse the repository at this point in the history
…ility
  • Loading branch information
michaldudak committed Sep 20, 2024
2 parents 75f56af + 9197824 commit 26c88a1
Show file tree
Hide file tree
Showing 106 changed files with 3,635 additions and 1,128 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/vale-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ jobs:
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: errata-ai/vale-action@38bf078c328061f59879b347ca344a718a736018 # v2.1.0
continue-on-error: true
continue-on-error: true # GitHub Action flag needed until https://github.com/errata-ai/vale-action/issues/89 is fixed
with:
reporter: github-pr-review
files: docs/data
env:
# Errors should be more visible
fail_on_error: true
# The other reports don't work, not really https://github.com/reviewdog/reviewdog#reporters
reporter: github-pr-check
# Required, set by GitHub actions automatically:
# https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
token: ${{secrets.GITHUB_TOKEN}}
20 changes: 20 additions & 0 deletions docs/data/api/menu-checkbox-item-indicator.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"props": {
"className": { "type": { "name": "union", "description": "func<br>&#124;&nbsp;string" } },
"keepMounted": { "type": { "name": "bool" }, "default": "true" },
"render": { "type": { "name": "union", "description": "element<br>&#124;&nbsp;func" } }
},
"name": "MenuCheckboxItemIndicator",
"imports": [
"import * as Menu from '@base_ui/react/Menu';\nconst MenuCheckboxItemIndicator = Menu.CheckboxItemIndicator;"
],
"classes": [],
"spread": true,
"themeDefaultProps": true,
"muiName": "MenuCheckboxItemIndicator",
"forwardsRefTo": "HTMLSpanElement",
"filename": "/packages/mui-base/src/Menu/CheckboxItemIndicator/MenuCheckboxItemIndicator.tsx",
"inheritance": null,
"demos": "<ul><li><a href=\"/components/react-menu/\">Menu</a></li></ul>",
"cssComponent": false
}
22 changes: 22 additions & 0 deletions docs/data/api/menu-checkbox-item.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"props": {
"closeOnClick": { "type": { "name": "bool" }, "default": "true" },
"disabled": { "type": { "name": "bool" }, "default": "false" },
"id": { "type": { "name": "string" } },
"label": { "type": { "name": "string" } },
"onClick": { "type": { "name": "func" } }
},
"name": "MenuCheckboxItem",
"imports": [
"import * as Menu from '@base_ui/react/Menu';\nconst MenuCheckboxItem = Menu.CheckboxItem;"
],
"classes": [],
"spread": true,
"themeDefaultProps": true,
"muiName": "MenuCheckboxItem",
"forwardsRefTo": "HTMLDivElement",
"filename": "/packages/mui-base/src/Menu/CheckboxItem/MenuCheckboxItem.tsx",
"inheritance": null,
"demos": "<ul><li><a href=\"/components/react-menu/\">Menu</a></li></ul>",
"cssComponent": false
}
23 changes: 23 additions & 0 deletions docs/data/api/menu-radio-group.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"props": {
"children": { "type": { "name": "node" } },
"className": { "type": { "name": "union", "description": "func<br>&#124;&nbsp;string" } },
"defaultValue": { "type": { "name": "any" } },
"onValueChange": { "type": { "name": "func" }, "default": "() => {}" },
"render": { "type": { "name": "union", "description": "element<br>&#124;&nbsp;func" } },
"value": { "type": { "name": "any" } }
},
"name": "MenuRadioGroup",
"imports": [
"import * as Menu from '@base_ui/react/Menu';\nconst MenuRadioGroup = Menu.RadioGroup;"
],
"classes": [],
"spread": true,
"themeDefaultProps": true,
"muiName": "MenuRadioGroup",
"forwardsRefTo": "HTMLDivElement",
"filename": "/packages/mui-base/src/Menu/RadioGroup/MenuRadioGroup.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-radio-item-indicator.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"props": {
"className": { "type": { "name": "union", "description": "func<br>&#124;&nbsp;string" } },
"keepMounted": { "type": { "name": "bool" }, "default": "true" },
"render": { "type": { "name": "union", "description": "element<br>&#124;&nbsp;func" } }
},
"name": "MenuRadioItemIndicator",
"imports": [
"import * as Menu from '@base_ui/react/Menu';\nconst MenuRadioItemIndicator = Menu.RadioItemIndicator;"
],
"classes": [],
"spread": true,
"themeDefaultProps": true,
"muiName": "MenuRadioItemIndicator",
"forwardsRefTo": "HTMLSpanElement",
"filename": "/packages/mui-base/src/Menu/RadioItemIndicator/MenuRadioItemIndicator.tsx",
"inheritance": null,
"demos": "<ul><li><a href=\"/components/react-menu/\">Menu</a></li></ul>",
"cssComponent": false
}
23 changes: 23 additions & 0 deletions docs/data/api/menu-radio-item.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"props": {
"value": { "type": { "name": "any" }, "required": true },
"closeOnClick": { "type": { "name": "bool" }, "default": "true" },
"disabled": { "type": { "name": "bool" }, "default": "false" },
"id": { "type": { "name": "string" } },
"label": { "type": { "name": "string" } },
"onClick": { "type": { "name": "func" } }
},
"name": "MenuRadioItem",
"imports": [
"import * as Menu from '@base_ui/react/Menu';\nconst MenuRadioItem = Menu.RadioItem;"
],
"classes": [],
"spread": true,
"themeDefaultProps": true,
"muiName": "MenuRadioItem",
"forwardsRefTo": "HTMLDivElement",
"filename": "/packages/mui-base/src/Menu/RadioItem/MenuRadioItem.tsx",
"inheritance": null,
"demos": "<ul><li><a href=\"/components/react-menu/\">Menu</a></li></ul>",
"cssComponent": false
}
8 changes: 2 additions & 6 deletions docs/data/api/popover-root.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,14 @@
"props": {
"animated": { "type": { "name": "bool" }, "default": "true" },
"closeDelay": { "type": { "name": "number" }, "default": "0" },
"defaultOpen": { "type": { "name": "bool" } },
"defaultOpen": { "type": { "name": "bool" }, "default": "false" },
"delay": { "type": { "name": "number" }, "default": "300" },
"delayType": {
"type": { "name": "enum", "description": "'hover'<br>&#124;&nbsp;'rest'" },
"default": "'rest'"
},
"followCursorAxis": {
"type": { "name": "enum", "description": "'none'<br>&#124;&nbsp;'x'<br>&#124;&nbsp;'y'" },
"default": "'none'"
},
"onOpenChange": { "type": { "name": "func" } },
"open": { "type": { "name": "bool" } },
"open": { "type": { "name": "bool" }, "default": "false" },
"openOnHover": { "type": { "name": "bool" }, "default": "false" }
},
"name": "PopoverRoot",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function UnstyledDialogIntroduction() {
);
}

function TriggerButton(props: AlertDialog.TriggerProps) {
function TriggerButton(props: AlertDialog.Trigger.Props) {
const className = `
bg-slate-900 dark:bg-slate-50 text-slate-50 dark:text-slate-900
py-2 px-4 rounded min-w-[80px] border-none font-sans
Expand All @@ -28,7 +28,7 @@ function TriggerButton(props: AlertDialog.TriggerProps) {
return <AlertDialog.Trigger {...props} className={className} />;
}

function Popup(props: AlertDialog.PopupProps) {
function Popup(props: AlertDialog.Popup.Props) {
const className = `
bg-slate-50 dark:bg-slate-900 border-[1px] border-solid border-slate-100 dark:border-slate-700
min-w-[400px] rounded shadow-xl fixed top-2/4 left-2/4 z-[2100]
Expand All @@ -46,7 +46,7 @@ function Controls(props: React.ComponentPropsWithoutRef<'div'>) {
);
}

function CloseButton(props: AlertDialog.CloseProps) {
function CloseButton(props: AlertDialog.Close.Props) {
const className = `
bg-transparent border-[1px] border-solid border-slate-500 dark:border-slate-300
text-slate-900 dark:text-slate-50 py-2 px-4 rounded font-sans min-w-[80px]
Expand All @@ -55,15 +55,15 @@ function CloseButton(props: AlertDialog.CloseProps) {
return <AlertDialog.Close {...props} className={className} />;
}

function Title(props: AlertDialog.TitleProps) {
function Title(props: AlertDialog.Title.Props) {
return <AlertDialog.Title {...props} className="text-lg" />;
}

function Description(props: AlertDialog.DescriptionProps) {
function Description(props: AlertDialog.Description.Props) {
return <AlertDialog.Description {...props} />;
}

function Backdrop(props: AlertDialog.BackdropProps) {
function Backdrop(props: AlertDialog.Backdrop.Props) {
return (
<AlertDialog.Backdrop
{...props}
Expand Down
200 changes: 200 additions & 0 deletions docs/data/components/menu/CheckboxItems.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
'use client';

import * as React from 'react';
import * as Menu from '@base_ui/react/Menu';
import { styled } from '@mui/system';

export default function CheckboxItems() {
const createHandleMenuClick = (menuItem) => {
return () => {
console.log(`Clicked on ${menuItem}`);
};
};

return (
<Menu.Root>
<MenuButton>My account</MenuButton>
<MenuPositioner alignment="start" keepMounted>
<MenuPopup>
<MenuItem onClick={createHandleMenuClick('Profile')}>Profile</MenuItem>
<MenuItem onClick={createHandleMenuClick('Language settings')}>
Language settings
</MenuItem>
<CheckboxItem>
<Indicator />
Mute notifications
</CheckboxItem>
<CheckboxItem defaultChecked>
<Indicator />
Enable preview features
</CheckboxItem>
<MenuItem onClick={createHandleMenuClick('Log out')}>Log out</MenuItem>
</MenuPopup>
</MenuPositioner>
</Menu.Root>
);
}

const blue = {
50: '#F0F7FF',
100: '#C2E0FF',
200: '#99CCF3',
300: '#66B2FF',
400: '#3399FF',
500: '#007FFF',
600: '#0072E6',
700: '#0059B3',
800: '#004C99',
900: '#003A75',
};

const grey = {
50: '#F3F6F9',
100: '#E5EAF2',
200: '#DAE2ED',
300: '#C7D0DD',
400: '#B0B8C4',
500: '#9DA8B7',
600: '#6B7A90',
700: '#434D5B',
800: '#303740',
900: '#1C2025',
};

const MenuPopup = styled(Menu.Popup)(
({ theme }) => `
font-family: 'IBM Plex Sans', sans-serif;
font-size: 0.875rem;
box-sizing: border-box;
padding: 6px;
margin: 12px 0;
min-width: 200px;
border-radius: 12px;
overflow: auto;
outline: 0;
background: ${theme.palette.mode === 'dark' ? grey[900] : '#fff'};
border: 1px solid ${theme.palette.mode === 'dark' ? grey[700] : grey[200]};
color: ${theme.palette.mode === 'dark' ? grey[300] : grey[900]};
box-shadow: 0px 4px 30px ${theme.palette.mode === 'dark' ? grey[900] : grey[200]};
z-index: 1;
transform-origin: var(--transform-origin);
opacity: 0;
transform: scale(0.8);
transition: opacity 100ms ease-in, transform 100ms ease-in;
&[data-menu='open'] {
opacity: 1;
transform: scale(1);
}
`,
);

const MenuItem = styled(Menu.Item)(
({ theme }) => `
list-style: none;
padding: 8px;
border-radius: 8px;
cursor: default;
user-select: none;
&:last-of-type {
border-bottom: none;
}
&:focus {
outline: 3px solid ${theme.palette.mode === 'dark' ? blue[600] : blue[200]};
background-color: ${theme.palette.mode === 'dark' ? grey[800] : grey[100]};
color: ${theme.palette.mode === 'dark' ? grey[300] : grey[900]};
}
&.[data-disabled] {
color: ${theme.palette.mode === 'dark' ? grey[700] : grey[400]};
}
`,
);

const CheckboxItem = styled(Menu.CheckboxItem)(
({ theme }) => `
list-style: none;
padding: 8px;
border-radius: 8px;
cursor: default;
user-select: none;
&:last-of-type {
border-bottom: none;
}
&:focus {
outline: 3px solid ${theme.palette.mode === 'dark' ? blue[600] : blue[200]};
background-color: ${theme.palette.mode === 'dark' ? grey[800] : grey[100]};
color: ${theme.palette.mode === 'dark' ? grey[300] : grey[900]};
}
&[data-disabled] {
color: ${theme.palette.mode === 'dark' ? grey[700] : grey[400]};
}
`,
);

const Indicator = styled(Menu.CheckboxItemIndicator)(
({ theme }) => `
display: inline-block;
width: 0.75rem;
height: 0.75rem;
border: 1px solid;
vertical-align: baseline;
margin-right: 8px;
border-color: ${theme.palette.mode === 'dark' ? grey[800] : grey[700]};
box-sizing: border-box;
border-radius: 2px;
&[data-checkboxitem=checked] {
background: ${theme.palette.mode === 'dark' ? grey[800] : grey[700]};
box-shadow: 0 0 0 2px ${theme.palette.mode === 'dark' ? grey[900] : '#fff'} inset;
}
`,
);

const MenuButton = styled(Menu.Trigger)(
({ theme }) => `
font-family: 'IBM Plex Sans', sans-serif;
font-weight: 600;
font-size: 0.875rem;
line-height: 1.5;
padding: 8px 16px;
border-radius: 8px;
color: white;
transition: all 150ms ease;
cursor: pointer;
background: ${theme.palette.mode === 'dark' ? grey[900] : '#fff'};
border: 1px solid ${theme.palette.mode === 'dark' ? grey[700] : grey[200]};
color: ${theme.palette.mode === 'dark' ? grey[200] : grey[900]};
box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05);
&:hover {
background: ${theme.palette.mode === 'dark' ? grey[800] : grey[50]};
border-color: ${theme.palette.mode === 'dark' ? grey[600] : grey[300]};
}
&:active {
background: ${theme.palette.mode === 'dark' ? grey[700] : grey[100]};
}
&:focus-visible {
box-shadow: 0 0 0 4px ${theme.palette.mode === 'dark' ? blue[300] : blue[200]};
outline: none;
}
`,
);

const MenuPositioner = styled(Menu.Positioner)`
&:focus-visible {
outline: 0;
}
&[data-menu='closed'] {
pointer-events: none;
}
`;
Loading

0 comments on commit 26c88a1

Please sign in to comment.