Skip to content

Commit

Permalink
Merge branch 'next' of https://github.com/mui-org/material-ui into po…
Browse files Browse the repository at this point in the history
…pover-enable-interaction
  • Loading branch information
yehee committed Mar 9, 2021
2 parents 511cf5e + e6561e2 commit c2f844d
Show file tree
Hide file tree
Showing 209 changed files with 1,221 additions and 443 deletions.
36 changes: 36 additions & 0 deletions docs/pages/api-docs/date-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,62 @@
"onChange": { "type": { "name": "func" }, "required": true },
"renderInput": { "type": { "name": "func" }, "required": true },
"acceptRegex": { "type": { "name": "instanceOf", "description": "RegExp" } },
"allowKeyboardControl": { "type": { "name": "bool" } },
"allowSameDateSelection": { "type": { "name": "bool" } },
"cancelText": { "type": { "name": "node" } },
"className": { "type": { "name": "string" } },
"clearable": { "type": { "name": "bool" } },
"clearText": { "type": { "name": "node" } },
"components": {
"type": {
"name": "shape",
"description": "{ LeftArrowButton?: elementType, LeftArrowIcon?: elementType, RightArrowButton?: elementType, RightArrowIcon?: elementType, SwitchViewButton?: elementType, SwitchViewIcon?: elementType }"
}
},
"componentsProps": { "type": { "name": "object" } },
"defaultCalendarMonth": { "type": { "name": "any" } },
"DialogProps": { "type": { "name": "object" } },
"disableCloseOnSelect": { "type": { "name": "bool" } },
"disabled": { "type": { "name": "bool" } },
"disableHighlightToday": { "type": { "name": "bool" } },
"disableMaskedInput": { "type": { "name": "bool" } },
"disableOpenPicker": { "type": { "name": "bool" } },
"getOpenDialogAriaText": { "type": { "name": "func" } },
"getViewSwitchingButtonText": { "type": { "name": "func" } },
"InputAdornmentProps": { "type": { "name": "object" } },
"inputFormat": { "type": { "name": "string" } },
"leftArrowButtonText": { "type": { "name": "string" } },
"loading": { "type": { "name": "bool" } },
"mask": { "type": { "name": "string" } },
"okText": { "type": { "name": "node" } },
"onAccept": { "type": { "name": "func" } },
"onClose": { "type": { "name": "func" } },
"onError": { "type": { "name": "func" } },
"onMonthChange": { "type": { "name": "func" } },
"onOpen": { "type": { "name": "func" } },
"onViewChange": { "type": { "name": "func" } },
"onYearChange": { "type": { "name": "func" } },
"open": { "type": { "name": "bool" } },
"OpenPickerButtonProps": { "type": { "name": "object" } },
"openPickerIcon": { "type": { "name": "node" } },
"openTo": {
"type": {
"name": "enum",
"description": "'date'<br>&#124;&nbsp;'hours'<br>&#124;&nbsp;'minutes'<br>&#124;&nbsp;'month'<br>&#124;&nbsp;'seconds'<br>&#124;&nbsp;'year'"
}
},
"orientation": {
"type": { "name": "enum", "description": "'landscape'<br>&#124;&nbsp;'portrait'" }
},
"readOnly": { "type": { "name": "bool" } },
"reduceAnimations": { "type": { "name": "bool" } },
"renderDay": { "type": { "name": "func" } },
"renderLoading": { "type": { "name": "func" } },
"rifmFormatter": { "type": { "name": "func" } },
"rightArrowButtonText": { "type": { "name": "string" } },
"shouldDisableDate": { "type": { "name": "func" } },
"shouldDisableYear": { "type": { "name": "func" } },
"showDaysOutsideCurrentMonth": { "type": { "name": "bool" } },
"showTodayButton": { "type": { "name": "bool" } },
"showToolbar": { "type": { "name": "bool" } },
"todayText": { "type": { "name": "node" } },
Expand All @@ -41,6 +71,12 @@
"name": "union",
"description": "any<br>&#124;&nbsp;Date<br>&#124;&nbsp;number<br>&#124;&nbsp;string"
}
},
"views": {
"type": {
"name": "arrayOf",
"description": "Array&lt;'date'<br>&#124;&nbsp;'month'<br>&#124;&nbsp;'year'&gt;"
}
}
},
"name": "DatePicker",
Expand Down
36 changes: 36 additions & 0 deletions docs/pages/api-docs/desktop-date-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,58 @@
"onChange": { "type": { "name": "func" }, "required": true },
"renderInput": { "type": { "name": "func" }, "required": true },
"acceptRegex": { "type": { "name": "instanceOf", "description": "RegExp" } },
"allowKeyboardControl": { "type": { "name": "bool" } },
"allowSameDateSelection": { "type": { "name": "bool" } },
"className": { "type": { "name": "string" } },
"components": {
"type": {
"name": "shape",
"description": "{ LeftArrowButton?: elementType, LeftArrowIcon?: elementType, RightArrowButton?: elementType, RightArrowIcon?: elementType, SwitchViewButton?: elementType, SwitchViewIcon?: elementType }"
}
},
"componentsProps": { "type": { "name": "object" } },
"defaultCalendarMonth": { "type": { "name": "any" } },
"disableCloseOnSelect": { "type": { "name": "bool" } },
"disabled": { "type": { "name": "bool" } },
"disableHighlightToday": { "type": { "name": "bool" } },
"disableMaskedInput": { "type": { "name": "bool" } },
"disableOpenPicker": { "type": { "name": "bool" } },
"getOpenDialogAriaText": { "type": { "name": "func" } },
"getViewSwitchingButtonText": { "type": { "name": "func" } },
"InputAdornmentProps": { "type": { "name": "object" } },
"inputFormat": { "type": { "name": "string" } },
"leftArrowButtonText": { "type": { "name": "string" } },
"loading": { "type": { "name": "bool" } },
"mask": { "type": { "name": "string" } },
"onAccept": { "type": { "name": "func" } },
"onClose": { "type": { "name": "func" } },
"onError": { "type": { "name": "func" } },
"onMonthChange": { "type": { "name": "func" } },
"onOpen": { "type": { "name": "func" } },
"onViewChange": { "type": { "name": "func" } },
"onYearChange": { "type": { "name": "func" } },
"open": { "type": { "name": "bool" } },
"OpenPickerButtonProps": { "type": { "name": "object" } },
"openPickerIcon": { "type": { "name": "node" } },
"openTo": {
"type": {
"name": "enum",
"description": "'date'<br>&#124;&nbsp;'hours'<br>&#124;&nbsp;'minutes'<br>&#124;&nbsp;'month'<br>&#124;&nbsp;'seconds'<br>&#124;&nbsp;'year'"
}
},
"orientation": {
"type": { "name": "enum", "description": "'landscape'<br>&#124;&nbsp;'portrait'" }
},
"PopperProps": { "type": { "name": "object" } },
"readOnly": { "type": { "name": "bool" } },
"reduceAnimations": { "type": { "name": "bool" } },
"renderDay": { "type": { "name": "func" } },
"renderLoading": { "type": { "name": "func" } },
"rifmFormatter": { "type": { "name": "func" } },
"rightArrowButtonText": { "type": { "name": "string" } },
"shouldDisableDate": { "type": { "name": "func" } },
"shouldDisableYear": { "type": { "name": "func" } },
"showDaysOutsideCurrentMonth": { "type": { "name": "bool" } },
"showToolbar": { "type": { "name": "bool" } },
"ToolbarComponent": { "type": { "name": "elementType" } },
"toolbarFormat": { "type": { "name": "string" } },
Expand All @@ -36,6 +66,12 @@
"name": "union",
"description": "any<br>&#124;&nbsp;Date<br>&#124;&nbsp;number<br>&#124;&nbsp;string"
}
},
"views": {
"type": {
"name": "arrayOf",
"description": "Array&lt;'date'<br>&#124;&nbsp;'month'<br>&#124;&nbsp;'year'&gt;"
}
}
},
"name": "DesktopDatePicker",
Expand Down
36 changes: 36 additions & 0 deletions docs/pages/api-docs/mobile-date-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,62 @@
"onChange": { "type": { "name": "func" }, "required": true },
"renderInput": { "type": { "name": "func" }, "required": true },
"acceptRegex": { "type": { "name": "instanceOf", "description": "RegExp" } },
"allowKeyboardControl": { "type": { "name": "bool" } },
"allowSameDateSelection": { "type": { "name": "bool" } },
"cancelText": { "type": { "name": "node" } },
"className": { "type": { "name": "string" } },
"clearable": { "type": { "name": "bool" } },
"clearText": { "type": { "name": "node" } },
"components": {
"type": {
"name": "shape",
"description": "{ LeftArrowButton?: elementType, LeftArrowIcon?: elementType, RightArrowButton?: elementType, RightArrowIcon?: elementType, SwitchViewButton?: elementType, SwitchViewIcon?: elementType }"
}
},
"componentsProps": { "type": { "name": "object" } },
"defaultCalendarMonth": { "type": { "name": "any" } },
"DialogProps": { "type": { "name": "object" } },
"disableCloseOnSelect": { "type": { "name": "bool" } },
"disabled": { "type": { "name": "bool" } },
"disableHighlightToday": { "type": { "name": "bool" } },
"disableMaskedInput": { "type": { "name": "bool" } },
"disableOpenPicker": { "type": { "name": "bool" } },
"getOpenDialogAriaText": { "type": { "name": "func" } },
"getViewSwitchingButtonText": { "type": { "name": "func" } },
"InputAdornmentProps": { "type": { "name": "object" } },
"inputFormat": { "type": { "name": "string" } },
"leftArrowButtonText": { "type": { "name": "string" } },
"loading": { "type": { "name": "bool" } },
"mask": { "type": { "name": "string" } },
"okText": { "type": { "name": "node" } },
"onAccept": { "type": { "name": "func" } },
"onClose": { "type": { "name": "func" } },
"onError": { "type": { "name": "func" } },
"onMonthChange": { "type": { "name": "func" } },
"onOpen": { "type": { "name": "func" } },
"onViewChange": { "type": { "name": "func" } },
"onYearChange": { "type": { "name": "func" } },
"open": { "type": { "name": "bool" } },
"OpenPickerButtonProps": { "type": { "name": "object" } },
"openPickerIcon": { "type": { "name": "node" } },
"openTo": {
"type": {
"name": "enum",
"description": "'date'<br>&#124;&nbsp;'hours'<br>&#124;&nbsp;'minutes'<br>&#124;&nbsp;'month'<br>&#124;&nbsp;'seconds'<br>&#124;&nbsp;'year'"
}
},
"orientation": {
"type": { "name": "enum", "description": "'landscape'<br>&#124;&nbsp;'portrait'" }
},
"readOnly": { "type": { "name": "bool" } },
"reduceAnimations": { "type": { "name": "bool" } },
"renderDay": { "type": { "name": "func" } },
"renderLoading": { "type": { "name": "func" } },
"rifmFormatter": { "type": { "name": "func" } },
"rightArrowButtonText": { "type": { "name": "string" } },
"shouldDisableDate": { "type": { "name": "func" } },
"shouldDisableYear": { "type": { "name": "func" } },
"showDaysOutsideCurrentMonth": { "type": { "name": "bool" } },
"showTodayButton": { "type": { "name": "bool" } },
"showToolbar": { "type": { "name": "bool" } },
"todayText": { "type": { "name": "node" } },
Expand All @@ -41,6 +71,12 @@
"name": "union",
"description": "any<br>&#124;&nbsp;Date<br>&#124;&nbsp;number<br>&#124;&nbsp;string"
}
},
"views": {
"type": {
"name": "arrayOf",
"description": "Array&lt;'date'<br>&#124;&nbsp;'month'<br>&#124;&nbsp;'year'&gt;"
}
}
},
"name": "MobileDatePicker",
Expand Down
36 changes: 36 additions & 0 deletions docs/pages/api-docs/static-date-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,60 @@
"onChange": { "type": { "name": "func" }, "required": true },
"renderInput": { "type": { "name": "func" }, "required": true },
"acceptRegex": { "type": { "name": "instanceOf", "description": "RegExp" } },
"allowKeyboardControl": { "type": { "name": "bool" } },
"allowSameDateSelection": { "type": { "name": "bool" } },
"className": { "type": { "name": "string" } },
"components": {
"type": {
"name": "shape",
"description": "{ LeftArrowButton?: elementType, LeftArrowIcon?: elementType, RightArrowButton?: elementType, RightArrowIcon?: elementType, SwitchViewButton?: elementType, SwitchViewIcon?: elementType }"
}
},
"componentsProps": { "type": { "name": "object" } },
"defaultCalendarMonth": { "type": { "name": "any" } },
"disableCloseOnSelect": { "type": { "name": "bool" } },
"disabled": { "type": { "name": "bool" } },
"disableHighlightToday": { "type": { "name": "bool" } },
"disableMaskedInput": { "type": { "name": "bool" } },
"disableOpenPicker": { "type": { "name": "bool" } },
"displayStaticWrapperAs": {
"type": { "name": "enum", "description": "'desktop'<br>&#124;&nbsp;'mobile'" }
},
"getOpenDialogAriaText": { "type": { "name": "func" } },
"getViewSwitchingButtonText": { "type": { "name": "func" } },
"InputAdornmentProps": { "type": { "name": "object" } },
"inputFormat": { "type": { "name": "string" } },
"leftArrowButtonText": { "type": { "name": "string" } },
"loading": { "type": { "name": "bool" } },
"mask": { "type": { "name": "string" } },
"onAccept": { "type": { "name": "func" } },
"onClose": { "type": { "name": "func" } },
"onError": { "type": { "name": "func" } },
"onMonthChange": { "type": { "name": "func" } },
"onOpen": { "type": { "name": "func" } },
"onViewChange": { "type": { "name": "func" } },
"onYearChange": { "type": { "name": "func" } },
"open": { "type": { "name": "bool" } },
"OpenPickerButtonProps": { "type": { "name": "object" } },
"openPickerIcon": { "type": { "name": "node" } },
"openTo": {
"type": {
"name": "enum",
"description": "'date'<br>&#124;&nbsp;'hours'<br>&#124;&nbsp;'minutes'<br>&#124;&nbsp;'month'<br>&#124;&nbsp;'seconds'<br>&#124;&nbsp;'year'"
}
},
"orientation": {
"type": { "name": "enum", "description": "'landscape'<br>&#124;&nbsp;'portrait'" }
},
"readOnly": { "type": { "name": "bool" } },
"reduceAnimations": { "type": { "name": "bool" } },
"renderDay": { "type": { "name": "func" } },
"renderLoading": { "type": { "name": "func" } },
"rifmFormatter": { "type": { "name": "func" } },
"rightArrowButtonText": { "type": { "name": "string" } },
"shouldDisableDate": { "type": { "name": "func" } },
"shouldDisableYear": { "type": { "name": "func" } },
"showDaysOutsideCurrentMonth": { "type": { "name": "bool" } },
"showToolbar": { "type": { "name": "bool" } },
"ToolbarComponent": { "type": { "name": "elementType" } },
"toolbarFormat": { "type": { "name": "string" } },
Expand All @@ -37,6 +67,12 @@
"name": "union",
"description": "any<br>&#124;&nbsp;Date<br>&#124;&nbsp;number<br>&#124;&nbsp;string"
}
},
"views": {
"type": {
"name": "arrayOf",
"description": "Array&lt;'date'<br>&#124;&nbsp;'month'<br>&#124;&nbsp;'year'&gt;"
}
}
},
"name": "StaticDatePicker",
Expand Down
4 changes: 2 additions & 2 deletions docs/src/modules/branding/BrandingPersona.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ export default function BrandingPersona(props: BrandingPersonaProps) {
<Box
sx={{
display: 'flex',
// TODO use Stack
'&& > * + *': {
// TODO Replace with Stack
'& > :not(style) + :not(style)': {
ml: 1,
},
}}
Expand Down
4 changes: 3 additions & 1 deletion docs/src/pages/components/dividers/MiddleDividers.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ export default function MiddleDividers() {
<Box
sx={{
// TODO Replace with Stack
'& > :not(style) + :not(style)': { ml: 1 },
'& > :not(style) + :not(style)': {
ml: 1,
},
}}
>
<Chip label="Extra Soft" />
Expand Down
4 changes: 3 additions & 1 deletion docs/src/pages/components/dividers/MiddleDividers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ export default function MiddleDividers() {
<Box
sx={{
// TODO Replace with Stack
'& > :not(style) + :not(style)': { ml: 1 },
'& > :not(style) + :not(style)': {
ml: 1,
},
}}
>
<Chip label="Extra Soft" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,35 @@ import Button from '@material-ui/core/Button';
import Menu from '@material-ui/core/Menu';
import MenuItem from '@material-ui/core/MenuItem';

export default function SimpleMenu() {
export default function BasicMenu() {
const [anchorEl, setAnchorEl] = React.useState(null);

const open = Boolean(anchorEl);
const handleClick = (event) => {
setAnchorEl(event.currentTarget);
};

const handleClose = () => {
setAnchorEl(null);
};

return (
<div>
<Button aria-controls="simple-menu" aria-haspopup="true" onClick={handleClick}>
Open Menu
<Button
id="basic-button"
aria-controls="basic-menu"
aria-haspopup="true"
aria-expanded={open ? 'true' : undefined}
onClick={handleClick}
>
Dashboard
</Button>
<Menu
id="simple-menu"
id="basic-menu"
anchorEl={anchorEl}
keepMounted
open={Boolean(anchorEl)}
open={open}
onClose={handleClose}
MenuListProps={{
'aria-labelledby': 'basic-button',
}}
>
<MenuItem onClick={handleClose}>Profile</MenuItem>
<MenuItem onClick={handleClose}>My account</MenuItem>
Expand Down
Loading

0 comments on commit c2f844d

Please sign in to comment.