@mui/system 6.0.0-alpha.1 → 6.0.0-alpha.4

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.
Files changed (139) hide show
  1. package/CHANGELOG.md +169 -2
  2. package/Container/Container.d.ts +1 -1
  3. package/Stack/Stack.d.ts +1 -1
  4. package/Stack/createStack.d.ts +1 -1
  5. package/Unstable_Grid/Grid.d.ts +1 -1
  6. package/Unstable_Grid/createGrid.d.ts +1 -1
  7. package/breakpoints/breakpoints.js +19 -1
  8. package/createTheme/createTheme.d.ts +2 -1
  9. package/createTheme/createTheme.js +2 -0
  10. package/cssContainerQueries/cssContainerQueries.d.ts +24 -0
  11. package/cssContainerQueries/cssContainerQueries.js +68 -0
  12. package/cssContainerQueries/index.d.ts +3 -0
  13. package/cssContainerQueries/index.js +2 -0
  14. package/cssContainerQueries/package.json +6 -0
  15. package/cssVars/cssVarsParser.d.ts +1 -1
  16. package/cssVars/index.d.ts +2 -0
  17. package/cssVars/index.js +1 -0
  18. package/cssVars/prepareTypographyVars.d.ts +8 -0
  19. package/cssVars/prepareTypographyVars.js +11 -0
  20. package/index.d.ts +2 -0
  21. package/index.js +2 -1
  22. package/modern/breakpoints/breakpoints.js +19 -1
  23. package/modern/createTheme/createTheme.js +2 -0
  24. package/modern/cssContainerQueries/cssContainerQueries.js +68 -0
  25. package/modern/cssContainerQueries/index.js +2 -0
  26. package/modern/cssVars/index.js +1 -0
  27. package/modern/cssVars/prepareTypographyVars.js +11 -0
  28. package/modern/index.js +2 -1
  29. package/modern/styleFunctionSx/defaultSxConfig.js +3 -0
  30. package/modern/styleFunctionSx/styleFunctionSx.js +2 -1
  31. package/node/breakpoints/breakpoints.js +19 -1
  32. package/node/createTheme/createTheme.js +2 -0
  33. package/node/cssContainerQueries/cssContainerQueries.js +79 -0
  34. package/node/cssContainerQueries/index.js +32 -0
  35. package/node/cssVars/index.js +7 -0
  36. package/node/cssVars/prepareTypographyVars.js +17 -0
  37. package/node/index.js +9 -1
  38. package/node/styleFunctionSx/defaultSxConfig.js +3 -0
  39. package/node/styleFunctionSx/styleFunctionSx.js +2 -1
  40. package/package.json +5 -5
  41. package/styleFunctionSx/defaultSxConfig.js +3 -0
  42. package/styleFunctionSx/styleFunctionSx.js +2 -1
  43. package/legacy/Box/Box.js +0 -30
  44. package/legacy/Box/boxClasses.js +0 -3
  45. package/legacy/Box/index.js +0 -5
  46. package/legacy/Container/Container.js +0 -61
  47. package/legacy/Container/ContainerProps.js +0 -1
  48. package/legacy/Container/containerClasses.js +0 -7
  49. package/legacy/Container/createContainer.js +0 -140
  50. package/legacy/Container/index.js +0 -5
  51. package/legacy/GlobalStyles/GlobalStyles.js +0 -37
  52. package/legacy/GlobalStyles/index.js +0 -4
  53. package/legacy/RtlProvider/index.js +0 -22
  54. package/legacy/Stack/Stack.js +0 -62
  55. package/legacy/Stack/StackProps.js +0 -1
  56. package/legacy/Stack/createStack.js +0 -180
  57. package/legacy/Stack/index.js +0 -7
  58. package/legacy/Stack/stackClasses.js +0 -7
  59. package/legacy/ThemeProvider/ThemeProvider.js +0 -87
  60. package/legacy/ThemeProvider/index.js +0 -3
  61. package/legacy/Unstable_Grid/Grid.js +0 -177
  62. package/legacy/Unstable_Grid/GridProps.js +0 -1
  63. package/legacy/Unstable_Grid/createGrid.js +0 -184
  64. package/legacy/Unstable_Grid/gridClasses.js +0 -28
  65. package/legacy/Unstable_Grid/gridGenerator.js +0 -216
  66. package/legacy/Unstable_Grid/index.js +0 -8
  67. package/legacy/Unstable_Grid/traverseBreakpoints.js +0 -48
  68. package/legacy/borders/borders.js +0 -51
  69. package/legacy/borders/index.js +0 -4
  70. package/legacy/breakpoints/breakpoints.js +0 -162
  71. package/legacy/breakpoints/index.js +0 -4
  72. package/legacy/colorManipulator/colorManipulator.js +0 -356
  73. package/legacy/colorManipulator/index.js +0 -3
  74. package/legacy/compose/compose.js +0 -32
  75. package/legacy/compose/index.js +0 -3
  76. package/legacy/createBox/createBox.js +0 -38
  77. package/legacy/createBox/index.js +0 -3
  78. package/legacy/createStyled/createStyled.js +0 -250
  79. package/legacy/createStyled/index.js +0 -4
  80. package/legacy/createTheme/applyStyles.js +0 -73
  81. package/legacy/createTheme/createBreakpoints.js +0 -83
  82. package/legacy/createTheme/createSpacing.js +0 -32
  83. package/legacy/createTheme/createTheme.js +0 -49
  84. package/legacy/createTheme/index.js +0 -3
  85. package/legacy/createTheme/shape.js +0 -4
  86. package/legacy/cssGrid/cssGrid.js +0 -91
  87. package/legacy/cssGrid/index.js +0 -4
  88. package/legacy/cssVars/createCssVarsProvider.js +0 -338
  89. package/legacy/cssVars/createCssVarsTheme.js +0 -13
  90. package/legacy/cssVars/createGetCssVar.js +0 -30
  91. package/legacy/cssVars/cssVarsParser.js +0 -141
  92. package/legacy/cssVars/getInitColorSchemeScript.js +0 -28
  93. package/legacy/cssVars/index.js +0 -6
  94. package/legacy/cssVars/prepareCssVars.js +0 -92
  95. package/legacy/cssVars/useCurrentColorScheme.js +0 -237
  96. package/legacy/display/display.js +0 -29
  97. package/legacy/display/index.js +0 -4
  98. package/legacy/flexbox/flexbox.js +0 -43
  99. package/legacy/flexbox/index.js +0 -4
  100. package/legacy/getThemeValue/getThemeValue.js +0 -47
  101. package/legacy/getThemeValue/index.js +0 -4
  102. package/legacy/index.js +0 -72
  103. package/legacy/memoize/index.js +0 -3
  104. package/legacy/memoize/memoize.js +0 -9
  105. package/legacy/merge/index.js +0 -3
  106. package/legacy/merge/merge.js +0 -10
  107. package/legacy/palette/index.js +0 -4
  108. package/legacy/palette/palette.js +0 -26
  109. package/legacy/positions/index.js +0 -4
  110. package/legacy/positions/positions.js +0 -22
  111. package/legacy/propsToClassKey/index.js +0 -3
  112. package/legacy/propsToClassKey/propsToClassKey.js +0 -24
  113. package/legacy/responsivePropType/index.js +0 -3
  114. package/legacy/responsivePropType/responsivePropType.js +0 -3
  115. package/legacy/shadows/index.js +0 -3
  116. package/legacy/shadows/shadows.js +0 -6
  117. package/legacy/sizing/index.js +0 -4
  118. package/legacy/sizing/sizing.js +0 -65
  119. package/legacy/spacing/index.js +0 -4
  120. package/legacy/spacing/spacing.js +0 -161
  121. package/legacy/style/index.js +0 -4
  122. package/legacy/style/style.js +0 -73
  123. package/legacy/styleFunctionSx/defaultSxConfig.js +0 -293
  124. package/legacy/styleFunctionSx/extendSxProp.js +0 -45
  125. package/legacy/styleFunctionSx/index.js +0 -4
  126. package/legacy/styleFunctionSx/styleFunctionSx.js +0 -126
  127. package/legacy/styled/index.js +0 -3
  128. package/legacy/styled/styled.js +0 -3
  129. package/legacy/typography/index.js +0 -4
  130. package/legacy/typography/typography.js +0 -37
  131. package/legacy/useMediaQuery/index.js +0 -2
  132. package/legacy/useMediaQuery/useMediaQuery.js +0 -145
  133. package/legacy/useTheme/index.js +0 -4
  134. package/legacy/useTheme/useTheme.js +0 -10
  135. package/legacy/useThemeProps/getThemeProps.js +0 -10
  136. package/legacy/useThemeProps/index.js +0 -4
  137. package/legacy/useThemeProps/useThemeProps.js +0 -20
  138. package/legacy/useThemeWithoutDefault/index.js +0 -3
  139. package/legacy/useThemeWithoutDefault/useThemeWithoutDefault.js +0 -13
