@mui/material 5.8.2 → 5.8.5
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/Alert/Alert.js +3 -1
- package/AppBar/AppBar.js +22 -5
- package/Autocomplete/autocompleteClasses.d.ts +1 -1
- package/Avatar/Avatar.js +7 -4
- package/Badge/Badge.js +2 -2
- package/Button/buttonClasses.d.ts +24 -0
- package/Button/buttonClasses.js +1 -1
- package/CHANGELOG.md +225 -8
- package/Checkbox/Checkbox.js +4 -4
- package/Chip/Chip.js +31 -30
- package/Dialog/Dialog.js +11 -6
- package/FilledInput/FilledInput.js +28 -13
- package/Grid/Grid.d.ts +73 -52
- package/Grid/Grid.js +94 -40
- package/Grow/Grow.js +1 -2
- package/Hidden/withWidth.js +0 -2
- package/InputBase/InputBase.js +2 -2
- package/LinearProgress/LinearProgress.js +6 -2
- package/Link/Link.js +10 -17
- package/Link/getTextDecoration.d.ts +15 -0
- package/Link/getTextDecoration.js +29 -0
- package/Modal/Modal.d.ts +2 -0
- package/Modal/Modal.js +25 -8
- package/OutlinedInput/OutlinedInput.js +25 -10
- package/Popover/Popover.d.ts +7 -0
- package/Popover/index.js +1 -0
- package/README.md +13 -12
- package/Skeleton/Skeleton.js +8 -3
- package/Slider/Slider.d.ts +3 -1
- package/Slider/Slider.js +35 -20
- package/Snackbar/Snackbar.js +6 -20
- package/SnackbarContent/SnackbarContent.js +3 -3
- package/SpeedDialAction/SpeedDialAction.js +7 -7
- package/Stack/Stack.js +1 -1
- package/StepConnector/StepConnector.js +14 -11
- package/StepContent/StepContent.js +1 -1
- package/StepIcon/StepIcon.js +2 -1
- package/Switch/Switch.js +11 -11
- package/Tab/Tab.d.ts +0 -1
- package/TableCell/TableCell.js +5 -5
- package/Tabs/Tabs.js +6 -0
- package/Tooltip/Tooltip.js +1 -1
- package/index.js +1 -1
- package/legacy/Alert/Alert.js +3 -1
- package/legacy/AppBar/AppBar.js +23 -4
- package/legacy/Avatar/Avatar.js +7 -4
- package/legacy/Badge/Badge.js +2 -2
- package/legacy/Button/buttonClasses.js +1 -1
- package/legacy/Checkbox/Checkbox.js +4 -4
- package/legacy/Chip/Chip.js +31 -30
- package/legacy/Dialog/Dialog.js +11 -6
- package/legacy/FilledInput/FilledInput.js +28 -14
- package/legacy/Grid/Grid.js +97 -48
- package/legacy/Grow/Grow.js +1 -2
- package/legacy/Hidden/withWidth.js +0 -2
- package/legacy/InputBase/InputBase.js +2 -2
- package/legacy/LinearProgress/LinearProgress.js +6 -2
- package/legacy/Link/Link.js +10 -17
- package/legacy/Link/getTextDecoration.js +28 -0
- package/legacy/Modal/Modal.js +23 -7
- package/legacy/OutlinedInput/OutlinedInput.js +21 -9
- package/legacy/Popover/index.js +1 -0
- package/legacy/Skeleton/Skeleton.js +2 -2
- package/legacy/Slider/Slider.js +35 -20
- package/legacy/Snackbar/Snackbar.js +6 -21
- package/legacy/SnackbarContent/SnackbarContent.js +3 -3
- package/legacy/SpeedDialAction/SpeedDialAction.js +7 -7
- package/legacy/Stack/Stack.js +2 -1
- package/legacy/StepConnector/StepConnector.js +2 -1
- package/legacy/StepContent/StepContent.js +1 -1
- package/legacy/StepIcon/StepIcon.js +2 -1
- package/legacy/Switch/Switch.js +11 -11
- package/legacy/TableCell/TableCell.js +5 -5
- package/legacy/Tabs/Tabs.js +6 -0
- package/legacy/Tooltip/Tooltip.js +1 -1
- package/legacy/index.js +1 -1
- package/legacy/styles/CssVarsProvider.js +4 -1
- package/legacy/styles/experimental_extendTheme.js +113 -18
- package/modern/Alert/Alert.js +3 -1
- package/modern/AppBar/AppBar.js +22 -5
- package/modern/Avatar/Avatar.js +7 -4
- package/modern/Badge/Badge.js +2 -2
- package/modern/Button/buttonClasses.js +1 -1
- package/modern/Checkbox/Checkbox.js +4 -4
- package/modern/Chip/Chip.js +31 -30
- package/modern/Dialog/Dialog.js +11 -6
- package/modern/FilledInput/FilledInput.js +27 -12
- package/modern/Grid/Grid.js +94 -40
- package/modern/Grow/Grow.js +1 -2
- package/modern/Hidden/withWidth.js +0 -2
- package/modern/InputBase/InputBase.js +2 -2
- package/modern/LinearProgress/LinearProgress.js +6 -2
- package/modern/Link/Link.js +10 -17
- package/modern/Link/getTextDecoration.js +29 -0
- package/modern/Modal/Modal.js +24 -7
- package/modern/OutlinedInput/OutlinedInput.js +25 -10
- package/modern/Popover/index.js +1 -0
- package/modern/Skeleton/Skeleton.js +7 -2
- package/modern/Slider/Slider.js +35 -20
- package/modern/Snackbar/Snackbar.js +6 -20
- package/modern/SnackbarContent/SnackbarContent.js +3 -3
- package/modern/SpeedDialAction/SpeedDialAction.js +7 -7
- package/modern/Stack/Stack.js +1 -1
- package/modern/StepConnector/StepConnector.js +14 -11
- package/modern/StepContent/StepContent.js +1 -1
- package/modern/StepIcon/StepIcon.js +2 -1
- package/modern/Switch/Switch.js +11 -11
- package/modern/TableCell/TableCell.js +5 -5
- package/modern/Tabs/Tabs.js +6 -0
- package/modern/Tooltip/Tooltip.js +1 -1
- package/modern/index.js +1 -1
- package/modern/styles/CssVarsProvider.js +4 -1
- package/modern/styles/experimental_extendTheme.js +114 -18
- package/node/Alert/Alert.js +3 -1
- package/node/AppBar/AppBar.js +22 -5
- package/node/Avatar/Avatar.js +7 -4
- package/node/Badge/Badge.js +2 -2
- package/node/Button/buttonClasses.js +1 -1
- package/node/Checkbox/Checkbox.js +4 -4
- package/node/Chip/Chip.js +31 -30
- package/node/Dialog/Dialog.js +11 -6
- package/node/FilledInput/FilledInput.js +28 -13
- package/node/Grid/Grid.js +95 -40
- package/node/Grow/Grow.js +1 -2
- package/node/Hidden/withWidth.js +0 -3
- package/node/InputBase/InputBase.js +2 -2
- package/node/LinearProgress/LinearProgress.js +6 -2
- package/node/Link/Link.js +12 -20
- package/node/Link/getTextDecoration.js +39 -0
- package/node/Modal/Modal.js +25 -8
- package/node/OutlinedInput/OutlinedInput.js +25 -10
- package/node/Popover/index.js +13 -3
- package/node/Skeleton/Skeleton.js +7 -2
- package/node/Slider/Slider.js +35 -20
- package/node/Snackbar/Snackbar.js +6 -18
- package/node/SnackbarContent/SnackbarContent.js +3 -3
- package/node/SpeedDialAction/SpeedDialAction.js +7 -7
- package/node/Stack/Stack.js +1 -1
- package/node/StepConnector/StepConnector.js +14 -11
- package/node/StepContent/StepContent.js +1 -1
- package/node/StepIcon/StepIcon.js +2 -1
- package/node/Switch/Switch.js +11 -11
- package/node/TableCell/TableCell.js +5 -5
- package/node/Tabs/Tabs.js +6 -0
- package/node/Tooltip/Tooltip.js +1 -1
- package/node/index.js +1 -1
- package/node/styles/CssVarsProvider.js +4 -1
- package/node/styles/experimental_extendTheme.js +112 -17
- package/package.json +6 -7
- package/styles/CssVarsProvider.js +4 -1
- package/styles/createPalette.d.ts +65 -2
- package/styles/experimental_extendTheme.js +114 -18
- package/umd/material-ui.development.js +767 -414
- package/umd/material-ui.production.min.js +27 -22
package/modern/Alert/Alert.js
CHANGED
|
@@ -93,7 +93,9 @@ const AlertMessage = styled('div', {
|
|
|
93
93
|
slot: 'Message',
|
|
94
94
|
overridesResolver: (props, styles) => styles.message
|
|
95
95
|
})({
|
|
96
|
-
padding: '8px 0'
|
|
96
|
+
padding: '8px 0',
|
|
97
|
+
minWidth: 0,
|
|
98
|
+
overflow: 'auto'
|
|
97
99
|
});
|
|
98
100
|
const AlertAction = styled('div', {
|
|
99
101
|
name: 'MuiAlert',
|
package/modern/AppBar/AppBar.js
CHANGED
|
@@ -22,7 +22,11 @@ const useUtilityClasses = ownerState => {
|
|
|
22
22
|
root: ['root', `color${capitalize(color)}`, `position${capitalize(position)}`]
|
|
23
23
|
};
|
|
24
24
|
return composeClasses(slots, getAppBarUtilityClass, classes);
|
|
25
|
-
};
|
|
25
|
+
}; // var2 is the fallback.
|
|
26
|
+
// Ex. var1: 'var(--a)', var2: 'var(--b)'; return: 'var(--a, var(--b))'
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
const joinVars = (var1, var2) => `${var1?.replace(')', '')}, ${var2})`;
|
|
26
30
|
|
|
27
31
|
const AppBarRoot = styled(Paper, {
|
|
28
32
|
name: 'MuiAppBar',
|
|
@@ -47,7 +51,7 @@ const AppBarRoot = styled(Paper, {
|
|
|
47
51
|
flexShrink: 0
|
|
48
52
|
}, ownerState.position === 'fixed' && {
|
|
49
53
|
position: 'fixed',
|
|
50
|
-
zIndex: theme.zIndex.appBar,
|
|
54
|
+
zIndex: (theme.vars || theme).zIndex.appBar,
|
|
51
55
|
top: 0,
|
|
52
56
|
left: 'auto',
|
|
53
57
|
right: 0,
|
|
@@ -57,14 +61,14 @@ const AppBarRoot = styled(Paper, {
|
|
|
57
61
|
}
|
|
58
62
|
}, ownerState.position === 'absolute' && {
|
|
59
63
|
position: 'absolute',
|
|
60
|
-
zIndex: theme.zIndex.appBar,
|
|
64
|
+
zIndex: (theme.vars || theme).zIndex.appBar,
|
|
61
65
|
top: 0,
|
|
62
66
|
left: 'auto',
|
|
63
67
|
right: 0
|
|
64
68
|
}, ownerState.position === 'sticky' && {
|
|
65
69
|
// ⚠️ sticky is not supported by IE11.
|
|
66
70
|
position: 'sticky',
|
|
67
|
-
zIndex: theme.zIndex.appBar,
|
|
71
|
+
zIndex: (theme.vars || theme).zIndex.appBar,
|
|
68
72
|
top: 0,
|
|
69
73
|
left: 'auto',
|
|
70
74
|
right: 0
|
|
@@ -72,7 +76,7 @@ const AppBarRoot = styled(Paper, {
|
|
|
72
76
|
position: 'static'
|
|
73
77
|
}, ownerState.position === 'relative' && {
|
|
74
78
|
position: 'relative'
|
|
75
|
-
}, ownerState.color === 'default' && {
|
|
79
|
+
}, !theme.vars && _extends({}, ownerState.color === 'default' && {
|
|
76
80
|
backgroundColor: backgroundColorDefault,
|
|
77
81
|
color: theme.palette.getContrastText(backgroundColorDefault)
|
|
78
82
|
}, ownerState.color && ownerState.color !== 'default' && ownerState.color !== 'inherit' && ownerState.color !== 'transparent' && {
|
|
@@ -88,6 +92,19 @@ const AppBarRoot = styled(Paper, {
|
|
|
88
92
|
color: 'inherit'
|
|
89
93
|
}, theme.palette.mode === 'dark' && {
|
|
90
94
|
backgroundImage: 'none'
|
|
95
|
+
})), theme.vars && _extends({}, ownerState.color === 'default' && {
|
|
96
|
+
'--AppBar-background': ownerState.enableColorOnDark ? theme.vars.palette.AppBar.defaultBg : joinVars(theme.vars.palette.AppBar.darkBg, theme.vars.palette.AppBar.defaultBg),
|
|
97
|
+
'--AppBar-color': ownerState.enableColorOnDark ? theme.vars.palette.text.primary : joinVars(theme.vars.palette.AppBar.darkColor, theme.vars.palette.text.primary)
|
|
98
|
+
}, ownerState.color && !ownerState.color.match(/^(default|inherit|transparent)$/) && {
|
|
99
|
+
'--AppBar-background': ownerState.enableColorOnDark ? theme.vars.palette[ownerState.color].main : joinVars(theme.vars.palette.AppBar.darkBg, theme.vars.palette[ownerState.color].main),
|
|
100
|
+
'--AppBar-color': ownerState.enableColorOnDark ? theme.vars.palette[ownerState.color].contrastText : joinVars(theme.vars.palette.AppBar.darkColor, theme.vars.palette[ownerState.color].contrastText)
|
|
101
|
+
}, {
|
|
102
|
+
backgroundColor: 'var(--AppBar-background)',
|
|
103
|
+
color: ownerState.color === 'inherit' ? 'inherit' : 'var(--AppBar-color)'
|
|
104
|
+
}, ownerState.color === 'transparent' && {
|
|
105
|
+
backgroundImage: 'none',
|
|
106
|
+
backgroundColor: 'transparent',
|
|
107
|
+
color: 'inherit'
|
|
91
108
|
}));
|
|
92
109
|
});
|
|
93
110
|
const AppBar = /*#__PURE__*/React.forwardRef(function AppBar(inProps, ref) {
|
package/modern/Avatar/Avatar.js
CHANGED
|
@@ -52,13 +52,16 @@ const AvatarRoot = styled('div', {
|
|
|
52
52
|
overflow: 'hidden',
|
|
53
53
|
userSelect: 'none'
|
|
54
54
|
}, ownerState.variant === 'rounded' && {
|
|
55
|
-
borderRadius: theme.shape.borderRadius
|
|
55
|
+
borderRadius: (theme.vars || theme).shape.borderRadius
|
|
56
56
|
}, ownerState.variant === 'square' && {
|
|
57
57
|
borderRadius: 0
|
|
58
|
-
}, ownerState.colorDefault && {
|
|
59
|
-
color: theme.palette.background.default
|
|
58
|
+
}, ownerState.colorDefault && _extends({
|
|
59
|
+
color: (theme.vars || theme).palette.background.default
|
|
60
|
+
}, theme.vars ? {
|
|
61
|
+
backgroundColor: theme.vars.palette.Avatar.defaultBg
|
|
62
|
+
} : {
|
|
60
63
|
backgroundColor: theme.palette.mode === 'light' ? theme.palette.grey[400] : theme.palette.grey[600]
|
|
61
|
-
}));
|
|
64
|
+
})));
|
|
62
65
|
const AvatarImg = styled('img', {
|
|
63
66
|
name: 'MuiAvatar',
|
|
64
67
|
slot: 'Img',
|
package/modern/Badge/Badge.js
CHANGED
|
@@ -321,8 +321,8 @@ process.env.NODE_ENV !== "production" ? Badge.propTypes
|
|
|
321
321
|
* @default {}
|
|
322
322
|
*/
|
|
323
323
|
componentsProps: PropTypes.shape({
|
|
324
|
-
badge: PropTypes.object,
|
|
325
|
-
root: PropTypes.object
|
|
324
|
+
badge: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
|
|
325
|
+
root: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
|
|
326
326
|
}),
|
|
327
327
|
|
|
328
328
|
/**
|
|
@@ -2,5 +2,5 @@ import { generateUtilityClass, generateUtilityClasses } from '@mui/base';
|
|
|
2
2
|
export function getButtonUtilityClass(slot) {
|
|
3
3
|
return generateUtilityClass('MuiButton', slot);
|
|
4
4
|
}
|
|
5
|
-
const buttonClasses = generateUtilityClasses('MuiButton', ['root', 'text', 'textInherit', 'textPrimary', 'textSecondary', 'outlined', 'outlinedInherit', 'outlinedPrimary', 'outlinedSecondary', 'contained', 'containedInherit', 'containedPrimary', 'containedSecondary', 'disableElevation', 'focusVisible', 'disabled', 'colorInherit', 'textSizeSmall', 'textSizeMedium', 'textSizeLarge', 'outlinedSizeSmall', 'outlinedSizeMedium', 'outlinedSizeLarge', 'containedSizeSmall', 'containedSizeMedium', 'containedSizeLarge', 'sizeMedium', 'sizeSmall', 'sizeLarge', 'fullWidth', 'startIcon', 'endIcon', 'iconSizeSmall', 'iconSizeMedium', 'iconSizeLarge']);
|
|
5
|
+
const buttonClasses = generateUtilityClasses('MuiButton', ['root', 'text', 'textInherit', 'textPrimary', 'textSecondary', 'textSuccess', 'textError', 'textInfo', 'textWarning', 'outlined', 'outlinedInherit', 'outlinedPrimary', 'outlinedSecondary', 'outlinedSuccess', 'outlinedError', 'outlinedInfo', 'outlinedWarning', 'contained', 'containedInherit', 'containedPrimary', 'containedSecondary', 'containedSuccess', 'containedError', 'containedInfo', 'containedWarning', 'disableElevation', 'focusVisible', 'disabled', 'colorInherit', 'textSizeSmall', 'textSizeMedium', 'textSizeLarge', 'outlinedSizeSmall', 'outlinedSizeMedium', 'outlinedSizeLarge', 'containedSizeSmall', 'containedSizeMedium', 'containedSizeLarge', 'sizeMedium', 'sizeSmall', 'sizeLarge', 'fullWidth', 'startIcon', 'endIcon', 'iconSizeSmall', 'iconSizeMedium', 'iconSizeLarge']);
|
|
6
6
|
export default buttonClasses;
|
|
@@ -43,10 +43,10 @@ const CheckboxRoot = styled(SwitchBase, {
|
|
|
43
43
|
theme,
|
|
44
44
|
ownerState
|
|
45
45
|
}) => _extends({
|
|
46
|
-
color: theme.palette.text.secondary
|
|
46
|
+
color: (theme.vars || theme).palette.text.secondary
|
|
47
47
|
}, !ownerState.disableRipple && {
|
|
48
48
|
'&:hover': {
|
|
49
|
-
backgroundColor: alpha(ownerState.color === 'default' ? theme.palette.action.active : theme.palette[ownerState.color].main, theme.palette.action.hoverOpacity),
|
|
49
|
+
backgroundColor: theme.vars ? `rgba(${ownerState.color === 'default' ? theme.vars.palette.action.activeChannel : theme.vars.palette.primary.mainChannel} / ${theme.vars.palette.action.hoverOpacity})` : alpha(ownerState.color === 'default' ? theme.palette.action.active : theme.palette[ownerState.color].main, theme.palette.action.hoverOpacity),
|
|
50
50
|
// Reset on touch devices, it doesn't add specificity
|
|
51
51
|
'@media (hover: none)': {
|
|
52
52
|
backgroundColor: 'transparent'
|
|
@@ -54,10 +54,10 @@ const CheckboxRoot = styled(SwitchBase, {
|
|
|
54
54
|
}
|
|
55
55
|
}, ownerState.color !== 'default' && {
|
|
56
56
|
[`&.${checkboxClasses.checked}, &.${checkboxClasses.indeterminate}`]: {
|
|
57
|
-
color: theme.palette[ownerState.color].main
|
|
57
|
+
color: (theme.vars || theme).palette[ownerState.color].main
|
|
58
58
|
},
|
|
59
59
|
[`&.${checkboxClasses.disabled}`]: {
|
|
60
|
-
color: theme.palette.action.disabled
|
|
60
|
+
color: (theme.vars || theme).palette.action.disabled
|
|
61
61
|
}
|
|
62
62
|
}));
|
|
63
63
|
|
package/modern/Chip/Chip.js
CHANGED
|
@@ -78,6 +78,7 @@ const ChipRoot = styled('div', {
|
|
|
78
78
|
ownerState
|
|
79
79
|
}) => {
|
|
80
80
|
const deleteIconColor = alpha(theme.palette.text.primary, 0.26);
|
|
81
|
+
const textColor = theme.palette.mode === 'light' ? theme.palette.grey[700] : theme.palette.grey[300];
|
|
81
82
|
return _extends({
|
|
82
83
|
maxWidth: '100%',
|
|
83
84
|
fontFamily: theme.typography.fontFamily,
|
|
@@ -86,8 +87,8 @@ const ChipRoot = styled('div', {
|
|
|
86
87
|
alignItems: 'center',
|
|
87
88
|
justifyContent: 'center',
|
|
88
89
|
height: 32,
|
|
89
|
-
color: theme.palette.text.primary,
|
|
90
|
-
backgroundColor: theme.palette.action.selected,
|
|
90
|
+
color: (theme.vars || theme).palette.text.primary,
|
|
91
|
+
backgroundColor: (theme.vars || theme).palette.action.selected,
|
|
91
92
|
borderRadius: 32 / 2,
|
|
92
93
|
whiteSpace: 'nowrap',
|
|
93
94
|
transition: theme.transitions.create(['background-color', 'box-shadow']),
|
|
@@ -103,7 +104,7 @@ const ChipRoot = styled('div', {
|
|
|
103
104
|
verticalAlign: 'middle',
|
|
104
105
|
boxSizing: 'border-box',
|
|
105
106
|
[`&.${chipClasses.disabled}`]: {
|
|
106
|
-
opacity: theme.palette.action.disabledOpacity,
|
|
107
|
+
opacity: (theme.vars || theme).palette.action.disabledOpacity,
|
|
107
108
|
pointerEvents: 'none'
|
|
108
109
|
},
|
|
109
110
|
[`& .${chipClasses.avatar}`]: {
|
|
@@ -111,16 +112,16 @@ const ChipRoot = styled('div', {
|
|
|
111
112
|
marginRight: -6,
|
|
112
113
|
width: 24,
|
|
113
114
|
height: 24,
|
|
114
|
-
color: theme.
|
|
115
|
+
color: theme.vars ? theme.vars.palette.Chip.defaultAvatarColor : textColor,
|
|
115
116
|
fontSize: theme.typography.pxToRem(12)
|
|
116
117
|
},
|
|
117
118
|
[`& .${chipClasses.avatarColorPrimary}`]: {
|
|
118
|
-
color: theme.palette.primary.contrastText,
|
|
119
|
-
backgroundColor: theme.palette.primary.dark
|
|
119
|
+
color: (theme.vars || theme).palette.primary.contrastText,
|
|
120
|
+
backgroundColor: (theme.vars || theme).palette.primary.dark
|
|
120
121
|
},
|
|
121
122
|
[`& .${chipClasses.avatarColorSecondary}`]: {
|
|
122
|
-
color: theme.palette.secondary.contrastText,
|
|
123
|
-
backgroundColor: theme.palette.secondary.dark
|
|
123
|
+
color: (theme.vars || theme).palette.secondary.contrastText,
|
|
124
|
+
backgroundColor: (theme.vars || theme).palette.secondary.dark
|
|
124
125
|
},
|
|
125
126
|
[`& .${chipClasses.avatarSmall}`]: {
|
|
126
127
|
marginLeft: 4,
|
|
@@ -130,7 +131,7 @@ const ChipRoot = styled('div', {
|
|
|
130
131
|
fontSize: theme.typography.pxToRem(10)
|
|
131
132
|
},
|
|
132
133
|
[`& .${chipClasses.icon}`]: _extends({
|
|
133
|
-
color: theme.
|
|
134
|
+
color: theme.vars ? theme.vars.palette.Chip.defaultIconColor : textColor,
|
|
134
135
|
marginLeft: 5,
|
|
135
136
|
marginRight: -6
|
|
136
137
|
}, ownerState.size === 'small' && {
|
|
@@ -142,35 +143,35 @@ const ChipRoot = styled('div', {
|
|
|
142
143
|
}),
|
|
143
144
|
[`& .${chipClasses.deleteIcon}`]: _extends({
|
|
144
145
|
WebkitTapHighlightColor: 'transparent',
|
|
145
|
-
color: deleteIconColor,
|
|
146
|
+
color: theme.vars ? `rgba(${theme.vars.palette.text.primaryChannel} / 0.26)` : deleteIconColor,
|
|
146
147
|
fontSize: 22,
|
|
147
148
|
cursor: 'pointer',
|
|
148
149
|
margin: '0 5px 0 -6px',
|
|
149
150
|
'&:hover': {
|
|
150
|
-
color: alpha(deleteIconColor, 0.4)
|
|
151
|
+
color: theme.vars ? `rgba(${theme.vars.palette.text.primaryChannel} / 0.4)` : alpha(deleteIconColor, 0.4)
|
|
151
152
|
}
|
|
152
153
|
}, ownerState.size === 'small' && {
|
|
153
154
|
fontSize: 16,
|
|
154
155
|
marginRight: 4,
|
|
155
156
|
marginLeft: -4
|
|
156
157
|
}, ownerState.color !== 'default' && {
|
|
157
|
-
color: alpha(theme.palette[ownerState.color].contrastText, 0.7),
|
|
158
|
+
color: theme.vars ? `rgba(${theme.vars.palette[ownerState.color].contrastTextChannel} / 0.7)` : alpha(theme.palette[ownerState.color].contrastText, 0.7),
|
|
158
159
|
'&:hover, &:active': {
|
|
159
|
-
color: theme.palette[ownerState.color].contrastText
|
|
160
|
+
color: (theme.vars || theme).palette[ownerState.color].contrastText
|
|
160
161
|
}
|
|
161
162
|
})
|
|
162
163
|
}, ownerState.size === 'small' && {
|
|
163
164
|
height: 24
|
|
164
165
|
}, ownerState.color !== 'default' && {
|
|
165
|
-
backgroundColor: theme.palette[ownerState.color].main,
|
|
166
|
-
color: theme.palette[ownerState.color].contrastText
|
|
166
|
+
backgroundColor: (theme.vars || theme).palette[ownerState.color].main,
|
|
167
|
+
color: (theme.vars || theme).palette[ownerState.color].contrastText
|
|
167
168
|
}, ownerState.onDelete && {
|
|
168
169
|
[`&.${chipClasses.focusVisible}`]: {
|
|
169
|
-
backgroundColor: alpha(theme.palette.action.selected, theme.palette.action.selectedOpacity + theme.palette.action.focusOpacity)
|
|
170
|
+
backgroundColor: theme.vars ? `rgba(${theme.vars.palette.action.selectedChannel} / calc(${theme.vars.palette.action.selectedOpacity + theme.vars.palette.action.focusOpacity}))` : alpha(theme.palette.action.selected, theme.palette.action.selectedOpacity + theme.palette.action.focusOpacity)
|
|
170
171
|
}
|
|
171
172
|
}, ownerState.onDelete && ownerState.color !== 'default' && {
|
|
172
173
|
[`&.${chipClasses.focusVisible}`]: {
|
|
173
|
-
backgroundColor: theme.palette[ownerState.color].dark
|
|
174
|
+
backgroundColor: (theme.vars || theme).palette[ownerState.color].dark
|
|
174
175
|
}
|
|
175
176
|
});
|
|
176
177
|
}, ({
|
|
@@ -181,29 +182,29 @@ const ChipRoot = styled('div', {
|
|
|
181
182
|
WebkitTapHighlightColor: 'transparent',
|
|
182
183
|
cursor: 'pointer',
|
|
183
184
|
'&:hover': {
|
|
184
|
-
backgroundColor: alpha(theme.palette.action.selected, theme.palette.action.selectedOpacity + theme.palette.action.hoverOpacity)
|
|
185
|
+
backgroundColor: theme.vars ? `rgba(${theme.vars.palette.action.selectedChannel} / calc(${theme.vars.palette.action.selectedOpacity + theme.vars.palette.action.hoverOpacity}))` : alpha(theme.palette.action.selected, theme.palette.action.selectedOpacity + theme.palette.action.hoverOpacity)
|
|
185
186
|
},
|
|
186
187
|
[`&.${chipClasses.focusVisible}`]: {
|
|
187
|
-
backgroundColor: alpha(theme.palette.action.selected, theme.palette.action.selectedOpacity + theme.palette.action.focusOpacity)
|
|
188
|
+
backgroundColor: theme.vars ? `rgba(${theme.vars.palette.action.selectedChannel} / calc(${theme.vars.palette.action.selectedOpacity + theme.vars.palette.action.focusOpacity}))` : alpha(theme.palette.action.selected, theme.palette.action.selectedOpacity + theme.palette.action.focusOpacity)
|
|
188
189
|
},
|
|
189
190
|
'&:active': {
|
|
190
|
-
boxShadow: theme.shadows[1]
|
|
191
|
+
boxShadow: (theme.vars || theme).shadows[1]
|
|
191
192
|
}
|
|
192
193
|
}, ownerState.clickable && ownerState.color !== 'default' && {
|
|
193
194
|
[`&:hover, &.${chipClasses.focusVisible}`]: {
|
|
194
|
-
backgroundColor: theme.palette[ownerState.color].dark
|
|
195
|
+
backgroundColor: (theme.vars || theme).palette[ownerState.color].dark
|
|
195
196
|
}
|
|
196
197
|
}), ({
|
|
197
198
|
theme,
|
|
198
199
|
ownerState
|
|
199
200
|
}) => _extends({}, ownerState.variant === 'outlined' && {
|
|
200
201
|
backgroundColor: 'transparent',
|
|
201
|
-
border: `1px solid ${theme.palette.mode === 'light' ? theme.palette.grey[400] : theme.palette.grey[700]}`,
|
|
202
|
+
border: theme.vars ? `1px solid ${theme.vars.palette.Chip.defaultBorder}` : `1px solid ${theme.palette.mode === 'light' ? theme.palette.grey[400] : theme.palette.grey[700]}`,
|
|
202
203
|
[`&.${chipClasses.clickable}:hover`]: {
|
|
203
|
-
backgroundColor: theme.palette.action.hover
|
|
204
|
+
backgroundColor: (theme.vars || theme).palette.action.hover
|
|
204
205
|
},
|
|
205
206
|
[`&.${chipClasses.focusVisible}`]: {
|
|
206
|
-
backgroundColor: theme.palette.action.focus
|
|
207
|
+
backgroundColor: (theme.vars || theme).palette.action.focus
|
|
207
208
|
},
|
|
208
209
|
[`& .${chipClasses.avatar}`]: {
|
|
209
210
|
marginLeft: 4
|
|
@@ -224,18 +225,18 @@ const ChipRoot = styled('div', {
|
|
|
224
225
|
marginRight: 3
|
|
225
226
|
}
|
|
226
227
|
}, ownerState.variant === 'outlined' && ownerState.color !== 'default' && {
|
|
227
|
-
color: theme.palette[ownerState.color].main,
|
|
228
|
-
border: `1px solid ${alpha(theme.palette[ownerState.color].main, 0.7)}`,
|
|
228
|
+
color: (theme.vars || theme).palette[ownerState.color].main,
|
|
229
|
+
border: `1px solid ${theme.vars ? `rgba(${theme.vars.palette[ownerState.color].mainChannel} / 0.7)` : alpha(theme.palette[ownerState.color].main, 0.7)}`,
|
|
229
230
|
[`&.${chipClasses.clickable}:hover`]: {
|
|
230
|
-
backgroundColor: alpha(theme.palette[ownerState.color].main, theme.palette.action.hoverOpacity)
|
|
231
|
+
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)
|
|
231
232
|
},
|
|
232
233
|
[`&.${chipClasses.focusVisible}`]: {
|
|
233
|
-
backgroundColor: alpha(theme.palette[ownerState.color].main, theme.palette.action.focusOpacity)
|
|
234
|
+
backgroundColor: theme.vars ? `rgba(${theme.vars.palette[ownerState.color].mainChannel} / ${theme.vars.palette.action.focusOpacity})` : alpha(theme.palette[ownerState.color].main, theme.palette.action.focusOpacity)
|
|
234
235
|
},
|
|
235
236
|
[`& .${chipClasses.deleteIcon}`]: {
|
|
236
|
-
color: alpha(theme.palette[ownerState.color].main, 0.7),
|
|
237
|
+
color: theme.vars ? `rgba(${theme.vars.palette[ownerState.color].mainChannel} / 0.7)` : alpha(theme.palette[ownerState.color].main, 0.7),
|
|
237
238
|
'&:hover, &:active': {
|
|
238
|
-
color: theme.palette[ownerState.color].main
|
|
239
|
+
color: (theme.vars || theme).palette[ownerState.color].main
|
|
239
240
|
}
|
|
240
241
|
}
|
|
241
242
|
}));
|
package/modern/Dialog/Dialog.js
CHANGED
|
@@ -125,7 +125,7 @@ const DialogPaper = styled(Paper, {
|
|
|
125
125
|
maxWidth: 'calc(100% - 64px)'
|
|
126
126
|
}
|
|
127
127
|
}
|
|
128
|
-
}, ownerState.maxWidth !== 'xs' && {
|
|
128
|
+
}, ownerState.maxWidth && ownerState.maxWidth !== 'xs' && {
|
|
129
129
|
maxWidth: `${theme.breakpoints.values[ownerState.maxWidth]}${theme.breakpoints.unit}`,
|
|
130
130
|
[`&.${dialogClasses.paperScrollBody}`]: {
|
|
131
131
|
[theme.breakpoints.down(theme.breakpoints.values[ownerState.maxWidth] + 32 * 2)]: {
|
|
@@ -226,12 +226,16 @@ const Dialog = /*#__PURE__*/React.forwardRef(function Dialog(inProps, ref) {
|
|
|
226
226
|
}, [ariaLabelledby]);
|
|
227
227
|
return /*#__PURE__*/_jsx(DialogRoot, _extends({
|
|
228
228
|
className: clsx(classes.root, className),
|
|
229
|
-
BackdropProps: _extends({
|
|
230
|
-
transitionDuration,
|
|
231
|
-
as: BackdropComponent
|
|
232
|
-
}, BackdropProps),
|
|
233
229
|
closeAfterTransition: true,
|
|
234
|
-
|
|
230
|
+
components: {
|
|
231
|
+
Backdrop: DialogBackdrop
|
|
232
|
+
},
|
|
233
|
+
componentsProps: {
|
|
234
|
+
backdrop: _extends({
|
|
235
|
+
transitionDuration,
|
|
236
|
+
as: BackdropComponent
|
|
237
|
+
}, BackdropProps)
|
|
238
|
+
},
|
|
235
239
|
disableEscapeKeyDown: disableEscapeKeyDown,
|
|
236
240
|
onClose: onClose,
|
|
237
241
|
open: open,
|
|
@@ -287,6 +291,7 @@ process.env.NODE_ENV !== "production" ? Dialog.propTypes
|
|
|
287
291
|
|
|
288
292
|
/**
|
|
289
293
|
* A backdrop component. This prop enables custom backdrop rendering.
|
|
294
|
+
* @deprecated Use `components.Backdrop` instead.
|
|
290
295
|
* @default styled(Backdrop, {
|
|
291
296
|
* name: 'MuiModal',
|
|
292
297
|
* slot: 'Backdrop',
|
|
@@ -42,31 +42,33 @@ const FilledInputRoot = styled(InputBaseRoot, {
|
|
|
42
42
|
const light = theme.palette.mode === 'light';
|
|
43
43
|
const bottomLineColor = light ? 'rgba(0, 0, 0, 0.42)' : 'rgba(255, 255, 255, 0.7)';
|
|
44
44
|
const backgroundColor = light ? 'rgba(0, 0, 0, 0.06)' : 'rgba(255, 255, 255, 0.09)';
|
|
45
|
+
const hoverBackground = light ? 'rgba(0, 0, 0, 0.09)' : 'rgba(255, 255, 255, 0.13)';
|
|
46
|
+
const disabledBackground = light ? 'rgba(0, 0, 0, 0.12)' : 'rgba(255, 255, 255, 0.12)';
|
|
45
47
|
return _extends({
|
|
46
48
|
position: 'relative',
|
|
47
|
-
backgroundColor,
|
|
48
|
-
borderTopLeftRadius: theme.shape.borderRadius,
|
|
49
|
-
borderTopRightRadius: theme.shape.borderRadius,
|
|
49
|
+
backgroundColor: theme.vars ? theme.vars.palette.FilledInput.bg : backgroundColor,
|
|
50
|
+
borderTopLeftRadius: (theme.vars || theme).shape.borderRadius,
|
|
51
|
+
borderTopRightRadius: (theme.vars || theme).shape.borderRadius,
|
|
50
52
|
transition: theme.transitions.create('background-color', {
|
|
51
53
|
duration: theme.transitions.duration.shorter,
|
|
52
54
|
easing: theme.transitions.easing.easeOut
|
|
53
55
|
}),
|
|
54
56
|
'&:hover': {
|
|
55
|
-
backgroundColor:
|
|
57
|
+
backgroundColor: theme.vars ? theme.vars.palette.FilledInput.hoverBg : hoverBackground,
|
|
56
58
|
// Reset on touch devices, it doesn't add specificity
|
|
57
59
|
'@media (hover: none)': {
|
|
58
|
-
backgroundColor
|
|
60
|
+
backgroundColor: theme.vars ? theme.vars.palette.FilledInput.bg : backgroundColor
|
|
59
61
|
}
|
|
60
62
|
},
|
|
61
63
|
[`&.${filledInputClasses.focused}`]: {
|
|
62
|
-
backgroundColor
|
|
64
|
+
backgroundColor: theme.vars ? theme.vars.palette.FilledInput.bg : backgroundColor
|
|
63
65
|
},
|
|
64
66
|
[`&.${filledInputClasses.disabled}`]: {
|
|
65
|
-
backgroundColor:
|
|
67
|
+
backgroundColor: theme.vars ? theme.vars.palette.FilledInput.disabledBg : disabledBackground
|
|
66
68
|
}
|
|
67
69
|
}, !ownerState.disableUnderline && {
|
|
68
70
|
'&:after': {
|
|
69
|
-
borderBottom: `2px solid ${theme.palette[ownerState.color || 'primary']?.main}`,
|
|
71
|
+
borderBottom: `2px solid ${(theme.vars || theme).palette[ownerState.color || 'primary']?.main}`,
|
|
70
72
|
left: 0,
|
|
71
73
|
bottom: 0,
|
|
72
74
|
// Doing the other way around crash on IE11 "''" https://github.com/cssinjs/jss/issues/242
|
|
@@ -87,12 +89,12 @@ const FilledInputRoot = styled(InputBaseRoot, {
|
|
|
87
89
|
transform: 'scaleX(1) translateX(0)'
|
|
88
90
|
},
|
|
89
91
|
[`&.${filledInputClasses.error}:after`]: {
|
|
90
|
-
borderBottomColor: theme.palette.error.main,
|
|
92
|
+
borderBottomColor: (theme.vars || theme).palette.error.main,
|
|
91
93
|
transform: 'scaleX(1)' // error is always underlined in red
|
|
92
94
|
|
|
93
95
|
},
|
|
94
96
|
'&:before': {
|
|
95
|
-
borderBottom: `1px solid ${bottomLineColor}`,
|
|
97
|
+
borderBottom: `1px solid ${theme.vars ? `rgba(${theme.vars.palette.common.onBackgroundChannel} / ${theme.vars.opacity.inputTouchBottomLine})` : bottomLineColor}`,
|
|
96
98
|
left: 0,
|
|
97
99
|
bottom: 0,
|
|
98
100
|
// Doing the other way around crash on IE11 "''" https://github.com/cssinjs/jss/issues/242
|
|
@@ -106,7 +108,7 @@ const FilledInputRoot = styled(InputBaseRoot, {
|
|
|
106
108
|
|
|
107
109
|
},
|
|
108
110
|
[`&:hover:not(.${filledInputClasses.disabled}):before`]: {
|
|
109
|
-
borderBottom: `1px solid ${theme.palette.text.primary}`
|
|
111
|
+
borderBottom: `1px solid ${(theme.vars || theme).palette.text.primary}`
|
|
110
112
|
},
|
|
111
113
|
[`&.${filledInputClasses.disabled}:before`]: {
|
|
112
114
|
borderBottomStyle: 'dotted'
|
|
@@ -136,7 +138,8 @@ const FilledInputInput = styled(InputBaseInput, {
|
|
|
136
138
|
paddingTop: 25,
|
|
137
139
|
paddingRight: 12,
|
|
138
140
|
paddingBottom: 8,
|
|
139
|
-
paddingLeft: 12
|
|
141
|
+
paddingLeft: 12
|
|
142
|
+
}, !theme.vars && {
|
|
140
143
|
'&:-webkit-autofill': {
|
|
141
144
|
WebkitBoxShadow: theme.palette.mode === 'light' ? null : '0 0 0 100px #266798 inset',
|
|
142
145
|
WebkitTextFillColor: theme.palette.mode === 'light' ? null : '#fff',
|
|
@@ -144,6 +147,18 @@ const FilledInputInput = styled(InputBaseInput, {
|
|
|
144
147
|
borderTopLeftRadius: 'inherit',
|
|
145
148
|
borderTopRightRadius: 'inherit'
|
|
146
149
|
}
|
|
150
|
+
}, theme.vars && {
|
|
151
|
+
'&:-webkit-autofill': {
|
|
152
|
+
borderTopLeftRadius: 'inherit',
|
|
153
|
+
borderTopRightRadius: 'inherit'
|
|
154
|
+
},
|
|
155
|
+
[theme.getColorSchemeSelector('dark')]: {
|
|
156
|
+
'&:-webkit-autofill': {
|
|
157
|
+
WebkitBoxShadow: '0 0 0 100px #266798 inset',
|
|
158
|
+
WebkitTextFillColor: '#fff',
|
|
159
|
+
caretColor: '#fff'
|
|
160
|
+
}
|
|
161
|
+
}
|
|
147
162
|
}, ownerState.size === 'small' && {
|
|
148
163
|
paddingTop: 21,
|
|
149
164
|
paddingBottom: 4
|