@mui/system 5.9.0 → 5.9.3

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 (46) hide show
  1. package/Box/Box.spec.d.ts +1 -1
  2. package/CHANGELOG.md +196 -6
  3. package/Container/Container.d.ts +13 -13
  4. package/Container/ContainerProps.d.ts +40 -40
  5. package/Container/containerClasses.d.ts +22 -22
  6. package/Container/createContainer.d.ts +18 -18
  7. package/Unstable_Grid/Grid.d.ts +12 -12
  8. package/Unstable_Grid/Grid.js +5 -0
  9. package/Unstable_Grid/GridProps.d.ts +162 -158
  10. package/Unstable_Grid/createGrid.d.ts +11 -11
  11. package/Unstable_Grid/createGrid.js +30 -5
  12. package/Unstable_Grid/gridClasses.d.ts +20 -20
  13. package/Unstable_Grid/gridGenerator.d.ts +26 -26
  14. package/Unstable_Grid/gridGenerator.js +10 -4
  15. package/Unstable_Grid/index.d.ts +5 -5
  16. package/breakpoints.js +1 -1
  17. package/createBox.spec.d.ts +1 -1
  18. package/createTheme/createSpacing.d.ts +10 -10
  19. package/cssVars/createCssVarsProvider.js +1 -1
  20. package/cssVars/createCssVarsProvider.spec.d.ts +1 -1
  21. package/cssVars/createGetCssVar.d.ts +5 -5
  22. package/cssVars/cssVarsParser.d.ts +65 -65
  23. package/cssVars/getInitColorSchemeScript.d.ts +45 -45
  24. package/cssVars/index.d.ts +3 -3
  25. package/cssVars/useCurrentColorScheme.d.ts +53 -53
  26. package/esm/Unstable_Grid/Grid.js +5 -0
  27. package/esm/Unstable_Grid/createGrid.js +30 -5
  28. package/esm/Unstable_Grid/gridGenerator.js +10 -4
  29. package/esm/breakpoints.js +1 -1
  30. package/esm/cssVars/createCssVarsProvider.js +1 -1
  31. package/index.js +1 -1
  32. package/index.spec.d.ts +1 -1
  33. package/legacy/Unstable_Grid/Grid.js +5 -0
  34. package/legacy/Unstable_Grid/createGrid.js +28 -3
  35. package/legacy/Unstable_Grid/gridGenerator.js +10 -4
  36. package/legacy/breakpoints.js +1 -1
  37. package/legacy/cssVars/createCssVarsProvider.js +1 -1
  38. package/legacy/index.js +1 -1
  39. package/modern/Unstable_Grid/Grid.js +5 -0
  40. package/modern/Unstable_Grid/createGrid.js +29 -4
  41. package/modern/Unstable_Grid/gridGenerator.js +10 -4
  42. package/modern/breakpoints.js +1 -1
  43. package/modern/cssVars/createCssVarsProvider.js +1 -1
  44. package/modern/index.js +1 -1
  45. package/package.json +4 -4
  46. package/styleFunctionSx/styleFunctionSx.spec.d.ts +1 -1
