@instructure/ui-grid 11.7.3-snapshot-7 → 11.7.3-snapshot-26

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 CHANGED
@@ -3,9 +3,12 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
- ## [11.7.3-snapshot-7](https://github.com/instructure/instructure-ui/compare/v11.7.2...v11.7.3-snapshot-7) (2026-04-29)
6
+ ## [11.7.3-snapshot-26](https://github.com/instructure/instructure-ui/compare/v11.7.2...v11.7.3-snapshot-26) (2026-05-05)
7
7
 
8
- **Note:** Version bump only for package @instructure/ui-grid
8
+
9
+ ### Bug Fixes
10
+
11
+ * **many:** update dependencies, remove lots of Babel plugins, remove Webpack 4 support ([f916fca](https://github.com/instructure/instructure-ui/commit/f916fcafdddcb2d7de401f93e8ff92cfdfa47bba))
9
12
 
10
13
 
11
14
 
@@ -1,7 +1,4 @@
1
- import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
2
- const _excluded = ["styles", "makeStyles"],
3
- _excluded2 = ["styles"];
4
- var _dec, _class, _Grid;
1
+ var _dec, _class;
5
2
  /*
6
3
  * The MIT License (MIT)
7
4
  *
@@ -40,27 +37,37 @@ import { jsx as _jsx } from "@emotion/react/jsx-runtime";
40
37
  category: components
41
38
  ---
42
39
  **/
43
- let Grid = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_Grid = class Grid extends Component {
44
- constructor(...args) {
45
- super(...args);
46
- this.ref = null;
47
- this.handleRef = el => {
48
- this.ref = el;
49
- };
50
- }
40
+ let Grid = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = class Grid extends Component {
41
+ static displayName = "Grid";
42
+ static componentId = 'Grid';
43
+ static allowedProps = allowedProps;
44
+ static defaultProps = {
45
+ colSpacing: 'medium',
46
+ rowSpacing: 'medium',
47
+ hAlign: 'start',
48
+ startAt: 'small',
49
+ vAlign: 'top',
50
+ visualDebug: false,
51
+ children: null
52
+ };
53
+ static Row = GridRow;
54
+ static Col = GridCol;
55
+ ref = null;
56
+ handleRef = el => {
57
+ this.ref = el;
58
+ };
51
59
  componentDidMount() {
52
- var _this$props$makeStyle, _this$props;
53
- (_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props);
60
+ this.props.makeStyles?.();
54
61
  }
55
62
  componentDidUpdate() {
56
- var _this$props$makeStyle2, _this$props2;
57
- (_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
63
+ this.props.makeStyles?.();
58
64
  }
59
65
  renderChildren() {
60
- const _this$props3 = this.props,
61
- styles = _this$props3.styles,
62
- makeStyles = _this$props3.makeStyles,
63
- props = _objectWithoutProperties(_this$props3, _excluded);
66
+ const {
67
+ styles,
68
+ makeStyles,
69
+ ...props
70
+ } = this.props;
64
71
  const children = Children.toArray(this.props.children);
65
72
  return children.map((child, index) => {
66
73
  if (matchComponentTypes(child, [GridRow])) {
@@ -75,25 +82,18 @@ let Grid = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class
75
82
  });
76
83
  }
77
84
  render() {
78
- const _this$props4 = this.props,
79
- styles = _this$props4.styles,
80
- restProps = _objectWithoutProperties(_this$props4, _excluded2);
85
+ const {
86
+ styles,
87
+ ...restProps
88
+ } = this.props;
81
89
  const props = omitProps(restProps, Grid.allowedProps);
82
90
  return _jsx("span", {
83
91
  ...props,
84
- css: styles === null || styles === void 0 ? void 0 : styles.grid,
92
+ css: styles?.grid,
85
93
  ref: this.handleRef,
86
94
  children: this.renderChildren()
87
95
  });
88
96
  }
89
- }, _Grid.displayName = "Grid", _Grid.componentId = 'Grid', _Grid.allowedProps = allowedProps, _Grid.defaultProps = {
90
- colSpacing: 'medium',
91
- rowSpacing: 'medium',
92
- hAlign: 'start',
93
- startAt: 'small',
94
- vAlign: 'top',
95
- visualDebug: false,
96
- children: null
97
- }, _Grid.Row = GridRow, _Grid.Col = GridCol, _Grid)) || _class);
97
+ }) || _class);
98
98
  export default Grid;