@@ -0,0 +1,11 @@
1
+ export default function prepareTypographyVars(typography) {
2
+ const vars = {};
3
+ const entries = Object.entries(typography);
4
+ entries.forEach(entry => {
5
+ const [key, value] = entry;
6
+ if (typeof value === 'object') {
7
+ vars[key] = `${value.fontStyle ? `${value.fontStyle} ` : ''}${value.fontVariant ? `${value.fontVariant} ` : ''}${value.fontWeight ? `${value.fontWeight} ` : ''}${value.fontStretch ? `${value.fontStretch} ` : ''}${value.fontSize || ''}${value.lineHeight ? `/${value.lineHeight} ` : ''}${value.fontFamily || ''}`;
8
+ }
9
+ });
10
+ return vars;
11
+ }
package/modern/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * @mui/system v6.0.0-alpha.1
2
+ * @mui/system v6.0.0-alpha.4
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';
@@ -267,6 +267,9 @@ const defaultSxConfig = {
267
267
  },
268
268
  boxSizing: {},
269
269
  // typography
270
+ font: {
271
+ themeKey: 'font'
272
+ },
270
273
  fontFamily: {
271
274
  themeKey: 'typography'
272
275
  },
@@ -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
  }
@@ -16,6 +16,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
16
16
  var _propTypes = _interopRequireDefault(require("prop-types"));