@@ -1,158 +1,162 @@
1
- import * as React from 'react';
2
- import { OverrideProps, IfEquals } from '@mui/types';
3
- import { SxProps } from '../styleFunctionSx';
4
- import { Theme, Breakpoint, BreakpointOverrides } from '../createTheme';
5
- import { SystemProps } from '../Box';
6
- declare type ResponsiveStyleValue<T> = T | Array<T | null> | {
7
- [key in Breakpoint]?: T | null;
8
- };
9
- export declare type GridDirection = 'row' | 'row-reverse' | 'column' | 'column-reverse';
10
- export declare type GridSpacing = number | string;
11
- export declare type GridWrap = 'nowrap' | 'wrap' | 'wrap-reverse';
12
- export declare type GridSize = 'auto' | number;
13
- export interface GridDefaultBreakpoints {
14
- /**
15
- * If a number, it sets the number of columns the grid item uses.
16
- * It can't be greater than the total number of columns of the container (12 by default).
17
- * If 'auto', the grid item's width matches its content.
18
- * If false, the prop is ignored.
19
- * If true, the grid item's width grows to use the space available in the grid container.
20
- * The value is applied for the `lg` breakpoint and wider screens if not overridden.
21
- * @default false
22
- */
23
- lg?: boolean | GridSize;
24
- /**
25
- * If a number, it sets the margin-left equals to the number of columns the grid item uses.
26
- * If 'auto', the grid item push itself to the right-end of the container.
27
- * The value is applied for the `lg` breakpoint and wider screens if not overridden.
28
- */
29
- lgOffset?: GridSize;
30
- /**
31
- * If a number, it sets the number of columns the grid item uses.
32
- * It can't be greater than the total number of columns of the container (12 by default).
33
- * If 'auto', the grid item's width matches its content.
34
- * If false, the prop is ignored.
35
- * If true, the grid item's width grows to use the space available in the grid container.
36
- * The value is applied for the `md` breakpoint and wider screens if not overridden.
37
- * @default false
38
- */
39
- md?: boolean | GridSize;
40
- /**
41
- * If a number, it sets the margin-left equals to the number of columns the grid item uses.
42
- * If 'auto', the grid item push itself to the right-end of the container.
43
- * The value is applied for the `md` breakpoint and wider screens if not overridden.
44
- */
45
- mdOffset?: GridSize;
46
- /**
47
- * If a number, it sets the number of columns the grid item uses.
48
- * It can't be greater than the total number of columns of the container (12 by default).
49
- * If 'auto', the grid item's width matches its content.
50
- * If false, the prop is ignored.
51
- * If true, the grid item's width grows to use the space available in the grid container.
52
- * The value is applied for the `sm` breakpoint and wider screens if not overridden.
53
- * @default false
54
- */
55
- sm?: boolean | GridSize;
56
- /**
57
- * If a number, it sets the margin-left equals to the number of columns the grid item uses.
58
- * If 'auto', the grid item push itself to the right-end of the container.
59
- * The value is applied for the `sm` breakpoint and wider screens if not overridden.
60
- */
61
- smOffset?: GridSize;
62
- /**
63
- * If a number, it sets the number of columns the grid item uses.
64
- * It can't be greater than the total number of columns of the container (12 by default).
65
- * If 'auto', the grid item's width matches its content.
66
- * If false, the prop is ignored.
67
- * If true, the grid item's width grows to use the space available in the grid container.
68
- * The value is applied for the `xl` breakpoint and wider screens if not overridden.
69
- * @default false
70
- */
71
- xl?: boolean | GridSize;
72
- /**
73
- * If a number, it sets the margin-left equals to the number of columns the grid item uses.
74
- * If 'auto', the grid item push itself to the right-end of the container.
75
- * The value is applied for the `xl` breakpoint and wider screens if not overridden.
76
- */
77
- xlOffset?: GridSize;
78
- /**
79
- * If a number, it sets the number of columns the grid item uses.
80
- * It can't be greater than the total number of columns of the container (12 by default).
81
- * If 'auto', the grid item's width matches its content.
82
- * If false, the prop is ignored.
83
- * If true, the grid item's width grows to use the space available in the grid container.
84
- * The value is applied for all the screen sizes with the lowest priority.
85
- * @default false
86
- */
87
- xs?: boolean | GridSize;
88
- /**
89
- * If a number, it sets the margin-left equals to the number of columns the grid item uses.
90
- * If 'auto', the grid item push itself to the right-end of the container.
91
- * The value is applied for the `xs` breakpoint and wider screens if not overridden.
92
- */
93
- xsOffset?: GridSize;
94
- }
95
- declare type CustomBreakpoints = Partial<Record<Breakpoint, boolean | GridSize> & Record<`${Breakpoint}Offset`, GridSize>>;
96
- interface BreakpointOverridesEmpty {
97
- }
98
- declare type Breakpoints = IfEquals<BreakpointOverrides, BreakpointOverridesEmpty, GridDefaultBreakpoints, CustomBreakpoints>;
99
- export interface GridBaseProps extends Breakpoints {
100
- /**
101
- * The content of the component.
102
- */
103
- children?: React.ReactNode;
104
- /**
105
- * The number of columns.
106
- * @default 12
107
- */
108
- columns?: ResponsiveStyleValue<number>;
109
- /**
110
- * Defines the horizontal space between the type `item` components.
111
- * It overrides the value of the `spacing` prop.
112
- */
113
- columnSpacing?: ResponsiveStyleValue<GridSpacing>;
114
- /**
115
- * If `true`, the component will have the flex *container* behavior.
116
- * You should be wrapping *items* with a *container*.
117
- * @default false
118
- */
119
- container?: boolean;
120
- /**
121
- * Defines the `flex-direction` style property.
122
- * It is applied for all screen sizes.
123
- * @default 'row'
124
- */
125
- direction?: ResponsiveStyleValue<GridDirection>;
126
- /**
127
- * Defines the vertical space between the type `item` components.
128
- * It overrides the value of the `spacing` prop.
129
- */
130
- rowSpacing?: ResponsiveStyleValue<GridSpacing>;
131
- /**
132
- * Defines the space between the type `item` components.
133
- * It can only be used on a type `container` component.
134
- * @default 0
135
- */
136
- spacing?: ResponsiveStyleValue<GridSpacing> | undefined;
137
- /**
138
- * Defines the `flex-wrap` style property.
139
- * It's applied for all screen sizes.
140
- * @default 'wrap'
141
- */
142
- wrap?: GridWrap;
143
- }
144
- export interface GridOwnerState extends GridBaseProps {
145
- nested: boolean;
146
- gridSize: Partial<Record<Breakpoint, GridSize | boolean>>;
147
- gridOffset: Partial<Record<Breakpoint, GridSize>>;
148
- }
149
- export interface GridTypeMap<P = {}, D extends React.ElementType = 'div'> {
150
- props: P & GridBaseProps & {
151
- sx?: SxProps<Theme>;
152
- } & SystemProps<Theme>;
153
- defaultComponent: D;
154
- }
155
- export declare type GridProps<D extends React.ElementType = GridTypeMap['defaultComponent'], P = {
156
- component?: React.ElementType;
157
- }> = OverrideProps<GridTypeMap<P, D>, D>;
158
- export {};
1
+ import * as React from 'react';
2
+ import { OverrideProps, IfEquals } from '@mui/types';
3
+ import { SxProps } from '../styleFunctionSx';
4
+ import { Theme, Breakpoint, BreakpointOverrides } from '../createTheme';
5
+ import { SystemProps } from '../Box';
6
+ declare type ResponsiveStyleValue<T> = T | Array<T | null> | {
7
+ [key in Breakpoint]?: T | null;
8
+ };
9
+ export declare type GridDirection = 'row' | 'row-reverse' | 'column' | 'column-reverse';
10
+ export declare type GridSpacing = number | string;
11
+ export declare type GridWrap = 'nowrap' | 'wrap' | 'wrap-reverse';
12
+ export declare type GridSize = 'auto' | number;
13
+ export interface GridDefaultBreakpoints {
14
+ /**
15
+ * If a number, it sets the number of columns the grid item uses.
16
+ * It can't be greater than the total number of columns of the container (12 by default).
17
+ * If 'auto', the grid item's width matches its content.
18
+ * If false, the prop is ignored.
19
+ * If true, the grid item's width grows to use the space available in the grid container.
20
+ * The value is applied for the `lg` breakpoint and wider screens if not overridden.
21
+ * @default false
22
+ */
23
+ lg?: boolean | GridSize;
24
+ /**
25
+ * If a number, it sets the margin-left equals to the number of columns the grid item uses.
26
+ * If 'auto', the grid item push itself to the right-end of the container.
27
+ * The value is applied for the `lg` breakpoint and wider screens if not overridden.
28
+ */
29
+ lgOffset?: GridSize;
30
+ /**
31
+ * If a number, it sets the number of columns the grid item uses.
32
+ * It can't be greater than the total number of columns of the container (12 by default).
33
+ * If 'auto', the grid item's width matches its content.
34
+ * If false, the prop is ignored.
35
+ * If true, the grid item's width grows to use the space available in the grid container.
36
+ * The value is applied for the `md` breakpoint and wider screens if not overridden.
37
+ * @default false
38
+ */
39
+ md?: boolean | GridSize;
40
+ /**
41
+ * If a number, it sets the margin-left equals to the number of columns the grid item uses.
42
+ * If 'auto', the grid item push itself to the right-end of the container.
43
+ * The value is applied for the `md` breakpoint and wider screens if not overridden.
44
+ */
45
+ mdOffset?: GridSize;
46
+ /**
47
+ * If a number, it sets the number of columns the grid item uses.
48
+ * It can't be greater than the total number of columns of the container (12 by default).
49
+ * If 'auto', the grid item's width matches its content.
50
+ * If false, the prop is ignored.
51
+ * If true, the grid item's width grows to use the space available in the grid container.
52
+ * The value is applied for the `sm` breakpoint and wider screens if not overridden.
53
+ * @default false
54
+ */
55
+ sm?: boolean | GridSize;
56
+ /**
57
+ * If a number, it sets the margin-left equals to the number of columns the grid item uses.
58
+ * If 'auto', the grid item push itself to the right-end of the container.
59
+ * The value is applied for the `sm` breakpoint and wider screens if not overridden.
60
+ */
61
+ smOffset?: GridSize;
62
+ /**
63
+ * If a number, it sets the number of columns the grid item uses.
64
+ * It can't be greater than the total number of columns of the container (12 by default).
65
+ * If 'auto', the grid item's width matches its content.
66
+ * If false, the prop is ignored.
67
+ * If true, the grid item's width grows to use the space available in the grid container.
68
+ * The value is applied for the `xl` breakpoint and wider screens if not overridden.
69
+ * @default false
70
+ */
71
+ xl?: boolean | GridSize;
72
+ /**
73
+ * If a number, it sets the margin-left equals to the number of columns the grid item uses.
74
+ * If 'auto', the grid item push itself to the right-end of the container.
75
+ * The value is applied for the `xl` breakpoint and wider screens if not overridden.
76
+ */
77
+ xlOffset?: GridSize;
78
+ /**
79
+ * If a number, it sets the number of columns the grid item uses.
80
+ * It can't be greater than the total number of columns of the container (12 by default).
81
+ * If 'auto', the grid item's width matches its content.
82
+ * If false, the prop is ignored.
83
+ * If true, the grid item's width grows to use the space available in the grid container.
84
+ * The value is applied for all the screen sizes with the lowest priority.
85
+ * @default false
86
+ */
87
+ xs?: boolean | GridSize;
88
+ /**
89
+ * If a number, it sets the margin-left equals to the number of columns the grid item uses.
90
+ * If 'auto', the grid item push itself to the right-end of the container.
91
+ * The value is applied for the `xs` breakpoint and wider screens if not overridden.
92
+ */
93
+ xsOffset?: GridSize;
94
+ }
95
+ declare type CustomBreakpoints = Partial<Record<Breakpoint, boolean | GridSize> & Record<`${Breakpoint}Offset`, GridSize>>;
96
+ interface BreakpointOverridesEmpty {
97
+ }
98
+ declare type Breakpoints = IfEquals<BreakpointOverrides, BreakpointOverridesEmpty, GridDefaultBreakpoints, CustomBreakpoints>;
99
+ export interface GridBaseProps extends Breakpoints {
100
+ /**
101
+ * The content of the component.
102
+ */
103
+ children?: React.ReactNode;
104
+ /**
105
+ * The number of columns.
106
+ * @default 12
107
+ */
108
+ columns?: ResponsiveStyleValue<number>;
109
+ /**
110
+ * Defines the horizontal space between the type `item` components.
111
+ * It overrides the value of the `spacing` prop.
112
+ */
113
+ columnSpacing?: ResponsiveStyleValue<GridSpacing>;
114
+ /**
115
+ * If `true`, the component will have the flex *container* behavior.
116
+ * You should be wrapping *items* with a *container*.
117
+ * @default false
118
+ */
119
+ container?: boolean;
120
+ /**
121
+ * Defines the `flex-direction` style property.
122
+ * It is applied for all screen sizes.
123
+ * @default 'row'
124
+ */
125
+ direction?: ResponsiveStyleValue<GridDirection>;
126
+ /**
127
+ * If `true`, the negative margin and padding are apply only to the top and left sides of the grid.
128
+ */
129
+ disableEqualOverflow?: boolean;
130
+ /**
131
+ * Defines the vertical space between the type `item` components.
132
+ * It overrides the value of the `spacing` prop.
133
+ */
134
+ rowSpacing?: ResponsiveStyleValue<GridSpacing>;
135
+ /**
136
+ * Defines the space between the type `item` components.
137
+ * It can only be used on a type `container` component.
138
+ * @default 0
139
+ */
140
+ spacing?: ResponsiveStyleValue<GridSpacing> | undefined;
141
+ /**
142
+ * Defines the `flex-wrap` style property.
143
+ * It's applied for all screen sizes.
144
+ * @default 'wrap'
145
+ */
146
+ wrap?: GridWrap;
147
+ }
148
+ export interface GridOwnerState extends GridBaseProps {
149
+ nested: boolean;
150
+ gridSize: Partial<Record<Breakpoint, GridSize | boolean>>;
151
+ gridOffset: Partial<Record<Breakpoint, GridSize>>;
152
+ }
153
+ export interface GridTypeMap<P = {}, D extends React.ElementType = 'div'> {
154
+ props: P & GridBaseProps & {
155
+ sx?: SxProps<Theme>;
156
+ } & SystemProps<Theme>;
157
+ defaultComponent: D;
158
+ }
159
+ export declare type GridProps<D extends React.ElementType = GridTypeMap['defaultComponent'], P = {
160
+ component?: React.ElementType;
161
+ }> = OverrideProps<GridTypeMap<P, D>, D>;
162
+ export {};
@@ -1,11 +1,11 @@
1
- import * as React from 'react';
2
- import { OverridableComponent } from '@mui/types';
3
- import { GridTypeMap } from './GridProps';
4
- declare const defaultCreateStyledComponent: import("@mui/styled-engine").CreateStyledComponent<import("../createStyled").MUIStyledCommonProps<any>, Pick<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, keyof React.ClassAttributes<HTMLDivElement> | keyof React.HTMLAttributes<HTMLDivElement>>, {}, any>;
5
- declare function useThemePropsDefault<T>(props: T): T & {};
6
- export default function createGrid(options?: {
7
- createStyledComponent?: typeof defaultCreateStyledComponent;
8
- useThemeProps?: typeof useThemePropsDefault;
9
- componentName?: string;
10
- }): OverridableComponent<GridTypeMap<{}, "div">>;
11
- export {};
1
+ import * as React from 'react';
2
+ import { OverridableComponent } from '@mui/types';
3
+ import { GridTypeMap } from './GridProps';
4
+ declare const defaultCreateStyledComponent: import("@mui/styled-engine").CreateStyledComponent<import("../createStyled").MUIStyledCommonProps<any>, Pick<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, keyof React.ClassAttributes<HTMLDivElement> | keyof React.HTMLAttributes<HTMLDivElement>>, {}, any>;
5
+ declare function useThemePropsDefault<T>(props: T): T & {};
6
+ export default function createGrid(options?: {
7
+ createStyledComponent?: typeof defaultCreateStyledComponent;
8
+ useThemeProps?: typeof useThemePropsDefault;
9
+ componentName?: string;
10
+ }): OverridableComponent<GridTypeMap<{}, "div">>;
11
+ export {};
@@ -33,7 +33,7 @@ var _gridGenerator = require("./gridGenerator");
33
33
 
