@mui/system 6.0.0-alpha.1 → 6.0.0-alpha.10
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 +462 -4
- package/Container/Container.d.ts +1 -1
- package/Container/createContainer.js +39 -35
- package/RtlProvider/index.js +8 -11
- package/Stack/Stack.d.ts +1 -1
- package/Stack/createStack.d.ts +1 -1
- package/Stack/createStack.js +24 -26
- package/ThemeProvider/ThemeProvider.js +9 -5
- package/Unstable_Grid/Grid.d.ts +1 -1
- package/Unstable_Grid/createGrid.d.ts +1 -1
- package/Unstable_Grid/createGrid.js +21 -23
- package/Unstable_Grid/gridGenerator.js +20 -17
- package/breakpoints/breakpoints.js +26 -7
- package/createBox/createBox.js +9 -12
- package/createStyled/createStyled.js +56 -51
- package/createTheme/applyStyles.d.ts +1 -1
- package/createTheme/applyStyles.js +1 -1
- package/createTheme/createBreakpoints.js +24 -25
- package/createTheme/createTheme.d.ts +2 -1
- package/createTheme/createTheme.js +20 -14
- package/cssContainerQueries/cssContainerQueries.d.ts +24 -0
- package/cssContainerQueries/cssContainerQueries.js +70 -0
- package/cssContainerQueries/index.d.ts +3 -0
- package/cssContainerQueries/index.js +2 -0
- package/cssContainerQueries/package.json +6 -0
- package/cssVars/createCssVarsProvider.d.ts +1 -1
- package/cssVars/createCssVarsProvider.js +17 -16
- package/cssVars/createCssVarsTheme.js +3 -3
- package/cssVars/cssVarsParser.d.ts +1 -1
- package/cssVars/index.d.ts +2 -0
- package/cssVars/index.js +1 -0
- package/cssVars/prepareCssVars.js +30 -25
- package/cssVars/prepareTypographyVars.d.ts +8 -0
- package/cssVars/prepareTypographyVars.js +11 -0
- package/cssVars/useCurrentColorScheme.js +18 -11
- package/index.d.ts +2 -0
- package/index.js +2 -1
- package/modern/Container/createContainer.js +39 -35
- package/modern/RtlProvider/index.js +8 -11
- 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/breakpoints.js +26 -7
- package/modern/createBox/createBox.js +9 -12
- package/modern/createStyled/createStyled.js +56 -51
- package/modern/createTheme/applyStyles.js +1 -1
- package/modern/createTheme/createBreakpoints.js +24 -25
- package/modern/createTheme/createTheme.js +20 -14
- package/modern/cssContainerQueries/cssContainerQueries.js +70 -0
- package/modern/cssContainerQueries/index.js +2 -0
- package/modern/cssVars/createCssVarsProvider.js +17 -16
- package/modern/cssVars/createCssVarsTheme.js +3 -3
- package/modern/cssVars/index.js +1 -0
- package/modern/cssVars/prepareCssVars.js +30 -25
- package/modern/cssVars/prepareTypographyVars.js +11 -0
- package/modern/cssVars/useCurrentColorScheme.js +18 -11
- package/modern/index.js +2 -1
- package/modern/propsToClassKey/propsToClassKey.js +3 -5
- package/modern/styleFunctionSx/defaultSxConfig.js +3 -0
- package/modern/styleFunctionSx/extendSxProp.js +14 -10
- package/modern/styleFunctionSx/styleFunctionSx.js +2 -1
- package/node/Container/createContainer.js +39 -35
- package/node/RtlProvider/index.js +8 -11
- package/node/Stack/createStack.js +24 -26
- package/node/ThemeProvider/ThemeProvider.js +9 -5
- package/node/Unstable_Grid/createGrid.js +23 -25
- package/node/Unstable_Grid/gridGenerator.js +20 -18
- package/node/breakpoints/breakpoints.js +26 -7
- package/node/createBox/createBox.js +9 -12
- package/node/createStyled/createStyled.js +58 -52
- package/node/createTheme/applyStyles.js +1 -1
- package/node/createTheme/createBreakpoints.js +24 -26
- package/node/createTheme/createTheme.js +20 -14
- package/node/cssContainerQueries/cssContainerQueries.js +81 -0
- package/node/cssContainerQueries/index.js +32 -0
- package/node/cssVars/createCssVarsProvider.js +17 -16
- package/node/cssVars/createCssVarsTheme.js +3 -3
- package/node/cssVars/index.js +7 -0
- package/node/cssVars/prepareCssVars.js +30 -25
- package/node/cssVars/prepareTypographyVars.js +17 -0
- package/node/cssVars/useCurrentColorScheme.js +18 -12
- package/node/index.js +9 -1
- package/node/propsToClassKey/propsToClassKey.js +3 -5
- package/node/styleFunctionSx/defaultSxConfig.js +3 -0
- package/node/styleFunctionSx/extendSxProp.js +14 -10
- package/node/styleFunctionSx/styleFunctionSx.js +2 -1
- package/package.json +7 -7
- package/propsToClassKey/propsToClassKey.js +3 -5
- package/styleFunctionSx/defaultSxConfig.js +3 -0
- package/styleFunctionSx/extendSxProp.js +14 -10
- package/styleFunctionSx/styleFunctionSx.js +2 -1
- package/legacy/Box/Box.js +0 -30
- package/legacy/Box/boxClasses.js +0 -3
- package/legacy/Box/index.js +0 -5
- package/legacy/Container/Container.js +0 -61
- package/legacy/Container/ContainerProps.js +0 -1
- package/legacy/Container/containerClasses.js +0 -7
- package/legacy/Container/createContainer.js +0 -140
- package/legacy/Container/index.js +0 -5
- package/legacy/GlobalStyles/GlobalStyles.js +0 -37
- package/legacy/GlobalStyles/index.js +0 -4
- package/legacy/RtlProvider/index.js +0 -22
- package/legacy/Stack/Stack.js +0 -62
- package/legacy/Stack/StackProps.js +0 -1
- package/legacy/Stack/createStack.js +0 -180
- package/legacy/Stack/index.js +0 -7
- package/legacy/Stack/stackClasses.js +0 -7
- package/legacy/ThemeProvider/ThemeProvider.js +0 -87
- package/legacy/ThemeProvider/index.js +0 -3
- package/legacy/Unstable_Grid/Grid.js +0 -177
- package/legacy/Unstable_Grid/GridProps.js +0 -1
- package/legacy/Unstable_Grid/createGrid.js +0 -184
- package/legacy/Unstable_Grid/gridClasses.js +0 -28
- package/legacy/Unstable_Grid/gridGenerator.js +0 -216
- package/legacy/Unstable_Grid/index.js +0 -8
- package/legacy/Unstable_Grid/traverseBreakpoints.js +0 -48
- package/legacy/borders/borders.js +0 -51
- package/legacy/borders/index.js +0 -4
- package/legacy/breakpoints/breakpoints.js +0 -162
- package/legacy/breakpoints/index.js +0 -4
- package/legacy/colorManipulator/colorManipulator.js +0 -356
- package/legacy/colorManipulator/index.js +0 -3
- package/legacy/compose/compose.js +0 -32
- package/legacy/compose/index.js +0 -3
- package/legacy/createBox/createBox.js +0 -38
- package/legacy/createBox/index.js +0 -3
- package/legacy/createStyled/createStyled.js +0 -250
- package/legacy/createStyled/index.js +0 -4
- package/legacy/createTheme/applyStyles.js +0 -73
- package/legacy/createTheme/createBreakpoints.js +0 -83
- package/legacy/createTheme/createSpacing.js +0 -32
- package/legacy/createTheme/createTheme.js +0 -49
- package/legacy/createTheme/index.js +0 -3
- package/legacy/createTheme/shape.js +0 -4
- package/legacy/cssGrid/cssGrid.js +0 -91
- package/legacy/cssGrid/index.js +0 -4
- package/legacy/cssVars/createCssVarsProvider.js +0 -338
- package/legacy/cssVars/createCssVarsTheme.js +0 -13
- package/legacy/cssVars/createGetCssVar.js +0 -30
- package/legacy/cssVars/cssVarsParser.js +0 -141
- package/legacy/cssVars/getInitColorSchemeScript.js +0 -28
- package/legacy/cssVars/index.js +0 -6
- package/legacy/cssVars/prepareCssVars.js +0 -92
- package/legacy/cssVars/useCurrentColorScheme.js +0 -237
- package/legacy/display/display.js +0 -29
- package/legacy/display/index.js +0 -4
- package/legacy/flexbox/flexbox.js +0 -43
- package/legacy/flexbox/index.js +0 -4
- package/legacy/getThemeValue/getThemeValue.js +0 -47
- package/legacy/getThemeValue/index.js +0 -4
- package/legacy/index.js +0 -72
- package/legacy/memoize/index.js +0 -3
- package/legacy/memoize/memoize.js +0 -9
- package/legacy/merge/index.js +0 -3
- package/legacy/merge/merge.js +0 -10
- package/legacy/palette/index.js +0 -4
- package/legacy/palette/palette.js +0 -26
- package/legacy/positions/index.js +0 -4
- package/legacy/positions/positions.js +0 -22
- package/legacy/propsToClassKey/index.js +0 -3
- package/legacy/propsToClassKey/propsToClassKey.js +0 -24
- package/legacy/responsivePropType/index.js +0 -3
- package/legacy/responsivePropType/responsivePropType.js +0 -3
- package/legacy/shadows/index.js +0 -3
- package/legacy/shadows/shadows.js +0 -6
- package/legacy/sizing/index.js +0 -4
- package/legacy/sizing/sizing.js +0 -65
- package/legacy/spacing/index.js +0 -4
- package/legacy/spacing/spacing.js +0 -161
- package/legacy/style/index.js +0 -4
- package/legacy/style/style.js +0 -73
- package/legacy/styleFunctionSx/defaultSxConfig.js +0 -293
- package/legacy/styleFunctionSx/extendSxProp.js +0 -45
- package/legacy/styleFunctionSx/index.js +0 -4
- package/legacy/styleFunctionSx/styleFunctionSx.js +0 -126
- package/legacy/styled/index.js +0 -3
- package/legacy/styled/styled.js +0 -3
- package/legacy/typography/index.js +0 -4
- package/legacy/typography/typography.js +0 -37
- package/legacy/useMediaQuery/index.js +0 -2
- package/legacy/useMediaQuery/useMediaQuery.js +0 -145
- package/legacy/useTheme/index.js +0 -4
- package/legacy/useTheme/useTheme.js +0 -10
- package/legacy/useThemeProps/getThemeProps.js +0 -10
- package/legacy/useThemeProps/index.js +0 -4
- package/legacy/useThemeProps/useThemeProps.js +0 -20
- package/legacy/useThemeWithoutDefault/index.js +0 -3
- package/legacy/useThemeWithoutDefault/useThemeWithoutDefault.js +0 -13
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
|
|
3
|
-
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
4
3
|
import * as React from 'react';
|
|
5
4
|
import { DEFAULT_MODE_STORAGE_KEY, DEFAULT_COLOR_SCHEME_STORAGE_KEY } from './getInitColorSchemeScript';
|
|
6
5
|
export function getSystemMode(mode) {
|
|
@@ -84,10 +83,11 @@ export default function useCurrentColorScheme(options) {
|
|
|
84
83
|
} catch (e) {
|
|
85
84
|
// Unsupported
|
|
86
85
|
}
|
|
87
|
-
return
|
|
86
|
+
return {
|
|
87
|
+
...currentState,
|
|
88
88
|
mode: newMode,
|
|
89
89
|
systemMode: getSystemMode(newMode)
|
|
90
|
-
}
|
|
90
|
+
};
|
|
91
91
|
});
|
|
92
92
|
}, [modeStorageKey, defaultMode]);
|
|
93
93
|
const setColorScheme = React.useCallback(value => {
|
|
@@ -99,17 +99,20 @@ export default function useCurrentColorScheme(options) {
|
|
|
99
99
|
} catch (e) {
|
|
100
100
|
// Unsupported
|
|
101
101
|
}
|
|
102
|
-
return
|
|
102
|
+
return {
|
|
103
|
+
...currentState,
|
|
103
104
|
lightColorScheme: defaultLightColorScheme,
|
|
104
105
|
darkColorScheme: defaultDarkColorScheme
|
|
105
|
-
}
|
|
106
|
+
};
|
|
106
107
|
});
|
|
107
108
|
} else if (typeof value === 'string') {
|
|
108
109
|
if (value && !joinedColorSchemes.includes(value)) {
|
|
109
110
|
console.error(`\`${value}\` does not exist in \`theme.colorSchemes\`.`);
|
|
110
111
|
} else {
|
|
111
112
|
setState(currentState => {
|
|
112
|
-
const newState =
|
|
113
|
+
const newState = {
|
|
114
|
+
...currentState
|
|
115
|
+
};
|
|
113
116
|
processState(currentState, mode => {
|
|
114
117
|
try {
|
|
115
118
|
localStorage.setItem(`${colorSchemeStorageKey}-${mode}`, value);
|
|
@@ -128,7 +131,9 @@ export default function useCurrentColorScheme(options) {
|
|
|
128
131
|
}
|
|
129
132
|
} else {
|
|
130
133
|
setState(currentState => {
|
|
131
|
-
const newState =
|
|
134
|
+
const newState = {
|
|
135
|
+
...currentState
|
|
136
|
+
};
|
|
132
137
|
const newLightColorScheme = value.light === null ? defaultLightColorScheme : value.light;
|
|
133
138
|
const newDarkColorScheme = value.dark === null ? defaultDarkColorScheme : value.dark;
|
|
134
139
|
if (newLightColorScheme) {
|
|
@@ -168,9 +173,10 @@ export default function useCurrentColorScheme(options) {
|
|
|
168
173
|
if (currentState.systemMode === systemMode) {
|
|
169
174
|
return currentState;
|
|
170
175
|
}
|
|
171
|
-
return
|
|
176
|
+
return {
|
|
177
|
+
...currentState,
|
|
172
178
|
systemMode
|
|
173
|
-
}
|
|
179
|
+
};
|
|
174
180
|
});
|
|
175
181
|
}
|
|
176
182
|
}, [state.mode]);
|
|
@@ -222,9 +228,10 @@ export default function useCurrentColorScheme(options) {
|
|
|
222
228
|
}
|
|
223
229
|
return undefined;
|
|
224
230
|
}, [setColorScheme, setMode, modeStorageKey, colorSchemeStorageKey, joinedColorSchemes, defaultMode, storageWindow]);
|
|
225
|
-
return
|
|
231
|
+
return {
|
|
232
|
+
...state,
|
|
226
233
|
colorScheme,
|
|
227
234
|
setMode,
|
|
228
235
|
setColorScheme
|
|
229
|
-
}
|
|
236
|
+
};
|
|
230
237
|
}
|
package/modern/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @mui/system v6.0.0-alpha.
|
|
2
|
+
* @mui/system v6.0.0-alpha.10
|
|
3
3
|
*
|
|
4
4
|
* @license MIT
|
|
5
5
|
* This source code is licensed under the MIT license found in the
|
|
@@ -11,6 +11,7 @@ export { default as GlobalStyles } from './GlobalStyles';
|
|
|
11
11
|
export { default as borders } from './borders';
|
|
12
12
|
export * from './borders';
|
|
13
13
|
export { default as breakpoints } from './breakpoints';
|
|
14
|
+
export { default as cssContainerQueries } from './cssContainerQueries';
|
|
14
15
|
export { handleBreakpoints, mergeBreakpointsInOrder, resolveBreakpointValues as unstable_resolveBreakpointValues } from './breakpoints';
|
|
15
16
|
export { default as compose } from './compose';
|
|
16
17
|
export { default as display } from './display';
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
|
|
2
|
-
const _excluded = ["variant"];
|
|
3
1
|
import capitalize from '@mui/utils/capitalize';
|
|
4
2
|
function isEmpty(string) {
|
|
5
3
|
return string.length === 0;
|
|
@@ -12,9 +10,9 @@ function isEmpty(string) {
|
|
|
12
10
|
*/
|
|
13
11
|
export default function propsToClassKey(props) {
|
|
14
12
|
const {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
13
|
+
variant,
|
|
14
|
+
...other
|
|
15
|
+
} = props;
|
|
18
16
|
let classKey = variant || '';
|
|
19
17
|
Object.keys(other).sort().forEach(key => {
|
|
20
18
|
if (key === 'color') {
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
2
|
-
import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
|
|
3
|
-
const _excluded = ["sx"];
|
|
4
1
|
import { isPlainObject } from '@mui/utils/deepmerge';
|
|
5
2
|
import defaultSxConfig from './defaultSxConfig';
|
|
6
3
|
const splitProps = props => {
|
|
@@ -20,9 +17,9 @@ const splitProps = props => {
|
|
|
20
17
|
};
|
|
21
18
|
export default function extendSxProp(props) {
|
|
22
19
|
const {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
20
|
+
sx: inSx,
|
|
21
|
+
...other
|
|
22
|
+
} = props;
|
|
26
23
|
const {
|
|
27
24
|
systemProps,
|
|
28
25
|
otherProps
|
|
@@ -36,12 +33,19 @@ export default function extendSxProp(props) {
|
|
|
36
33
|
if (!isPlainObject(result)) {
|
|
37
34
|
return systemProps;
|
|
38
35
|
}
|
|
39
|
-
return
|
|
36
|
+
return {
|
|
37
|
+
...systemProps,
|
|
38
|
+
...result
|
|
39
|
+
};
|
|
40
40
|
};
|
|
41
41
|
} else {
|
|
42
|
-
finalSx =
|
|
42
|
+
finalSx = {
|
|
43
|
+
...systemProps,
|
|
44
|
+
...inSx
|
|
45
|
+
};
|
|
43
46
|
}
|
|
44
|
-
return
|
|
47
|
+
return {
|
|
48
|
+
...otherProps,
|
|
45
49
|
sx: finalSx
|
|
46
|
-
}
|
|
50
|
+
};
|
|
47
51
|
}
|
|
@@ -2,6 +2,7 @@ import capitalize from '@mui/utils/capitalize';
|
|
|
2
2
|
import merge from '../merge';
|
|
3
3
|
import { getPath, getStyleValue as getValue } from '../style';
|
|
4
4
|
import { handleBreakpoints, createEmptyBreakpointObject, removeUnusedBreakpoints } from '../breakpoints';
|
|
5
|
+
import { sortContainerQueries } from '../cssContainerQueries';
|
|
5
6
|
import defaultSxConfig from './defaultSxConfig';
|
|
6
7
|
function objectsHaveSameKeys(...objects) {
|
|
7
8
|
const allKeys = objects.reduce((keys, object) => keys.concat(Object.keys(object)), []);
|
|
@@ -115,7 +116,7 @@ export function unstable_createStyleFunctionSx() {
|
|
|
115
116
|
}
|
|
116
117
|
}
|
|
117
118
|
});
|
|
118
|
-
return removeUnusedBreakpoints(breakpointsKeys, css);
|
|
119
|
+
return sortContainerQueries(theme, removeUnusedBreakpoints(breakpointsKeys, css));
|
|
119
120
|
}
|
|
120
121
|
return Array.isArray(sx) ? sx.map(traverse) : traverse(sx);
|
|
121
122
|
}
|
|
@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.default = createContainer;
|
|
8
|
-
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
|
|
9
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
10
8
|
var React = _interopRequireWildcard(require("react"));
|
|
11
9
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
12
10
|
var _clsx = _interopRequireDefault(require("clsx"));
|
|
@@ -17,7 +15,6 @@ var _useThemeProps = _interopRequireDefault(require("../useThemeProps"));
|
|
|
17
15
|
var _styled = _interopRequireDefault(require("../styled"));
|
|
18
16
|
var _createTheme = _interopRequireDefault(require("../createTheme"));
|
|
19
17
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
20
|
-
const _excluded = ["className", "component", "disableGutters", "fixed", "maxWidth", "classes"];
|
|
21
18
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
22
19
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
23
20
|
const defaultTheme = (0, _createTheme.default)();
|
|
@@ -61,20 +58,20 @@ function createContainer(options = {}) {
|
|
|
61
58
|
const ContainerRoot = createStyledComponent(({
|
|
62
59
|
theme,
|
|
63
60
|
ownerState
|
|
64
|
-
}) => (
|
|
61
|
+
}) => ({
|
|
65
62
|
width: '100%',
|
|
66
63
|
marginLeft: 'auto',
|
|
67
64
|
boxSizing: 'border-box',
|
|
68
65
|
marginRight: 'auto',
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
}
|
|
66
|
+
...(!ownerState.disableGutters && {
|
|
67
|
+
paddingLeft: theme.spacing(2),
|
|
68
|
+
paddingRight: theme.spacing(2),
|
|
69
|
+
// @ts-ignore module augmentation fails if custom breakpoints are used
|
|
70
|
+
[theme.breakpoints.up('sm')]: {
|
|
71
|
+
paddingLeft: theme.spacing(3),
|
|
72
|
+
paddingRight: theme.spacing(3)
|
|
73
|
+
}
|
|
74
|
+
})
|
|
78
75
|
}), ({
|
|
79
76
|
theme,
|
|
80
77
|
ownerState
|
|
@@ -91,51 +88,58 @@ function createContainer(options = {}) {
|
|
|
91
88
|
}, {}), ({
|
|
92
89
|
theme,
|
|
93
90
|
ownerState
|
|
94
|
-
}) => (
|
|
91
|
+
}) => ({
|
|
95
92
|
// @ts-ignore module augmentation fails if custom breakpoints are used
|
|
96
|
-
|
|
93
|
+
...(ownerState.maxWidth === 'xs' && {
|
|
97
94
|
// @ts-ignore module augmentation fails if custom breakpoints are used
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
95
|
+
[theme.breakpoints.up('xs')]: {
|
|
96
|
+
// @ts-ignore module augmentation fails if custom breakpoints are used
|
|
97
|
+
maxWidth: Math.max(theme.breakpoints.values.xs, 444)
|
|
98
|
+
}
|
|
99
|
+
}),
|
|
100
|
+
...(ownerState.maxWidth &&
|
|
103
101
|
// @ts-ignore module augmentation fails if custom breakpoints are used
|
|
104
|
-
|
|
102
|
+
ownerState.maxWidth !== 'xs' && {
|
|
105
103
|
// @ts-ignore module augmentation fails if custom breakpoints are used
|
|
106
|
-
|
|
107
|
-
|
|
104
|
+
[theme.breakpoints.up(ownerState.maxWidth)]: {
|
|
105
|
+
// @ts-ignore module augmentation fails if custom breakpoints are used
|
|
106
|
+
maxWidth: `${theme.breakpoints.values[ownerState.maxWidth]}${theme.breakpoints.unit}`
|
|
107
|
+
}
|
|
108
|
+
})
|
|
108
109
|
}));
|
|
109
110
|
const Container = /*#__PURE__*/React.forwardRef(function Container(inProps, ref) {
|
|
110
111
|
const props = useThemeProps(inProps);
|
|
111
112
|
const {
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
other
|
|
119
|
-
|
|
113
|
+
className,
|
|
114
|
+
component = 'div',
|
|
115
|
+
disableGutters = false,
|
|
116
|
+
fixed = false,
|
|
117
|
+
maxWidth = 'lg',
|
|
118
|
+
classes: classesProp,
|
|
119
|
+
...other
|
|
120
|
+
} = props;
|
|
121
|
+
const ownerState = {
|
|
122
|
+
...props,
|
|
120
123
|
component,
|
|
121
124
|
disableGutters,
|
|
122
125
|
fixed,
|
|
123
126
|
maxWidth
|
|
124
|
-
}
|
|
127
|
+
};
|
|
125
128
|
|
|
126
129
|
// @ts-ignore module augmentation fails if custom breakpoints are used
|
|
127
130
|
const classes = useUtilityClasses(ownerState, componentName);
|
|
128
131
|
return (
|
|
129
132
|
/*#__PURE__*/
|
|
130
133
|
// @ts-ignore theme is injected by the styled util
|
|
131
|
-
(0, _jsxRuntime.jsx)(ContainerRoot,
|
|
134
|
+
(0, _jsxRuntime.jsx)(ContainerRoot, {
|
|
132
135
|
as: component
|
|
133
136
|
// @ts-ignore module augmentation fails if custom breakpoints are used
|
|
134
137
|
,
|
|
135
138
|
ownerState: ownerState,
|
|
136
139
|
className: (0, _clsx.default)(classes.root, className),
|
|
137
|
-
ref: ref
|
|
138
|
-
|
|
140
|
+
ref: ref,
|
|
141
|
+
...other
|
|
142
|
+
})
|
|
139
143
|
);
|
|
140
144
|
});
|
|
141
145
|
process.env.NODE_ENV !== "production" ? Container.propTypes /* remove-proptypes */ = {
|
|
@@ -5,23 +5,20 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.useRtl = 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 React = _interopRequireWildcard(require("react"));
|
|
11
9
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
12
10
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
13
|
-
const _excluded = ["value"];
|
|
14
11
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
15
12
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
16
13
|
const RtlContext = /*#__PURE__*/React.createContext();
|
|
17
|
-
function RtlProvider(
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}
|
|
14
|
+
function RtlProvider({
|
|
15
|
+
value,
|
|
16
|
+
...props
|
|
17
|
+
}) {
|
|
18
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)(RtlContext.Provider, {
|
|
19
|
+
value: value != null ? value : true,
|
|
20
|
+
...props
|
|
21
|
+
});
|
|
25
22
|
}
|
|
26
23
|
process.env.NODE_ENV !== "production" ? RtlProvider.propTypes = {
|
|
27
24
|
children: _propTypes.default.node,
|
|
@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.default = createStack;
|
|
8
8
|
exports.style = void 0;
|
|
9
|
-
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
|
|
10
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
11
9
|
var React = _interopRequireWildcard(require("react"));
|
|
12
10
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
13
11
|
var _clsx = _interopRequireDefault(require("clsx"));
|
|
@@ -21,7 +19,6 @@ var _createTheme = _interopRequireDefault(require("../createTheme"));
|
|
|
21
19
|
var _breakpoints = require("../breakpoints");
|
|
22
20
|
var _spacing = require("../spacing");
|
|
23
21
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
24
|
-
const _excluded = ["component", "direction", "spacing", "divider", "children", "className", "useFlexGap"];
|
|
25
22
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
26
23
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
27
24
|
const defaultTheme = (0, _createTheme.default)();
|
|
@@ -70,17 +67,18 @@ const style = ({
|
|
|
70
67
|
ownerState,
|
|
71
68
|
theme
|
|
72
69
|
}) => {
|
|
73
|
-
let styles =
|
|
70
|
+
let styles = {
|
|
74
71
|
display: 'flex',
|
|
75
|
-
flexDirection: 'column'
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
72
|
+
flexDirection: 'column',
|
|
73
|
+
...(0, _breakpoints.handleBreakpoints)({
|
|
74
|
+
theme
|
|
75
|
+
}, (0, _breakpoints.resolveBreakpointValues)({
|
|
76
|
+
values: ownerState.direction,
|
|
77
|
+
breakpoints: theme.breakpoints.values
|
|
78
|
+
}), propValue => ({
|
|
79
|
+
flexDirection: propValue
|
|
80
|
+
}))
|
|
81
|
+
};
|
|
84
82
|
if (ownerState.spacing) {
|
|
85
83
|
const transformer = (0, _spacing.createUnarySpacing)(theme);
|
|
86
84
|
const base = Object.keys(theme.breakpoints.values).reduce((acc, breakpoint) => {
|
|
@@ -149,29 +147,29 @@ function createStack(options = {}) {
|
|
|
149
147
|
const themeProps = useThemeProps(inProps);
|
|
150
148
|
const props = (0, _styleFunctionSx.extendSxProp)(themeProps); // `color` type conflicts with html color attribute.
|
|
151
149
|
const {
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
150
|
+
component = 'div',
|
|
151
|
+
direction = 'column',
|
|
152
|
+
spacing = 0,
|
|
153
|
+
divider,
|
|
154
|
+
children,
|
|
155
|
+
className,
|
|
156
|
+
useFlexGap = false,
|
|
157
|
+
...other
|
|
158
|
+
} = props;
|
|
161
159
|
const ownerState = {
|
|
162
160
|
direction,
|
|
163
161
|
spacing,
|
|
164
162
|
useFlexGap
|
|
165
163
|
};
|
|
166
164
|
const classes = useUtilityClasses();
|
|
167
|
-
return /*#__PURE__*/(0, _jsxRuntime.jsx)(StackRoot,
|
|
165
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)(StackRoot, {
|
|
168
166
|
as: component,
|
|
169
167
|
ownerState: ownerState,
|
|
170
168
|
ref: ref,
|
|
171
|
-
className: (0, _clsx.default)(classes.root, className)
|
|
172
|
-
|
|
169
|
+
className: (0, _clsx.default)(classes.root, className),
|
|
170
|
+
...other,
|
|
173
171
|
children: divider ? joinChildren(children, divider) : children
|
|
174
|
-
})
|
|
172
|
+
});
|
|
175
173
|
});
|
|
176
174
|
process.env.NODE_ENV !== "production" ? Stack.propTypes /* remove-proptypes */ = {
|
|
177
175
|
children: _propTypes.default.node,
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
8
|
exports.default = void 0;
|
|
9
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
10
9
|
var React = _interopRequireWildcard(require("react"));
|
|
11
10
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
12
11
|
var _privateTheming = require("@mui/private-theming");
|
|
@@ -23,9 +22,10 @@ function useThemeScoping(themeId, upperTheme, localTheme, isPrivate = false) {
|
|
|
23
22
|
const resolvedTheme = themeId ? upperTheme[themeId] || upperTheme : upperTheme;
|
|
24
23
|
if (typeof localTheme === 'function') {
|
|
25
24
|
const mergedTheme = localTheme(resolvedTheme);
|
|
26
|
-
const result = themeId ?
|
|
25
|
+
const result = themeId ? {
|
|
26
|
+
...upperTheme,
|
|
27
27
|
[themeId]: mergedTheme
|
|
28
|
-
}
|
|
28
|
+
} : mergedTheme;
|
|
29
29
|
// must return a function for the private theme to NOT merge with the upper theme.
|
|
30
30
|
// see the test case "use provided theme from a callback" in ThemeProvider.test.js
|
|
31
31
|
if (isPrivate) {
|
|
@@ -33,9 +33,13 @@ function useThemeScoping(themeId, upperTheme, localTheme, isPrivate = false) {
|
|
|
33
33
|
}
|
|
34
34
|
return result;
|
|
35
35
|
}
|
|
36
|
-
return themeId ?
|
|
36
|
+
return themeId ? {
|
|
37
|
+
...upperTheme,
|
|
37
38
|
[themeId]: localTheme
|
|
38
|
-
}
|
|
39
|
+
} : {
|
|
40
|
+
...upperTheme,
|
|
41
|
+
...localTheme
|
|
42
|
+
};
|
|
39
43
|
}, [themeId, upperTheme, localTheme, isPrivate]);
|
|
40
44
|
}
|
|
41
45
|
|
|
@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.default = createGrid;
|
|
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 _propTypes = _interopRequireDefault(require("prop-types"));
|
|
12
10
|
var _clsx = _interopRequireDefault(require("clsx"));
|
|
@@ -20,7 +18,6 @@ var _styleFunctionSx = require("../styleFunctionSx");
|
|
|
20
18
|
var _createTheme = _interopRequireDefault(require("../createTheme"));
|
|
21
19
|
var _gridGenerator = require("./gridGenerator");
|
|
22
20
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
23
|
-
const _excluded = ["className", "children", "columns", "container", "component", "direction", "wrap", "spacing", "rowSpacing", "columnSpacing", "disableEqualOverflow", "unstable_level"];
|
|
24
21
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
25
22
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
26
23
|
const defaultTheme = (0, _createTheme.default)();
|
|
@@ -70,20 +67,20 @@ function createGrid(options = {}) {
|
|
|
70
67
|
const props = (0, _styleFunctionSx.extendSxProp)(themeProps); // `color` type conflicts with html color attribute.
|
|
71
68
|
const overflow = React.useContext(GridOverflowContext);
|
|
72
69
|
const {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
70
|
+
className,
|
|
71
|
+
children,
|
|
72
|
+
columns: columnsProp = 12,
|
|
73
|
+
container = false,
|
|
74
|
+
component = 'div',
|
|
75
|
+
direction = 'row',
|
|
76
|
+
wrap = 'wrap',
|
|
77
|
+
spacing: spacingProp = 0,
|
|
78
|
+
rowSpacing: rowSpacingProp = spacingProp,
|
|
79
|
+
columnSpacing: columnSpacingProp = spacingProp,
|
|
80
|
+
disableEqualOverflow: themeDisableEqualOverflow,
|
|
81
|
+
unstable_level: level = 0,
|
|
82
|
+
...rest
|
|
83
|
+
} = props;
|
|
87
84
|
// Because `disableEqualOverflow` can be set from the theme's defaultProps, the **nested** grid should look at the instance props instead.
|
|
88
85
|
let disableEqualOverflow = themeDisableEqualOverflow;
|
|
89
86
|
if (level && themeDisableEqualOverflow !== undefined) {
|
|
@@ -106,7 +103,8 @@ function createGrid(options = {}) {
|
|
|
106
103
|
const spacing = (_inProps$spacing = inProps.spacing) != null ? _inProps$spacing : level ? undefined : spacingProp;
|
|
107
104
|
const rowSpacing = (_ref = (_inProps$rowSpacing = inProps.rowSpacing) != null ? _inProps$rowSpacing : inProps.spacing) != null ? _ref : level ? undefined : rowSpacingProp;
|
|
108
105
|
const columnSpacing = (_ref2 = (_inProps$columnSpacin = inProps.columnSpacing) != null ? _inProps$columnSpacin : inProps.spacing) != null ? _ref2 : level ? undefined : columnSpacingProp;
|
|
109
|
-
const ownerState =
|
|
106
|
+
const ownerState = {
|
|
107
|
+
...props,
|
|
110
108
|
level,
|
|
111
109
|
columns,
|
|
112
110
|
container,
|
|
@@ -120,24 +118,24 @@ function createGrid(options = {}) {
|
|
|
120
118
|
disableEqualOverflow: (_ref3 = (_disableEqualOverflow = disableEqualOverflow) != null ? _disableEqualOverflow : overflow) != null ? _ref3 : false,
|
|
121
119
|
// use context value if exists.
|
|
122
120
|
parentDisableEqualOverflow: overflow // for nested grid
|
|
123
|
-
}
|
|
121
|
+
};
|
|
124
122
|
const classes = useUtilityClasses(ownerState, theme);
|
|
125
|
-
let result = /*#__PURE__*/(0, _jsxRuntime.jsx)(GridRoot,
|
|
123
|
+
let result = /*#__PURE__*/(0, _jsxRuntime.jsx)(GridRoot, {
|
|
126
124
|
ref: ref,
|
|
127
125
|
as: component,
|
|
128
126
|
ownerState: ownerState,
|
|
129
|
-
className: (0, _clsx.default)(classes.root, className)
|
|
130
|
-
|
|
127
|
+
className: (0, _clsx.default)(classes.root, className),
|
|
128
|
+
...other,
|
|
131
129
|
children: React.Children.map(children, child => {
|
|
132
130
|
if ( /*#__PURE__*/React.isValidElement(child) && (0, _isMuiElement.default)(child, ['Grid'])) {
|
|
133
|
-
var
|
|
131
|
+
var _unstable_level;
|
|
134
132
|
return /*#__PURE__*/React.cloneElement(child, {
|
|
135
|
-
unstable_level: (
|
|
133
|
+
unstable_level: (_unstable_level = child.props.unstable_level) != null ? _unstable_level : level + 1
|
|
136
134
|
});
|
|
137
135
|
}
|
|
138
136
|
return child;
|
|
139
137
|
})
|
|
140
|
-
})
|
|
138
|
+
});
|
|
141
139
|
if (disableEqualOverflow !== undefined && disableEqualOverflow !== (overflow != null ? overflow : false)) {
|
|
142
140
|
// There are 2 possibilities that should wrap with the GridOverflowContext to communicate with the nested grids:
|
|
143
141
|
// 1. It is the root grid with `disableEqualOverflow`.
|
|
@@ -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.generateSpacingClassNames = exports.generateSizeClassNames = exports.generateGridStyles = exports.generateGridSizeStyles = exports.generateGridRowSpacingStyles = exports.generateGridOffsetStyles = exports.generateGridDirectionStyles = exports.generateGridColumnsStyles = exports.generateGridColumnSpacingStyles = exports.generateDirectionClasses = void 0;
|
|
8
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
9
7
|
var _traverseBreakpoints = require("./traverseBreakpoints");
|
|
10
8
|
function appendLevel(level) {
|
|
11
9
|
if (!level) {
|
|
@@ -178,23 +176,27 @@ const generateGridStyles = ({
|
|
|
178
176
|
}) => {
|
|
179
177
|
const getSelfSpacing = createGetSelfSpacing(ownerState);
|
|
180
178
|
const getParentSpacing = createGetParentSpacing(ownerState);
|
|
181
|
-
return
|
|
179
|
+
return {
|
|
182
180
|
minWidth: 0,
|
|
183
|
-
boxSizing: 'border-box'
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
181
|
+
boxSizing: 'border-box',
|
|
182
|
+
...(ownerState.container && {
|
|
183
|
+
display: 'flex',
|
|
184
|
+
flexWrap: 'wrap',
|
|
185
|
+
...(ownerState.wrap && ownerState.wrap !== 'wrap' && {
|
|
186
|
+
flexWrap: ownerState.wrap
|
|
187
|
+
}),
|
|
188
|
+
margin: `calc(${getSelfSpacing('row')} / -2) calc(${getSelfSpacing('column')} / -2)`,
|
|
189
|
+
...(ownerState.disableEqualOverflow && {
|
|
190
|
+
margin: `calc(${getSelfSpacing('row')} * -1) 0px 0px calc(${getSelfSpacing('column')} * -1)`
|
|
191
|
+
})
|
|
192
|
+
}),
|
|
193
|
+
...((!ownerState.container || isNestedContainer(ownerState)) && {
|
|
194
|
+
padding: `calc(${getParentSpacing('row')} / 2) calc(${getParentSpacing('column')} / 2)`,
|
|
195
|
+
...((ownerState.disableEqualOverflow || ownerState.parentDisableEqualOverflow) && {
|
|
196
|
+
padding: `${getParentSpacing('row')} 0px 0px ${getParentSpacing('column')}`
|
|
197
|
+
})
|
|
198
|
+
})
|
|
199
|
+
};
|
|
198
200
|
};
|
|
199
201
|
exports.generateGridStyles = generateGridStyles;
|
|
200
202
|
const generateSizeClassNames = gridSize => {
|