17
17
  var _deepmerge = _interopRequireDefault(require("@mui/utils/deepmerge"));
18
18
  var _merge = _interopRequireDefault(require("../merge"));
19
+ var _cssContainerQueries = require("../cssContainerQueries");
19
20
  // The breakpoint **start** at this value.
20
21
  // For instance with the first breakpoint xs: [xs, sm[.
21
22
  const values = exports.values = {
@@ -35,6 +36,17 @@ const defaultBreakpoints = {
35
36
  keys: ['xs', 'sm', 'md', 'lg', 'xl'],
36
37
  up: key => `@media (min-width:${values[key]}px)`
37
38
  };
39
+ const defaultContainerQueries = {
40
+ containerQueries: containerName => ({
41
+ up: key => {
42
+ let result = typeof key === 'number' ? key : values[key] || key;
43
+ if (typeof result === 'number') {
44
+ result = `${result}px`;
45
+ }
46
+ return containerName ? `@container ${containerName} (min-width:${result})` : `@container (min-width:${result})`;
47
+ }
48
+ })
49
+ };
38
50
  function handleBreakpoints(props, propValue, styleFromPropValue) {
39
51
  const theme = props.theme || {};
40
52
  if (Array.isArray(propValue)) {
@@ -47,8 +59,14 @@ function handleBreakpoints(props, propValue, styleFromPropValue) {
47
59
  if (typeof propValue === 'object') {
48
60
  const themeBreakpoints = theme.breakpoints || defaultBreakpoints;
49
61
  return Object.keys(propValue).reduce((acc, breakpoint) => {
62
+ if ((0, _cssContainerQueries.isCqShorthand)(themeBreakpoints.keys, breakpoint)) {
63
+ const containerKey = (0, _cssContainerQueries.getContainerQuery)(theme.containerQueries ? theme : defaultContainerQueries, breakpoint);
64
+ if (containerKey) {
65
+ acc[containerKey] = styleFromPropValue(propValue[breakpoint], breakpoint);
66
+ }
67
+ }
50
68
  // key is breakpoint
51
- if (Object.keys(themeBreakpoints.values || values).indexOf(breakpoint) !== -1) {
69
+ else if (Object.keys(themeBreakpoints.values || values).indexOf(breakpoint) !== -1) {
52
70
  const mediaKey = themeBreakpoints.up(breakpoint);
53
71
  acc[mediaKey] = styleFromPropValue(propValue[breakpoint], breakpoint);
54
72
  } else {
@@ -9,6 +9,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
9
9
  var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
10
10
  var _deepmerge = _interopRequireDefault(require("@mui/utils/deepmerge"));
11
11
  var _createBreakpoints = _interopRequireDefault(require("./createBreakpoints"));
12
+ var _cssContainerQueries = _interopRequireDefault(require("../cssContainerQueries"));
12
13
  var _shape = _interopRequireDefault(require("./shape"));
13
14
  var _createSpacing = _interopRequireDefault(require("./createSpacing"));
14
15
  var _styleFunctionSx = _interopRequireDefault(require("../styleFunctionSx/styleFunctionSx"));
@@ -36,6 +37,7 @@ function createTheme(options = {}, ...args) {
36
37
  spacing,
37
38
  shape: (0, _extends2.default)({}, _shape.default, shapeInput)
38
39
  }, other);
40
+ muiTheme = (0, _cssContainerQueries.default)(muiTheme);
39
41
  muiTheme.applyStyles = _applyStyles.default;
40
42
  muiTheme = args.reduce((acc, argument) => (0, _deepmerge.default)(acc, argument), muiTheme);
41
43
  muiTheme.unstable_sxConfig = (0, _extends2.default)({}, _defaultSxConfig.default, other == null ? void 0 : other.unstable_sxConfig);
@@ -0,0 +1,79 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports.default = cssContainerQueries;
8
+ exports.getContainerQuery = getContainerQuery;
9
+ exports.isCqShorthand = isCqShorthand;
10
+ exports.sortContainerQueries = sortContainerQueries;
11
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
12
+ var _formatMuiErrorMessage2 = _interopRequireDefault(require("@mui/utils/formatMuiErrorMessage"));
13
+ /**
14
+ * For using in `sx` prop to sort the breakpoint from low to high.
15
+ * Note: this function does not work and will not support multiple units.
16
+ * e.g. input: { '@container (min-width:300px)': '1rem', '@container (min-width:40rem)': '2rem' }
17
+ * output: { '@container (min-width:40rem)': '2rem', '@container (min-width:300px)': '1rem' } // since 40 < 300 eventhough 40rem > 300px
18
+ */
19
+ function sortContainerQueries(theme, css) {
20
+ if (!theme.containerQueries) {
21
+ return css;
22
+ }
23
+ const sorted = Object.keys(css).filter(key => key.startsWith('@container')).sort((a, b) => {
24
+ var _a$match, _b$match;
25
+ const regex = /min-width:\s*([0-9.]+)/;
26
+ return +(((_a$match = a.match(regex)) == null ? void 0 : _a$match[1]) || 0) - +(((_b$match = b.match(regex)) == null ? void 0 : _b$match[1]) || 0);
27
+ });
28
+ if (!sorted.length) {
29
+ return css;
30
+ }
31
+ return sorted.reduce((acc, key) => {
32
+ const value = css[key];
33
+ delete acc[key];
34
+ acc[key] = value;
35
+ return acc;
36
+ }, (0, _extends2.default)({}, css));
37
+ }
38
+ function isCqShorthand(breakpointKeys, value) {
39
+ return value.startsWith('@') && (breakpointKeys.some(key => value.startsWith(`@${key}`)) || !!value.match(/^@\d/));
40
+ }
41
+ function getContainerQuery(theme, shorthand) {
42
+ const matches = shorthand.match(/^@([^/]+)\/?(.+)?$/);
43
+ if (!matches) {
44
+ if (process.env.NODE_ENV !== 'production') {
45
+ throw new Error(process.env.NODE_ENV !== "production" ? `MUI: The provided shorthand ${`(${shorthand})`} is invalid. The format should be \`@<breakpoint | number>\` or \`@<breakpoint | number>/<container>\`.
46
+ For example, \`@sm\` or \`@600\` or \`@40rem/sidebar\`.` : (0, _formatMuiErrorMessage2.default)(21, `(${shorthand})`));
47
+ }
48
+ return null;
49
+ }
50
+ const [, containerQuery, containerName] = matches;
51
+ const value = Number.isNaN(+containerQuery) ? containerQuery : +containerQuery;
52
+ return theme.containerQueries(containerName).up(value);
53
+ }
54
+ function cssContainerQueries(themeInput) {
55
+ const toContainerQuery = (mediaQuery, name) => mediaQuery.replace('@media', name ? `@container ${name}` : '@container');
56
+ function attachCq(node, name) {
57
+ node.up = (...args) => toContainerQuery(themeInput.breakpoints.up(...args), name);
58
+ node.down = (...args) => toContainerQuery(themeInput.breakpoints.down(...args), name);
59
+ node.between = (...args) => toContainerQuery(themeInput.breakpoints.between(...args), name);
60
+ node.only = (...args) => toContainerQuery(themeInput.breakpoints.only(...args), name);
61
+ node.not = (...args) => {
62
+ const result = toContainerQuery(themeInput.breakpoints.not(...args), name);
63
+ if (result.includes('not all and')) {
64
+ // `@container` does not work with `not all and`, so need to invert the logic
65
+ return result.replace('not all and ', '').replace('min-width:', 'width<').replace('max-width:', 'width>');
66
+ }
67
+ return result;
68
+ };
69
+ }
70
+ const node = {};
71
+ const containerQueries = name => {
72
+ attachCq(node, name);
73
+ return node;
74
+ };
75
+ attachCq(containerQueries);
76
+ return (0, _extends2.default)({}, themeInput, {
77
+ containerQueries
78
+ });
79
+ }
@@ -0,0 +1,32 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ Object.defineProperty(exports, "default", {
7
+ enumerable: true,
8
+ get: function () {
9
+ return _cssContainerQueries.default;
10
+ }
11
+ });
12
+ Object.defineProperty(exports, "getContainerQuery", {
13
+ enumerable: true,
14
+ get: function () {
15
+ return _cssContainerQueries.getContainerQuery;
16
+ }
17
+ });
18
+ Object.defineProperty(exports, "isCqShorthand", {
19
+ enumerable: true,
20
+ get: function () {
21
+ return _cssContainerQueries.isCqShorthand;
22
+ }
23
+ });
24
+ Object.defineProperty(exports, "sortContainerQueries", {
25
+ enumerable: true,
26
+ get: function () {
27
+ return _cssContainerQueries.sortContainerQueries;
28
+ }
29
+ });
30
+ var _cssContainerQueries = _interopRequireWildcard(require("./cssContainerQueries"));
31
+ 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); }
32
+ 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; }
@@ -29,7 +29,14 @@ Object.defineProperty(exports, "prepareCssVars", {
29
29
  return _prepareCssVars.default;
30
30
  }
31
31
  });
32
+ Object.defineProperty(exports, "prepareTypographyVars", {
33
+ enumerable: true,
34
+ get: function () {
35
+ return _prepareTypographyVars.default;
36
+ }
37
+ });
32
38
  var _createCssVarsProvider = _interopRequireDefault(require("./createCssVarsProvider"));
33
39
  var _getInitColorSchemeScript = _interopRequireDefault(require("./getInitColorSchemeScript"));
34
40
  var _prepareCssVars = _interopRequireDefault(require("./prepareCssVars"));
41
+ var _prepareTypographyVars = _interopRequireDefault(require("./prepareTypographyVars"));
35
42
  var _createCssVarsTheme = _interopRequireDefault(require("./createCssVarsTheme"));
@@ -0,0 +1,17 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = prepareTypographyVars;
7
+ function prepareTypographyVars(typography) {
8
+ const vars = {};
9
+ const entries = Object.entries(typography);
10
+ entries.forEach(entry => {
11
+ const [key, value] = entry;
12
+ if (typeof value === 'object') {
13
+ vars[key] = `${value.fontStyle ? `${value.fontStyle} ` : ''}${value.fontVariant ? `${value.fontVariant} ` : ''}${value.fontWeight ? `${value.fontWeight} ` : ''}${value.fontStretch ? `${value.fontStretch} ` : ''}${value.fontSize || ''}${value.lineHeight ? `/${value.lineHeight} ` : ''}${value.fontFamily || ''}`;
14
+ }
15
+ });
16
+ return vars;
17
+ }
package/node/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * @mui/system v6.0.0-alpha.1
2
+ * @mui/system v6.0.0-alpha.4
3
3
  *
4
4
  * @license MIT
5
5
  * This source code is licensed under the MIT license found in the
@@ -22,6 +22,7 @@ var _exportNames = {
22
22
  handleBreakpoints: true,
23
23
  mergeBreakpointsInOrder: true,
24
24
  unstable_resolveBreakpointValues: true,
25
+ cssContainerQueries: true,
25
26
  compose: true,
26
27
  display: true,
27
28
  flexbox: true,
@@ -174,6 +175,12 @@ Object.defineProperty(exports, "css", {
174
175
  return _styledEngine.css;
175
176
  }
176
177
  });
178
+ Object.defineProperty(exports, "cssContainerQueries", {
179
+ enumerable: true,
180
+ get: function () {
181
+ return _cssContainerQueries.default;
182
+ }
183
+ });
177
184
  Object.defineProperty(exports, "display", {
178
185
  enumerable: true,
179
186
  get: function () {
@@ -395,6 +402,7 @@ Object.keys(_borders).forEach(function (key) {
395
402
  });
396
403
  });
397
404
  var _breakpoints = _interopRequireWildcard(require("./breakpoints"));
405
+ var _cssContainerQueries = _interopRequireDefault(require("./cssContainerQueries"));
398
406
  var _compose = _interopRequireDefault(require("./compose"));
399
407
  var _display = _interopRequireDefault(require("./display"));
400
408
  var _flexbox = _interopRequireWildcard(require("./flexbox"));
@@ -273,6 +273,9 @@ const defaultSxConfig = {
273
273
  },
274
274
  boxSizing: {},
275
275
  // typography
276
+ font: {
277
+ themeKey: 'font'
278
+ },
276
279
  fontFamily: {
277
280
  themeKey: 'typography'
278
281
  },
@@ -10,6 +10,7 @@ var _capitalize = _interopRequireDefault(require("@mui/utils/capitalize"));
10
10
  var _merge = _interopRequireDefault(require("../merge"));
11
11
  var _style = require("../style");
12
12
  var _breakpoints = require("../breakpoints");
13
+ var _cssContainerQueries = require("../cssContainerQueries");
13
14
  var _defaultSxConfig = _interopRequireDefault(require("./defaultSxConfig"));
14
15
  function objectsHaveSameKeys(...objects) {
15
16
  const allKeys = objects.reduce((keys, object) => keys.concat(Object.keys(object)), []);
@@ -124,7 +125,7 @@ function unstable_createStyleFunctionSx() {
124
125
  }
125
126
  }
126
127
  });
127
- return (0, _breakpoints.removeUnusedBreakpoints)(breakpointsKeys, css);
128
+ return (0, _cssContainerQueries.sortContainerQueries)(theme, (0, _breakpoints.removeUnusedBreakpoints)(breakpointsKeys, css));
128
129
  }
129
130
  return Array.isArray(sx) ? sx.map(traverse) : traverse(sx);
130
131
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mui/system",
3
- "version": "6.0.0-alpha.1",
3
+ "version": "6.0.0-alpha.4",
4
4
  "private": false,
5
5
  "author": "MUI Team",
6
6
  "description": "MUI System is a set of CSS utilities to help you build custom designs more efficiently. It makes it possible to rapidly lay out custom designs.",
@@ -30,10 +30,10 @@
30
30
  "clsx": "^2.1.0",
31
31
  "csstype": "^3.1.3",
32
32
  "prop-types": "^15.8.1",
33
- "@mui/private-theming": "^6.0.0-alpha.1",
34
- "@mui/styled-engine": "^6.0.0-alpha.1",
35
- "@mui/utils": "^6.0.0-alpha.1",
36
- "@mui/types": "^7.2.14"
33
+ "@mui/utils": "^6.0.0-alpha.3",
34
+ "@mui/private-theming": "^6.0.0-alpha.3",
35
+ "@mui/types": "^7.2.14",
36
+ "@mui/styled-engine": "^6.0.0-alpha.3"
37
37
  },
38
38
  "peerDependencies": {
39
39
  "@emotion/react": "^11.5.0",
@@ -267,6 +267,9 @@ const defaultSxConfig = {
267
267
  },
268
268
  boxSizing: {},
269
269
  // typography
270
+ font: {
271
+ themeKey: 'font'
272
+ },
270
273
  fontFamily: {
271
274
  themeKey: 'typography'
272
275
  },
@@ -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
  }
package/legacy/Box/Box.js DELETED
@@ -1,30 +0,0 @@
1
- 'use client';
2
-
3
- import PropTypes from 'prop-types';
4
- import ClassNameGenerator from '@mui/utils/ClassNameGenerator';
5
- import createBox from '../createBox';
6
- import boxClasses from './boxClasses';
7
- var Box = createBox({
8
- defaultClassName: boxClasses.root,
9
- generateClassName: ClassNameGenerator.generate
10
- });
11
- process.env.NODE_ENV !== "production" ? Box.propTypes /* remove-proptypes */ = {
12
- // ┌────────────────────────────── Warning ──────────────────────────────┐
13
- // │ These PropTypes are generated from the TypeScript type definitions. │
14
- // │ To update them, edit the d.ts file and run `pnpm proptypes`. │
15
- // └─────────────────────────────────────────────────────────────────────┘
16
- /**
17
- * @ignore
18
- */
19
- children: PropTypes.node,
20
- /**
21
- * The component used for the root node.
22
- * Either a string to use a HTML element or a component.
23
- */
24
- component: PropTypes.elementType,
25
- /**
26
- * The system prop that allows defining system overrides as well as additional CSS styles.
27
- */
28
- sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object])
29
- } : void 0;
30
- export default Box;
@@ -1,3 +0,0 @@
1
- import generateUtilityClasses from '@mui/utils/generateUtilityClasses';
2
- var boxClasses = generateUtilityClasses('MuiBox', ['root']);
3
- export default boxClasses;
@@ -1,5 +0,0 @@
1
- 'use client';
2
-
3
- export { default } from './Box';
4
- export { default as boxClasses } from './boxClasses';
5
- export * from './boxClasses';
@@ -1,61 +0,0 @@
1
- 'use client';
2
-
3
- import PropTypes from 'prop-types';
4
- import createContainer from './createContainer';
5
-
6
- /**
7
- *
8
- * Demos:
9
- *
10
- * - [Container (Material UI)](https://mui.com/material-ui/react-container/)
11
- * - [Container (MUI System)](https://mui.com/system/react-container/)
12
- *
13
- * API:
14
- *
15
- * - [Container API](https://mui.com/system/api/container/)
16
- */
17
- var Container = createContainer();
18
- process.env.NODE_ENV !== "production" ? Container.propTypes /* remove-proptypes */ = {
19
- // ┌────────────────────────────── Warning ──────────────────────────────┐
20
- // │ These PropTypes are generated from the TypeScript type definitions. │
21
- // │ To update them, edit the TypeScript types and run `pnpm proptypes`. │
22
- // └─────────────────────────────────────────────────────────────────────┘
23
- /**
24
- * @ignore
25
- */
26
- children: PropTypes.node,
27
- /**
28
- * Override or extend the styles applied to the component.
29
- */
30
- classes: PropTypes.object,
31
- /**
32
- * The component used for the root node.
33
- * Either a string to use a HTML element or a component.
34
- */
35
- component: PropTypes.elementType,
36
- /**
37
- * If `true`, the left and right padding is removed.
38
- * @default false
39
- */
40
- disableGutters: PropTypes.bool,
41
- /**
42
- * Set the max-width to match the min-width of the current breakpoint.
43
- * This is useful if you'd prefer to design for a fixed set of sizes
44
- * instead of trying to accommodate a fully fluid viewport.
45
- * It's fluid by default.
46
- * @default false
47
- */
48
- fixed: PropTypes.bool,
49
- /**
50
- * Determine the max-width of the container.
51
- * The container width grows with the size of the screen.
52
- * Set to `false` to disable `maxWidth`.
53
- * @default 'lg'
54
- */
55
- maxWidth: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['xs', 'sm', 'md', 'lg', 'xl', false]), PropTypes.string]),
56
- /**
57
- * The system prop that allows defining system overrides as well as additional CSS styles.
58
- */
59
- sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object])
60
- } : void 0;
61
- export default Container;
@@ -1 +0,0 @@
1
- export {};
@@ -1,7 +0,0 @@
1
- import generateUtilityClasses from '@mui/utils/generateUtilityClasses';
2
- import generateUtilityClass from '@mui/utils/generateUtilityClass';
3
- export function getContainerUtilityClass(slot) {
4
- return generateUtilityClass('MuiContainer', slot);
5
- }
6
- var containerClasses = generateUtilityClasses('MuiContainer', ['root', 'disableGutters', 'fixed', 'maxWidthXs', 'maxWidthSm', 'maxWidthMd', 'maxWidthLg', 'maxWidthXl']);
7
- export default containerClasses;
@@ -1,140 +0,0 @@
1
- import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
2
- import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
- import _extends from "@babel/runtime/helpers/esm/extends";
4
- import * as React from 'react';
5
- import PropTypes from 'prop-types';
6
- import clsx from 'clsx';
7
- import generateUtilityClass from '@mui/utils/generateUtilityClass';
8
- import composeClasses from '@mui/utils/composeClasses';
9
- import capitalize from '@mui/utils/capitalize';
10
- import useThemePropsSystem from '../useThemeProps';
11
- import systemStyled from '../styled';
12
- import createTheme from '../createTheme';
13
- import { jsx as _jsx } from "react/jsx-runtime";
14
- var defaultTheme = createTheme();
15
- var defaultCreateStyledComponent = systemStyled('div', {
16
- name: 'MuiContainer',
17
- slot: 'Root',
18
- overridesResolver: function overridesResolver(props, styles) {
19
- var ownerState = props.ownerState;
20
- return [styles.root, styles["maxWidth".concat(capitalize(String(ownerState.maxWidth)))], ownerState.fixed && styles.fixed, ownerState.disableGutters && styles.disableGutters];
21
- }
22
- });
23
- var useThemePropsDefault = function useThemePropsDefault(inProps) {
24
- return useThemePropsSystem({
25
- props: inProps,
26
- name: 'MuiContainer',
27
- defaultTheme: defaultTheme
28
- });
29
- };
30
- var useUtilityClasses = function useUtilityClasses(ownerState, componentName) {
31
- var getContainerUtilityClass = function getContainerUtilityClass(slot) {
32
- return generateUtilityClass(componentName, slot);
33
- };
34
- var classes = ownerState.classes,
35
- fixed = ownerState.fixed,
36
- disableGutters = ownerState.disableGutters,
37
- maxWidth = ownerState.maxWidth;
38
- var slots = {
39
- root: ['root', maxWidth && "maxWidth".concat(capitalize(String(maxWidth))), fixed && 'fixed', disableGutters && 'disableGutters']
40
- };
41
- return composeClasses(slots, getContainerUtilityClass, classes);
42
- };
43
- export default function createContainer() {
44
- var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
45
- var _options$createStyled = options.createStyledComponent,
46
- createStyledComponent = _options$createStyled === void 0 ? defaultCreateStyledComponent : _options$createStyled,
47
- _options$useThemeProp = options.useThemeProps,
48
- useThemeProps = _options$useThemeProp === void 0 ? useThemePropsDefault : _options$useThemeProp,
49
- _options$componentNam = options.componentName,
50
- componentName = _options$componentNam === void 0 ? 'MuiContainer' : _options$componentNam;
51
- var ContainerRoot = createStyledComponent(function (_ref) {
52
- var theme = _ref.theme,
53
- ownerState = _ref.ownerState;
54
- return _extends({
55
- width: '100%',
56
- marginLeft: 'auto',
57
- boxSizing: 'border-box',
58
- marginRight: 'auto',
59
- display: 'block'
60
- }, !ownerState.disableGutters && _defineProperty({
61
- paddingLeft: theme.spacing(2),
62
- paddingRight: theme.spacing(2)
63
- }, theme.breakpoints.up('sm'), {
64
- paddingLeft: theme.spacing(3),
65
- paddingRight: theme.spacing(3)
66
- }));
67
- }, function (_ref3) {
68
- var theme = _ref3.theme,
69
- ownerState = _ref3.ownerState;
70
- return ownerState.fixed && Object.keys(theme.breakpoints.values).reduce(function (acc, breakpointValueKey) {
71
- var breakpoint = breakpointValueKey;
72
- var value = theme.breakpoints.values[breakpoint];
73
- if (value !== 0) {
74
- // @ts-ignore
75
- acc[theme.breakpoints.up(breakpoint)] = {
76
- maxWidth: "".concat(value).concat(theme.breakpoints.unit)
77
- };
78
- }
79
- return acc;
80
- }, {});
81
- }, function (_ref4) {
82
- var theme = _ref4.theme,
83
- ownerState = _ref4.ownerState;
84
- return _extends({}, ownerState.maxWidth === 'xs' && _defineProperty({}, theme.breakpoints.up('xs'), {
85
- // @ts-ignore module augmentation fails if custom breakpoints are used
86
- maxWidth: Math.max(theme.breakpoints.values.xs, 444)
87
- }), ownerState.maxWidth &&
88
- // @ts-ignore module augmentation fails if custom breakpoints are used
89
- ownerState.maxWidth !== 'xs' && _defineProperty({}, theme.breakpoints.up(ownerState.maxWidth), {
90
- // @ts-ignore module augmentation fails if custom breakpoints are used
91
- maxWidth: "".concat(theme.breakpoints.values[ownerState.maxWidth]).concat(theme.breakpoints.unit)
92
- }));
93
- });
94
- var Container = /*#__PURE__*/React.forwardRef(function Container(inProps, ref) {
95
- var props = useThemeProps(inProps);
96
- var className = props.className,
97
- _props$component = props.component,
98
- component = _props$component === void 0 ? 'div' : _props$component,
99
- _props$disableGutters = props.disableGutters,
100
- disableGutters = _props$disableGutters === void 0 ? false : _props$disableGutters,
101
- _props$fixed = props.fixed,
102
- fixed = _props$fixed === void 0 ? false : _props$fixed,
103
- _props$maxWidth = props.maxWidth,
104
- maxWidth = _props$maxWidth === void 0 ? 'lg' : _props$maxWidth,
105
- classesProp = props.classes,
106
- other = _objectWithoutProperties(props, ["className", "component", "disableGutters", "fixed", "maxWidth", "classes"]);
107
- var ownerState = _extends({}, props, {
108
- component: component,
109
- disableGutters: disableGutters,
110
- fixed: fixed,
111
- maxWidth: maxWidth
112
- });
113
-
114
- // @ts-ignore module augmentation fails if custom breakpoints are used
115
- var classes = useUtilityClasses(ownerState, componentName);
116
- return (
117
- /*#__PURE__*/
118
- // @ts-ignore theme is injected by the styled util
119
- _jsx(ContainerRoot, _extends({
120
- as: component
121
- // @ts-ignore module augmentation fails if custom breakpoints are used
122
- ,
123
- ownerState: ownerState,
124
- className: clsx(classes.root, className),
125
- ref: ref
126
- }, other))
127
- );
128
- });
129
- process.env.NODE_ENV !== "production" ? Container.propTypes /* remove-proptypes */ = {
130
- children: PropTypes.node,
131
- classes: PropTypes.object,
132
- className: PropTypes.string,
133
- component: PropTypes.elementType,
134
- disableGutters: PropTypes.bool,
135
- fixed: PropTypes.bool,
136
- maxWidth: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['xs', 'sm', 'md', 'lg', 'xl', false]), PropTypes.string]),
137
- sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object])
138
- } : void 0;
139
- return Container;
140
- }
@@ -1,5 +0,0 @@
1
- 'use client';
2
-
3
- export { default } from './Container';
4
- export { default as containerClasses } from './containerClasses';
5
- export * from './containerClasses';