@mui/material 5.11.11 → 5.11.13
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/Autocomplete/Autocomplete.d.ts +1 -0
- package/Autocomplete/Autocomplete.js +5 -2
- package/Autocomplete/autocompleteClasses.d.ts +2 -0
- package/Autocomplete/autocompleteClasses.js +1 -1
- package/CHANGELOG.md +187 -2
- package/DialogTitle/DialogTitle.js +2 -2
- package/Menu/Menu.js +1 -1
- package/index.js +1 -1
- package/legacy/Autocomplete/Autocomplete.js +5 -2
- package/legacy/Autocomplete/autocompleteClasses.js +1 -1
- package/legacy/DialogTitle/DialogTitle.js +2 -2
- package/legacy/Menu/Menu.js +1 -1
- package/legacy/index.js +1 -1
- package/legacy/styles/CssVarsProvider.js +1 -8
- package/legacy/styles/createTypography.js +8 -1
- package/legacy/styles/experimental_extendTheme.js +59 -40
- package/legacy/styles/index.js +1 -0
- package/legacy/styles/shouldSkipGeneratingVar.js +6 -0
- package/modern/Autocomplete/Autocomplete.js +5 -2
- package/modern/Autocomplete/autocompleteClasses.js +1 -1
- package/modern/DialogTitle/DialogTitle.js +2 -2
- package/modern/Menu/Menu.js +1 -1
- package/modern/index.js +1 -1
- package/modern/styles/CssVarsProvider.js +1 -5
- package/modern/styles/createTypography.js +8 -1
- package/modern/styles/experimental_extendTheme.js +60 -41
- package/modern/styles/index.js +1 -0
- package/modern/styles/shouldSkipGeneratingVar.js +5 -0
- package/node/Autocomplete/Autocomplete.js +5 -2
- package/node/Autocomplete/autocompleteClasses.js +1 -1
- package/node/DialogTitle/DialogTitle.js +2 -2
- package/node/Menu/Menu.js +1 -1
- package/node/index.js +1 -1
- package/node/styles/CssVarsProvider.js +1 -9
- package/node/styles/createTypography.js +8 -1
- package/node/styles/experimental_extendTheme.js +59 -40
- package/node/styles/index.js +8 -0
- package/node/styles/shouldSkipGeneratingVar.js +12 -0
- package/package.json +5 -5
- package/styles/CssVarsProvider.d.ts +1 -2
- package/styles/CssVarsProvider.js +1 -8
- package/styles/createTypography.js +8 -1
- package/styles/experimental_extendTheme.d.ts +20 -0
- package/styles/experimental_extendTheme.js +60 -41
- package/styles/index.d.ts +1 -0
- package/styles/index.js +1 -0
- package/styles/shouldSkipGeneratingVar.d.ts +1 -0
- package/styles/shouldSkipGeneratingVar.js +6 -0
- package/umd/material-ui.development.js +362 -221
- package/umd/material-ui.production.min.js +20 -20
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export default function shouldSkipGeneratingVar(keys) {
|
|
2
|
+
var _keys$;
|
|
3
|
+
return !!keys[0].match(/(cssVarPrefix|typography|mixins|breakpoints|direction|transitions)/) || !!keys[0].match(/sxConfig$/) ||
|
|
4
|
+
// ends with sxConfig
|
|
5
|
+
keys[0] === 'palette' && !!((_keys$ = keys[1]) != null && _keys$.match(/(mode|contrastThreshold|tonalOffset)/));
|
|
6
|
+
}
|
|
@@ -29,6 +29,7 @@ const useUtilityClasses = ownerState => {
|
|
|
29
29
|
const {
|
|
30
30
|
classes,
|
|
31
31
|
disablePortal,
|
|
32
|
+
expanded,
|
|
32
33
|
focused,
|
|
33
34
|
fullWidth,
|
|
34
35
|
hasClearIcon,
|
|
@@ -38,7 +39,7 @@ const useUtilityClasses = ownerState => {
|
|
|
38
39
|
size
|
|
39
40
|
} = ownerState;
|
|
40
41
|
const slots = {
|
|
41
|
-
root: ['root', focused && 'focused', fullWidth && 'fullWidth', hasClearIcon && 'hasClearIcon', hasPopupIcon && 'hasPopupIcon'],
|
|
42
|
+
root: ['root', expanded && 'expanded', focused && 'focused', fullWidth && 'fullWidth', hasClearIcon && 'hasClearIcon', hasPopupIcon && 'hasPopupIcon'],
|
|
42
43
|
inputRoot: ['inputRoot'],
|
|
43
44
|
input: ['input', inputFocused && 'inputFocused'],
|
|
44
45
|
tag: ['tag', `tagSize${capitalize(size)}`],
|
|
@@ -434,6 +435,7 @@ const Autocomplete = /*#__PURE__*/React.forwardRef(function Autocomplete(inProps
|
|
|
434
435
|
getOptionProps,
|
|
435
436
|
value,
|
|
436
437
|
dirty,
|
|
438
|
+
expanded,
|
|
437
439
|
id,
|
|
438
440
|
popupOpen,
|
|
439
441
|
focused,
|
|
@@ -451,6 +453,7 @@ const Autocomplete = /*#__PURE__*/React.forwardRef(function Autocomplete(inProps
|
|
|
451
453
|
// If you modify this, make sure to keep the `AutocompleteOwnerState` type in sync.
|
|
452
454
|
const ownerState = _extends({}, props, {
|
|
453
455
|
disablePortal,
|
|
456
|
+
expanded,
|
|
454
457
|
focused,
|
|
455
458
|
fullWidth,
|
|
456
459
|
hasClearIcon,
|
|
@@ -897,7 +900,7 @@ process.env.NODE_ENV !== "production" ? Autocomplete.propTypes /* remove-proptyp
|
|
|
897
900
|
*
|
|
898
901
|
* @param {React.SyntheticEvent} event The event source of the callback.
|
|
899
902
|
* @param {T} option The highlighted option.
|
|
900
|
-
* @param {string} reason Can be: `"keyboard"`, `"auto"`, `"mouse"`.
|
|
903
|
+
* @param {string} reason Can be: `"keyboard"`, `"auto"`, `"mouse"`, `"touch"`.
|
|
901
904
|
*/
|
|
902
905
|
onHighlightChange: PropTypes.func,
|
|
903
906
|
/**
|
|
@@ -3,5 +3,5 @@ import generateUtilityClass from '../generateUtilityClass';
|
|
|
3
3
|
export function getAutocompleteUtilityClass(slot) {
|
|
4
4
|
return generateUtilityClass('MuiAutocomplete', slot);
|
|
5
5
|
}
|
|
6
|
-
const autocompleteClasses = generateUtilityClasses('MuiAutocomplete', ['root', 'fullWidth', 'focused', 'focusVisible', 'tag', 'tagSizeSmall', 'tagSizeMedium', 'hasPopupIcon', 'hasClearIcon', 'inputRoot', 'input', 'inputFocused', 'endAdornment', 'clearIndicator', 'popupIndicator', 'popupIndicatorOpen', 'popper', 'popperDisablePortal', 'paper', 'listbox', 'loading', 'noOptions', 'option', 'groupLabel', 'groupUl']);
|
|
6
|
+
const autocompleteClasses = generateUtilityClasses('MuiAutocomplete', ['root', 'expanded', 'fullWidth', 'focused', 'focusVisible', 'tag', 'tagSizeSmall', 'tagSizeMedium', 'hasPopupIcon', 'hasClearIcon', 'inputRoot', 'input', 'inputFocused', 'endAdornment', 'clearIndicator', 'popupIndicator', 'popupIndicatorOpen', 'popper', 'popperDisablePortal', 'paper', 'listbox', 'loading', 'noOptions', 'option', 'groupLabel', 'groupUl']);
|
|
7
7
|
export default autocompleteClasses;
|
|
@@ -41,7 +41,7 @@ const DialogTitle = /*#__PURE__*/React.forwardRef(function DialogTitle(inProps,
|
|
|
41
41
|
const ownerState = props;
|
|
42
42
|
const classes = useUtilityClasses(ownerState);
|
|
43
43
|
const {
|
|
44
|
-
titleId
|
|
44
|
+
titleId = idProp
|
|
45
45
|
} = React.useContext(DialogContext);
|
|
46
46
|
return /*#__PURE__*/_jsx(DialogTitleRoot, _extends({
|
|
47
47
|
component: "h2",
|
|
@@ -49,7 +49,7 @@ const DialogTitle = /*#__PURE__*/React.forwardRef(function DialogTitle(inProps,
|
|
|
49
49
|
ownerState: ownerState,
|
|
50
50
|
ref: ref,
|
|
51
51
|
variant: "h6",
|
|
52
|
-
id:
|
|
52
|
+
id: idProp ?? titleId
|
|
53
53
|
}, other));
|
|
54
54
|
});
|
|
55
55
|
process.env.NODE_ENV !== "production" ? DialogTitle.propTypes /* remove-proptypes */ = {
|
package/modern/Menu/Menu.js
CHANGED
|
@@ -149,7 +149,7 @@ const Menu = /*#__PURE__*/React.forwardRef(function Menu(inProps, ref) {
|
|
|
149
149
|
},
|
|
150
150
|
transformOrigin: isRtl ? RTL_ORIGIN : LTR_ORIGIN,
|
|
151
151
|
PaperProps: _extends({
|
|
152
|
-
|
|
152
|
+
as: MenuPaper
|
|
153
153
|
}, PaperProps, {
|
|
154
154
|
classes: _extends({}, PaperProps.classes, {
|
|
155
155
|
root: classes.paper
|
package/modern/index.js
CHANGED
|
@@ -3,9 +3,6 @@ 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
|
-
const shouldSkipGeneratingVar = keys => !!keys[0].match(/(typography|mixins|breakpoints|direction|transitions)/) || !!keys[0].match(/sxConfig$/) ||
|
|
7
|
-
// ends with sxConfig
|
|
8
|
-
keys[0] === 'palette' && !!keys[1]?.match(/(mode|contrastThreshold|tonalOffset)/);
|
|
9
6
|
const defaultTheme = experimental_extendTheme();
|
|
10
7
|
const {
|
|
11
8
|
CssVarsProvider,
|
|
@@ -32,7 +29,6 @@ const {
|
|
|
32
29
|
};
|
|
33
30
|
return newTheme;
|
|
34
31
|
},
|
|
35
|
-
shouldSkipGeneratingVar,
|
|
36
32
|
excludeVariablesFromRoot
|
|
37
33
|
});
|
|
38
|
-
export { useColorScheme, getInitColorSchemeScript,
|
|
34
|
+
export { useColorScheme, getInitColorSchemeScript, CssVarsProvider as Experimental_CssVarsProvider };
|
|
@@ -65,7 +65,14 @@ export default function createTypography(palette, typography) {
|
|
|
65
65
|
body2: buildVariant(fontWeightRegular, 14, 1.43, 0.15),
|
|
66
66
|
button: buildVariant(fontWeightMedium, 14, 1.75, 0.4, caseAllCaps),
|
|
67
67
|
caption: buildVariant(fontWeightRegular, 12, 1.66, 0.4),
|
|
68
|
-
overline: buildVariant(fontWeightRegular, 12, 2.66, 1, caseAllCaps)
|
|
68
|
+
overline: buildVariant(fontWeightRegular, 12, 2.66, 1, caseAllCaps),
|
|
69
|
+
inherit: {
|
|
70
|
+
fontFamily: 'inherit',
|
|
71
|
+
fontWeight: 'inherit',
|
|
72
|
+
fontSize: 'inherit',
|
|
73
|
+
lineHeight: 'inherit',
|
|
74
|
+
letterSpacing: 'inherit'
|
|
75
|
+
}
|
|
69
76
|
};
|
|
70
77
|
return deepmerge(_extends({
|
|
71
78
|
htmlFontSize,
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
2
2
|
import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
|
|
3
|
-
const _excluded = ["colorSchemes", "cssVarPrefix"],
|
|
3
|
+
const _excluded = ["colorSchemes", "cssVarPrefix", "shouldSkipGeneratingVar"],
|
|
4
4
|
_excluded2 = ["palette"];
|
|
5
5
|
import { deepmerge } from '@mui/utils';
|
|
6
|
-
import { private_safeColorChannel as safeColorChannel, private_safeAlpha as safeAlpha, private_safeDarken as safeDarken, private_safeLighten as safeLighten, private_safeEmphasize as safeEmphasize, unstable_createGetCssVar as systemCreateGetCssVar, unstable_defaultSxConfig as defaultSxConfig, unstable_styleFunctionSx as styleFunctionSx } from '@mui/system';
|
|
6
|
+
import { private_safeColorChannel as safeColorChannel, private_safeAlpha as safeAlpha, private_safeDarken as safeDarken, private_safeLighten as safeLighten, private_safeEmphasize as safeEmphasize, unstable_createGetCssVar as systemCreateGetCssVar, unstable_defaultSxConfig as defaultSxConfig, unstable_styleFunctionSx as styleFunctionSx, unstable_prepareCssVars as prepareCssVars } from '@mui/system';
|
|
7
|
+
import defaultShouldSkipGeneratingVar from './shouldSkipGeneratingVar';
|
|
7
8
|
import createThemeWithoutVars from './createTheme';
|
|
8
9
|
import getOverlayAlpha from './getOverlayAlpha';
|
|
9
10
|
const defaultDarkOverlays = [...Array(25)].map((_, index) => {
|
|
@@ -44,7 +45,8 @@ export const createGetCssVar = (cssVarPrefix = 'mui') => systemCreateGetCssVar(c
|
|
|
44
45
|
export default function extendTheme(options = {}, ...args) {
|
|
45
46
|
const {
|
|
46
47
|
colorSchemes: colorSchemesInput = {},
|
|
47
|
-
cssVarPrefix = 'mui'
|
|
48
|
+
cssVarPrefix = 'mui',
|
|
49
|
+
shouldSkipGeneratingVar = defaultShouldSkipGeneratingVar
|
|
48
50
|
} = options,
|
|
49
51
|
input = _objectWithoutPropertiesLoose(options, _excluded);
|
|
50
52
|
const getCssVar = createGetCssVar(cssVarPrefix);
|
|
@@ -90,6 +92,12 @@ export default function extendTheme(options = {}, ...args) {
|
|
|
90
92
|
});
|
|
91
93
|
Object.keys(theme.colorSchemes).forEach(key => {
|
|
92
94
|
const palette = theme.colorSchemes[key].palette;
|
|
95
|
+
const setCssVarColor = cssVar => {
|
|
96
|
+
const tokens = cssVar.split('-');
|
|
97
|
+
const color = tokens[1];
|
|
98
|
+
const colorToken = tokens[2];
|
|
99
|
+
return getCssVar(cssVar, palette[color][colorToken]);
|
|
100
|
+
};
|
|
93
101
|
|
|
94
102
|
// attach black & white channels to common node
|
|
95
103
|
if (key === 'light') {
|
|
@@ -107,10 +115,10 @@ export default function extendTheme(options = {}, ...args) {
|
|
|
107
115
|
setColor(palette.Alert, 'infoColor', safeDarken(palette.info.light, 0.6));
|
|
108
116
|
setColor(palette.Alert, 'successColor', safeDarken(palette.success.light, 0.6));
|
|
109
117
|
setColor(palette.Alert, 'warningColor', safeDarken(palette.warning.light, 0.6));
|
|
110
|
-
setColor(palette.Alert, 'errorFilledBg',
|
|
111
|
-
setColor(palette.Alert, 'infoFilledBg',
|
|
112
|
-
setColor(palette.Alert, 'successFilledBg',
|
|
113
|
-
setColor(palette.Alert, 'warningFilledBg',
|
|
118
|
+
setColor(palette.Alert, 'errorFilledBg', setCssVarColor('palette-error-main'));
|
|
119
|
+
setColor(palette.Alert, 'infoFilledBg', setCssVarColor('palette-info-main'));
|
|
120
|
+
setColor(palette.Alert, 'successFilledBg', setCssVarColor('palette-success-main'));
|
|
121
|
+
setColor(palette.Alert, 'warningFilledBg', setCssVarColor('palette-warning-main'));
|
|
114
122
|
setColor(palette.Alert, 'errorFilledColor', silent(() => lightPalette.getContrastText(palette.error.main)));
|
|
115
123
|
setColor(palette.Alert, 'infoFilledColor', silent(() => lightPalette.getContrastText(palette.info.main)));
|
|
116
124
|
setColor(palette.Alert, 'successFilledColor', silent(() => lightPalette.getContrastText(palette.success.main)));
|
|
@@ -119,15 +127,15 @@ export default function extendTheme(options = {}, ...args) {
|
|
|
119
127
|
setColor(palette.Alert, 'infoStandardBg', safeLighten(palette.info.light, 0.9));
|
|
120
128
|
setColor(palette.Alert, 'successStandardBg', safeLighten(palette.success.light, 0.9));
|
|
121
129
|
setColor(palette.Alert, 'warningStandardBg', safeLighten(palette.warning.light, 0.9));
|
|
122
|
-
setColor(palette.Alert, 'errorIconColor',
|
|
123
|
-
setColor(palette.Alert, 'infoIconColor',
|
|
124
|
-
setColor(palette.Alert, 'successIconColor',
|
|
125
|
-
setColor(palette.Alert, 'warningIconColor',
|
|
126
|
-
setColor(palette.AppBar, 'defaultBg',
|
|
127
|
-
setColor(palette.Avatar, 'defaultBg',
|
|
128
|
-
setColor(palette.Chip, 'defaultBorder',
|
|
129
|
-
setColor(palette.Chip, 'defaultAvatarColor',
|
|
130
|
-
setColor(palette.Chip, 'defaultIconColor',
|
|
130
|
+
setColor(palette.Alert, 'errorIconColor', setCssVarColor('palette-error-main'));
|
|
131
|
+
setColor(palette.Alert, 'infoIconColor', setCssVarColor('palette-info-main'));
|
|
132
|
+
setColor(palette.Alert, 'successIconColor', setCssVarColor('palette-success-main'));
|
|
133
|
+
setColor(palette.Alert, 'warningIconColor', setCssVarColor('palette-warning-main'));
|
|
134
|
+
setColor(palette.AppBar, 'defaultBg', setCssVarColor('palette-grey-100'));
|
|
135
|
+
setColor(palette.Avatar, 'defaultBg', setCssVarColor('palette-grey-400'));
|
|
136
|
+
setColor(palette.Chip, 'defaultBorder', setCssVarColor('palette-grey-400'));
|
|
137
|
+
setColor(palette.Chip, 'defaultAvatarColor', setCssVarColor('palette-grey-700'));
|
|
138
|
+
setColor(palette.Chip, 'defaultIconColor', setCssVarColor('palette-grey-700'));
|
|
131
139
|
setColor(palette.FilledInput, 'bg', 'rgba(0, 0, 0, 0.06)');
|
|
132
140
|
setColor(palette.FilledInput, 'hoverBg', 'rgba(0, 0, 0, 0.09)');
|
|
133
141
|
setColor(palette.FilledInput, 'disabledBg', 'rgba(0, 0, 0, 0.12)');
|
|
@@ -137,7 +145,7 @@ export default function extendTheme(options = {}, ...args) {
|
|
|
137
145
|
setColor(palette.LinearProgress, 'infoBg', safeLighten(palette.info.main, 0.62));
|
|
138
146
|
setColor(palette.LinearProgress, 'successBg', safeLighten(palette.success.main, 0.62));
|
|
139
147
|
setColor(palette.LinearProgress, 'warningBg', safeLighten(palette.warning.main, 0.62));
|
|
140
|
-
setColor(palette.Skeleton, 'bg', `rgba(${
|
|
148
|
+
setColor(palette.Skeleton, 'bg', `rgba(${setCssVarColor('palette-text-primaryChannel')} / 0.11)`);
|
|
141
149
|
setColor(palette.Slider, 'primaryTrack', safeLighten(palette.primary.main, 0.62));
|
|
142
150
|
setColor(palette.Slider, 'secondaryTrack', safeLighten(palette.secondary.main, 0.62));
|
|
143
151
|
setColor(palette.Slider, 'errorTrack', safeLighten(palette.error.main, 0.62));
|
|
@@ -148,10 +156,10 @@ export default function extendTheme(options = {}, ...args) {
|
|
|
148
156
|
setColor(palette.SnackbarContent, 'bg', snackbarContentBackground);
|
|
149
157
|
setColor(palette.SnackbarContent, 'color', silent(() => lightPalette.getContrastText(snackbarContentBackground)));
|
|
150
158
|
setColor(palette.SpeedDialAction, 'fabHoverBg', safeEmphasize(palette.background.paper, 0.15));
|
|
151
|
-
setColor(palette.StepConnector, 'border',
|
|
152
|
-
setColor(palette.StepContent, 'border',
|
|
153
|
-
setColor(palette.Switch, 'defaultColor',
|
|
154
|
-
setColor(palette.Switch, 'defaultDisabledColor',
|
|
159
|
+
setColor(palette.StepConnector, 'border', setCssVarColor('palette-grey-400'));
|
|
160
|
+
setColor(palette.StepContent, 'border', setCssVarColor('palette-grey-400'));
|
|
161
|
+
setColor(palette.Switch, 'defaultColor', setCssVarColor('palette-common-white'));
|
|
162
|
+
setColor(palette.Switch, 'defaultDisabledColor', setCssVarColor('palette-grey-100'));
|
|
155
163
|
setColor(palette.Switch, 'primaryDisabledColor', safeLighten(palette.primary.main, 0.62));
|
|
156
164
|
setColor(palette.Switch, 'secondaryDisabledColor', safeLighten(palette.secondary.main, 0.62));
|
|
157
165
|
setColor(palette.Switch, 'errorDisabledColor', safeLighten(palette.error.main, 0.62));
|
|
@@ -165,10 +173,10 @@ export default function extendTheme(options = {}, ...args) {
|
|
|
165
173
|
setColor(palette.Alert, 'infoColor', safeLighten(palette.info.light, 0.6));
|
|
166
174
|
setColor(palette.Alert, 'successColor', safeLighten(palette.success.light, 0.6));
|
|
167
175
|
setColor(palette.Alert, 'warningColor', safeLighten(palette.warning.light, 0.6));
|
|
168
|
-
setColor(palette.Alert, 'errorFilledBg',
|
|
169
|
-
setColor(palette.Alert, 'infoFilledBg',
|
|
170
|
-
setColor(palette.Alert, 'successFilledBg',
|
|
171
|
-
setColor(palette.Alert, 'warningFilledBg',
|
|
176
|
+
setColor(palette.Alert, 'errorFilledBg', setCssVarColor('palette-error-dark'));
|
|
177
|
+
setColor(palette.Alert, 'infoFilledBg', setCssVarColor('palette-info-dark'));
|
|
178
|
+
setColor(palette.Alert, 'successFilledBg', setCssVarColor('palette-success-dark'));
|
|
179
|
+
setColor(palette.Alert, 'warningFilledBg', setCssVarColor('palette-warning-dark'));
|
|
172
180
|
setColor(palette.Alert, 'errorFilledColor', silent(() => darkPalette.getContrastText(palette.error.dark)));
|
|
173
181
|
setColor(palette.Alert, 'infoFilledColor', silent(() => darkPalette.getContrastText(palette.info.dark)));
|
|
174
182
|
setColor(palette.Alert, 'successFilledColor', silent(() => darkPalette.getContrastText(palette.success.dark)));
|
|
@@ -177,17 +185,17 @@ export default function extendTheme(options = {}, ...args) {
|
|
|
177
185
|
setColor(palette.Alert, 'infoStandardBg', safeDarken(palette.info.light, 0.9));
|
|
178
186
|
setColor(palette.Alert, 'successStandardBg', safeDarken(palette.success.light, 0.9));
|
|
179
187
|
setColor(palette.Alert, 'warningStandardBg', safeDarken(palette.warning.light, 0.9));
|
|
180
|
-
setColor(palette.Alert, 'errorIconColor',
|
|
181
|
-
setColor(palette.Alert, 'infoIconColor',
|
|
182
|
-
setColor(palette.Alert, 'successIconColor',
|
|
183
|
-
setColor(palette.Alert, 'warningIconColor',
|
|
184
|
-
setColor(palette.AppBar, 'defaultBg',
|
|
185
|
-
setColor(palette.AppBar, 'darkBg',
|
|
186
|
-
setColor(palette.AppBar, 'darkColor',
|
|
187
|
-
setColor(palette.Avatar, 'defaultBg',
|
|
188
|
-
setColor(palette.Chip, 'defaultBorder',
|
|
189
|
-
setColor(palette.Chip, 'defaultAvatarColor',
|
|
190
|
-
setColor(palette.Chip, 'defaultIconColor',
|
|
188
|
+
setColor(palette.Alert, 'errorIconColor', setCssVarColor('palette-error-main'));
|
|
189
|
+
setColor(palette.Alert, 'infoIconColor', setCssVarColor('palette-info-main'));
|
|
190
|
+
setColor(palette.Alert, 'successIconColor', setCssVarColor('palette-success-main'));
|
|
191
|
+
setColor(palette.Alert, 'warningIconColor', setCssVarColor('palette-warning-main'));
|
|
192
|
+
setColor(palette.AppBar, 'defaultBg', setCssVarColor('palette-grey-900'));
|
|
193
|
+
setColor(palette.AppBar, 'darkBg', setCssVarColor('palette-background-paper')); // specific for dark mode
|
|
194
|
+
setColor(palette.AppBar, 'darkColor', setCssVarColor('palette-text-primary')); // specific for dark mode
|
|
195
|
+
setColor(palette.Avatar, 'defaultBg', setCssVarColor('palette-grey-600'));
|
|
196
|
+
setColor(palette.Chip, 'defaultBorder', setCssVarColor('palette-grey-700'));
|
|
197
|
+
setColor(palette.Chip, 'defaultAvatarColor', setCssVarColor('palette-grey-300'));
|
|
198
|
+
setColor(palette.Chip, 'defaultIconColor', setCssVarColor('palette-grey-300'));
|
|
191
199
|
setColor(palette.FilledInput, 'bg', 'rgba(255, 255, 255, 0.09)');
|
|
192
200
|
setColor(palette.FilledInput, 'hoverBg', 'rgba(255, 255, 255, 0.13)');
|
|
193
201
|
setColor(palette.FilledInput, 'disabledBg', 'rgba(255, 255, 255, 0.12)');
|
|
@@ -197,7 +205,7 @@ export default function extendTheme(options = {}, ...args) {
|
|
|
197
205
|
setColor(palette.LinearProgress, 'infoBg', safeDarken(palette.info.main, 0.5));
|
|
198
206
|
setColor(palette.LinearProgress, 'successBg', safeDarken(palette.success.main, 0.5));
|
|
199
207
|
setColor(palette.LinearProgress, 'warningBg', safeDarken(palette.warning.main, 0.5));
|
|
200
|
-
setColor(palette.Skeleton, 'bg', `rgba(${
|
|
208
|
+
setColor(palette.Skeleton, 'bg', `rgba(${setCssVarColor('palette-text-primaryChannel')} / 0.13)`);
|
|
201
209
|
setColor(palette.Slider, 'primaryTrack', safeDarken(palette.primary.main, 0.5));
|
|
202
210
|
setColor(palette.Slider, 'secondaryTrack', safeDarken(palette.secondary.main, 0.5));
|
|
203
211
|
setColor(palette.Slider, 'errorTrack', safeDarken(palette.error.main, 0.5));
|
|
@@ -208,10 +216,10 @@ export default function extendTheme(options = {}, ...args) {
|
|
|
208
216
|
setColor(palette.SnackbarContent, 'bg', snackbarContentBackground);
|
|
209
217
|
setColor(palette.SnackbarContent, 'color', silent(() => darkPalette.getContrastText(snackbarContentBackground)));
|
|
210
218
|
setColor(palette.SpeedDialAction, 'fabHoverBg', safeEmphasize(palette.background.paper, 0.15));
|
|
211
|
-
setColor(palette.StepConnector, 'border',
|
|
212
|
-
setColor(palette.StepContent, 'border',
|
|
213
|
-
setColor(palette.Switch, 'defaultColor',
|
|
214
|
-
setColor(palette.Switch, 'defaultDisabledColor',
|
|
219
|
+
setColor(palette.StepConnector, 'border', setCssVarColor('palette-grey-600'));
|
|
220
|
+
setColor(palette.StepContent, 'border', setCssVarColor('palette-grey-600'));
|
|
221
|
+
setColor(palette.Switch, 'defaultColor', setCssVarColor('palette-grey-300'));
|
|
222
|
+
setColor(palette.Switch, 'defaultDisabledColor', setCssVarColor('palette-grey-600'));
|
|
215
223
|
setColor(palette.Switch, 'primaryDisabledColor', safeDarken(palette.primary.main, 0.55));
|
|
216
224
|
setColor(palette.Switch, 'secondaryDisabledColor', safeDarken(palette.secondary.main, 0.55));
|
|
217
225
|
setColor(palette.Switch, 'errorDisabledColor', safeDarken(palette.error.main, 0.55));
|
|
@@ -264,6 +272,17 @@ export default function extendTheme(options = {}, ...args) {
|
|
|
264
272
|
});
|
|
265
273
|
});
|
|
266
274
|
theme = args.reduce((acc, argument) => deepmerge(acc, argument), theme);
|
|
275
|
+
const parserConfig = {
|
|
276
|
+
prefix: cssVarPrefix,
|
|
277
|
+
shouldSkipGeneratingVar
|
|
278
|
+
};
|
|
279
|
+
const {
|
|
280
|
+
vars: themeVars,
|
|
281
|
+
generateCssVars
|
|
282
|
+
} = prepareCssVars(theme, parserConfig);
|
|
283
|
+
theme.vars = themeVars;
|
|
284
|
+
theme.generateCssVars = generateCssVars;
|
|
285
|
+
theme.shouldSkipGeneratingVar = shouldSkipGeneratingVar;
|
|
267
286
|
theme.unstable_sxConfig = _extends({}, defaultSxConfig, input?.unstable_sxConfig);
|
|
268
287
|
theme.unstable_sx = function sx(props) {
|
|
269
288
|
return styleFunctionSx({
|
package/modern/styles/index.js
CHANGED
|
@@ -26,6 +26,7 @@ export { default as withTheme } from './withTheme';
|
|
|
26
26
|
export * from './CssVarsProvider';
|
|
27
27
|
export { default as experimental_extendTheme } from './experimental_extendTheme';
|
|
28
28
|
export { default as getOverlayAlpha } from './getOverlayAlpha';
|
|
29
|
+
export { default as shouldSkipGeneratingVar } from './shouldSkipGeneratingVar';
|
|
29
30
|
|
|
30
31
|
// Private methods for creating parts of the theme
|
|
31
32
|
export { default as private_createTypography } from './createTypography';
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export default function shouldSkipGeneratingVar(keys) {
|
|
2
|
+
return !!keys[0].match(/(cssVarPrefix|typography|mixins|breakpoints|direction|transitions)/) || !!keys[0].match(/sxConfig$/) ||
|
|
3
|
+
// ends with sxConfig
|
|
4
|
+
keys[0] === 'palette' && !!keys[1]?.match(/(mode|contrastThreshold|tonalOffset)/);
|
|
5
|
+
}
|
|
@@ -43,6 +43,7 @@ const useUtilityClasses = ownerState => {
|
|
|
43
43
|
const {
|
|
44
44
|
classes,
|
|
45
45
|
disablePortal,
|
|
46
|
+
expanded,
|
|
46
47
|
focused,
|
|
47
48
|
fullWidth,
|
|
48
49
|
hasClearIcon,
|
|
@@ -52,7 +53,7 @@ const useUtilityClasses = ownerState => {
|
|
|
52
53
|
size
|
|
53
54
|
} = ownerState;
|
|
54
55
|
const slots = {
|
|
55
|
-
root: ['root', focused && 'focused', fullWidth && 'fullWidth', hasClearIcon && 'hasClearIcon', hasPopupIcon && 'hasPopupIcon'],
|
|
56
|
+
root: ['root', expanded && 'expanded', focused && 'focused', fullWidth && 'fullWidth', hasClearIcon && 'hasClearIcon', hasPopupIcon && 'hasPopupIcon'],
|
|
56
57
|
inputRoot: ['inputRoot'],
|
|
57
58
|
input: ['input', inputFocused && 'inputFocused'],
|
|
58
59
|
tag: ['tag', `tagSize${(0, _capitalize.default)(size)}`],
|
|
@@ -451,6 +452,7 @@ const Autocomplete = /*#__PURE__*/React.forwardRef(function Autocomplete(inProps
|
|
|
451
452
|
getOptionProps,
|
|
452
453
|
value,
|
|
453
454
|
dirty,
|
|
455
|
+
expanded,
|
|
454
456
|
id,
|
|
455
457
|
popupOpen,
|
|
456
458
|
focused,
|
|
@@ -468,6 +470,7 @@ const Autocomplete = /*#__PURE__*/React.forwardRef(function Autocomplete(inProps
|
|
|
468
470
|
// If you modify this, make sure to keep the `AutocompleteOwnerState` type in sync.
|
|
469
471
|
const ownerState = (0, _extends2.default)({}, props, {
|
|
470
472
|
disablePortal,
|
|
473
|
+
expanded,
|
|
471
474
|
focused,
|
|
472
475
|
fullWidth,
|
|
473
476
|
hasClearIcon,
|
|
@@ -914,7 +917,7 @@ process.env.NODE_ENV !== "production" ? Autocomplete.propTypes /* remove-proptyp
|
|
|
914
917
|
*
|
|
915
918
|
* @param {React.SyntheticEvent} event The event source of the callback.
|
|
916
919
|
* @param {T} option The highlighted option.
|
|
917
|
-
* @param {string} reason Can be: `"keyboard"`, `"auto"`, `"mouse"`.
|
|
920
|
+
* @param {string} reason Can be: `"keyboard"`, `"auto"`, `"mouse"`, `"touch"`.
|
|
918
921
|
*/
|
|
919
922
|
onHighlightChange: _propTypes.default.func,
|
|
920
923
|
/**
|
|
@@ -11,6 +11,6 @@ var _generateUtilityClass = _interopRequireDefault(require("../generateUtilityCl
|
|
|
11
11
|
function getAutocompleteUtilityClass(slot) {
|
|
12
12
|
return (0, _generateUtilityClass.default)('MuiAutocomplete', slot);
|
|
13
13
|
}
|
|
14
|
-
const autocompleteClasses = (0, _utils.unstable_generateUtilityClasses)('MuiAutocomplete', ['root', 'fullWidth', 'focused', 'focusVisible', 'tag', 'tagSizeSmall', 'tagSizeMedium', 'hasPopupIcon', 'hasClearIcon', 'inputRoot', 'input', 'inputFocused', 'endAdornment', 'clearIndicator', 'popupIndicator', 'popupIndicatorOpen', 'popper', 'popperDisablePortal', 'paper', 'listbox', 'loading', 'noOptions', 'option', 'groupLabel', 'groupUl']);
|
|
14
|
+
const autocompleteClasses = (0, _utils.unstable_generateUtilityClasses)('MuiAutocomplete', ['root', 'expanded', 'fullWidth', 'focused', 'focusVisible', 'tag', 'tagSizeSmall', 'tagSizeMedium', 'hasPopupIcon', 'hasClearIcon', 'inputRoot', 'input', 'inputFocused', 'endAdornment', 'clearIndicator', 'popupIndicator', 'popupIndicatorOpen', 'popper', 'popperDisablePortal', 'paper', 'listbox', 'loading', 'noOptions', 'option', 'groupLabel', 'groupUl']);
|
|
15
15
|
var _default = autocompleteClasses;
|
|
16
16
|
exports.default = _default;
|
|
@@ -50,7 +50,7 @@ const DialogTitle = /*#__PURE__*/React.forwardRef(function DialogTitle(inProps,
|
|
|
50
50
|
const ownerState = props;
|
|
51
51
|
const classes = useUtilityClasses(ownerState);
|
|
52
52
|
const {
|
|
53
|
-
titleId
|
|
53
|
+
titleId = idProp
|
|
54
54
|
} = React.useContext(_DialogContext.default);
|
|
55
55
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(DialogTitleRoot, (0, _extends2.default)({
|
|
56
56
|
component: "h2",
|
|
@@ -58,7 +58,7 @@ const DialogTitle = /*#__PURE__*/React.forwardRef(function DialogTitle(inProps,
|
|
|
58
58
|
ownerState: ownerState,
|
|
59
59
|
ref: ref,
|
|
60
60
|
variant: "h6",
|
|
61
|
-
id:
|
|
61
|
+
id: idProp != null ? idProp : titleId
|
|
62
62
|
}, other));
|
|
63
63
|
});
|
|
64
64
|
process.env.NODE_ENV !== "production" ? DialogTitle.propTypes /* remove-proptypes */ = {
|
package/node/Menu/Menu.js
CHANGED
|
@@ -158,7 +158,7 @@ const Menu = /*#__PURE__*/React.forwardRef(function Menu(inProps, ref) {
|
|
|
158
158
|
},
|
|
159
159
|
transformOrigin: isRtl ? RTL_ORIGIN : LTR_ORIGIN,
|
|
160
160
|
PaperProps: (0, _extends2.default)({
|
|
161
|
-
|
|
161
|
+
as: MenuPaper
|
|
162
162
|
}, PaperProps, {
|
|
163
163
|
classes: (0, _extends2.default)({}, PaperProps.classes, {
|
|
164
164
|
root: classes.paper
|
package/node/index.js
CHANGED
|
@@ -4,19 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
-
exports.useColorScheme = exports.
|
|
7
|
+
exports.useColorScheme = exports.getInitColorSchemeScript = exports.Experimental_CssVarsProvider = void 0;
|
|
8
8
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
9
9
|
var _system = require("@mui/system");
|
|
10
10
|
var _experimental_extendTheme = _interopRequireDefault(require("./experimental_extendTheme"));
|
|
11
11
|
var _createTypography = _interopRequireDefault(require("./createTypography"));
|
|
12
12
|
var _excludeVariablesFromRoot = _interopRequireDefault(require("./excludeVariablesFromRoot"));
|
|
13
|
-
const shouldSkipGeneratingVar = keys => {
|
|
14
|
-
var _keys$;
|
|
15
|
-
return !!keys[0].match(/(typography|mixins|breakpoints|direction|transitions)/) || !!keys[0].match(/sxConfig$/) ||
|
|
16
|
-
// ends with sxConfig
|
|
17
|
-
keys[0] === 'palette' && !!((_keys$ = keys[1]) != null && _keys$.match(/(mode|contrastThreshold|tonalOffset)/));
|
|
18
|
-
};
|
|
19
|
-
exports.shouldSkipGeneratingVar = shouldSkipGeneratingVar;
|
|
20
13
|
const defaultTheme = (0, _experimental_extendTheme.default)();
|
|
21
14
|
const {
|
|
22
15
|
CssVarsProvider,
|
|
@@ -43,7 +36,6 @@ const {
|
|
|
43
36
|
};
|
|
44
37
|
return newTheme;
|
|
45
38
|
},
|
|
46
|
-
shouldSkipGeneratingVar,
|
|
47
39
|
excludeVariablesFromRoot: _excludeVariablesFromRoot.default
|
|
48
40
|
});
|
|
49
41
|
exports.getInitColorSchemeScript = getInitColorSchemeScript;
|
|
@@ -72,7 +72,14 @@ function createTypography(palette, typography) {
|
|
|
72
72
|
body2: buildVariant(fontWeightRegular, 14, 1.43, 0.15),
|
|
73
73
|
button: buildVariant(fontWeightMedium, 14, 1.75, 0.4, caseAllCaps),
|
|
74
74
|
caption: buildVariant(fontWeightRegular, 12, 1.66, 0.4),
|
|
75
|
-
overline: buildVariant(fontWeightRegular, 12, 2.66, 1, caseAllCaps)
|
|
75
|
+
overline: buildVariant(fontWeightRegular, 12, 2.66, 1, caseAllCaps),
|
|
76
|
+
inherit: {
|
|
77
|
+
fontFamily: 'inherit',
|
|
78
|
+
fontWeight: 'inherit',
|
|
79
|
+
fontSize: 'inherit',
|
|
80
|
+
lineHeight: 'inherit',
|
|
81
|
+
letterSpacing: 'inherit'
|
|
82
|
+
}
|
|
76
83
|
};
|
|
77
84
|
return (0, _utils.deepmerge)((0, _extends2.default)({
|
|
78
85
|
htmlFontSize,
|