99
99
  export { Grid, GridRow, GridCol };
@@ -33,8 +33,10 @@
33
33
  * @return {Object} The final style object, which will be used in the component
34
34
  */
35
35
  const generateStyle = (componentTheme, props) => {
36
- const startAt = props.startAt,
37
- visualDebug = props.visualDebug;
36
+ const {
37
+ startAt,
38
+ visualDebug
39
+ } = props;
38
40
  const getStartAtVariants = breakpoint => !!startAt && startAt === breakpoint ? {
39
41
  boxSizing: 'border-box'
40
42
  } : {};
@@ -28,12 +28,14 @@
28
28
  * @return {Object} The final theme object with the overrides and component variables
29
29
  */
30
30
  const generateComponentTheme = theme => {
31
- const spacing = theme.spacing,
32
- media = theme.media;
31
+ const {
32
+ spacing,
33
+ media
34
+ } = theme;
33
35
  const componentVariables = {
34
- spacingSmall: spacing === null || spacing === void 0 ? void 0 : spacing.small,
35
- spacingMedium: spacing === null || spacing === void 0 ? void 0 : spacing.medium,
36
- spacingLarge: spacing === null || spacing === void 0 ? void 0 : spacing.large,
36
+ spacingSmall: spacing?.small,
37
+ spacingMedium: spacing?.medium,
38
+ spacingLarge: spacing?.large,
37
39
  ...media
38
40
  };
39
41
  return {
@@ -1,7 +1,4 @@
1
- import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
2
- const _excluded = ["styles", "makeStyles"],
3
- _excluded2 = ["styles"];
4
- var _dec, _class, _Grid;
1
+ var _dec, _class;
5
2
  /*
6
3
  * The MIT License (MIT)
7
4
  *
@@ -39,27 +36,37 @@ import { jsx as _jsx } from "@emotion/react/jsx-runtime";
39
36
  category: components
40
37
  ---
41
38
  **/
42
- let Grid = (_dec = withStyle(generateStyle), _dec(_class = (_Grid = class Grid extends Component {
43
- constructor(...args) {
44
- super(...args);
45
- this.ref = null;
46
- this.handleRef = el => {
47
- this.ref = el;
48
- };
49
- }
39
+ let Grid = (_dec = withStyle(generateStyle), _dec(_class = class Grid extends Component {
40
+ static displayName = "Grid";
41
+ static componentId = 'Grid';
42
+ static allowedProps = allowedProps;
43
+ static defaultProps = {
44
+ colSpacing: 'medium',
45
+ rowSpacing: 'medium',
46
+ hAlign: 'start',
47
+ startAt: 'small',
48
+ vAlign: 'top',
49
+ visualDebug: false,
50
+ children: null
51
+ };
52
+ static Row = GridRow;
53
+ static Col = GridCol;
54
+ ref = null;
55
+ handleRef = el => {
56
+ this.ref = el;
57
+ };
50
58
  componentDidMount() {
51
- var _this$props$makeStyle, _this$props;
52
- (_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props);
59
+ this.props.makeStyles?.();
53
60
  }
54
61
  componentDidUpdate() {
55
- var _this$props$makeStyle2, _this$props2;
56
- (_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
62
+ this.props.makeStyles?.();
57
63
  }
58
64
  renderChildren() {
59
- const _this$props3 = this.props,
60
- styles = _this$props3.styles,
61
- makeStyles = _this$props3.makeStyles,
62
- props = _objectWithoutProperties(_this$props3, _excluded);
65
+ const {
66
+ styles,
67
+ makeStyles,
68
+ ...props
69
+ } = this.props;
63
70
  const children = Children.toArray(this.props.children);
64
71
  return children.map((child, index) => {
65
72
  if (matchComponentTypes(child, [GridRow])) {
@@ -74,25 +81,18 @@ let Grid = (_dec = withStyle(generateStyle), _dec(_class = (_Grid = class Grid e
74
81
  });
75
82
  }
76
83
  render() {
77
- const _this$props4 = this.props,
78
- styles = _this$props4.styles,
79
- restProps = _objectWithoutProperties(_this$props4, _excluded2);
84
+ const {
85
+ styles,
86
+ ...restProps
87
+ } = this.props;
80
88
  const props = omitProps(restProps, Grid.allowedProps);
81
89
  return _jsx("span", {
82
90
  ...props,
83
- css: styles === null || styles === void 0 ? void 0 : styles.grid,
91
+ css: styles?.grid,
84
92
  ref: this.handleRef,
85
93
  children: this.renderChildren()
86
94
  });
87
95
  }
88
- }, _Grid.displayName = "Grid", _Grid.componentId = 'Grid', _Grid.allowedProps = allowedProps, _Grid.defaultProps = {
89
- colSpacing: 'medium',
90
- rowSpacing: 'medium',
91
- hAlign: 'start',
92
- startAt: 'small',
93
- vAlign: 'top',
94
- visualDebug: false,
95
- children: null
96
- }, _Grid.Row = GridRow, _Grid.Col = GridCol, _Grid)) || _class);
96
+ }) || _class);
97
97
  export default Grid;
98
98
  export { Grid, GridRow, GridCol };
@@ -33,8 +33,10 @@
33
33
  * @return {Object} The final style object, which will be used in the component
34
34
  */
35
35
  const generateStyle = (componentTheme, props) => {
36
- const startAt = props.startAt,
37
- visualDebug = props.visualDebug;
36
+ const {
37
+ startAt,
38
+ visualDebug
39
+ } = props;
38
40
  const getStartAtVariants = breakpoint => !!startAt && startAt === breakpoint ? {
39
41
  boxSizing: 'border-box'
40
42
  } : {};
@@ -1,4 +1,4 @@
1
- var _dec, _class, _GridCol;
1
+ var _dec, _class;
2
2
  /*
3
3
  * The MIT License (MIT)
4
4
  *
@@ -37,20 +37,30 @@ parent: Grid
37
37
  id: Grid.Col
38
38
  ---
39
39
  **/
40
- let GridCol = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_GridCol = class GridCol extends Component {
41
- constructor(...args) {
42
- super(...args);
43
- this.ref = null;
44
- this.handleRef = el => {
45
- const elementRef = this.props.elementRef;
46
- this.ref = el;
47
- if (typeof elementRef === 'function') {
48
- elementRef(el);
49
- }
50
- };
51
- }
40
+ let GridCol = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = class GridCol extends Component {
41
+ static displayName = "GridCol";
42
+ static componentId = 'Grid.Col';
43
+ static allowedProps = allowedProps;
44
+ static defaultProps = {
45
+ textAlign: 'inherit',
46
+ children: null,
47
+ isLastCol: false,
48
+ isLastRow: false
49
+ };
50
+ ref = null;
51
+ handleRef = el => {
52
+ const {
53
+ elementRef
54
+ } = this.props;
55
+ this.ref = el;
56
+ if (typeof elementRef === 'function') {
57
+ elementRef(el);
58
+ }
59
+ };
52
60
  widthCheck() {
53
- const width = this.props.width;
61
+ const {
62
+ width
63
+ } = this.props;
54
64
  let shouldWarn = false;
55
65
  if (width) {
56
66
  if (typeof width === 'number' && width <= 0) {
@@ -70,32 +80,26 @@ let GridCol = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_cl
70
80
  }
71
81
  }
72
82
  componentDidMount() {
73
- var _this$props$makeStyle, _this$props;
74
- (_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props);
83
+ this.props.makeStyles?.();
75
84
  this.widthCheck();
76
85
  }
77
86
  componentDidUpdate() {
78
- var _this$props$makeStyle2, _this$props2;
79
- (_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
87
+ this.props.makeStyles?.();
80
88
  this.widthCheck();
81
89
  }
82
90
  render() {
83
- const _this$props3 = this.props,
84
- children = _this$props3.children,
85
- styles = _this$props3.styles;
91
+ const {
92
+ children,
93
+ styles
94
+ } = this.props;
86
95
  const props = omitProps(this.props, GridCol.allowedProps);
87
96
  return _jsx("span", {
88
97
  ...props,
89
98
  ref: this.handleRef,
90
- css: styles === null || styles === void 0 ? void 0 : styles.gridCol,
99
+ css: styles?.gridCol,
91
100
  children: children
92
101
  });
93
102
  }
94
- }, _GridCol.displayName = "GridCol", _GridCol.componentId = 'Grid.Col', _GridCol.allowedProps = allowedProps, _GridCol.defaultProps = {
95
- textAlign: 'inherit',
96
- children: null,
97
- isLastCol: false,
98
- isLastRow: false
99
- }, _GridCol)) || _class);
103
+ }) || _class);
100
104
  export default GridCol;
101
105
  export { GridCol };
@@ -1,3 +1,4 @@
1
+ import "core-js/modules/es.array.includes.js";
1
2
  /*
2
3
  * The MIT License (MIT)
3
4
  *
@@ -33,14 +34,16 @@
33
34
  * @return {Object} The final style object, which will be used in the component
34
35
  */
35
36
  const generateStyle = (componentTheme, props) => {
36
- const vAlign = props.vAlign,
37
- textAlign = props.textAlign,
38
- rowSpacing = props.rowSpacing,
39
- colSpacing = props.colSpacing,
40
- isLastRow = props.isLastRow,
41
- isLastCol = props.isLastCol,
42
- startAt = props.startAt,
43
- visualDebug = props.visualDebug;
37
+ const {
38
+ vAlign,
39
+ textAlign,
40
+ rowSpacing,
41
+ colSpacing,
42
+ isLastRow,
43
+ isLastCol,
44
+ startAt,
45
+ visualDebug
46
+ } = props;
44
47
  const rowSpacingVariants = {
45
48
  small: {
46
49
  marginBottom: componentTheme.spacingSmall
@@ -118,7 +121,9 @@ const generateStyle = (componentTheme, props) => {
118
121
  return enabledBreakpoints().includes(breakpoint);
119
122
  };
120
123
  const getColSize = breakpoint => {
121
- let width = props.width;
124
+ let {
125
+ width
126
+ } = props;
122
127
  if (!width) return;
123
128
  if (width && typeof width === 'object') {
124
129
  width = width[breakpoint === 'x-large' ? 'xLarge' : breakpoint];
@@ -126,7 +131,9 @@ const generateStyle = (componentTheme, props) => {
126
131
  return width;
127
132
  };
128
133
  const getColOffset = breakpoint => {
129
- let offset = props.offset;
134
+ let {
135
+ offset
136
+ } = props;
130
137
  if (!offset) return;
131
138
  if (offset && typeof offset === 'object') {
132
139
  offset = offset[breakpoint === 'x-large' ? 'xLarge' : breakpoint];
@@ -28,12 +28,14 @@
28
28
  * @return {Object} The final theme object with the overrides and component variables
29
29
  */
30
30
  const generateComponentTheme = theme => {
31
- const spacing = theme.spacing,
32
- media = theme.media;
31
+ const {
32
+ spacing,
33
+ media
34
+ } = theme;
33
35
  const componentVariables = {
34
- spacingSmall: spacing === null || spacing === void 0 ? void 0 : spacing.small,
35
- spacingMedium: spacing === null || spacing === void 0 ? void 0 : spacing.medium,
36
- spacingLarge: spacing === null || spacing === void 0 ? void 0 : spacing.large,
36
+ spacingSmall: spacing?.small,
37
+ spacingMedium: spacing?.medium,
38
+ spacingLarge: spacing?.large,
37
39
  ...media
38
40
  };
39
41
  return {
@@ -1,4 +1,4 @@
1
- var _dec, _class, _GridCol;
1
+ var _dec, _class;
2
2
  /*
3
3
  * The MIT License (MIT)
4
4
  *
@@ -36,20 +36,30 @@ parent: Grid
36
36
  id: Grid.Col
37
37
  ---
38
38
  **/
39
- let GridCol = (_dec = withStyle(generateStyle), _dec(_class = (_GridCol = class GridCol extends Component {
40
- constructor(...args) {
41
- super(...args);
42
- this.ref = null;
43
- this.handleRef = el => {
44
- const elementRef = this.props.elementRef;
45
- this.ref = el;
46
- if (typeof elementRef === 'function') {
47
- elementRef(el);
48
- }
49
- };
50
- }
39
+ let GridCol = (_dec = withStyle(generateStyle), _dec(_class = class GridCol extends Component {
40
+ static displayName = "GridCol";
41
+ static componentId = 'Grid.Col';
42
+ static allowedProps = allowedProps;
43
+ static defaultProps = {
44
+ textAlign: 'inherit',
45
+ children: null,
46
+ isLastCol: false,
47
+ isLastRow: false
48
+ };
49
+ ref = null;
50
+ handleRef = el => {
51
+ const {
52
+ elementRef
53
+ } = this.props;
54
+ this.ref = el;
55
+ if (typeof elementRef === 'function') {
56
+ elementRef(el);
57
+ }
58
+ };
51
59
  widthCheck() {
52
- const width = this.props.width;
60
+ const {
61
+ width
62
+ } = this.props;
53
63
  let shouldWarn = false;
54
64
  if (width) {
55
65
  if (typeof width === 'number' && width <= 0) {
@@ -69,32 +79,26 @@ let GridCol = (_dec = withStyle(generateStyle), _dec(_class = (_GridCol = class
69
79
  }
70
80
  }
71
81
  componentDidMount() {
72
- var _this$props$makeStyle, _this$props;
73
- (_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props);
82
+ this.props.makeStyles?.();
74
83
  this.widthCheck();
75
84
  }
76
85
  componentDidUpdate() {
77
- var _this$props$makeStyle2, _this$props2;
78
- (_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
86
+ this.props.makeStyles?.();
79
87
  this.widthCheck();
80
88
  }
81
89
  render() {
82
- const _this$props3 = this.props,
83
- children = _this$props3.children,
84
- styles = _this$props3.styles;
90
+ const {
91
+ children,
92
+ styles
93
+ } = this.props;
85
94
  const props = omitProps(this.props, GridCol.allowedProps);
86
95
  return _jsx("span", {
87
96
  ...props,
88
97
  ref: this.handleRef,
89
- css: styles === null || styles === void 0 ? void 0 : styles.gridCol,
98
+ css: styles?.gridCol,
90
99
  children: children
91
100
  });
92
101
  }
93
- }, _GridCol.displayName = "GridCol", _GridCol.componentId = 'Grid.Col', _GridCol.allowedProps = allowedProps, _GridCol.defaultProps = {
94
- textAlign: 'inherit',
95
- children: null,
96
- isLastCol: false,
97
- isLastRow: false
98
- }, _GridCol)) || _class);
102
+ }) || _class);
99
103
  export default GridCol;
100
104
  export { GridCol };
@@ -1,3 +1,4 @@
1
+ import "core-js/modules/es.array.includes.js";
1
2
  /*
2
3
  * The MIT License (MIT)
3
4
  *
@@ -33,14 +34,16 @@
33
34
  * @return {Object} The final style object, which will be used in the component
34
35
  */
35
36
  const generateStyle = (componentTheme, props) => {
36
- const vAlign = props.vAlign,
37
- textAlign = props.textAlign,
38
- rowSpacing = props.rowSpacing,
39
- colSpacing = props.colSpacing,
40
- isLastRow = props.isLastRow,
41
- isLastCol = props.isLastCol,
42
- startAt = props.startAt,
43
- visualDebug = props.visualDebug;
37
+ const {
38
+ vAlign,
39
+ textAlign,
40
+ rowSpacing,
41
+ colSpacing,
42
+ isLastRow,
43
+ isLastCol,
44
+ startAt,
45
+ visualDebug
46
+ } = props;
44
47
  const rowSpacingVariants = {
45
48
  small: {
46
49
  marginBottom: componentTheme.spacingSmall
@@ -118,7 +121,9 @@ const generateStyle = (componentTheme, props) => {
118
121
  return enabledBreakpoints().includes(breakpoint);
119
122
  };
120
123
  const getColSize = breakpoint => {
121
- let width = props.width;
124
+ let {
125
+ width
126
+ } = props;
122
127
  if (!width) return;
123
128
  if (width && typeof width === 'object') {
124
129
  width = width[breakpoint === 'x-large' ? 'xLarge' : breakpoint];
@@ -126,7 +131,9 @@ const generateStyle = (componentTheme, props) => {
126
131
  return width;
127
132
  };
128
133
  const getColOffset = breakpoint => {
129
- let offset = props.offset;
134
+ let {
135
+ offset
136
+ } = props;
130
137
  if (!offset) return;
131
138
  if (offset && typeof offset === 'object') {
132
139
  offset = offset[breakpoint === 'x-large' ? 'xLarge' : breakpoint];
@@ -1,7 +1,4 @@
1
- import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
2
- const _excluded = ["styles", "makeStyles"],
3
- _excluded2 = ["styles"];
4
- var _dec, _class, _GridRow;
1
+ var _dec, _class;
5
2
  /*
6
3
  * The MIT License (MIT)
7
4
  *
@@ -40,27 +37,30 @@ parent: Grid
40
37
  id: Grid.Row
41
38
  ---
42
39
  **/
43
- let GridRow = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_GridRow = class GridRow extends Component {
44
- constructor(...args) {
45
- super(...args);
46
- this.ref = null;
47
- this.handleRef = el => {
48
- this.ref = el;
49
- };
50
- }
40
+ let GridRow = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = class GridRow extends Component {
41
+ static displayName = "GridRow";
42
+ static componentId = 'Grid.Row';
43
+ static allowedProps = allowedProps;
44
+ static defaultProps = {
45
+ children: null,
46
+ isLastRow: false
47
+ };
48
+ ref = null;
49
+ handleRef = el => {
50
+ this.ref = el;
51
+ };
51
52
  componentDidMount() {
52
- var _this$props$makeStyle, _this$props;
53
- (_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props);
53
+ this.props.makeStyles?.();
54
54
  }
55
55
  componentDidUpdate() {
56
- var _this$props$makeStyle2, _this$props2;
57
- (_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
56
+ this.props.makeStyles?.();
58
57
  }
59
58
  renderChildren() {
60
- const _this$props3 = this.props,
61
- styles = _this$props3.styles,
62
- makeStyles = _this$props3.makeStyles,
63
- props = _objectWithoutProperties(_this$props3, _excluded);
59
+ const {
60
+ styles,
61
+ makeStyles,
62
+ ...props
63
+ } = this.props;
64
64
  return Children.map(this.props.children, (child, index) => {
65
65
  if (matchComponentTypes(child, [GridCol])) {
66
66
  return safeCloneElement(child, {
@@ -75,20 +75,18 @@ let GridRow = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_cl
75
75
  });
76
76
  }
77
77
  render() {
78
- const _this$props4 = this.props,
79
- styles = _this$props4.styles,
80
- restProps = _objectWithoutProperties(_this$props4, _excluded2);
78
+ const {
79
+ styles,
80
+ ...restProps
81
+ } = this.props;
81
82
  const props = omitProps(restProps, GridRow.allowedProps);
82
83
  return _jsx("span", {
83
84
  ...props,
84
- css: styles === null || styles === void 0 ? void 0 : styles.gridRow,
85
+ css: styles?.gridRow,
85
86
  ref: this.handleRef,
86
87
  children: this.renderChildren()
87
88
  });
88
89
  }
89
- }, _GridRow.displayName = "GridRow", _GridRow.componentId = 'Grid.Row', _GridRow.allowedProps = allowedProps, _GridRow.defaultProps = {
90
- children: null,
91
- isLastRow: false
92
- }, _GridRow)) || _class);
90
+ }) || _class);
93
91
  export default GridRow;
94
92
  export { GridRow };
@@ -33,13 +33,15 @@
33
33
  * @return {Object} The final style object, which will be used in the component
34
34
  */
35
35
  const generateStyle = (componentTheme, props) => {
36
- const hAlign = props.hAlign,
37
- vAlign = props.vAlign,
38
- rowSpacing = props.rowSpacing,
39
- colSpacing = props.colSpacing,
40
- isLastRow = props.isLastRow,
41
- startAt = props.startAt,
42
- visualDebug = props.visualDebug;
36
+ const {
37
+ hAlign,
38
+ vAlign,
39
+ rowSpacing,
40
+ colSpacing,
41
+ isLastRow,
42
+ startAt,
43
+ visualDebug
44
+ } = props;
43
45
  const getGridRowStyle = () => {
44
46
  const hAlignVariants = {
45
47
  center: {