@mui/system 5.12.1 → 5.13.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/CHANGELOG.md +312 -0
- package/Container/Container.d.ts +13 -13
- package/Container/ContainerProps.d.ts +40 -40
- package/Container/containerClasses.d.ts +22 -22
- package/Container/createContainer.d.ts +18 -18
- package/Container/createContainer.js +41 -35
- package/GlobalStyles/GlobalStyles.d.ts +13 -13
- package/GlobalStyles/index.d.ts +2 -2
- package/Stack/Stack.d.ts +14 -14
- package/Stack/Stack.js +1 -1
- package/Stack/StackProps.d.ts +53 -53
- package/Stack/createStack.d.ts +21 -21
- package/Stack/createStack.js +24 -26
- package/Stack/index.d.ts +5 -5
- package/Stack/stackClasses.d.ts +8 -8
- package/ThemeProvider/ThemeProvider.js +9 -5
- package/Unstable_Grid/Grid.d.ts +12 -12
- package/Unstable_Grid/GridProps.d.ts +185 -185
- package/Unstable_Grid/createGrid.d.ts +11 -11
- package/Unstable_Grid/createGrid.js +21 -23
- package/Unstable_Grid/gridClasses.d.ts +20 -20
- package/Unstable_Grid/gridGenerator.d.ts +38 -38
- package/Unstable_Grid/gridGenerator.js +20 -18
- package/Unstable_Grid/index.d.ts +5 -5
- package/breakpoints.js +7 -6
- package/colorManipulator.js +2 -0
- package/createBox.js +9 -12
- package/createStyled.js +40 -31
- package/createTheme/createBreakpoints.js +24 -26
- package/createTheme/createSpacing.d.ts +10 -10
- package/createTheme/createSpacing.js +3 -1
- package/createTheme/createTheme.js +18 -14
- package/cssVars/createCssVarsProvider.js +21 -20
- package/cssVars/createCssVarsTheme.d.ts +15 -15
- package/cssVars/createCssVarsTheme.js +10 -10
- package/cssVars/createGetCssVar.d.ts +5 -5
- package/cssVars/cssVarsParser.d.ts +64 -64
- package/cssVars/getInitColorSchemeScript.d.ts +42 -42
- package/cssVars/index.d.ts +5 -5
- package/cssVars/prepareCssVars.d.ts +16 -16
- package/cssVars/prepareCssVars.js +13 -12
- package/cssVars/useCurrentColorScheme.d.ts +53 -53
- package/cssVars/useCurrentColorScheme.js +17 -11
- package/esm/Container/createContainer.js +41 -35
- package/esm/Stack/Stack.js +1 -1
- package/esm/Stack/createStack.js +24 -26
- package/esm/ThemeProvider/ThemeProvider.js +9 -5
- package/esm/Unstable_Grid/createGrid.js +21 -23
- package/esm/Unstable_Grid/gridGenerator.js +20 -17
- package/esm/breakpoints.js +7 -6
- package/esm/colorManipulator.js +1 -0
- package/esm/createBox.js +9 -12
- package/esm/createStyled.js +38 -31
- package/esm/createTheme/createBreakpoints.js +24 -25
- package/esm/createTheme/createSpacing.js +4 -0
- package/esm/createTheme/createTheme.js +18 -14
- package/esm/cssVars/createCssVarsProvider.js +21 -20
- package/esm/cssVars/createCssVarsTheme.js +10 -10
- package/esm/cssVars/prepareCssVars.js +13 -12
- package/esm/cssVars/useCurrentColorScheme.js +17 -10
- package/esm/propsToClassKey.js +3 -5
- package/esm/styleFunctionSx/extendSxProp.js +14 -10
- package/index.js +5 -2
- package/legacy/Container/createContainer.js +7 -6
- package/legacy/Stack/Stack.js +1 -1
- package/legacy/Stack/createStack.js +6 -5
- package/legacy/ThemeProvider/ThemeProvider.js +4 -3
- package/legacy/Unstable_Grid/createGrid.js +6 -4
- package/legacy/Unstable_Grid/gridGenerator.js +6 -4
- package/legacy/breakpoints.js +5 -3
- package/legacy/colorManipulator.js +1 -0
- package/legacy/createBox.js +4 -2
- package/legacy/createStyled.js +13 -11
- package/legacy/createTheme/createBreakpoints.js +4 -3
- package/legacy/createTheme/createSpacing.js +4 -0
- package/legacy/createTheme/createTheme.js +6 -4
- package/legacy/cssVars/createCssVarsProvider.js +6 -5
- package/legacy/cssVars/createCssVarsTheme.js +4 -2
- package/legacy/cssVars/prepareCssVars.js +5 -3
- package/legacy/cssVars/useCurrentColorScheme.js +9 -7
- package/legacy/index.js +1 -1
- package/legacy/styleFunctionSx/extendSxProp.js +6 -4
- package/modern/Container/createContainer.js +41 -35
- package/modern/Stack/Stack.js +1 -1
- package/modern/Stack/createStack.js +24 -26
- package/modern/ThemeProvider/ThemeProvider.js +9 -5
- package/modern/Unstable_Grid/createGrid.js +21 -23
- package/modern/Unstable_Grid/gridGenerator.js +20 -17
- package/modern/breakpoints.js +7 -6
- package/modern/colorManipulator.js +1 -0
- package/modern/createBox.js +9 -12
- package/modern/createStyled.js +38 -31
- package/modern/createTheme/createBreakpoints.js +24 -25
- package/modern/createTheme/createSpacing.js +4 -0
- package/modern/createTheme/createTheme.js +18 -14
- package/modern/cssVars/createCssVarsProvider.js +21 -20
- package/modern/cssVars/createCssVarsTheme.js +10 -10
- package/modern/cssVars/prepareCssVars.js +13 -12
- package/modern/cssVars/useCurrentColorScheme.js +17 -10
- package/modern/index.js +1 -1
- package/modern/propsToClassKey.js +3 -5
- package/modern/styleFunctionSx/extendSxProp.js +14 -10
- package/package.json +4 -4
- package/propsToClassKey.js +3 -6
- package/styleFunctionSx/extendSxProp.js +14 -10
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
3
|
Object.defineProperty(exports, "__esModule", {
|
|
5
4
|
value: true
|
|
6
5
|
});
|
|
7
6
|
exports.traverseBreakpoints = exports.generateSpacingClassNames = exports.generateSizeClassNames = exports.generateGridStyles = exports.generateGridSizeStyles = exports.generateGridRowSpacingStyles = exports.generateGridOffsetStyles = exports.generateGridDirectionStyles = exports.generateGridColumnsStyles = exports.generateGridColumnSpacingStyles = exports.generateDirectionClasses = exports.filterBreakpointKeys = void 0;
|
|
8
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
9
7
|
function appendLevel(level) {
|
|
10
8
|
if (!level) {
|
|
11
9
|
return '';
|
|
@@ -221,23 +219,27 @@ const generateGridStyles = ({
|
|
|
221
219
|
}) => {
|
|
222
220
|
const getSelfSpacing = createGetSelfSpacing(ownerState);
|
|
223
221
|
const getParentSpacing = createGetParentSpacing(ownerState);
|
|
224
|
-
return
|
|
222
|
+
return {
|
|
225
223
|
minWidth: 0,
|
|
226
|
-
boxSizing: 'border-box'
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
224
|
+
boxSizing: 'border-box',
|
|
225
|
+
...(ownerState.container && {
|
|
226
|
+
display: 'flex',
|
|
227
|
+
flexWrap: 'wrap',
|
|
228
|
+
...(ownerState.wrap && ownerState.wrap !== 'wrap' && {
|
|
229
|
+
flexWrap: ownerState.wrap
|
|
230
|
+
}),
|
|
231
|
+
margin: `calc(${getSelfSpacing('row')} / -2) calc(${getSelfSpacing('column')} / -2)`,
|
|
232
|
+
...(ownerState.disableEqualOverflow && {
|
|
233
|
+
margin: `calc(${getSelfSpacing('row')} * -1) 0px 0px calc(${getSelfSpacing('column')} * -1)`
|
|
234
|
+
})
|
|
235
|
+
}),
|
|
236
|
+
...((!ownerState.container || isNestedContainer(ownerState)) && {
|
|
237
|
+
padding: `calc(${getParentSpacing('row')} / 2) calc(${getParentSpacing('column')} / 2)`,
|
|
238
|
+
...((ownerState.disableEqualOverflow || ownerState.parentDisableEqualOverflow) && {
|
|
239
|
+
padding: `${getParentSpacing('row')} 0px 0px ${getParentSpacing('column')}`
|
|
240
|
+
})
|
|
241
|
+
})
|
|
242
|
+
};
|
|
241
243
|
};
|
|
242
244
|
exports.generateGridStyles = generateGridStyles;
|
|
243
245
|
const generateSizeClassNames = gridSize => {
|
package/Unstable_Grid/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export { default } from './Grid';
|
|
2
|
-
export { default as createGrid } from './createGrid';
|
|
3
|
-
export * from './GridProps';
|
|
4
|
-
export { default as gridClasses } from './gridClasses';
|
|
5
|
-
export * from './gridClasses';
|
|
1
|
+
export { default } from './Grid';
|
|
2
|
+
export { default as createGrid } from './createGrid';
|
|
3
|
+
export * from './GridProps';
|
|
4
|
+
export { default as gridClasses } from './gridClasses';
|
|
5
|
+
export * from './gridClasses';
|
package/breakpoints.js
CHANGED
|
@@ -12,7 +12,6 @@ exports.mergeBreakpointsInOrder = mergeBreakpointsInOrder;
|
|
|
12
12
|
exports.removeUnusedBreakpoints = removeUnusedBreakpoints;
|
|
13
13
|
exports.resolveBreakpointValues = resolveBreakpointValues;
|
|
14
14
|
exports.values = void 0;
|
|
15
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
16
15
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
17
16
|
var _utils = require("@mui/utils");
|
|
18
17
|
var _merge = _interopRequireDefault(require("./merge"));
|
|
@@ -72,21 +71,23 @@ function breakpoints(styleFunction) {
|
|
|
72
71
|
const extended = themeBreakpoints.keys.reduce((acc, key) => {
|
|
73
72
|
if (props[key]) {
|
|
74
73
|
acc = acc || {};
|
|
75
|
-
acc[themeBreakpoints.up(key)] = styleFunction(
|
|
76
|
-
theme
|
|
77
|
-
|
|
74
|
+
acc[themeBreakpoints.up(key)] = styleFunction({
|
|
75
|
+
theme,
|
|
76
|
+
...props[key]
|
|
77
|
+
});
|
|
78
78
|
}
|
|
79
79
|
return acc;
|
|
80
80
|
}, null);
|
|
81
81
|
return (0, _merge.default)(base, extended);
|
|
82
82
|
};
|
|
83
|
-
newStyleFunction.propTypes = process.env.NODE_ENV !== 'production' ?
|
|
83
|
+
newStyleFunction.propTypes = process.env.NODE_ENV !== 'production' ? {
|
|
84
|
+
...styleFunction.propTypes,
|
|
84
85
|
xs: _propTypes.default.object,
|
|
85
86
|
sm: _propTypes.default.object,
|
|
86
87
|
md: _propTypes.default.object,
|
|
87
88
|
lg: _propTypes.default.object,
|
|
88
89
|
xl: _propTypes.default.object
|
|
89
|
-
}
|
|
90
|
+
} : {};
|
|
90
91
|
newStyleFunction.filterProps = ['xs', 'sm', 'md', 'lg', 'xl', ...styleFunction.filterProps];
|
|
91
92
|
return newStyleFunction;
|
|
92
93
|
}
|
package/colorManipulator.js
CHANGED
|
@@ -21,6 +21,8 @@ exports.private_safeLighten = private_safeLighten;
|
|
|
21
21
|
exports.recomposeColor = recomposeColor;
|
|
22
22
|
exports.rgbToHex = rgbToHex;
|
|
23
23
|
var _utils = require("@mui/utils");
|
|
24
|
+
/* eslint-disable @typescript-eslint/naming-convention */
|
|
25
|
+
|
|
24
26
|
/**
|
|
25
27
|
* Returns a number whose value is limited to the given range.
|
|
26
28
|
* @param {number} value The value to be clamped
|
package/createBox.js
CHANGED
|
@@ -5,15 +5,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.default = createBox;
|
|
8
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
9
|
-
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
|
|
10
8
|
var React = _interopRequireWildcard(require("react"));
|
|
11
9
|
var _clsx = _interopRequireDefault(require("clsx"));
|
|
12
10
|
var _styledEngine = _interopRequireDefault(require("@mui/styled-engine"));
|
|
13
11
|
var _styleFunctionSx = _interopRequireWildcard(require("./styleFunctionSx"));
|
|
14
12
|
var _useTheme = _interopRequireDefault(require("./useTheme"));
|
|
15
13
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
16
|
-
const _excluded = ["className", "component"];
|
|
17
14
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
18
15
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
19
16
|
function createBox(options = {}) {
|
|
@@ -28,18 +25,18 @@ function createBox(options = {}) {
|
|
|
28
25
|
})(_styleFunctionSx.default);
|
|
29
26
|
const Box = /*#__PURE__*/React.forwardRef(function Box(inProps, ref) {
|
|
30
27
|
const theme = (0, _useTheme.default)(defaultTheme);
|
|
31
|
-
const
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
return /*#__PURE__*/(0, _jsxRuntime.jsx)(BoxRoot, (0, _extends2.default)({
|
|
28
|
+
const {
|
|
29
|
+
className,
|
|
30
|
+
component = 'div',
|
|
31
|
+
...other
|
|
32
|
+
} = (0, _styleFunctionSx.extendSxProp)(inProps);
|
|
33
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)(BoxRoot, {
|
|
38
34
|
as: component,
|
|
39
35
|
ref: ref,
|
|
40
36
|
className: (0, _clsx.default)(className, generateClassName ? generateClassName(defaultClassName) : defaultClassName),
|
|
41
|
-
theme: themeId ? theme[themeId] || theme : theme
|
|
42
|
-
|
|
37
|
+
theme: themeId ? theme[themeId] || theme : theme,
|
|
38
|
+
...other
|
|
39
|
+
});
|
|
43
40
|
});
|
|
44
41
|
return Box;
|
|
45
42
|
}
|
package/createStyled.js
CHANGED
|
@@ -7,16 +7,15 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.default = createStyled;
|
|
8
8
|
exports.shouldForwardProp = shouldForwardProp;
|
|
9
9
|
exports.systemDefaultTheme = void 0;
|
|
10
|
-
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
|
|
11
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
12
10
|
var _styledEngine = _interopRequireWildcard(require("@mui/styled-engine"));
|
|
13
11
|
var _utils = require("@mui/utils");
|
|
14
12
|
var _createTheme = _interopRequireDefault(require("./createTheme"));
|
|
15
13
|
var _propsToClassKey = _interopRequireDefault(require("./propsToClassKey"));
|
|
16
14
|
var _styleFunctionSx = _interopRequireDefault(require("./styleFunctionSx"));
|
|
17
|
-
const _excluded = ["name", "slot", "skipVariantsResolver", "skipSx", "overridesResolver"];
|
|
18
15
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
19
16
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
17
|
+
/* eslint-disable no-underscore-dangle */
|
|
18
|
+
|
|
20
19
|
function isEmpty(obj) {
|
|
21
20
|
return Object.keys(obj).length === 0;
|
|
22
21
|
}
|
|
@@ -94,25 +93,27 @@ function createStyled(input = {}) {
|
|
|
94
93
|
slotShouldForwardProp = shouldForwardProp
|
|
95
94
|
} = input;
|
|
96
95
|
const systemSx = props => {
|
|
97
|
-
return (0, _styleFunctionSx.default)(
|
|
98
|
-
|
|
96
|
+
return (0, _styleFunctionSx.default)({
|
|
97
|
+
...props,
|
|
98
|
+
theme: resolveTheme({
|
|
99
|
+
...props,
|
|
99
100
|
defaultTheme,
|
|
100
101
|
themeId
|
|
101
|
-
})
|
|
102
|
-
})
|
|
102
|
+
})
|
|
103
|
+
});
|
|
103
104
|
};
|
|
104
105
|
systemSx.__mui_systemSx = true;
|
|
105
106
|
return (tag, inputOptions = {}) => {
|
|
106
107
|
// Filter out the `sx` style function from the previous styled component to prevent unnecessary styles generated by the composite components.
|
|
107
108
|
(0, _styledEngine.internal_processStyles)(tag, styles => styles.filter(style => !(style != null && style.__mui_systemSx)));
|
|
108
109
|
const {
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
110
|
+
name: componentName,
|
|
111
|
+
slot: componentSlot,
|
|
112
|
+
skipVariantsResolver: inputSkipVariantsResolver,
|
|
113
|
+
skipSx: inputSkipSx,
|
|
114
|
+
overridesResolver,
|
|
115
|
+
...options
|
|
116
|
+
} = inputOptions;
|
|
116
117
|
|
|
117
118
|
// if skipVariantsResolver option is defined, take the value, otherwise, true for root and false for other slots.
|
|
118
119
|
const skipVariantsResolver = inputSkipVariantsResolver !== undefined ? inputSkipVariantsResolver : componentSlot && componentSlot !== 'Root' || false;
|
|
@@ -133,38 +134,43 @@ function createStyled(input = {}) {
|
|
|
133
134
|
// for string (html) tag, preserve the behavior in emotion & styled-components.
|
|
134
135
|
shouldForwardPropOption = undefined;
|
|
135
136
|
}
|
|
136
|
-
const defaultStyledResolver = (0, _styledEngine.default)(tag,
|
|
137
|
+
const defaultStyledResolver = (0, _styledEngine.default)(tag, {
|
|
137
138
|
shouldForwardProp: shouldForwardPropOption,
|
|
138
|
-
label
|
|
139
|
-
|
|
139
|
+
label,
|
|
140
|
+
...options
|
|
141
|
+
});
|
|
140
142
|
const muiStyledResolver = (styleArg, ...expressions) => {
|
|
141
143
|
const expressionsWithDefaultTheme = expressions ? expressions.map(stylesArg => {
|
|
142
144
|
// On the server Emotion doesn't use React.forwardRef for creating components, so the created
|
|
143
145
|
// component stays as a function. This condition makes sure that we do not interpolate functions
|
|
144
146
|
// which are basically components used as a selectors.
|
|
145
147
|
return typeof stylesArg === 'function' && stylesArg.__emotion_real !== stylesArg ? props => {
|
|
146
|
-
return stylesArg(
|
|
147
|
-
|
|
148
|
+
return stylesArg({
|
|
149
|
+
...props,
|
|
150
|
+
theme: resolveTheme({
|
|
151
|
+
...props,
|
|
148
152
|
defaultTheme,
|
|
149
153
|
themeId
|
|
150
|
-
})
|
|
151
|
-
})
|
|
154
|
+
})
|
|
155
|
+
});
|
|
152
156
|
} : stylesArg;
|
|
153
157
|
}) : [];
|
|
154
158
|
let transformedStyleArg = styleArg;
|
|
155
159
|
if (componentName && overridesResolver) {
|
|
156
160
|
expressionsWithDefaultTheme.push(props => {
|
|
157
|
-
const theme = resolveTheme(
|
|
161
|
+
const theme = resolveTheme({
|
|
162
|
+
...props,
|
|
158
163
|
defaultTheme,
|
|
159
164
|
themeId
|
|
160
|
-
})
|
|
165
|
+
});
|
|
161
166
|
const styleOverrides = getStyleOverrides(componentName, theme);
|
|
162
167
|
if (styleOverrides) {
|
|
163
168
|
const resolvedStyleOverrides = {};
|
|
164
169
|
Object.entries(styleOverrides).forEach(([slotKey, slotStyle]) => {
|
|
165
|
-
resolvedStyleOverrides[slotKey] = typeof slotStyle === 'function' ? slotStyle(
|
|
170
|
+
resolvedStyleOverrides[slotKey] = typeof slotStyle === 'function' ? slotStyle({
|
|
171
|
+
...props,
|
|
166
172
|
theme
|
|
167
|
-
})
|
|
173
|
+
}) : slotStyle;
|
|
168
174
|
});
|
|
169
175
|
return overridesResolver(props, resolvedStyleOverrides);
|
|
170
176
|
}
|
|
@@ -173,10 +179,11 @@ function createStyled(input = {}) {
|
|
|
173
179
|
}
|
|
174
180
|
if (componentName && !skipVariantsResolver) {
|
|
175
181
|
expressionsWithDefaultTheme.push(props => {
|
|
176
|
-
const theme = resolveTheme(
|
|
182
|
+
const theme = resolveTheme({
|
|
183
|
+
...props,
|
|
177
184
|
defaultTheme,
|
|
178
185
|
themeId
|
|
179
|
-
})
|
|
186
|
+
});
|
|
180
187
|
return variantsResolver(props, getVariantStyles(componentName, theme), theme, componentName);
|
|
181
188
|
});
|
|
182
189
|
}
|
|
@@ -195,12 +202,14 @@ function createStyled(input = {}) {
|
|
|
195
202
|
// which are basically components used as a selectors.
|
|
196
203
|
styleArg.__emotion_real !== styleArg) {
|
|
197
204
|
// If the type is function, we need to define the default theme.
|
|
198
|
-
transformedStyleArg = props => styleArg(
|
|
199
|
-
|
|
205
|
+
transformedStyleArg = props => styleArg({
|
|
206
|
+
...props,
|
|
207
|
+
theme: resolveTheme({
|
|
208
|
+
...props,
|
|
200
209
|
defaultTheme,
|
|
201
210
|
themeId
|
|
202
|
-
})
|
|
203
|
-
})
|
|
211
|
+
})
|
|
212
|
+
});
|
|
204
213
|
}
|
|
205
214
|
const Component = defaultStyledResolver(transformedStyleArg, ...expressionsWithDefaultTheme);
|
|
206
215
|
if (process.env.NODE_ENV !== 'production') {
|
|
@@ -1,14 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
3
|
Object.defineProperty(exports, "__esModule", {
|
|
5
4
|
value: true
|
|
6
5
|
});
|
|
7
6
|
exports.breakpointKeys = void 0;
|
|
8
7
|
exports.default = createBreakpoints;
|
|
9
|
-
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
|
|
10
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
11
|
-
const _excluded = ["values", "unit", "step"];
|
|
12
8
|
// Sorted ASC by size. That's important.
|
|
13
9
|
// It can't be configured as it's used statically for propTypes.
|
|
14
10
|
const breakpointKeys = ['xs', 'sm', 'md', 'lg', 'xl'];
|
|
@@ -21,33 +17,34 @@ const sortBreakpointsValues = values => {
|
|
|
21
17
|
// Sort in ascending order
|
|
22
18
|
breakpointsAsArray.sort((breakpoint1, breakpoint2) => breakpoint1.val - breakpoint2.val);
|
|
23
19
|
return breakpointsAsArray.reduce((acc, obj) => {
|
|
24
|
-
return
|
|
20
|
+
return {
|
|
21
|
+
...acc,
|
|
25
22
|
[obj.key]: obj.val
|
|
26
|
-
}
|
|
23
|
+
};
|
|
27
24
|
}, {});
|
|
28
25
|
};
|
|
29
26
|
|
|
30
27
|
// Keep in mind that @media is inclusive by the CSS specification.
|
|
31
28
|
function createBreakpoints(breakpoints) {
|
|
32
29
|
const {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
30
|
+
// The breakpoint **start** at this value.
|
|
31
|
+
// For instance with the first breakpoint xs: [xs, sm).
|
|
32
|
+
values = {
|
|
33
|
+
xs: 0,
|
|
34
|
+
// phone
|
|
35
|
+
sm: 600,
|
|
36
|
+
// tablet
|
|
37
|
+
md: 900,
|
|
38
|
+
// small laptop
|
|
39
|
+
lg: 1200,
|
|
40
|
+
// desktop
|
|
41
|
+
xl: 1536 // large screen
|
|
42
|
+
},
|
|
46
43
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
44
|
+
unit = 'px',
|
|
45
|
+
step = 5,
|
|
46
|
+
...other
|
|
47
|
+
} = breakpoints;
|
|
51
48
|
const sortedValues = sortBreakpointsValues(values);
|
|
52
49
|
const keys = Object.keys(sortedValues);
|
|
53
50
|
function up(key) {
|
|
@@ -79,7 +76,7 @@ function createBreakpoints(breakpoints) {
|
|
|
79
76
|
}
|
|
80
77
|
return between(key, keys[keys.indexOf(key) + 1]).replace('@media', '@media not all and');
|
|
81
78
|
}
|
|
82
|
-
return
|
|
79
|
+
return {
|
|
83
80
|
keys,
|
|
84
81
|
values: sortedValues,
|
|
85
82
|
up,
|
|
@@ -87,6 +84,7 @@ function createBreakpoints(breakpoints) {
|
|
|
87
84
|
between,
|
|
88
85
|
only,
|
|
89
86
|
not,
|
|
90
|
-
unit
|
|
91
|
-
|
|
87
|
+
unit,
|
|
88
|
+
...other
|
|
89
|
+
};
|
|
92
90
|
}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
export type SpacingOptions = number | Spacing | ((abs: number) => number | string) | ((abs: number | string) => number | string) | ReadonlyArray<string | number>;
|
|
2
|
-
export type SpacingArgument = number | string;
|
|
3
|
-
export interface Spacing {
|
|
4
|
-
(): string;
|
|
5
|
-
(value: number): string;
|
|
6
|
-
(topBottom: SpacingArgument, rightLeft: SpacingArgument): string;
|
|
7
|
-
(top: SpacingArgument, rightLeft: SpacingArgument, bottom: SpacingArgument): string;
|
|
8
|
-
(top: SpacingArgument, right: SpacingArgument, bottom: SpacingArgument, left: SpacingArgument): string;
|
|
9
|
-
}
|
|
10
|
-
export default function createSpacing(spacingInput?: SpacingOptions): Spacing;
|
|
1
|
+
export type SpacingOptions = number | Spacing | ((abs: number) => number | string) | ((abs: number | string) => number | string) | ReadonlyArray<string | number>;
|
|
2
|
+
export type SpacingArgument = number | string;
|
|
3
|
+
export interface Spacing {
|
|
4
|
+
(): string;
|
|
5
|
+
(value: number): string;
|
|
6
|
+
(topBottom: SpacingArgument, rightLeft: SpacingArgument): string;
|
|
7
|
+
(top: SpacingArgument, rightLeft: SpacingArgument, bottom: SpacingArgument): string;
|
|
8
|
+
(top: SpacingArgument, right: SpacingArgument, bottom: SpacingArgument, left: SpacingArgument): string;
|
|
9
|
+
}
|
|
10
|
+
export default function createSpacing(spacingInput?: SpacingOptions): Spacing;
|
|
@@ -5,8 +5,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.default = createSpacing;
|
|
7
7
|
var _spacing = require("../spacing");
|
|
8
|
+
// The different signatures imply different meaning for their arguments that can't be expressed structurally.
|
|
9
|
+
// We express the difference with variable names.
|
|
10
|
+
/* tslint:disable:unified-signatures */
|
|
8
11
|
/* tslint:enable:unified-signatures */
|
|
9
|
-
|
|
10
12
|
function createSpacing(spacingInput = 8) {
|
|
11
13
|
// Already transformed.
|
|
12
14
|
if (spacingInput.mui) {
|
|
@@ -5,23 +5,20 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.default = void 0;
|
|
8
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
9
|
-
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
|
|
10
8
|
var _utils = require("@mui/utils");
|
|
11
9
|
var _createBreakpoints = _interopRequireDefault(require("./createBreakpoints"));
|
|
12
10
|
var _shape = _interopRequireDefault(require("./shape"));
|
|
13
11
|
var _createSpacing = _interopRequireDefault(require("./createSpacing"));
|
|
14
12
|
var _styleFunctionSx = _interopRequireDefault(require("../styleFunctionSx/styleFunctionSx"));
|
|
15
13
|
var _defaultSxConfig = _interopRequireDefault(require("../styleFunctionSx/defaultSxConfig"));
|
|
16
|
-
const _excluded = ["breakpoints", "palette", "spacing", "shape"];
|
|
17
14
|
function createTheme(options = {}, ...args) {
|
|
18
15
|
const {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
16
|
+
breakpoints: breakpointsInput = {},
|
|
17
|
+
palette: paletteInput = {},
|
|
18
|
+
spacing: spacingInput,
|
|
19
|
+
shape: shapeInput = {},
|
|
20
|
+
...other
|
|
21
|
+
} = options;
|
|
25
22
|
const breakpoints = (0, _createBreakpoints.default)(breakpointsInput);
|
|
26
23
|
const spacing = (0, _createSpacing.default)(spacingInput);
|
|
27
24
|
let muiTheme = (0, _utils.deepmerge)({
|
|
@@ -29,14 +26,21 @@ function createTheme(options = {}, ...args) {
|
|
|
29
26
|
direction: 'ltr',
|
|
30
27
|
components: {},
|
|
31
28
|
// Inject component definitions.
|
|
32
|
-
palette:
|
|
33
|
-
mode: 'light'
|
|
34
|
-
|
|
29
|
+
palette: {
|
|
30
|
+
mode: 'light',
|
|
31
|
+
...paletteInput
|
|
32
|
+
},
|
|
35
33
|
spacing,
|
|
36
|
-
shape:
|
|
34
|
+
shape: {
|
|
35
|
+
..._shape.default,
|
|
36
|
+
...shapeInput
|
|
37
|
+
}
|
|
37
38
|
}, other);
|
|
38
39
|
muiTheme = args.reduce((acc, argument) => (0, _utils.deepmerge)(acc, argument), muiTheme);
|
|
39
|
-
muiTheme.unstable_sxConfig =
|
|
40
|
+
muiTheme.unstable_sxConfig = {
|
|
41
|
+
..._defaultSxConfig.default,
|
|
42
|
+
...(other == null ? void 0 : other.unstable_sxConfig)
|
|
43
|
+
};
|
|
40
44
|
muiTheme.unstable_sx = function sx(props) {
|
|
41
45
|
return (0, _styleFunctionSx.default)({
|
|
42
46
|
sx: props,
|
|
@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.DISABLE_CSS_TRANSITION = void 0;
|
|
8
8
|
exports.default = createCssVarsProvider;
|
|
9
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
10
|
-
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
|
|
11
9
|
var _utils = require("@mui/utils");
|
|
12
10
|
var React = _interopRequireWildcard(require("react"));
|
|
13
11
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
@@ -17,7 +15,6 @@ var _ThemeProvider = _interopRequireDefault(require("../ThemeProvider"));
|
|
|
17
15
|
var _getInitColorSchemeScript = _interopRequireWildcard(require("./getInitColorSchemeScript"));
|
|
18
16
|
var _useCurrentColorScheme = _interopRequireDefault(require("./useCurrentColorScheme"));
|
|
19
17
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
20
|
-
const _excluded = ["colorSchemes", "components", "generateCssVars", "cssVarPrefix"];
|
|
21
18
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
22
19
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
23
20
|
const DISABLE_CSS_TRANSITION = '*{-webkit-transition:none!important;-moz-transition:none!important;-o-transition:none!important;-ms-transition:none!important;transition:none!important}';
|
|
@@ -67,17 +64,16 @@ function createCssVarsProvider(options) {
|
|
|
67
64
|
const ctx = React.useContext(ColorSchemeContext);
|
|
68
65
|
const nested = !!ctx && !disableNestedContext;
|
|
69
66
|
const scopedTheme = themeProp[themeId];
|
|
70
|
-
const
|
|
71
|
-
{
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
restThemeProp = (0, _objectWithoutPropertiesLoose2.default)(_ref, _excluded);
|
|
67
|
+
const {
|
|
68
|
+
colorSchemes = {},
|
|
69
|
+
components = {},
|
|
70
|
+
generateCssVars = () => ({
|
|
71
|
+
vars: {},
|
|
72
|
+
css: {}
|
|
73
|
+
}),
|
|
74
|
+
cssVarPrefix,
|
|
75
|
+
...restThemeProp
|
|
76
|
+
} = scopedTheme || themeProp;
|
|
81
77
|
const allColorSchemes = Object.keys(colorSchemes);
|
|
82
78
|
const defaultLightColorScheme = typeof defaultColorScheme === 'string' ? defaultColorScheme : defaultColorScheme.light;
|
|
83
79
|
const defaultDarkColorScheme = typeof defaultColorScheme === 'string' ? defaultColorScheme : defaultColorScheme.dark;
|
|
@@ -135,13 +131,14 @@ function createCssVarsProvider(options) {
|
|
|
135
131
|
} = generateCssVars();
|
|
136
132
|
|
|
137
133
|
// 3. Start composing the theme object
|
|
138
|
-
const theme =
|
|
134
|
+
const theme = {
|
|
135
|
+
...restThemeProp,
|
|
139
136
|
components,
|
|
140
137
|
colorSchemes,
|
|
141
138
|
cssVarPrefix,
|
|
142
139
|
vars: rootVars,
|
|
143
140
|
getColorSchemeSelector: targetColorScheme => `[${attribute}="${targetColorScheme}"] &`
|
|
144
|
-
}
|
|
141
|
+
};
|
|
145
142
|
|
|
146
143
|
// 4. Create color CSS variables and store them in objects (to be generated in stylesheets in the final step)
|
|
147
144
|
// The default color scheme stylesheet is constructed to have the least CSS specificity.
|
|
@@ -159,7 +156,10 @@ function createCssVarsProvider(options) {
|
|
|
159
156
|
Object.keys(scheme).forEach(schemeKey => {
|
|
160
157
|
if (scheme[schemeKey] && typeof scheme[schemeKey] === 'object') {
|
|
161
158
|
// shallow merge the 1st level structure of the theme.
|
|
162
|
-
theme[schemeKey] =
|
|
159
|
+
theme[schemeKey] = {
|
|
160
|
+
...theme[schemeKey],
|
|
161
|
+
...scheme[schemeKey]
|
|
162
|
+
};
|
|
163
163
|
} else {
|
|
164
164
|
theme[schemeKey] = scheme[schemeKey];
|
|
165
165
|
}
|
|
@@ -329,14 +329,15 @@ function createCssVarsProvider(options) {
|
|
|
329
329
|
} : void 0;
|
|
330
330
|
const defaultLightColorScheme = typeof designSystemColorScheme === 'string' ? designSystemColorScheme : designSystemColorScheme.light;
|
|
331
331
|
const defaultDarkColorScheme = typeof designSystemColorScheme === 'string' ? designSystemColorScheme : designSystemColorScheme.dark;
|
|
332
|
-
const getInitColorSchemeScript = params => (0, _getInitColorSchemeScript.default)(
|
|
332
|
+
const getInitColorSchemeScript = params => (0, _getInitColorSchemeScript.default)({
|
|
333
333
|
attribute: defaultAttribute,
|
|
334
334
|
colorSchemeStorageKey: defaultColorSchemeStorageKey,
|
|
335
335
|
defaultMode: designSystemMode,
|
|
336
336
|
defaultLightColorScheme,
|
|
337
337
|
defaultDarkColorScheme,
|
|
338
|
-
modeStorageKey: defaultModeStorageKey
|
|
339
|
-
|
|
338
|
+
modeStorageKey: defaultModeStorageKey,
|
|
339
|
+
...params
|
|
340
|
+
});
|
|
340
341
|
return {
|
|
341
342
|
CssVarsProvider,
|
|
342
343
|
useColorScheme,
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { DefaultCssVarsTheme } from './prepareCssVars';
|
|
2
|
-
interface Theme extends DefaultCssVarsTheme {
|
|
3
|
-
cssVarPrefix?: string;
|
|
4
|
-
shouldSkipGeneratingVar?: (objectPathKeys: Array<string>, value: string | number) => boolean;
|
|
5
|
-
}
|
|
6
|
-
declare function createCssVarsTheme<T extends Theme, ThemeVars extends Record<string, any>>(theme: T): T & {
|
|
7
|
-
vars: ThemeVars;
|
|
8
|
-
generateCssVars: (colorScheme?: string | undefined) => {
|
|
9
|
-
css: {
|
|
10
|
-
[x: string]: string | number;
|
|
11
|
-
};
|
|
12
|
-
vars: ThemeVars;
|
|
13
|
-
};
|
|
14
|
-
};
|
|
15
|
-
export default createCssVarsTheme;
|
|
1
|
+
import { DefaultCssVarsTheme } from './prepareCssVars';
|
|
2
|
+
interface Theme extends DefaultCssVarsTheme {
|
|
3
|
+
cssVarPrefix?: string;
|
|
4
|
+
shouldSkipGeneratingVar?: (objectPathKeys: Array<string>, value: string | number) => boolean;
|
|
5
|
+
}
|
|
6
|
+
declare function createCssVarsTheme<T extends Theme, ThemeVars extends Record<string, any>>(theme: T): T & {
|
|
7
|
+
vars: ThemeVars;
|
|
8
|
+
generateCssVars: (colorScheme?: string | undefined) => {
|
|
9
|
+
css: {
|
|
10
|
+
[x: string]: string | number;
|
|
11
|
+
};
|
|
12
|
+
vars: ThemeVars;
|
|
13
|
+
};
|
|
14
|
+
};
|
|
15
|
+
export default createCssVarsTheme;
|
|
@@ -5,20 +5,20 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.default = void 0;
|
|
8
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
9
|
-
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
|
|
10
8
|
var _prepareCssVars = _interopRequireDefault(require("./prepareCssVars"));
|
|
11
|
-
const _excluded = ["cssVarPrefix", "shouldSkipGeneratingVar"];
|
|
12
9
|
function createCssVarsTheme(theme) {
|
|
13
10
|
const {
|
|
14
|
-
|
|
11
|
+
cssVarPrefix,
|
|
12
|
+
shouldSkipGeneratingVar,
|
|
13
|
+
...otherTheme
|
|
14
|
+
} = theme;
|
|
15
|
+
return {
|
|
16
|
+
...theme,
|
|
17
|
+
...(0, _prepareCssVars.default)(otherTheme, {
|
|
18
|
+
prefix: cssVarPrefix,
|
|
15
19
|
shouldSkipGeneratingVar
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
return (0, _extends2.default)({}, theme, (0, _prepareCssVars.default)(otherTheme, {
|
|
19
|
-
prefix: cssVarPrefix,
|
|
20
|
-
shouldSkipGeneratingVar
|
|
21
|
-
}));
|
|
20
|
+
})
|
|
21
|
+
};
|
|
22
22
|
}
|
|
23
23
|
var _default = createCssVarsTheme;
|
|
24
24
|
exports.default = _default;
|