34
34
  var _jsxRuntime = require("react/jsx-runtime");
35
35
 
36
- const _excluded = ["className", "columns", "container", "component", "direction", "wrap", "spacing", "rowSpacing", "columnSpacing"];
36
+ const _excluded = ["className", "columns", "container", "component", "direction", "wrap", "spacing", "rowSpacing", "columnSpacing", "disableEqualOverflow"];
37
37
 
38
38
  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); }
39
39
 
@@ -63,6 +63,7 @@ function createGrid(options = {}) {
63
63
  componentName = 'MuiGrid'
64
64
  } = options;
65
65
  const NestedContext = /*#__PURE__*/React.createContext(false);
66
+ const OverflowContext = /*#__PURE__*/React.createContext(undefined);
66
67
 
67
68
  const useUtilityClasses = (ownerState, theme) => {
68
69
  const {
@@ -80,13 +81,14 @@ function createGrid(options = {}) {
80
81
 
81
82
  const GridRoot = createStyledComponent(_gridGenerator.generateGridColumnsStyles, _gridGenerator.generateGridColumnSpacingStyles, _gridGenerator.generateGridRowSpacingStyles, _gridGenerator.generateGridSizeStyles, _gridGenerator.generateGridDirectionStyles, _gridGenerator.generateGridStyles, _gridGenerator.generateGridOffsetStyles);
82
83
  const Grid = /*#__PURE__*/React.forwardRef(function Grid(inProps, ref) {
83
- var _inProps$columns, _inProps$spacing, _ref, _inProps$rowSpacing, _ref2, _inProps$columnSpacin;
84
+ var _inProps$columns, _inProps$spacing, _ref, _inProps$rowSpacing, _ref2, _inProps$columnSpacin, _ref3, _disableEqualOverflow;
84
85
 
85
86
  const theme = (0, _useTheme.default)();
86
87
  const themeProps = useThemeProps(inProps);
87
88
  const props = (0, _styleFunctionSx.extendSxProp)(themeProps); // `color` type conflicts with html color attribute.
88
89
 
89
90
  const nested = React.useContext(NestedContext);
91
+ const overflow = React.useContext(OverflowContext);
90
92
  const {
91
93
  className,
92
94
  columns: columnsProp = 12,
@@ -96,9 +98,17 @@ function createGrid(options = {}) {
96
98
  wrap = 'wrap',
97
99
  spacing: spacingProp = 0,
98
100
  rowSpacing: rowSpacingProp = spacingProp,
99
- columnSpacing: columnSpacingProp = spacingProp
101
+ columnSpacing: columnSpacingProp = spacingProp,
102
+ disableEqualOverflow: themeDisableEqualOverflow
100
103
  } = props,
101
- rest = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded); // collect breakpoints related props because they can be custom from the theme.
104
+ rest = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded); // Because `disableEqualOverflow` can be set from the theme's defaultProps, the **nested** grid should look at the instance props instead.
105
+
106
+ let disableEqualOverflow = themeDisableEqualOverflow;
107
+
108
+ if (nested && themeDisableEqualOverflow !== undefined) {
109
+ disableEqualOverflow = inProps.disableEqualOverflow;
110
+ } // collect breakpoints related props because they can be customized from the theme.
111
+
102
112
 
103
113
  const gridSize = {};
104
114
  const gridOffset = {};
@@ -126,7 +136,11 @@ function createGrid(options = {}) {
126
136
  rowSpacing,
127
137
  columnSpacing,
128
138
  gridSize,
129
- gridOffset
139
+ gridOffset,
140
+ disableEqualOverflow: (_ref3 = (_disableEqualOverflow = disableEqualOverflow) != null ? _disableEqualOverflow : overflow) != null ? _ref3 : false,
141
+ // use context value if exists.
142
+ parentDisableEqualOverflow: overflow // for nested grid
143
+
130
144
  });
131
145
  const classes = useUtilityClasses(ownerState, theme);
132
146
  let result = /*#__PURE__*/(0, _jsxRuntime.jsx)(GridRoot, (0, _extends2.default)({
@@ -143,6 +157,16 @@ function createGrid(options = {}) {
143
157
  });
144
158
  }
145
159
 
160
+ if (disableEqualOverflow !== undefined && disableEqualOverflow !== (overflow != null ? overflow : false)) {
161
+ // There are 2 possibilities that should wrap with the OverflowContext to communicate with the nested grids:
162
+ // 1. It is the root grid with `disableEqualOverflow`.
163
+ // 2. It is a nested grid with different `disableEqualOverflow` from the context.
164
+ result = /*#__PURE__*/(0, _jsxRuntime.jsx)(OverflowContext.Provider, {
165
+ value: disableEqualOverflow,
166
+ children: result
167
+ });
168
+ }
169
+
146
170
  return result;
147
171
  });
148
172
  process.env.NODE_ENV !== "production" ? Grid.propTypes
@@ -155,6 +179,7 @@ function createGrid(options = {}) {
155
179
  component: _propTypes.default.elementType,
156
180
  container: _propTypes.default.bool,
157
181
  direction: _propTypes.default.oneOfType([_propTypes.default.oneOf(['column-reverse', 'column', 'row-reverse', 'row']), _propTypes.default.arrayOf(_propTypes.default.oneOf(['column-reverse', 'column', 'row-reverse', 'row'])), _propTypes.default.object]),
182
+ disableEqualOverflow: _propTypes.default.bool,
158
183
  lg: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number, _propTypes.default.bool]),
159
184
  lgOffset: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number]),
