@instructure/ui-grid 10.16.1-snapshot-0 → 10.16.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -3,7 +3,7 @@
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
- ## [10.16.1-snapshot-0](https://github.com/instructure/instructure-ui/compare/v10.16.0...v10.16.1-snapshot-0) (2025-04-15)
6
+ ## [10.16.1](https://github.com/instructure/instructure-ui/compare/v10.16.0...v10.16.1) (2025-04-22)
7
7
 
8
8
  **Note:** Version bump only for package @instructure/ui-grid
9
9
 
@@ -23,29 +23,42 @@ var _Grid, _Grid2;
23
23
  * SOFTWARE.
24
24
  */
25
25
 
26
- import React from 'react';
27
26
  import { render, screen } from '@testing-library/react';
28
27
  import '@testing-library/jest-dom';
29
28
  import { Grid } from '../index';
29
+ import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
30
30
  describe('<Grid />', () => {
31
31
  it('should render content in each column', async () => {
32
- const _render = render(_Grid || (_Grid = /*#__PURE__*/React.createElement(Grid, null, /*#__PURE__*/React.createElement(Grid.Row, null, /*#__PURE__*/React.createElement(Grid.Col, null, "Foo"), /*#__PURE__*/React.createElement(Grid.Col, null, "Bar"), /*#__PURE__*/React.createElement(Grid.Col, null, "Baz"))))),
32
+ const _render = render(_Grid || (_Grid = _jsx(Grid, {
33
+ children: _jsxs(Grid.Row, {
34
+ children: [_jsx(Grid.Col, {
35
+ children: "Foo"
36
+ }), _jsx(Grid.Col, {
37
+ children: "Bar"
38
+ }), _jsx(Grid.Col, {
39
+ children: "Baz"
40
+ })]
41
+ })
42
+ }))),
33
43
  container = _render.container;
34
44
  expect(container).toHaveTextContent('FooBarBaz');
35
45
  });
36
46
  it('should pass aria and role attributes to underlying DOM elements', async () => {
37
- render(_Grid2 || (_Grid2 = /*#__PURE__*/React.createElement(Grid, {
47
+ render(_Grid2 || (_Grid2 = _jsx(Grid, {
38
48
  "data-testid": "grid",
39
49
  role: "grid",
40
- "aria-hidden": "true"
41
- }, /*#__PURE__*/React.createElement(Grid.Row, {
42
- "data-testid": "grid-row",
43
- "aria-live": "polite",
44
- role: "presentation"
45
- }, /*#__PURE__*/React.createElement(Grid.Col, {
46
- "data-testid": "grid-col",
47
- "aria-disabled": "true"
48
- }, "Foo")))));
50
+ "aria-hidden": "true",
51
+ children: _jsx(Grid.Row, {
52
+ "data-testid": "grid-row",
53
+ "aria-live": "polite",
54
+ role: "presentation",
55
+ children: _jsx(Grid.Col, {
56
+ "data-testid": "grid-col",
57
+ "aria-disabled": "true",
58
+ children: "Foo"
59
+ })
60
+ })
61
+ })));
49
62
  expect(screen.getByTestId('grid')).toHaveAttribute('aria-hidden');
50
63
  expect(screen.getByTestId('grid-row')).toHaveAttribute('aria-live', 'polite');
51
64
  expect(screen.getByTestId('grid-col')).toHaveAttribute('aria-disabled');
package/es/Grid/index.js CHANGED
@@ -26,15 +26,15 @@ var _dec, _class, _Grid;
26
26
  * SOFTWARE.
27
27
  */
28
28
 
29
- /** @jsx jsx */
30
- import React, { Component, Children } from 'react';
29
+ import { Component, Children } from 'react';
31
30
  import { safeCloneElement, matchComponentTypes, omitProps, pickProps } from '@instructure/ui-react-utils';
32
31
  import { GridRow } from '../GridRow';
33
32
  import { GridCol } from '../GridCol';
34
- import { withStyle, jsx } from '@instructure/emotion';
33
+ import { withStyle } from '@instructure/emotion';
35
34
  import generateStyle from './styles';
36
35
  import generateComponentTheme from './theme';
37
36
  import { propTypes, allowedProps } from './props';
37
+ import { jsx as _jsx } from "@emotion/react/jsx-runtime";
38
38
  /**
39
39
  ---
40
40
  category: components
@@ -79,10 +79,12 @@ let Grid = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class
79
79
  styles = _this$props4.styles,
80
80
  restProps = _objectWithoutProperties(_this$props4, _excluded2);
81
81
  const props = omitProps(restProps, Grid.allowedProps);
82
- return jsx("span", Object.assign({}, props, {
82
+ return _jsx("span", {
83
+ ...props,
83
84
  css: styles === null || styles === void 0 ? void 0 : styles.grid,
84
- ref: this.handleRef
85
- }), this.renderChildren());
85
+ ref: this.handleRef,
86
+ children: this.renderChildren()
87
+ });
86
88
  }
87
89
  }, _Grid.displayName = "Grid", _Grid.componentId = 'Grid', _Grid.propTypes = propTypes, _Grid.allowedProps = allowedProps, _Grid.defaultProps = {
88
90
  colSpacing: 'medium',
@@ -22,17 +22,18 @@
22
22
  * SOFTWARE.
23
23
  */
24
24
 
25
- import React from 'react';
26
25
  import { render } from '@testing-library/react';
27
26
  import { vi } from 'vitest';
28
27
  import '@testing-library/jest-dom';
29
28
  import { GridCol } from '../index';
29
+ import { jsx as _jsx } from "@emotion/react/jsx-runtime";
30
30
  describe('<GridCol />', () => {
31
31
  it('should render content in each column', async () => {
32
32
  const elementRef = vi.fn();
33
- const _render = render(/*#__PURE__*/React.createElement(GridCol, {
34
- elementRef: elementRef
35
- }, "Foo")),
33
+ const _render = render(_jsx(GridCol, {
34
+ elementRef: elementRef,
35
+ children: "Foo"
36
+ })),
36
37
  container = _render.container;
37
38
  expect(container).toHaveTextContent('Foo');
38
39
  expect(elementRef).toHaveBeenCalledWith(container.firstChild);
@@ -23,14 +23,14 @@ var _dec, _class, _GridCol;
23
23
  * SOFTWARE.
24
24
  */
25
25
 
26
- /** @jsx jsx */
27
26
  import { Component } from 'react';
28
27
  import { omitProps } from '@instructure/ui-react-utils';
29
- import { withStyle, jsx } from '@instructure/emotion';
28
+ import { withStyle } from '@instructure/emotion';
30
29
  import { logWarn as warn } from '@instructure/console';
31
30
  import generateStyle from './styles';
32
31
  import generateComponentTheme from './theme';
33
32
  import { propTypes, allowedProps } from './props';
33
+ import { jsx as _jsx } from "@emotion/react/jsx-runtime";
34
34
  /**
35
35
  ---
36
36
  parent: Grid
@@ -84,10 +84,12 @@ let GridCol = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_cl
84
84
  children = _this$props3.children,
85
85
  styles = _this$props3.styles;
86
86
  const props = omitProps(this.props, GridCol.allowedProps);
87
- return jsx("span", Object.assign({}, props, {
87
+ return _jsx("span", {
88
+ ...props,
88
89
  ref: this.handleRef,
89
- css: styles === null || styles === void 0 ? void 0 : styles.gridCol
90
- }), children);
90
+ css: styles === null || styles === void 0 ? void 0 : styles.gridCol,
91
+ children: children
92
+ });
91
93
  }
92
94
  }, _GridCol.displayName = "GridCol", _GridCol.componentId = 'Grid.Col', _GridCol.propTypes = propTypes, _GridCol.allowedProps = allowedProps, _GridCol.defaultProps = {
93
95
  textAlign: 'inherit',
@@ -26,14 +26,14 @@ var _dec, _class, _GridRow;
26
26
  * SOFTWARE.
27
27
  */
28
28
 
29
- /** @jsx jsx */
30
- import React, { Component, Children } from 'react';
29
+ import { Component, Children } from 'react';
31
30
  import { safeCloneElement, matchComponentTypes, omitProps, pickProps } from '@instructure/ui-react-utils';
32
31
  import { GridCol } from '../GridCol';
33
- import { withStyle, jsx } from '@instructure/emotion';
32
+ import { withStyle } from '@instructure/emotion';
34
33
  import generateStyle from './styles';
35
34
  import generateComponentTheme from './theme';
36
35
  import { propTypes, allowedProps } from './props';
36
+ import { jsx as _jsx } from "@emotion/react/jsx-runtime";
37
37
  /**
38
38
  ---
39
39
  parent: Grid
@@ -79,10 +79,12 @@ let GridRow = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_cl
79
79
  styles = _this$props4.styles,
80
80
  restProps = _objectWithoutProperties(_this$props4, _excluded2);
81
81
  const props = omitProps(restProps, GridRow.allowedProps);
82
- return jsx("span", Object.assign({}, props, {
82
+ return _jsx("span", {
83
+ ...props,
83
84
  css: styles === null || styles === void 0 ? void 0 : styles.gridRow,
84
- ref: this.handleRef
85
- }), this.renderChildren());
85
+ ref: this.handleRef,
86
+ children: this.renderChildren()
87
+ });
86
88
  }
87
89
  }, _GridRow.displayName = "GridRow", _GridRow.componentId = 'Grid.Row', _GridRow.propTypes = propTypes, _GridRow.allowedProps = allowedProps, _GridRow.defaultProps = {
88
90
  children: null,
@@ -1,10 +1,9 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
- var _react = _interopRequireDefault(require("react"));
5
- var _react2 = require("@testing-library/react");
3
+ var _react = require("@testing-library/react");
6
4
  require("@testing-library/jest-dom");
7
5
  var _index = require("../index");
6
+ var _jsxRuntime = require("@emotion/react/jsx-runtime");
8
7
  var _Grid, _Grid2;
9
8
  /*
10
9
  * The MIT License (MIT)
@@ -31,25 +30,38 @@ var _Grid, _Grid2;
31
30
  */
32
31
  describe('<Grid />', () => {
33
32
  it('should render content in each column', async () => {
34
- const _render = (0, _react2.render)(_Grid || (_Grid = /*#__PURE__*/_react.default.createElement(_index.Grid, null, /*#__PURE__*/_react.default.createElement(_index.Grid.Row, null, /*#__PURE__*/_react.default.createElement(_index.Grid.Col, null, "Foo"), /*#__PURE__*/_react.default.createElement(_index.Grid.Col, null, "Bar"), /*#__PURE__*/_react.default.createElement(_index.Grid.Col, null, "Baz"))))),
33
+ const _render = (0, _react.render)(_Grid || (_Grid = (0, _jsxRuntime.jsx)(_index.Grid, {
34
+ children: (0, _jsxRuntime.jsxs)(_index.Grid.Row, {
35
+ children: [(0, _jsxRuntime.jsx)(_index.Grid.Col, {
36
+ children: "Foo"
37
+ }), (0, _jsxRuntime.jsx)(_index.Grid.Col, {
38
+ children: "Bar"
39
+ }), (0, _jsxRuntime.jsx)(_index.Grid.Col, {
40
+ children: "Baz"
41
+ })]
42
+ })
43
+ }))),
35
44
  container = _render.container;
36
45
  expect(container).toHaveTextContent('FooBarBaz');
37
46
  });
38
47
  it('should pass aria and role attributes to underlying DOM elements', async () => {
39
- (0, _react2.render)(_Grid2 || (_Grid2 = /*#__PURE__*/_react.default.createElement(_index.Grid, {
48
+ (0, _react.render)(_Grid2 || (_Grid2 = (0, _jsxRuntime.jsx)(_index.Grid, {
40
49
  "data-testid": "grid",
41
50
  role: "grid",
42
- "aria-hidden": "true"
43
- }, /*#__PURE__*/_react.default.createElement(_index.Grid.Row, {
44
- "data-testid": "grid-row",
45
- "aria-live": "polite",
46
- role: "presentation"
47
- }, /*#__PURE__*/_react.default.createElement(_index.Grid.Col, {
48
- "data-testid": "grid-col",
49
- "aria-disabled": "true"
50
- }, "Foo")))));
51
- expect(_react2.screen.getByTestId('grid')).toHaveAttribute('aria-hidden');
52
- expect(_react2.screen.getByTestId('grid-row')).toHaveAttribute('aria-live', 'polite');
53
- expect(_react2.screen.getByTestId('grid-col')).toHaveAttribute('aria-disabled');
51
+ "aria-hidden": "true",
52
+ children: (0, _jsxRuntime.jsx)(_index.Grid.Row, {
53
+ "data-testid": "grid-row",
54
+ "aria-live": "polite",
55
+ role: "presentation",
56
+ children: (0, _jsxRuntime.jsx)(_index.Grid.Col, {
57
+ "data-testid": "grid-col",
58
+ "aria-disabled": "true",
59
+ children: "Foo"
60
+ })
61
+ })
62
+ })));
63
+ expect(_react.screen.getByTestId('grid')).toHaveAttribute('aria-hidden');
64
+ expect(_react.screen.getByTestId('grid-row')).toHaveAttribute('aria-live', 'polite');
65
+ expect(_react.screen.getByTestId('grid-col')).toHaveAttribute('aria-disabled');
54
66
  });
55
67
  });
package/lib/Grid/index.js CHANGED
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
- var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
5
4
  Object.defineProperty(exports, "__esModule", {
6
5
  value: true
7
6
  });
@@ -20,7 +19,7 @@ Object.defineProperty(exports, "GridRow", {
20
19
  });
21
20
  exports.default = void 0;
22
21
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
23
- var _react = _interopRequireWildcard(require("react"));
22
+ var _react = require("react");
24
23
  var _safeCloneElement = require("@instructure/ui-react-utils/lib/safeCloneElement.js");
25
24
  var _matchComponentTypes = require("@instructure/ui-react-utils/lib/matchComponentTypes.js");
26
25
  var _omitProps = require("@instructure/ui-react-utils/lib/omitProps.js");
@@ -31,6 +30,7 @@ var _emotion = require("@instructure/emotion");
31
30
  var _styles = _interopRequireDefault(require("./styles"));
32
31
  var _theme = _interopRequireDefault(require("./theme"));
33
32
  var _props = require("./props");
33
+ var _jsxRuntime = require("@emotion/react/jsx-runtime");
34
34
  const _excluded = ["styles", "makeStyles"],
35
35
  _excluded2 = ["styles"];
36
36
  var _dec, _class, _Grid;
@@ -57,7 +57,6 @@ var _dec, _class, _Grid;
57
57
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
58
58
  * SOFTWARE.
59
59
  */
60
- /** @jsx jsx */
61
60
  /**
62
61
  ---
63
62
  category: components
@@ -102,10 +101,12 @@ let Grid = exports.Grid = (_dec = (0, _emotion.withStyle)(_styles.default, _them
102
101
  styles = _this$props4.styles,
103
102
  restProps = (0, _objectWithoutProperties2.default)(_this$props4, _excluded2);
104
103
  const props = (0, _omitProps.omitProps)(restProps, Grid.allowedProps);
105
- return (0, _emotion.jsx)("span", Object.assign({}, props, {
104
+ return (0, _jsxRuntime.jsx)("span", {
105
+ ...props,
106
106
  css: styles === null || styles === void 0 ? void 0 : styles.grid,
107
- ref: this.handleRef
108
- }), this.renderChildren());
107
+ ref: this.handleRef,
108
+ children: this.renderChildren()
109
+ });
109
110
  }
110
111
  }, _Grid.displayName = "Grid", _Grid.componentId = 'Grid', _Grid.propTypes = _props.propTypes, _Grid.allowedProps = _props.allowedProps, _Grid.defaultProps = {
111
112
  colSpacing: 'medium',
@@ -1,11 +1,10 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
- var _react = _interopRequireDefault(require("react"));
5
- var _react2 = require("@testing-library/react");
3
+ var _react = require("@testing-library/react");
6
4
  var _vitest = require("vitest");
7
5
  require("@testing-library/jest-dom");
8
6
  var _index = require("../index");
7
+ var _jsxRuntime = require("@emotion/react/jsx-runtime");
9
8
  /*
10
9
  * The MIT License (MIT)
11
10
  *
@@ -33,9 +32,10 @@ var _index = require("../index");
33
32
  describe('<GridCol />', () => {
34
33
  it('should render content in each column', async () => {
35
34
  const elementRef = _vitest.vi.fn();
36
- const _render = (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.GridCol, {
37
- elementRef: elementRef
38
- }, "Foo")),
35
+ const _render = (0, _react.render)((0, _jsxRuntime.jsx)(_index.GridCol, {
36
+ elementRef: elementRef,
37
+ children: "Foo"
38
+ })),
39
39
  container = _render.container;
40
40
  expect(container).toHaveTextContent('Foo');
41
41
  expect(elementRef).toHaveBeenCalledWith(container.firstChild);
@@ -12,6 +12,7 @@ var _console = require("@instructure/console");
12
12
  var _styles = _interopRequireDefault(require("./styles"));
13
13
  var _theme = _interopRequireDefault(require("./theme"));
14
14
  var _props = require("./props");
15
+ var _jsxRuntime = require("@emotion/react/jsx-runtime");
15
16
  var _dec, _class, _GridCol;
16
17
  /*
17
18
  * The MIT License (MIT)
@@ -36,7 +37,6 @@ var _dec, _class, _GridCol;
36
37
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
37
38
  * SOFTWARE.
38
39
  */
39
- /** @jsx jsx */
40
40
  /**
41
41
  ---
42
42
  parent: Grid
@@ -90,10 +90,12 @@ let GridCol = exports.GridCol = (_dec = (0, _emotion.withStyle)(_styles.default,
90
90
  children = _this$props3.children,
91
91
  styles = _this$props3.styles;
92
92
  const props = (0, _omitProps.omitProps)(this.props, GridCol.allowedProps);
93
- return (0, _emotion.jsx)("span", Object.assign({}, props, {
93
+ return (0, _jsxRuntime.jsx)("span", {
94
+ ...props,
94
95
  ref: this.handleRef,
95
- css: styles === null || styles === void 0 ? void 0 : styles.gridCol
96
- }), children);
96
+ css: styles === null || styles === void 0 ? void 0 : styles.gridCol,
97
+ children: children
98
+ });
97
99
  }
98
100
  }, _GridCol.displayName = "GridCol", _GridCol.componentId = 'Grid.Col', _GridCol.propTypes = _props.propTypes, _GridCol.allowedProps = _props.allowedProps, _GridCol.defaultProps = {
99
101
  textAlign: 'inherit',
@@ -1,13 +1,12 @@
1
1
  "use strict";
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
- var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
5
4
  Object.defineProperty(exports, "__esModule", {
6
5
  value: true
7
6
  });
8
7
  exports.default = exports.GridRow = void 0;
9
8
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
10
- var _react = _interopRequireWildcard(require("react"));
9
+ var _react = require("react");
11
10
  var _safeCloneElement = require("@instructure/ui-react-utils/lib/safeCloneElement.js");
12
11
  var _matchComponentTypes = require("@instructure/ui-react-utils/lib/matchComponentTypes.js");
13
12
  var _omitProps = require("@instructure/ui-react-utils/lib/omitProps.js");
@@ -17,6 +16,7 @@ var _emotion = require("@instructure/emotion");
17
16
  var _styles = _interopRequireDefault(require("./styles"));
18
17
  var _theme = _interopRequireDefault(require("./theme"));
19
18
  var _props = require("./props");
19
+ var _jsxRuntime = require("@emotion/react/jsx-runtime");
20
20
  const _excluded = ["styles", "makeStyles"],
21
21
  _excluded2 = ["styles"];
22
22
  var _dec, _class, _GridRow;
@@ -43,7 +43,6 @@ var _dec, _class, _GridRow;
43
43
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
44
44
  * SOFTWARE.
45
45
  */
46
- /** @jsx jsx */
47
46
  /**
48
47
  ---
49
48
  parent: Grid
@@ -89,10 +88,12 @@ let GridRow = exports.GridRow = (_dec = (0, _emotion.withStyle)(_styles.default,
89
88
  styles = _this$props4.styles,
90
89
  restProps = (0, _objectWithoutProperties2.default)(_this$props4, _excluded2);
91
90
  const props = (0, _omitProps.omitProps)(restProps, GridRow.allowedProps);
92
- return (0, _emotion.jsx)("span", Object.assign({}, props, {
91
+ return (0, _jsxRuntime.jsx)("span", {
92
+ ...props,
93
93
  css: styles === null || styles === void 0 ? void 0 : styles.gridRow,
94
- ref: this.handleRef
95
- }), this.renderChildren());
94
+ ref: this.handleRef,
95
+ children: this.renderChildren()
96
+ });
96
97
  }
97
98
  }, _GridRow.displayName = "GridRow", _GridRow.componentId = 'Grid.Row', _GridRow.propTypes = _props.propTypes, _GridRow.allowedProps = _props.allowedProps, _GridRow.defaultProps = {
98
99
  children: null,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@instructure/ui-grid",
3
- "version": "10.16.1-snapshot-0",
3
+ "version": "10.16.1",
4
4
  "description": "A Grid component.",
5
5
  "author": "Instructure, Inc. Engineering and Product Design",
6
6
  "module": "./es/index.js",
@@ -24,21 +24,21 @@
24
24
  "license": "MIT",
25
25
  "dependencies": {
26
26
  "@babel/runtime": "^7.26.0",
27
- "@instructure/console": "10.16.1-snapshot-0",
28
- "@instructure/emotion": "10.16.1-snapshot-0",
29
- "@instructure/shared-types": "10.16.1-snapshot-0",
30
- "@instructure/ui-a11y-content": "10.16.1-snapshot-0",
31
- "@instructure/ui-prop-types": "10.16.1-snapshot-0",
32
- "@instructure/ui-react-utils": "10.16.1-snapshot-0",
33
- "@instructure/ui-testable": "10.16.1-snapshot-0",
34
- "@instructure/ui-utils": "10.16.1-snapshot-0",
27
+ "@instructure/console": "10.16.1",
28
+ "@instructure/emotion": "10.16.1",
29
+ "@instructure/shared-types": "10.16.1",
30
+ "@instructure/ui-a11y-content": "10.16.1",
31
+ "@instructure/ui-prop-types": "10.16.1",
32
+ "@instructure/ui-react-utils": "10.16.1",
33
+ "@instructure/ui-testable": "10.16.1",
34
+ "@instructure/ui-utils": "10.16.1",
35
35
  "prop-types": "^15.8.1"
36
36
  },
37
37
  "devDependencies": {
38
- "@instructure/ui-babel-preset": "10.16.1-snapshot-0",
39
- "@instructure/ui-color-utils": "10.16.1-snapshot-0",
40
- "@instructure/ui-test-utils": "10.16.1-snapshot-0",
41
- "@instructure/ui-themes": "10.16.1-snapshot-0",
38
+ "@instructure/ui-babel-preset": "10.16.1",
39
+ "@instructure/ui-color-utils": "10.16.1",
40
+ "@instructure/ui-test-utils": "10.16.1",
41
+ "@instructure/ui-themes": "10.16.1",
42
42
  "@testing-library/jest-dom": "^6.6.3",
43
43
  "@testing-library/react": "^16.0.1",
44
44
  "vitest": "^2.1.8"
@@ -22,7 +22,6 @@
22
22
  * SOFTWARE.
23
23
  */
24
24
 
25
- import React from 'react'
26
25
  import { render, screen } from '@testing-library/react'
27
26
  import '@testing-library/jest-dom'
28
27
 
@@ -22,8 +22,7 @@
22
22
  * SOFTWARE.
23
23
  */
24
24
 
25
- /** @jsx jsx */
26
- import React, { Component, Children } from 'react'
25
+ import { ComponentElement, Component, Children } from 'react'
27
26
 
28
27
  import {
29
28
  safeCloneElement,
@@ -36,7 +35,7 @@ import { GridRow } from '../GridRow'
36
35
  import type { GridRowProps } from '../GridRow/props'
37
36
  import { GridCol } from '../GridCol'
38
37
 
39
- import { withStyle, jsx } from '@instructure/emotion'
38
+ import { withStyle } from '@instructure/emotion'
40
39
 
41
40
  import generateStyle from './styles'
42
41
  import generateComponentTheme from './theme'
@@ -88,10 +87,9 @@ class Grid extends Component<GridProps> {
88
87
 
89
88
  return children.map((child, index) => {
90
89
  if (
91
- matchComponentTypes<React.ComponentElement<GridRowProps, GridRow>>(
92
- child,
93
- [GridRow]
94
- )
90
+ matchComponentTypes<ComponentElement<GridRowProps, GridRow>>(child, [
91
+ GridRow
92
+ ])
95
93
  ) {
96
94
  return safeCloneElement(child, {
97
95
  ...pickProps(props, Grid.allowedProps),
@@ -22,7 +22,6 @@
22
22
  * SOFTWARE.
23
23
  */
24
24
 
25
- import React from 'react'
26
25
  import { render } from '@testing-library/react'
27
26
  import { vi } from 'vitest'
28
27
  import '@testing-library/jest-dom'
@@ -22,12 +22,11 @@
22
22
  * SOFTWARE.
23
23
  */
24
24
 
25
- /** @jsx jsx */
26
25
  import { Component } from 'react'
27
26
 
28
27
  import { omitProps } from '@instructure/ui-react-utils'
29
28
 
30
- import { withStyle, jsx } from '@instructure/emotion'
29
+ import { withStyle } from '@instructure/emotion'
31
30
  import { logWarn as warn } from '@instructure/console'
32
31
 
33
32
  import generateStyle from './styles'
@@ -22,8 +22,7 @@
22
22
  * SOFTWARE.
23
23
  */
24
24
 
25
- /** @jsx jsx */
26
- import React, { Component, Children } from 'react'
25
+ import { ComponentElement, Component, Children } from 'react'
27
26
 
28
27
  import {
29
28
  safeCloneElement,
@@ -35,7 +34,7 @@ import {
35
34
  import { GridCol } from '../GridCol'
36
35
  import type { GridColProps } from '../GridCol/props'
37
36
 
38
- import { withStyle, jsx } from '@instructure/emotion'
37
+ import { withStyle } from '@instructure/emotion'
39
38
 
40
39
  import generateStyle from './styles'
41
40
  import generateComponentTheme from './theme'
@@ -79,10 +78,9 @@ class GridRow extends Component<GridRowProps> {
79
78
 
80
79
  return Children.map(this.props.children, (child, index) => {
81
80
  if (
82
- matchComponentTypes<React.ComponentElement<GridColProps, GridCol>>(
83
- child,
84
- [GridCol]
85
- )
81
+ matchComponentTypes<ComponentElement<GridColProps, GridCol>>(child, [
82
+ GridCol
83
+ ])
86
84
  ) {
87
85
  return safeCloneElement(child, {
88
86
  ...pickProps(props, GridRow.allowedProps),