@mui/material 5.11.16 → 5.12.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Accordion/accordionClasses.d.ts +18 -18
- package/AccordionActions/accordionActionsClasses.d.ts +10 -10
- package/AccordionDetails/accordionDetailsClasses.d.ts +8 -8
- package/AccordionSummary/accordionSummaryClasses.d.ts +22 -22
- package/Alert/alertClasses.d.ts +44 -44
- package/AlertTitle/alertTitleClasses.d.ts +8 -8
- package/AppBar/appBarClasses.d.ts +28 -28
- package/Autocomplete/Autocomplete.js +2 -2
- package/Autocomplete/autocompleteClasses.d.ts +56 -56
- package/Avatar/avatarClasses.d.ts +20 -20
- package/AvatarGroup/avatarGroupClasses.d.ts +10 -10
- package/Backdrop/backdropClasses.d.ts +10 -10
- package/Badge/badgeClasses.d.ts +56 -56
- package/BottomNavigation/BottomNavigation.js +0 -0
- package/BottomNavigation/bottomNavigationClasses.d.ts +8 -8
- package/BottomNavigationAction/bottomNavigationActionClasses.d.ts +14 -14
- package/Box/Box.js +2 -0
- package/Breadcrumbs/breadcrumbsClasses.d.ts +14 -14
- package/Button/Button.js +4 -2
- package/Button/buttonClasses.d.ts +100 -100
- package/ButtonBase/buttonBaseClasses.d.ts +12 -12
- package/ButtonBase/touchRippleClasses.d.ts +20 -20
- package/ButtonGroup/ButtonGroupContext.d.ts +18 -18
- package/ButtonGroup/buttonGroupClasses.d.ts +58 -58
- package/CHANGELOG.md +147 -22
- package/Card/cardClasses.d.ts +8 -8
- package/CardActionArea/cardActionAreaClasses.d.ts +12 -12
- package/CardActions/cardActionsClasses.d.ts +10 -10
- package/CardContent/cardContentClasses.d.ts +8 -8
- package/CardHeader/cardHeaderClasses.d.ts +18 -18
- package/CardMedia/cardMediaClasses.d.ts +12 -12
- package/Checkbox/checkboxClasses.d.ts +18 -18
- package/Chip/chipClasses.d.ts +96 -96
- package/CircularProgress/circularProgressClasses.d.ts +26 -26
- package/ClickAwayListener/index.d.ts +2 -2
- package/Collapse/collapseClasses.d.ts +18 -18
- package/Container/containerClasses.d.ts +6 -6
- package/Dialog/DialogContext.d.ts +6 -6
- package/Dialog/dialogClasses.d.ts +36 -36
- package/DialogActions/dialogActionsClasses.d.ts +10 -10
- package/DialogContent/dialogContentClasses.d.ts +10 -10
- package/DialogContentText/dialogContentTextClasses.d.ts +8 -8
- package/DialogTitle/dialogTitleClasses.d.ts +8 -8
- package/Divider/dividerClasses.d.ts +34 -34
- package/Drawer/drawerClasses.d.ts +30 -30
- package/Fab/fabClasses.d.ts +26 -26
- package/FilledInput/filledInputClasses.d.ts +42 -40
- package/FormControl/FormControlContext.d.ts +17 -17
- package/FormControl/formControlClasses.d.ts +14 -14
- package/FormControl/useFormControl.d.ts +2 -2
- package/FormControlLabel/FormControlLabel.d.ts +4 -0
- package/FormControlLabel/FormControlLabel.js +34 -14
- package/FormControlLabel/formControlLabelClasses.d.ts +24 -20
- package/FormControlLabel/formControlLabelClasses.js +1 -1
- package/FormGroup/formGroupClasses.d.ts +12 -12
- package/FormHelperText/formHelperTextClasses.d.ts +22 -22
- package/FormLabel/formLabelClasses.d.ts +22 -22
- package/GlobalStyles/GlobalStyles.js +4 -4
- package/Grid/gridClasses.d.ts +48 -48
- package/Icon/iconClasses.d.ts +24 -24
- package/IconButton/iconButtonClasses.d.ts +34 -34
- package/ImageList/imageListClasses.d.ts +16 -16
- package/ImageListItem/imageListItemClasses.d.ts +18 -18
- package/ImageListItemBar/imageListItemBarClasses.d.ts +30 -30
- package/Input/inputClasses.d.ts +34 -34
- package/InputAdornment/inputAdornmentClasses.d.ts +24 -24
- package/InputBase/inputBaseClasses.d.ts +46 -46
- package/InputLabel/inputLabelClasses.d.ts +32 -32
- package/LinearProgress/linearProgressClasses.d.ts +42 -42
- package/Link/getTextDecoration.d.ts +15 -15
- package/Link/linkClasses.d.ts +18 -18
- package/List/listClasses.d.ts +14 -14
- package/ListItem/listItemClasses.d.ts +30 -30
- package/ListItemAvatar/listItemAvatarClasses.d.ts +10 -10
- package/ListItemButton/listItemButtonClasses.d.ts +22 -22
- package/ListItemIcon/listItemIconClasses.d.ts +10 -10
- package/ListItemSecondaryAction/listItemSecondaryActionClasses.d.ts +10 -10
- package/ListItemText/listItemTextClasses.d.ts +18 -18
- package/ListSubheader/listSubheaderClasses.d.ts +18 -18
- package/Menu/Menu.js +1 -1
- package/Menu/menuClasses.d.ts +12 -12
- package/MenuItem/menuItemClasses.d.ts +20 -20
- package/MobileStepper/mobileStepperClasses.d.ts +22 -22
- package/NativeSelect/nativeSelectClasses.d.ts +34 -34
- package/OutlinedInput/outlinedInputClasses.d.ts +38 -36
- package/OverridableComponent.d.ts +1 -1
- package/Pagination/paginationClasses.d.ts +14 -14
- package/PaginationItem/paginationItemClasses.d.ts +42 -42
- package/Paper/paperClasses.d.ts +39 -39
- package/Popover/popoverClasses.d.ts +10 -10
- package/Popper/Popper.d.ts +55 -55
- package/Popper/Popper.js +0 -4
- package/README.md +5 -5
- package/Radio/radioClasses.d.ts +16 -16
- package/RadioGroup/RadioGroupContext.d.ts +11 -11
- package/RadioGroup/useRadioGroup.d.ts +4 -4
- package/Rating/ratingClasses.d.ts +40 -40
- package/ScopedCssBaseline/scopedCssBaselineClasses.d.ts +8 -8
- package/Select/Select.d.ts +1 -1
- package/Select/Select.js +1 -1
- package/Select/selectClasses.d.ts +32 -32
- package/Skeleton/skeletonClasses.d.ts +26 -26
- package/Slider/SliderValueLabel.d.ts +15 -15
- package/Slider/SliderValueLabel.types.d.ts +24 -24
- package/Slider/sliderClasses.d.ts +58 -58
- package/Snackbar/snackbarClasses.d.ts +20 -20
- package/SnackbarContent/snackbarContentClasses.d.ts +12 -12
- package/SpeedDial/speedDialClasses.d.ts +22 -22
- package/SpeedDialAction/speedDialActionClasses.d.ts +20 -20
- package/SpeedDialIcon/speedDialIconClasses.d.ts +18 -18
- package/Stack/Stack.d.ts +1 -1
- package/Stack/Stack.js +1 -1
- package/Stack/stackClasses.d.ts +6 -6
- package/Step/StepContext.d.ts +20 -20
- package/Step/stepClasses.d.ts +16 -16
- package/StepButton/stepButtonClasses.d.ts +14 -14
- package/StepConnector/stepConnectorClasses.d.ts +26 -26
- package/StepContent/stepContentClasses.d.ts +12 -12
- package/StepIcon/stepIconClasses.d.ts +16 -16
- package/StepLabel/stepLabelClasses.d.ts +28 -28
- package/Stepper/StepperContext.d.ts +18 -18
- package/Stepper/stepperClasses.d.ts +14 -14
- package/SvgIcon/svgIconClasses.d.ts +26 -26
- package/Switch/switchClasses.d.ts +32 -32
- package/Tab/tabClasses.d.ts +26 -26
- package/TabScrollButton/tabScrollButtonClasses.d.ts +12 -12
- package/Table/tableClasses.d.ts +10 -10
- package/TableBody/tableBodyClasses.d.ts +8 -8
- package/TableCell/tableCellClasses.d.ts +32 -32
- package/TableContainer/tableContainerClasses.d.ts +8 -8
- package/TableFooter/tableFooterClasses.d.ts +8 -8
- package/TableHead/tableHeadClasses.d.ts +8 -8
- package/TablePagination/tablePaginationClasses.d.ts +28 -28
- package/TableRow/tableRowClasses.d.ts +16 -16
- package/TableSortLabel/tableSortLabelClasses.d.ts +16 -16
- package/Tabs/ScrollbarSize.js +2 -2
- package/Tabs/Tabs.js +1 -1
- package/Tabs/tabsClasses.d.ts +32 -32
- package/TextField/textFieldClasses.d.ts +8 -8
- package/ToggleButton/toggleButtonClasses.d.ts +24 -24
- package/ToggleButtonGroup/toggleButtonGroupClasses.d.ts +18 -18
- package/Toolbar/Toolbar.d.ts +1 -1
- package/Toolbar/Toolbar.js +1 -1
- package/Toolbar/toolbarClasses.d.ts +14 -14
- package/Tooltip/tooltipClasses.d.ts +30 -30
- package/Typography/typographyClasses.d.ts +50 -50
- package/Unstable_Grid2/Grid2.d.ts +4 -4
- package/Unstable_Grid2/Grid2Props.d.ts +15 -15
- package/Unstable_Grid2/grid2Classes.d.ts +5 -5
- package/Unstable_Grid2/index.d.ts +4 -4
- package/className/index.d.ts +1 -1
- package/darkScrollbar/index.d.ts +28 -28
- package/darkScrollbar/index.js +1 -1
- package/generateUtilityClass/index.d.ts +2 -2
- package/generateUtilityClasses/index.d.ts +1 -1
- package/index.js +1 -1
- package/internal/switchBaseClasses.d.ts +12 -12
- package/legacy/Autocomplete/Autocomplete.js +2 -2
- package/legacy/BottomNavigation/BottomNavigation.js +0 -0
- package/legacy/Box/Box.js +2 -0
- package/legacy/Button/Button.js +4 -2
- package/legacy/FormControlLabel/FormControlLabel.js +35 -14
- package/legacy/FormControlLabel/formControlLabelClasses.js +1 -1
- package/legacy/GlobalStyles/GlobalStyles.js +4 -4
- package/legacy/Menu/Menu.js +1 -1
- package/legacy/Popper/Popper.js +0 -4
- package/legacy/Select/Select.js +1 -1
- package/legacy/Stack/Stack.js +1 -1
- package/legacy/Tabs/ScrollbarSize.js +2 -2
- package/legacy/Tabs/Tabs.js +1 -1
- package/legacy/Toolbar/Toolbar.js +1 -1
- package/legacy/darkScrollbar/index.js +1 -1
- package/legacy/index.js +1 -1
- package/legacy/styles/CssVarsProvider.js +2 -0
- package/legacy/styles/ThemeProvider.js +26 -1
- package/legacy/styles/experimental_extendTheme.js +5 -1
- package/legacy/styles/identifier.js +1 -0
- package/legacy/styles/index.js +1 -0
- package/legacy/styles/styled.js +2 -0
- package/legacy/styles/useTheme.js +2 -1
- package/legacy/styles/useThemeProps.js +3 -1
- package/locale/index.d.ts +76 -76
- package/modern/Autocomplete/Autocomplete.js +2 -2
- package/modern/BottomNavigation/BottomNavigation.js +0 -0
- package/modern/Box/Box.js +2 -0
- package/modern/Button/Button.js +100 -96
- package/modern/FormControlLabel/FormControlLabel.js +33 -13
- package/modern/FormControlLabel/formControlLabelClasses.js +1 -1
- package/modern/GlobalStyles/GlobalStyles.js +4 -4
- package/modern/Menu/Menu.js +1 -1
- package/modern/Popper/Popper.js +0 -4
- package/modern/Select/Select.js +1 -1
- package/modern/Stack/Stack.js +1 -1
- package/modern/Tabs/ScrollbarSize.js +2 -2
- package/modern/Tabs/Tabs.js +1 -1
- package/modern/Toolbar/Toolbar.js +1 -1
- package/modern/darkScrollbar/index.js +1 -1
- package/modern/index.js +1 -1
- package/modern/styles/CssVarsProvider.js +2 -0
- package/modern/styles/ThemeProvider.js +29 -1
- package/modern/styles/experimental_extendTheme.js +5 -1
- package/modern/styles/identifier.js +1 -0
- package/modern/styles/index.js +1 -0
- package/modern/styles/styled.js +2 -0
- package/modern/styles/useTheme.js +2 -1
- package/modern/styles/useThemeProps.js +3 -1
- package/node/Autocomplete/Autocomplete.js +2 -2
- package/node/BottomNavigation/BottomNavigation.js +0 -0
- package/node/Box/Box.js +2 -0
- package/node/Button/Button.js +4 -2
- package/node/FormControlLabel/FormControlLabel.js +35 -15
- package/node/FormControlLabel/formControlLabelClasses.js +1 -1
- package/node/GlobalStyles/GlobalStyles.js +4 -4
- package/node/Menu/Menu.js +1 -1
- package/node/Popper/Popper.js +0 -4
- package/node/Select/Select.js +1 -1
- package/node/Stack/Stack.js +1 -1
- package/node/Tabs/ScrollbarSize.js +1 -1
- package/node/Tabs/Tabs.js +1 -1
- package/node/Toolbar/Toolbar.js +1 -1
- package/node/darkScrollbar/index.js +1 -1
- package/node/index.js +1 -1
- package/node/styles/CssVarsProvider.js +2 -0
- package/node/styles/ThemeProvider.js +33 -7
- package/node/styles/experimental_extendTheme.js +5 -1
- package/node/styles/identifier.js +8 -0
- package/node/styles/index.js +8 -0
- package/node/styles/styled.js +2 -0
- package/node/styles/useTheme.js +2 -1
- package/node/styles/useThemeProps.js +3 -1
- package/package.json +6 -6
- package/styles/CssVarsProvider.d.ts +20 -15
- package/styles/CssVarsProvider.js +2 -0
- package/styles/ThemeProvider.js +29 -1
- package/styles/excludeVariablesFromRoot.d.ts +5 -5
- package/styles/experimental_extendTheme.d.ts +8 -1
- package/styles/experimental_extendTheme.js +5 -1
- package/styles/getOverlayAlpha.d.ts +2 -2
- package/styles/identifier.d.ts +2 -0
- package/styles/identifier.js +1 -0
- package/styles/index.d.ts +1 -0
- package/styles/index.js +1 -0
- package/styles/shouldSkipGeneratingVar.d.ts +1 -1
- package/styles/styled.js +2 -0
- package/styles/useTheme.js +2 -1
- package/styles/useThemeProps.js +3 -1
- package/transitions/index.d.ts +1 -1
- package/transitions/transition.d.ts +13 -13
- package/transitions/utils.d.ts +23 -23
- package/types/OverridableComponentAugmentation.d.ts +31 -31
- package/umd/material-ui.development.js +672 -535
- package/umd/material-ui.production.min.js +21 -21
- package/useMediaQuery/useMediaQuery.d.ts +46 -46
- package/useTouchRipple/index.d.ts +1 -1
- package/useTouchRipple/useTouchRipple.d.ts +28 -28
- package/utils/getScrollbarSize.d.ts +2 -2
- package/utils/ownerDocument.d.ts +2 -2
- package/utils/ownerWindow.d.ts +2 -2
- package/utils/setRef.d.ts +2 -2
package/modern/Button/Button.js
CHANGED
|
@@ -59,106 +59,110 @@ const ButtonRoot = styled(ButtonBase, {
|
|
|
59
59
|
})(({
|
|
60
60
|
theme,
|
|
61
61
|
ownerState
|
|
62
|
-
}) =>
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
backgroundColor:
|
|
75
|
-
|
|
62
|
+
}) => {
|
|
63
|
+
const inheritContainedBackgroundColor = theme.palette.mode === 'light' ? theme.palette.grey[300] : theme.palette.grey[800];
|
|
64
|
+
const inheritContainedHoverBackgroundColor = theme.palette.mode === 'light' ? theme.palette.grey.A100 : theme.palette.grey[700];
|
|
65
|
+
return _extends({}, theme.typography.button, {
|
|
66
|
+
minWidth: 64,
|
|
67
|
+
padding: '6px 16px',
|
|
68
|
+
borderRadius: (theme.vars || theme).shape.borderRadius,
|
|
69
|
+
transition: theme.transitions.create(['background-color', 'box-shadow', 'border-color', 'color'], {
|
|
70
|
+
duration: theme.transitions.duration.short
|
|
71
|
+
}),
|
|
72
|
+
'&:hover': _extends({
|
|
73
|
+
textDecoration: 'none',
|
|
74
|
+
backgroundColor: theme.vars ? `rgba(${theme.vars.palette.text.primaryChannel} / ${theme.vars.palette.action.hoverOpacity})` : alpha(theme.palette.text.primary, theme.palette.action.hoverOpacity),
|
|
75
|
+
// Reset on touch devices, it doesn't add specificity
|
|
76
|
+
'@media (hover: none)': {
|
|
77
|
+
backgroundColor: 'transparent'
|
|
78
|
+
}
|
|
79
|
+
}, ownerState.variant === 'text' && ownerState.color !== 'inherit' && {
|
|
80
|
+
backgroundColor: theme.vars ? `rgba(${theme.vars.palette[ownerState.color].mainChannel} / ${theme.vars.palette.action.hoverOpacity})` : alpha(theme.palette[ownerState.color].main, theme.palette.action.hoverOpacity),
|
|
81
|
+
// Reset on touch devices, it doesn't add specificity
|
|
82
|
+
'@media (hover: none)': {
|
|
83
|
+
backgroundColor: 'transparent'
|
|
84
|
+
}
|
|
85
|
+
}, ownerState.variant === 'outlined' && ownerState.color !== 'inherit' && {
|
|
86
|
+
border: `1px solid ${(theme.vars || theme).palette[ownerState.color].main}`,
|
|
87
|
+
backgroundColor: theme.vars ? `rgba(${theme.vars.palette[ownerState.color].mainChannel} / ${theme.vars.palette.action.hoverOpacity})` : alpha(theme.palette[ownerState.color].main, theme.palette.action.hoverOpacity),
|
|
88
|
+
// Reset on touch devices, it doesn't add specificity
|
|
89
|
+
'@media (hover: none)': {
|
|
90
|
+
backgroundColor: 'transparent'
|
|
91
|
+
}
|
|
92
|
+
}, ownerState.variant === 'contained' && {
|
|
93
|
+
backgroundColor: theme.vars ? theme.vars.palette.Button.inheritContainedHoverBg : inheritContainedHoverBackgroundColor,
|
|
94
|
+
boxShadow: (theme.vars || theme).shadows[4],
|
|
95
|
+
// Reset on touch devices, it doesn't add specificity
|
|
96
|
+
'@media (hover: none)': {
|
|
97
|
+
boxShadow: (theme.vars || theme).shadows[2],
|
|
98
|
+
backgroundColor: (theme.vars || theme).palette.grey[300]
|
|
99
|
+
}
|
|
100
|
+
}, ownerState.variant === 'contained' && ownerState.color !== 'inherit' && {
|
|
101
|
+
backgroundColor: (theme.vars || theme).palette[ownerState.color].dark,
|
|
102
|
+
// Reset on touch devices, it doesn't add specificity
|
|
103
|
+
'@media (hover: none)': {
|
|
104
|
+
backgroundColor: (theme.vars || theme).palette[ownerState.color].main
|
|
105
|
+
}
|
|
106
|
+
}),
|
|
107
|
+
'&:active': _extends({}, ownerState.variant === 'contained' && {
|
|
108
|
+
boxShadow: (theme.vars || theme).shadows[8]
|
|
109
|
+
}),
|
|
110
|
+
[`&.${buttonClasses.focusVisible}`]: _extends({}, ownerState.variant === 'contained' && {
|
|
111
|
+
boxShadow: (theme.vars || theme).shadows[6]
|
|
112
|
+
}),
|
|
113
|
+
[`&.${buttonClasses.disabled}`]: _extends({
|
|
114
|
+
color: (theme.vars || theme).palette.action.disabled
|
|
115
|
+
}, ownerState.variant === 'outlined' && {
|
|
116
|
+
border: `1px solid ${(theme.vars || theme).palette.action.disabledBackground}`
|
|
117
|
+
}, ownerState.variant === 'contained' && {
|
|
118
|
+
color: (theme.vars || theme).palette.action.disabled,
|
|
119
|
+
boxShadow: (theme.vars || theme).shadows[0],
|
|
120
|
+
backgroundColor: (theme.vars || theme).palette.action.disabledBackground
|
|
121
|
+
})
|
|
122
|
+
}, ownerState.variant === 'text' && {
|
|
123
|
+
padding: '6px 8px'
|
|
76
124
|
}, ownerState.variant === 'text' && ownerState.color !== 'inherit' && {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
}
|
|
125
|
+
color: (theme.vars || theme).palette[ownerState.color].main
|
|
126
|
+
}, ownerState.variant === 'outlined' && {
|
|
127
|
+
padding: '5px 15px',
|
|
128
|
+
border: '1px solid currentColor'
|
|
82
129
|
}, ownerState.variant === 'outlined' && ownerState.color !== 'inherit' && {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
// Reset on touch devices, it doesn't add specificity
|
|
86
|
-
'@media (hover: none)': {
|
|
87
|
-
backgroundColor: 'transparent'
|
|
88
|
-
}
|
|
130
|
+
color: (theme.vars || theme).palette[ownerState.color].main,
|
|
131
|
+
border: theme.vars ? `1px solid rgba(${theme.vars.palette[ownerState.color].mainChannel} / 0.5)` : `1px solid ${alpha(theme.palette[ownerState.color].main, 0.5)}`
|
|
89
132
|
}, ownerState.variant === 'contained' && {
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
backgroundColor: (theme.vars || theme).palette.grey[300]
|
|
96
|
-
}
|
|
133
|
+
color: theme.vars ?
|
|
134
|
+
// this is safe because grey does not change between default light/dark mode
|
|
135
|
+
theme.vars.palette.text.primary : theme.palette.getContrastText?.(theme.palette.grey[300]),
|
|
136
|
+
backgroundColor: theme.vars ? theme.vars.palette.Button.inheritContainedBg : inheritContainedBackgroundColor,
|
|
137
|
+
boxShadow: (theme.vars || theme).shadows[2]
|
|
97
138
|
}, ownerState.variant === 'contained' && ownerState.color !== 'inherit' && {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
}, ownerState.variant === 'outlined' && {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
}
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
}, ownerState.
|
|
122
|
-
|
|
123
|
-
}
|
|
124
|
-
|
|
125
|
-
border: '1px solid currentColor'
|
|
126
|
-
}, ownerState.variant === 'outlined' && ownerState.color !== 'inherit' && {
|
|
127
|
-
color: (theme.vars || theme).palette[ownerState.color].main,
|
|
128
|
-
border: theme.vars ? `1px solid rgba(${theme.vars.palette[ownerState.color].mainChannel} / 0.5)` : `1px solid ${alpha(theme.palette[ownerState.color].main, 0.5)}`
|
|
129
|
-
}, ownerState.variant === 'contained' && {
|
|
130
|
-
color: theme.vars ?
|
|
131
|
-
// this is safe because grey does not change between default light/dark mode
|
|
132
|
-
theme.vars.palette.text.primary : theme.palette.getContrastText?.(theme.palette.grey[300]),
|
|
133
|
-
backgroundColor: (theme.vars || theme).palette.grey[300],
|
|
134
|
-
boxShadow: (theme.vars || theme).shadows[2]
|
|
135
|
-
}, ownerState.variant === 'contained' && ownerState.color !== 'inherit' && {
|
|
136
|
-
color: (theme.vars || theme).palette[ownerState.color].contrastText,
|
|
137
|
-
backgroundColor: (theme.vars || theme).palette[ownerState.color].main
|
|
138
|
-
}, ownerState.color === 'inherit' && {
|
|
139
|
-
color: 'inherit',
|
|
140
|
-
borderColor: 'currentColor'
|
|
141
|
-
}, ownerState.size === 'small' && ownerState.variant === 'text' && {
|
|
142
|
-
padding: '4px 5px',
|
|
143
|
-
fontSize: theme.typography.pxToRem(13)
|
|
144
|
-
}, ownerState.size === 'large' && ownerState.variant === 'text' && {
|
|
145
|
-
padding: '8px 11px',
|
|
146
|
-
fontSize: theme.typography.pxToRem(15)
|
|
147
|
-
}, ownerState.size === 'small' && ownerState.variant === 'outlined' && {
|
|
148
|
-
padding: '3px 9px',
|
|
149
|
-
fontSize: theme.typography.pxToRem(13)
|
|
150
|
-
}, ownerState.size === 'large' && ownerState.variant === 'outlined' && {
|
|
151
|
-
padding: '7px 21px',
|
|
152
|
-
fontSize: theme.typography.pxToRem(15)
|
|
153
|
-
}, ownerState.size === 'small' && ownerState.variant === 'contained' && {
|
|
154
|
-
padding: '4px 10px',
|
|
155
|
-
fontSize: theme.typography.pxToRem(13)
|
|
156
|
-
}, ownerState.size === 'large' && ownerState.variant === 'contained' && {
|
|
157
|
-
padding: '8px 22px',
|
|
158
|
-
fontSize: theme.typography.pxToRem(15)
|
|
159
|
-
}, ownerState.fullWidth && {
|
|
160
|
-
width: '100%'
|
|
161
|
-
}), ({
|
|
139
|
+
color: (theme.vars || theme).palette[ownerState.color].contrastText,
|
|
140
|
+
backgroundColor: (theme.vars || theme).palette[ownerState.color].main
|
|
141
|
+
}, ownerState.color === 'inherit' && {
|
|
142
|
+
color: 'inherit',
|
|
143
|
+
borderColor: 'currentColor'
|
|
144
|
+
}, ownerState.size === 'small' && ownerState.variant === 'text' && {
|
|
145
|
+
padding: '4px 5px',
|
|
146
|
+
fontSize: theme.typography.pxToRem(13)
|
|
147
|
+
}, ownerState.size === 'large' && ownerState.variant === 'text' && {
|
|
148
|
+
padding: '8px 11px',
|
|
149
|
+
fontSize: theme.typography.pxToRem(15)
|
|
150
|
+
}, ownerState.size === 'small' && ownerState.variant === 'outlined' && {
|
|
151
|
+
padding: '3px 9px',
|
|
152
|
+
fontSize: theme.typography.pxToRem(13)
|
|
153
|
+
}, ownerState.size === 'large' && ownerState.variant === 'outlined' && {
|
|
154
|
+
padding: '7px 21px',
|
|
155
|
+
fontSize: theme.typography.pxToRem(15)
|
|
156
|
+
}, ownerState.size === 'small' && ownerState.variant === 'contained' && {
|
|
157
|
+
padding: '4px 10px',
|
|
158
|
+
fontSize: theme.typography.pxToRem(13)
|
|
159
|
+
}, ownerState.size === 'large' && ownerState.variant === 'contained' && {
|
|
160
|
+
padding: '8px 22px',
|
|
161
|
+
fontSize: theme.typography.pxToRem(15)
|
|
162
|
+
}, ownerState.fullWidth && {
|
|
163
|
+
width: '100%'
|
|
164
|
+
});
|
|
165
|
+
}, ({
|
|
162
166
|
ownerState
|
|
163
167
|
}) => ownerState.disableElevation && {
|
|
164
168
|
boxShadow: 'none',
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
|
|
2
2
|
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
3
|
-
const _excluded = ["checked", "className", "componentsProps", "control", "disabled", "disableTypography", "inputRef", "label", "labelPlacement", "name", "onChange", "slotProps", "value"];
|
|
3
|
+
const _excluded = ["checked", "className", "componentsProps", "control", "disabled", "disableTypography", "inputRef", "label", "labelPlacement", "name", "onChange", "required", "slotProps", "value"];
|
|
4
4
|
import * as React from 'react';
|
|
5
5
|
import PropTypes from 'prop-types';
|
|
6
6
|
import clsx from 'clsx';
|
|
@@ -20,11 +20,13 @@ const useUtilityClasses = ownerState => {
|
|
|
20
20
|
classes,
|
|
21
21
|
disabled,
|
|
22
22
|
labelPlacement,
|
|
23
|
-
error
|
|
23
|
+
error,
|
|
24
|
+
required
|
|
24
25
|
} = ownerState;
|
|
25
26
|
const slots = {
|
|
26
|
-
root: ['root', disabled && 'disabled', `labelPlacement${capitalize(labelPlacement)}`, error && 'error'],
|
|
27
|
-
label: ['label', disabled && 'disabled']
|
|
27
|
+
root: ['root', disabled && 'disabled', `labelPlacement${capitalize(labelPlacement)}`, error && 'error', required && 'required'],
|
|
28
|
+
label: ['label', disabled && 'disabled'],
|
|
29
|
+
asterisk: ['asterisk', error && 'error']
|
|
28
30
|
};
|
|
29
31
|
return composeClasses(slots, getFormControlLabelUtilityClasses, classes);
|
|
30
32
|
};
|
|
@@ -73,6 +75,17 @@ export const FormControlLabelRoot = styled('label', {
|
|
|
73
75
|
}
|
|
74
76
|
}
|
|
75
77
|
}));
|
|
78
|
+
const AsteriskComponent = styled('span', {
|
|
79
|
+
name: 'MuiFormControlLabel',
|
|
80
|
+
slot: 'Asterisk',
|
|
81
|
+
overridesResolver: (props, styles) => styles.asterisk
|
|
82
|
+
})(({
|
|
83
|
+
theme
|
|
84
|
+
}) => ({
|
|
85
|
+
[`&.${formControlLabelClasses.error}`]: {
|
|
86
|
+
color: (theme.vars || theme).palette.error.main
|
|
87
|
+
}
|
|
88
|
+
}));
|
|
76
89
|
|
|
77
90
|
/**
|
|
78
91
|
* Drop-in replacement of the `Radio`, `Switch` and `Checkbox` component.
|
|
@@ -91,19 +104,16 @@ const FormControlLabel = /*#__PURE__*/React.forwardRef(function FormControlLabel
|
|
|
91
104
|
disableTypography,
|
|
92
105
|
label: labelProp,
|
|
93
106
|
labelPlacement = 'end',
|
|
107
|
+
required: requiredProp,
|
|
94
108
|
slotProps = {}
|
|
95
109
|
} = props,
|
|
96
110
|
other = _objectWithoutPropertiesLoose(props, _excluded);
|
|
97
111
|
const muiFormControl = useFormControl();
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
disabled = control.props.disabled;
|
|
101
|
-
}
|
|
102
|
-
if (typeof disabled === 'undefined' && muiFormControl) {
|
|
103
|
-
disabled = muiFormControl.disabled;
|
|
104
|
-
}
|
|
112
|
+
const disabled = disabledProp ?? control.props.disabled ?? muiFormControl?.disabled;
|
|
113
|
+
const required = requiredProp ?? control.props.required;
|
|
105
114
|
const controlProps = {
|
|
106
|
-
disabled
|
|
115
|
+
disabled,
|
|
116
|
+
required
|
|
107
117
|
};
|
|
108
118
|
['checked', 'name', 'onChange', 'value', 'inputRef'].forEach(key => {
|
|
109
119
|
if (typeof control.props[key] === 'undefined' && typeof props[key] !== 'undefined') {
|
|
@@ -118,6 +128,7 @@ const FormControlLabel = /*#__PURE__*/React.forwardRef(function FormControlLabel
|
|
|
118
128
|
const ownerState = _extends({}, props, {
|
|
119
129
|
disabled,
|
|
120
130
|
labelPlacement,
|
|
131
|
+
required,
|
|
121
132
|
error: fcs.error
|
|
122
133
|
});
|
|
123
134
|
const classes = useUtilityClasses(ownerState);
|
|
@@ -136,7 +147,12 @@ const FormControlLabel = /*#__PURE__*/React.forwardRef(function FormControlLabel
|
|
|
136
147
|
ownerState: ownerState,
|
|
137
148
|
ref: ref
|
|
138
149
|
}, other, {
|
|
139
|
-
children: [/*#__PURE__*/React.cloneElement(control, controlProps), label
|
|
150
|
+
children: [/*#__PURE__*/React.cloneElement(control, controlProps), label, required && /*#__PURE__*/_jsxs(AsteriskComponent, {
|
|
151
|
+
ownerState: ownerState,
|
|
152
|
+
"aria-hidden": true,
|
|
153
|
+
className: classes.asterisk,
|
|
154
|
+
children: ["\u2009", '*']
|
|
155
|
+
})]
|
|
140
156
|
}));
|
|
141
157
|
});
|
|
142
158
|
process.env.NODE_ENV !== "production" ? FormControlLabel.propTypes /* remove-proptypes */ = {
|
|
@@ -199,6 +215,10 @@ process.env.NODE_ENV !== "production" ? FormControlLabel.propTypes /* remove-pro
|
|
|
199
215
|
* You can pull out the new checked state by accessing `event.target.checked` (boolean).
|
|
200
216
|
*/
|
|
201
217
|
onChange: PropTypes.func,
|
|
218
|
+
/**
|
|
219
|
+
* If `true`, the label will indicate that the `input` is required.
|
|
220
|
+
*/
|
|
221
|
+
required: PropTypes.bool,
|
|
202
222
|
/**
|
|
203
223
|
* The props used for each slot inside.
|
|
204
224
|
* @default {}
|
|
@@ -3,5 +3,5 @@ import generateUtilityClass from '../generateUtilityClass';
|
|
|
3
3
|
export function getFormControlLabelUtilityClasses(slot) {
|
|
4
4
|
return generateUtilityClass('MuiFormControlLabel', slot);
|
|
5
5
|
}
|
|
6
|
-
const formControlLabelClasses = generateUtilityClasses('MuiFormControlLabel', ['root', 'labelPlacementStart', 'labelPlacementTop', 'labelPlacementBottom', 'disabled', 'label', 'error']);
|
|
6
|
+
const formControlLabelClasses = generateUtilityClasses('MuiFormControlLabel', ['root', 'labelPlacementStart', 'labelPlacementTop', 'labelPlacementBottom', 'disabled', 'label', 'error', 'required', 'asterisk']);
|
|
7
7
|
export default formControlLabelClasses;
|
|
@@ -3,10 +3,12 @@ import * as React from 'react';
|
|
|
3
3
|
import PropTypes from 'prop-types';
|
|
4
4
|
import { GlobalStyles as SystemGlobalStyles } from '@mui/system';
|
|
5
5
|
import defaultTheme from '../styles/defaultTheme';
|
|
6
|
+
import THEME_ID from '../styles/identifier';
|
|
6
7
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
7
8
|
function GlobalStyles(props) {
|
|
8
9
|
return /*#__PURE__*/_jsx(SystemGlobalStyles, _extends({}, props, {
|
|
9
|
-
defaultTheme: defaultTheme
|
|
10
|
+
defaultTheme: defaultTheme,
|
|
11
|
+
themeId: THEME_ID
|
|
10
12
|
}));
|
|
11
13
|
}
|
|
12
14
|
process.env.NODE_ENV !== "production" ? GlobalStyles.propTypes /* remove-proptypes */ = {
|
|
@@ -17,8 +19,6 @@ process.env.NODE_ENV !== "production" ? GlobalStyles.propTypes /* remove-proptyp
|
|
|
17
19
|
/**
|
|
18
20
|
* The styles you want to apply globally.
|
|
19
21
|
*/
|
|
20
|
-
styles: PropTypes
|
|
21
|
-
__emotion_styles: PropTypes.any.isRequired
|
|
22
|
-
}), PropTypes.string, PropTypes.bool])
|
|
22
|
+
styles: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.array, PropTypes.func, PropTypes.number, PropTypes.object, PropTypes.string, PropTypes.bool])
|
|
23
23
|
} : void 0;
|
|
24
24
|
export default GlobalStyles;
|
package/modern/Menu/Menu.js
CHANGED
|
@@ -47,7 +47,7 @@ const MenuPaper = styled(Paper, {
|
|
|
47
47
|
overridesResolver: (props, styles) => styles.paper
|
|
48
48
|
})({
|
|
49
49
|
// specZ: The maximum height of a simple menu should be one or more rows less than the view
|
|
50
|
-
// height. This ensures a
|
|
50
|
+
// height. This ensures a tappable area outside of the simple menu with which to dismiss
|
|
51
51
|
// the menu.
|
|
52
52
|
maxHeight: 'calc(100% - 96px)',
|
|
53
53
|
// Add iOS momentum scrolling for iOS < 13.0
|
package/modern/Popper/Popper.js
CHANGED
|
@@ -129,10 +129,6 @@ process.env.NODE_ENV !== "production" ? Popper.propTypes /* remove-proptypes */
|
|
|
129
129
|
* If `true`, the component is shown.
|
|
130
130
|
*/
|
|
131
131
|
open: PropTypes.bool.isRequired,
|
|
132
|
-
/**
|
|
133
|
-
* @ignore
|
|
134
|
-
*/
|
|
135
|
-
ownerState: PropTypes.any,
|
|
136
132
|
/**
|
|
137
133
|
* Popper placement.
|
|
138
134
|
* @default 'bottom'
|
package/modern/Select/Select.js
CHANGED
|
@@ -228,7 +228,7 @@ process.env.NODE_ENV !== "production" ? Select.propTypes /* remove-proptypes */
|
|
|
228
228
|
onChange: PropTypes.func,
|
|
229
229
|
/**
|
|
230
230
|
* Callback fired when the component requests to be closed.
|
|
231
|
-
* Use it in either controlled (see the `open` prop), or uncontrolled mode (to detect when the Select
|
|
231
|
+
* Use it in either controlled (see the `open` prop), or uncontrolled mode (to detect when the Select collapses).
|
|
232
232
|
*
|
|
233
233
|
* @param {object} event The event source of the callback.
|
|
234
234
|
*/
|
package/modern/Stack/Stack.js
CHANGED
|
@@ -49,7 +49,7 @@ process.env.NODE_ENV !== "production" ? Stack.propTypes /* remove-proptypes */ =
|
|
|
49
49
|
/**
|
|
50
50
|
* If `true`, the CSS flexbox `gap` is used instead of applying `margin` to children.
|
|
51
51
|
*
|
|
52
|
-
* While CSS `gap` removes the [known limitations](https://mui.com/joy-ui/react-stack
|
|
52
|
+
* While CSS `gap` removes the [known limitations](https://mui.com/joy-ui/react-stack/#limitations),
|
|
53
53
|
* it is not fully supported in some browsers. We recommend checking https://caniuse.com/?search=flex%20gap before using this flag.
|
|
54
54
|
*
|
|
55
55
|
* To enable this flag globally, follow the [theme's default props](https://mui.com/material-ui/customization/theme-components/#default-props) configuration.
|
|
@@ -4,7 +4,7 @@ const _excluded = ["onChange"];
|
|
|
4
4
|
import * as React from 'react';
|
|
5
5
|
import PropTypes from 'prop-types';
|
|
6
6
|
import debounce from '../utils/debounce';
|
|
7
|
-
import { ownerWindow } from '../utils';
|
|
7
|
+
import { ownerWindow, unstable_useEnhancedEffect as useEnhancedEffect } from '../utils';
|
|
8
8
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
9
9
|
const styles = {
|
|
10
10
|
width: 99,
|
|
@@ -29,7 +29,7 @@ export default function ScrollbarSize(props) {
|
|
|
29
29
|
const setMeasurements = () => {
|
|
30
30
|
scrollbarHeight.current = nodeRef.current.offsetHeight - nodeRef.current.clientHeight;
|
|
31
31
|
};
|
|
32
|
-
|
|
32
|
+
useEnhancedEffect(() => {
|
|
33
33
|
const handleResize = debounce(() => {
|
|
34
34
|
const prevHeight = scrollbarHeight.current;
|
|
35
35
|
setMeasurements();
|
package/modern/Tabs/Tabs.js
CHANGED
|
@@ -418,7 +418,7 @@ const Tabs = /*#__PURE__*/React.forwardRef(function Tabs(inProps, ref) {
|
|
|
418
418
|
moveTabsScroll(getScrollSize());
|
|
419
419
|
};
|
|
420
420
|
|
|
421
|
-
// TODO Remove <ScrollbarSize /> as browser support for
|
|
421
|
+
// TODO Remove <ScrollbarSize /> as browser support for hiding the scrollbar
|
|
422
422
|
// with CSS improves.
|
|
423
423
|
const handleScrollbarSizeChange = React.useCallback(scrollbarWidth => {
|
|
424
424
|
setScrollerStyle({
|
|
@@ -81,7 +81,7 @@ process.env.NODE_ENV !== "production" ? Toolbar.propTypes /* remove-proptypes */
|
|
|
81
81
|
// ----------------------------------------------------------------------
|
|
82
82
|
/**
|
|
83
83
|
* The Toolbar children, usually a mixture of `IconButton`, `Button` and `Typography`.
|
|
84
|
-
* The Toolbar is a flex container, allowing flex item
|
|
84
|
+
* The Toolbar is a flex container, allowing flex item properties to be used to lay out the children.
|
|
85
85
|
*/
|
|
86
86
|
children: PropTypes.node,
|
|
87
87
|
/**
|
package/modern/index.js
CHANGED
|
@@ -3,12 +3,14 @@ import { unstable_createCssVarsProvider as createCssVarsProvider, unstable_style
|
|
|
3
3
|
import experimental_extendTheme from './experimental_extendTheme';
|
|
4
4
|
import createTypography from './createTypography';
|
|
5
5
|
import excludeVariablesFromRoot from './excludeVariablesFromRoot';
|
|
6
|
+
import THEME_ID from './identifier';
|
|
6
7
|
const defaultTheme = experimental_extendTheme();
|
|
7
8
|
const {
|
|
8
9
|
CssVarsProvider,
|
|
9
10
|
useColorScheme,
|
|
10
11
|
getInitColorSchemeScript
|
|
11
12
|
} = createCssVarsProvider({
|
|
13
|
+
themeId: THEME_ID,
|
|
12
14
|
theme: defaultTheme,
|
|
13
15
|
attribute: 'data-mui-color-scheme',
|
|
14
16
|
modeStorageKey: 'mui-mode',
|
|
@@ -1 +1,29 @@
|
|
|
1
|
-
|
|
1
|
+
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
2
|
+
import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
|
|
3
|
+
const _excluded = ["theme"];
|
|
4
|
+
import * as React from 'react';
|
|
5
|
+
import PropTypes from 'prop-types';
|
|
6
|
+
import { ThemeProvider as SystemThemeProvider } from '@mui/system';
|
|
7
|
+
import THEME_ID from './identifier';
|
|
8
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
9
|
+
export default function ThemeProvider(_ref) {
|
|
10
|
+
let {
|
|
11
|
+
theme: themeInput
|
|
12
|
+
} = _ref,
|
|
13
|
+
props = _objectWithoutPropertiesLoose(_ref, _excluded);
|
|
14
|
+
const scopedTheme = themeInput[THEME_ID];
|
|
15
|
+
return /*#__PURE__*/_jsx(SystemThemeProvider, _extends({}, props, {
|
|
16
|
+
themeId: scopedTheme ? THEME_ID : undefined,
|
|
17
|
+
theme: scopedTheme || themeInput
|
|
18
|
+
}));
|
|
19
|
+
}
|
|
20
|
+
process.env.NODE_ENV !== "production" ? ThemeProvider.propTypes = {
|
|
21
|
+
/**
|
|
22
|
+
* Your component tree.
|
|
23
|
+
*/
|
|
24
|
+
children: PropTypes.node,
|
|
25
|
+
/**
|
|
26
|
+
* A theme object. You can provide a function to extend the outer theme.
|
|
27
|
+
*/
|
|
28
|
+
theme: PropTypes.oneOfType([PropTypes.object, PropTypes.func]).isRequired
|
|
29
|
+
} : void 0;
|
|
@@ -109,7 +109,7 @@ export default function extendTheme(options = {}, ...args) {
|
|
|
109
109
|
}
|
|
110
110
|
|
|
111
111
|
// assign component variables
|
|
112
|
-
assignNode(palette, ['Alert', 'AppBar', 'Avatar', 'Chip', 'FilledInput', 'LinearProgress', 'Skeleton', 'Slider', 'SnackbarContent', 'SpeedDialAction', 'StepConnector', 'StepContent', 'Switch', 'TableCell', 'Tooltip']);
|
|
112
|
+
assignNode(palette, ['Alert', 'AppBar', 'Avatar', 'Button', 'Chip', 'FilledInput', 'LinearProgress', 'Skeleton', 'Slider', 'SnackbarContent', 'SpeedDialAction', 'StepConnector', 'StepContent', 'Switch', 'TableCell', 'Tooltip']);
|
|
113
113
|
if (key === 'light') {
|
|
114
114
|
setColor(palette.Alert, 'errorColor', safeDarken(palette.error.light, 0.6));
|
|
115
115
|
setColor(palette.Alert, 'infoColor', safeDarken(palette.info.light, 0.6));
|
|
@@ -133,6 +133,8 @@ export default function extendTheme(options = {}, ...args) {
|
|
|
133
133
|
setColor(palette.Alert, 'warningIconColor', setCssVarColor('palette-warning-main'));
|
|
134
134
|
setColor(palette.AppBar, 'defaultBg', setCssVarColor('palette-grey-100'));
|
|
135
135
|
setColor(palette.Avatar, 'defaultBg', setCssVarColor('palette-grey-400'));
|
|
136
|
+
setColor(palette.Button, 'inheritContainedBg', setCssVarColor('palette-grey-300'));
|
|
137
|
+
setColor(palette.Button, 'inheritContainedHoverBg', setCssVarColor('palette-grey-A100'));
|
|
136
138
|
setColor(palette.Chip, 'defaultBorder', setCssVarColor('palette-grey-400'));
|
|
137
139
|
setColor(palette.Chip, 'defaultAvatarColor', setCssVarColor('palette-grey-700'));
|
|
138
140
|
setColor(palette.Chip, 'defaultIconColor', setCssVarColor('palette-grey-700'));
|
|
@@ -193,6 +195,8 @@ export default function extendTheme(options = {}, ...args) {
|
|
|
193
195
|
setColor(palette.AppBar, 'darkBg', setCssVarColor('palette-background-paper')); // specific for dark mode
|
|
194
196
|
setColor(palette.AppBar, 'darkColor', setCssVarColor('palette-text-primary')); // specific for dark mode
|
|
195
197
|
setColor(palette.Avatar, 'defaultBg', setCssVarColor('palette-grey-600'));
|
|
198
|
+
setColor(palette.Button, 'inheritContainedBg', setCssVarColor('palette-grey-800'));
|
|
199
|
+
setColor(palette.Button, 'inheritContainedHoverBg', setCssVarColor('palette-grey-700'));
|
|
196
200
|
setColor(palette.Chip, 'defaultBorder', setCssVarColor('palette-grey-700'));
|
|
197
201
|
setColor(palette.Chip, 'defaultAvatarColor', setCssVarColor('palette-grey-300'));
|
|
198
202
|
setColor(palette.Chip, 'defaultIconColor', setCssVarColor('palette-grey-300'));
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export default '$$material';
|
package/modern/styles/index.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { formatMuiErrorMessage as _formatMuiErrorMessage } from "@mui/utils";
|
|
2
|
+
export { default as THEME_ID } from './identifier';
|
|
2
3
|
export { default as adaptV4Theme } from './adaptV4Theme';
|
|
3
4
|
export { hexToRgb, rgbToHex, hslToRgb, decomposeColor, recomposeColor, getContrastRatio, getLuminance, emphasize, alpha, darken, lighten, css, keyframes } from '@mui/system';
|
|
4
5
|
// TODO: Remove this function in v6.
|
package/modern/styles/styled.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { createStyled, shouldForwardProp } from '@mui/system';
|
|
2
2
|
import defaultTheme from './defaultTheme';
|
|
3
|
+
import THEME_ID from './identifier';
|
|
3
4
|
export const rootShouldForwardProp = prop => shouldForwardProp(prop) && prop !== 'classes';
|
|
4
5
|
export const slotShouldForwardProp = shouldForwardProp;
|
|
5
6
|
const styled = createStyled({
|
|
7
|
+
themeId: THEME_ID,
|
|
6
8
|
defaultTheme,
|
|
7
9
|
rootShouldForwardProp
|
|
8
10
|
});
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import { useTheme as useThemeSystem } from '@mui/system';
|
|
3
3
|
import defaultTheme from './defaultTheme';
|
|
4
|
+
import THEME_ID from './identifier';
|
|
4
5
|
export default function useTheme() {
|
|
5
6
|
const theme = useThemeSystem(defaultTheme);
|
|
6
7
|
if (process.env.NODE_ENV !== 'production') {
|
|
7
8
|
// eslint-disable-next-line react-hooks/rules-of-hooks
|
|
8
9
|
React.useDebugValue(theme);
|
|
9
10
|
}
|
|
10
|
-
return theme;
|
|
11
|
+
return theme[THEME_ID] || theme;
|
|
11
12
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { useThemeProps as systemUseThemeProps } from '@mui/system';
|
|
2
2
|
import defaultTheme from './defaultTheme';
|
|
3
|
+
import THEME_ID from './identifier';
|
|
3
4
|
export default function useThemeProps({
|
|
4
5
|
props,
|
|
5
6
|
name
|
|
@@ -7,6 +8,7 @@ export default function useThemeProps({
|
|
|
7
8
|
return systemUseThemeProps({
|
|
8
9
|
props,
|
|
9
10
|
name,
|
|
10
|
-
defaultTheme
|
|
11
|
+
defaultTheme,
|
|
12
|
+
themeId: THEME_ID
|
|
11
13
|
});
|
|
12
14
|
}
|
|
@@ -152,7 +152,7 @@ const AutocompleteRoot = (0, _styled.default)('div', {
|
|
|
152
152
|
paddingRight: 52 + 4 + 9
|
|
153
153
|
},
|
|
154
154
|
[`& .${_autocompleteClasses.default.input}`]: {
|
|
155
|
-
padding: '7.5px 4px 7.5px
|
|
155
|
+
padding: '7.5px 4px 7.5px 5px'
|
|
156
156
|
},
|
|
157
157
|
[`& .${_autocompleteClasses.default.endAdornment}`]: {
|
|
158
158
|
right: 9
|
|
@@ -165,7 +165,7 @@ const AutocompleteRoot = (0, _styled.default)('div', {
|
|
|
165
165
|
paddingBottom: 6,
|
|
166
166
|
paddingLeft: 6,
|
|
167
167
|
[`& .${_autocompleteClasses.default.input}`]: {
|
|
168
|
-
padding: '2.5px 4px 2.5px
|
|
168
|
+
padding: '2.5px 4px 2.5px 8px'
|
|
169
169
|
}
|
|
170
170
|
},
|
|
171
171
|
[`& .${_filledInputClasses.default.root}`]: {
|
|
File without changes
|
package/node/Box/Box.js
CHANGED
|
@@ -9,8 +9,10 @@ var _system = require("@mui/system");
|
|
|
9
9
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
10
10
|
var _className = require("../className");
|
|
11
11
|
var _styles = require("../styles");
|
|
12
|
+
var _identifier = _interopRequireDefault(require("../styles/identifier"));
|
|
12
13
|
const defaultTheme = (0, _styles.createTheme)();
|
|
13
14
|
const Box = (0, _system.createBox)({
|
|
15
|
+
themeId: _identifier.default,
|
|
14
16
|
defaultTheme,
|
|
15
17
|
defaultClassName: 'MuiBox-root',
|
|
16
18
|
generateClassName: _className.unstable_ClassNameGenerator.generate
|
package/node/Button/Button.js
CHANGED
|
@@ -69,6 +69,8 @@ const ButtonRoot = (0, _styled.default)(_ButtonBase.default, {
|
|
|
69
69
|
ownerState
|
|
70
70
|
}) => {
|
|
71
71
|
var _theme$palette$getCon, _theme$palette;
|
|
72
|
+
const inheritContainedBackgroundColor = theme.palette.mode === 'light' ? theme.palette.grey[300] : theme.palette.grey[800];
|
|
73
|
+
const inheritContainedHoverBackgroundColor = theme.palette.mode === 'light' ? theme.palette.grey.A100 : theme.palette.grey[700];
|
|
72
74
|
return (0, _extends2.default)({}, theme.typography.button, {
|
|
73
75
|
minWidth: 64,
|
|
74
76
|
padding: '6px 16px',
|
|
@@ -97,7 +99,7 @@ const ButtonRoot = (0, _styled.default)(_ButtonBase.default, {
|
|
|
97
99
|
backgroundColor: 'transparent'
|
|
98
100
|
}
|
|
99
101
|
}, ownerState.variant === 'contained' && {
|
|
100
|
-
backgroundColor:
|
|
102
|
+
backgroundColor: theme.vars ? theme.vars.palette.Button.inheritContainedHoverBg : inheritContainedHoverBackgroundColor,
|
|
101
103
|
boxShadow: (theme.vars || theme).shadows[4],
|
|
102
104
|
// Reset on touch devices, it doesn't add specificity
|
|
103
105
|
'@media (hover: none)': {
|
|
@@ -140,7 +142,7 @@ const ButtonRoot = (0, _styled.default)(_ButtonBase.default, {
|
|
|
140
142
|
color: theme.vars ?
|
|
141
143
|
// this is safe because grey does not change between default light/dark mode
|
|
142
144
|
theme.vars.palette.text.primary : (_theme$palette$getCon = (_theme$palette = theme.palette).getContrastText) == null ? void 0 : _theme$palette$getCon.call(_theme$palette, theme.palette.grey[300]),
|
|
143
|
-
backgroundColor:
|
|
145
|
+
backgroundColor: theme.vars ? theme.vars.palette.Button.inheritContainedBg : inheritContainedBackgroundColor,
|
|
144
146
|
boxShadow: (theme.vars || theme).shadows[2]
|
|
145
147
|
}, ownerState.variant === 'contained' && ownerState.color !== 'inherit' && {
|
|
146
148
|
color: (theme.vars || theme).palette[ownerState.color].contrastText,
|