160
185
  md: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number, _propTypes.default.bool]),
@@ -1,20 +1,20 @@
1
- export interface GridClasses {
2
- /** Styles applied to the root element. */
3
- root: string;
4
- /** Styles applied to the root element if `container={true}`. */
5
- container: string;
6
- /** Styles applied to the root element if `direction="column"`. */
7
- 'direction-xs-column': string;
8
- /** Styles applied to the root element if `direction="column-reverse"`. */
9
- 'direction-xs-column-reverse': string;
10
- /** Styles applied to the root element if `direction="row-reverse"`. */
11
- 'direction-xs-row-reverse': string;
12
- /** Styles applied to the root element if `wrap="nowrap"`. */
13
- 'wrap-xs-nowrap': string;
14
- /** Styles applied to the root element if `wrap="reverse"`. */
15
- 'wrap-xs-wrap-reverse': string;
16
- }
17
- export declare type GridClassKey = keyof GridClasses;
18
- export declare function getGridUtilityClass(slot: string): string;
19
- declare const gridClasses: GridClasses;
20
- export default gridClasses;
1
+ export interface GridClasses {
2
+ /** Styles applied to the root element. */
3
+ root: string;
4
+ /** Styles applied to the root element if `container={true}`. */
5
+ container: string;
6
+ /** Styles applied to the root element if `direction="column"`. */
7
+ 'direction-xs-column': string;
8
+ /** Styles applied to the root element if `direction="column-reverse"`. */
9
+ 'direction-xs-column-reverse': string;
10
+ /** Styles applied to the root element if `direction="row-reverse"`. */
11
+ 'direction-xs-row-reverse': string;
12
+ /** Styles applied to the root element if `wrap="nowrap"`. */
13
+ 'wrap-xs-nowrap': string;
14
+ /** Styles applied to the root element if `wrap="reverse"`. */
15
+ 'wrap-xs-wrap-reverse': string;
16
+ }
17
+ export declare type GridClassKey = keyof GridClasses;
18
+ export declare function getGridUtilityClass(slot: string): string;
19
+ declare const gridClasses: GridClasses;
20
+ export default gridClasses;
@@ -1,26 +1,26 @@
1
- import { Breakpoints } from '../createTheme/createBreakpoints';
2
- import { Spacing } from '../createTheme/createSpacing';
3
- import { GridOwnerState } from './GridProps';
4
- interface Props {
5
- theme: {
6
- breakpoints: Breakpoints;
7
- spacing?: Spacing;
8
- };
9
- ownerState: GridOwnerState & {
10
- parentDisableEqualOverflow?: boolean;
11
- };
12
- }
13
- interface Iterator<T> {
14
- (appendStyle: (responsizeStyles: Record<string, any>, style: object) => void, value: T): void;
15
- }
16
- export declare const traverseBreakpoints: <T = unknown>(breakpoints: Breakpoints, responsize: Record<string, any> | T | T[] | undefined, iterator: Iterator<T>) => void;
17
- export declare const generateGridSizeStyles: ({ theme, ownerState }: Props) => {};
18
- export declare const generateGridOffsetStyles: ({ theme, ownerState }: Props) => {};
19
- export declare const generateGridColumnsStyles: ({ theme, ownerState }: Props) => {};
20
- export declare const generateGridRowSpacingStyles: ({ theme, ownerState }: Props) => {};
21
- export declare const generateGridColumnSpacingStyles: ({ theme, ownerState }: Props) => {};
22
- export declare const generateGridDirectionStyles: ({ theme, ownerState }: Props) => {};
23
- export declare const generateGridStyles: ({ ownerState }: Props) => {};
24
- export declare const generateSizeClassNames: (gridSize: GridOwnerState['gridSize']) => string[];
25
- export declare const generateSpacingClassNames: (spacing: GridOwnerState['spacing'], smallestBreakpoint?: string) => string[];
26
- export {};
1
+ import { Breakpoints } from '../createTheme/createBreakpoints';
2
+ import { Spacing } from '../createTheme/createSpacing';
3
+ import { GridOwnerState } from './GridProps';
4
+ interface Props {
5
+ theme: {
6
+ breakpoints: Breakpoints;
7
+ spacing?: Spacing;
8
+ };
9
+ ownerState: GridOwnerState & {
10
+ parentDisableEqualOverflow?: boolean;
11
+ };
12
+ }
13
+ interface Iterator<T> {
14
+ (appendStyle: (responsizeStyles: Record<string, any>, style: object) => void, value: T): void;
15
+ }
16
+ export declare const traverseBreakpoints: <T = unknown>(breakpoints: Breakpoints, responsize: Record<string, any> | T | T[] | undefined, iterator: Iterator<T>) => void;
17
+ export declare const generateGridSizeStyles: ({ theme, ownerState }: Props) => {};
18
+ export declare const generateGridOffsetStyles: ({ theme, ownerState }: Props) => {};
19
+ export declare const generateGridColumnsStyles: ({ theme, ownerState }: Props) => {};
20
+ export declare const generateGridRowSpacingStyles: ({ theme, ownerState }: Props) => {};
21
+ export declare const generateGridColumnSpacingStyles: ({ theme, ownerState }: Props) => {};
22
+ export declare const generateGridDirectionStyles: ({ theme, ownerState }: Props) => {};
23
+ export declare const generateGridStyles: ({ ownerState }: Props) => {};
24
+ export declare const generateSizeClassNames: (gridSize: GridOwnerState['gridSize']) => string[];
25
+ export declare const generateSpacingClassNames: (spacing: GridOwnerState['spacing'], smallestBreakpoint?: string) => string[];
26
+ export {};
@@ -216,14 +216,20 @@ const generateGridStyles = ({
216
216
  flexWrap: ownerState.wrap
217
217
  }, {
218
218
  margin: `calc(var(--Grid-rowSpacing) / -2) calc(var(--Grid-columnSpacing) / -2)`
219
- }, ownerState.nested ? {
219
+ }, ownerState.disableEqualOverflow && {
220
+ margin: `calc(var(--Grid-rowSpacing) * -1) 0px 0px calc(var(--Grid-columnSpacing) * -1)`
221
+ }, ownerState.nested ? (0, _extends2.default)({
220
222
  padding: `calc(var(--Grid-nested-rowSpacing) / 2) calc(var(--Grid-nested-columnSpacing) / 2)`
221
- } : {
223
+ }, (ownerState.disableEqualOverflow || ownerState.parentDisableEqualOverflow) && {
224
+ padding: `calc(var(--Grid-nested-rowSpacing)) 0px 0px calc(var(--Grid-nested-columnSpacing))`
225
+ }) : {
222
226
  '--Grid-nested-rowSpacing': 'var(--Grid-rowSpacing)',
223
227
  '--Grid-nested-columnSpacing': 'var(--Grid-columnSpacing)'
224
- }) : {
228
+ }) : (0, _extends2.default)({
225
229
  padding: `calc(var(--Grid-rowSpacing) / 2) calc(var(--Grid-columnSpacing) / 2)`
226
- });
230
+ }, ownerState.disableEqualOverflow && {
231
+ padding: `calc(var(--Grid-rowSpacing)) 0px 0px calc(var(--Grid-columnSpacing))`
232
+ }));
227
233
  };
228
234
 
229
235
  exports.generateGridStyles = generateGridStyles;
@@ -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
@@ -107,7 +107,7 @@ function breakpoints(styleFunction) {
107
107
  function createEmptyBreakpointObject(breakpointsInput = {}) {
108
108
  var _breakpointsInput$key;
109
109
 
110
- const breakpointsInOrder = breakpointsInput == null ? void 0 : (_breakpointsInput$key = breakpointsInput.keys) == null ? void 0 : _breakpointsInput$key.reduce((acc, key) => {
110
+ const breakpointsInOrder = (_breakpointsInput$key = breakpointsInput.keys) == null ? void 0 : _breakpointsInput$key.reduce((acc, key) => {
111
111
  const breakpointStyleKey = breakpointsInput.up(key);
112
112
  acc[breakpointStyleKey] = {};
113
113
  return acc;
@@ -1 +1 @@
1
- export {};
1
+ export {};
@@ -1,10 +1,10 @@
1
- export declare type SpacingOptions = number | Spacing | ((abs: number) => number | string) | ((abs: number | string) => number | string) | ReadonlyArray<string | number>;
2
- export declare 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 declare type SpacingOptions = number | Spacing | ((abs: number) => number | string) | ((abs: number | string) => number | string) | ReadonlyArray<string | number>;
2
+ export declare 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;
@@ -179,7 +179,7 @@ function createCssVarsProvider(options) {
179
179
  })();
180
180
 
181
181
  if (key === resolvedDefaultColorScheme) {
182
- defaultColorSchemeStyleSheet[colorSchemeSelector] = css;
182
+ defaultColorSchemeStyleSheet[`${colorSchemeSelector}, [${attribute}="${key}"]`] = css;
183
183
  } else {
184
184
  otherColorSchemesStyleSheet[`${colorSchemeSelector === ':root' ? '' : colorSchemeSelector}[${attribute}="${key}"]`] = css;
185
185
  }
@@ -1 +1 @@
1
- export {};
1
+ export {};
@@ -1,5 +1,5 @@
1
- /**
2
- * The benefit of this function is to help developers get CSS var from theme without specifying the whole variable
3
- * and they does not need to remember the prefix (defined once).
4
- */
5
- export default function createGetCssVar<T extends string = string>(prefix?: string): <AdditionalVars extends string = never>(field: T | AdditionalVars, ...fallbacks: (T | AdditionalVars)[]) => string;
1
+ /**
2
+ * The benefit of this function is to help developers get CSS var from theme without specifying the whole variable
3
+ * and they does not need to remember the prefix (defined once).
4
+ */
5
+ export default function createGetCssVar<T extends string = string>(prefix?: string): <AdditionalVars extends string = never>(field: T | AdditionalVars, ...fallbacks: (T | AdditionalVars)[]) => string;