@instructure/ui-grid 8.56.4 → 8.56.5-pr-snapshot-1728655013879
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 +8 -0
- package/lib/Grid/index.js +5 -8
- package/lib/Grid/props.js +3 -3
- package/lib/GridCol/index.js +2 -2
- package/lib/GridRow/index.js +5 -8
- package/lib/GridRow/props.js +3 -3
- package/package.json +13 -13
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
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
|
+
## [8.56.5-pr-snapshot-1728655013879](https://github.com/instructure/instructure-ui/compare/v8.56.4...v8.56.5-pr-snapshot-1728655013879) (2024-10-11)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @instructure/ui-grid
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
6
14
|
## [8.56.4](https://github.com/instructure/instructure-ui/compare/v8.56.3...v8.56.4) (2024-10-02)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @instructure/ui-grid
|
package/lib/Grid/index.js
CHANGED
|
@@ -21,10 +21,7 @@ Object.defineProperty(exports, "GridRow", {
|
|
|
21
21
|
exports.default = void 0;
|
|
22
22
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
23
23
|
var _react = _interopRequireWildcard(require("react"));
|
|
24
|
-
var
|
|
25
|
-
var _matchComponentTypes = require("@instructure/ui-react-utils/lib/matchComponentTypes.js");
|
|
26
|
-
var _omitProps = require("@instructure/ui-react-utils/lib/omitProps.js");
|
|
27
|
-
var _pickProps = require("@instructure/ui-react-utils/lib/pickProps.js");
|
|
24
|
+
var _uiReactUtils = require("@instructure/ui-react-utils");
|
|
28
25
|
var _GridRow = require("../GridRow");
|
|
29
26
|
var _GridCol = require("../GridCol");
|
|
30
27
|
var _emotion = require("@instructure/emotion");
|
|
@@ -86,9 +83,9 @@ let Grid = exports.Grid = (_dec = (0, _emotion.withStyle)(_styles.default, _them
|
|
|
86
83
|
props = (0, _objectWithoutProperties2.default)(_this$props3, _excluded);
|
|
87
84
|
const children = _react.Children.toArray(this.props.children);
|
|
88
85
|
return children.map((child, index) => {
|
|
89
|
-
if ((0,
|
|
90
|
-
return (0,
|
|
91
|
-
...(0,
|
|
86
|
+
if ((0, _uiReactUtils.matchComponentTypes)(child, [_GridRow.GridRow])) {
|
|
87
|
+
return (0, _uiReactUtils.safeCloneElement)(child, {
|
|
88
|
+
...(0, _uiReactUtils.pickProps)(props, Grid.allowedProps),
|
|
92
89
|
...child.props /* child props should override parent */,
|
|
93
90
|
isLastRow: index + 1 === children.length
|
|
94
91
|
});
|
|
@@ -102,7 +99,7 @@ let Grid = exports.Grid = (_dec = (0, _emotion.withStyle)(_styles.default, _them
|
|
|
102
99
|
const _this$props4 = this.props,
|
|
103
100
|
styles = _this$props4.styles,
|
|
104
101
|
restProps = (0, _objectWithoutProperties2.default)(_this$props4, _excluded2);
|
|
105
|
-
const props = (0,
|
|
102
|
+
const props = (0, _uiReactUtils.omitProps)(restProps, Grid.allowedProps);
|
|
106
103
|
return (0, _emotion.jsx)("span", Object.assign({}, props, {
|
|
107
104
|
css: styles === null || styles === void 0 ? void 0 : styles.grid,
|
|
108
105
|
ref: this.handleRef
|
package/lib/Grid/props.js
CHANGED
|
@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.propTypes = exports.allowedProps = void 0;
|
|
8
8
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
|
-
var
|
|
10
|
-
var
|
|
9
|
+
var _uiPropTypes = require("@instructure/ui-prop-types");
|
|
10
|
+
var _uiA11yContent = require("@instructure/ui-a11y-content");
|
|
11
11
|
var _GridRow = require("../GridRow");
|
|
12
12
|
/*
|
|
13
13
|
* The MIT License (MIT)
|
|
@@ -34,7 +34,7 @@ var _GridRow = require("../GridRow");
|
|
|
34
34
|
*/
|
|
35
35
|
|
|
36
36
|
const propTypes = exports.propTypes = {
|
|
37
|
-
children:
|
|
37
|
+
children: _uiPropTypes.Children.oneOf([_GridRow.GridRow, _uiA11yContent.ScreenReaderContent]),
|
|
38
38
|
colSpacing: _propTypes.default.oneOf(['none', 'small', 'medium', 'large']),
|
|
39
39
|
rowSpacing: _propTypes.default.oneOf(['none', 'small', 'medium', 'large']),
|
|
40
40
|
hAlign: _propTypes.default.oneOf(['start', 'center', 'end', 'space-around', 'space-between']),
|
package/lib/GridCol/index.js
CHANGED
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.default = exports.GridCol = void 0;
|
|
8
8
|
var _react = require("react");
|
|
9
|
-
var
|
|
9
|
+
var _uiReactUtils = require("@instructure/ui-react-utils");
|
|
10
10
|
var _emotion = require("@instructure/emotion");
|
|
11
11
|
var _console = require("@instructure/console");
|
|
12
12
|
var _styles = _interopRequireDefault(require("./styles"));
|
|
@@ -89,7 +89,7 @@ let GridCol = exports.GridCol = (_dec = (0, _emotion.withStyle)(_styles.default,
|
|
|
89
89
|
const _this$props3 = this.props,
|
|
90
90
|
children = _this$props3.children,
|
|
91
91
|
styles = _this$props3.styles;
|
|
92
|
-
const props = (0,
|
|
92
|
+
const props = (0, _uiReactUtils.omitProps)(this.props, GridCol.allowedProps);
|
|
93
93
|
return (0, _emotion.jsx)("span", Object.assign({}, props, {
|
|
94
94
|
ref: this.handleRef,
|
|
95
95
|
css: styles === null || styles === void 0 ? void 0 : styles.gridCol
|
package/lib/GridRow/index.js
CHANGED
|
@@ -8,10 +8,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
8
8
|
exports.default = exports.GridRow = void 0;
|
|
9
9
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
10
10
|
var _react = _interopRequireWildcard(require("react"));
|
|
11
|
-
var
|
|
12
|
-
var _matchComponentTypes = require("@instructure/ui-react-utils/lib/matchComponentTypes.js");
|
|
13
|
-
var _omitProps = require("@instructure/ui-react-utils/lib/omitProps.js");
|
|
14
|
-
var _pickProps = require("@instructure/ui-react-utils/lib/pickProps.js");
|
|
11
|
+
var _uiReactUtils = require("@instructure/ui-react-utils");
|
|
15
12
|
var _GridCol = require("../GridCol");
|
|
16
13
|
var _emotion = require("@instructure/emotion");
|
|
17
14
|
var _styles = _interopRequireDefault(require("./styles"));
|
|
@@ -72,9 +69,9 @@ let GridRow = exports.GridRow = (_dec = (0, _emotion.withStyle)(_styles.default,
|
|
|
72
69
|
makeStyles = _this$props3.makeStyles,
|
|
73
70
|
props = (0, _objectWithoutProperties2.default)(_this$props3, _excluded);
|
|
74
71
|
return _react.Children.map(this.props.children, (child, index) => {
|
|
75
|
-
if ((0,
|
|
76
|
-
return (0,
|
|
77
|
-
...(0,
|
|
72
|
+
if ((0, _uiReactUtils.matchComponentTypes)(child, [_GridCol.GridCol])) {
|
|
73
|
+
return (0, _uiReactUtils.safeCloneElement)(child, {
|
|
74
|
+
...(0, _uiReactUtils.pickProps)(props, GridRow.allowedProps),
|
|
78
75
|
...child.props /* child props should override parent */,
|
|
79
76
|
isLastRow: props.isLastRow,
|
|
80
77
|
isLastCol: index + 1 === _react.Children.count(this.props.children)
|
|
@@ -89,7 +86,7 @@ let GridRow = exports.GridRow = (_dec = (0, _emotion.withStyle)(_styles.default,
|
|
|
89
86
|
const _this$props4 = this.props,
|
|
90
87
|
styles = _this$props4.styles,
|
|
91
88
|
restProps = (0, _objectWithoutProperties2.default)(_this$props4, _excluded2);
|
|
92
|
-
const props = (0,
|
|
89
|
+
const props = (0, _uiReactUtils.omitProps)(restProps, GridRow.allowedProps);
|
|
93
90
|
return (0, _emotion.jsx)("span", Object.assign({}, props, {
|
|
94
91
|
css: styles === null || styles === void 0 ? void 0 : styles.gridRow,
|
|
95
92
|
ref: this.handleRef
|
package/lib/GridRow/props.js
CHANGED
|
@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.propTypes = exports.allowedProps = void 0;
|
|
8
8
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
|
-
var
|
|
10
|
-
var
|
|
9
|
+
var _uiPropTypes = require("@instructure/ui-prop-types");
|
|
10
|
+
var _uiA11yContent = require("@instructure/ui-a11y-content");
|
|
11
11
|
var _GridCol = require("../GridCol");
|
|
12
12
|
/*
|
|
13
13
|
* The MIT License (MIT)
|
|
@@ -34,7 +34,7 @@ var _GridCol = require("../GridCol");
|
|
|
34
34
|
*/
|
|
35
35
|
|
|
36
36
|
const propTypes = exports.propTypes = {
|
|
37
|
-
children:
|
|
37
|
+
children: _uiPropTypes.Children.oneOf([_GridCol.GridCol, _uiA11yContent.ScreenReaderContent]),
|
|
38
38
|
rowSpacing: _propTypes.default.oneOf(['none', 'small', 'medium', 'large']),
|
|
39
39
|
colSpacing: _propTypes.default.oneOf(['none', 'small', 'medium', 'large']),
|
|
40
40
|
hAlign: _propTypes.default.oneOf(['start', 'center', 'end', 'space-around', 'space-between']),
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@instructure/ui-grid",
|
|
3
|
-
"version": "8.56.
|
|
3
|
+
"version": "8.56.5-pr-snapshot-1728655013879",
|
|
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.23.2",
|
|
27
|
-
"@instructure/console": "8.56.
|
|
28
|
-
"@instructure/emotion": "8.56.
|
|
29
|
-
"@instructure/shared-types": "8.56.
|
|
30
|
-
"@instructure/ui-a11y-content": "8.56.
|
|
31
|
-
"@instructure/ui-prop-types": "8.56.
|
|
32
|
-
"@instructure/ui-react-utils": "8.56.
|
|
33
|
-
"@instructure/ui-testable": "8.56.
|
|
34
|
-
"@instructure/ui-utils": "8.56.
|
|
27
|
+
"@instructure/console": "8.56.5-pr-snapshot-1728655013879",
|
|
28
|
+
"@instructure/emotion": "8.56.5-pr-snapshot-1728655013879",
|
|
29
|
+
"@instructure/shared-types": "8.56.5-pr-snapshot-1728655013879",
|
|
30
|
+
"@instructure/ui-a11y-content": "8.56.5-pr-snapshot-1728655013879",
|
|
31
|
+
"@instructure/ui-prop-types": "8.56.5-pr-snapshot-1728655013879",
|
|
32
|
+
"@instructure/ui-react-utils": "8.56.5-pr-snapshot-1728655013879",
|
|
33
|
+
"@instructure/ui-testable": "8.56.5-pr-snapshot-1728655013879",
|
|
34
|
+
"@instructure/ui-utils": "8.56.5-pr-snapshot-1728655013879",
|
|
35
35
|
"prop-types": "^15.8.1"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@instructure/ui-babel-preset": "8.56.
|
|
39
|
-
"@instructure/ui-color-utils": "8.56.
|
|
40
|
-
"@instructure/ui-test-utils": "8.56.
|
|
41
|
-
"@instructure/ui-themes": "8.56.
|
|
38
|
+
"@instructure/ui-babel-preset": "8.56.5-pr-snapshot-1728655013879",
|
|
39
|
+
"@instructure/ui-color-utils": "8.56.5-pr-snapshot-1728655013879",
|
|
40
|
+
"@instructure/ui-test-utils": "8.56.5-pr-snapshot-1728655013879",
|
|
41
|
+
"@instructure/ui-themes": "8.56.5-pr-snapshot-1728655013879"
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
44
|
"react": ">=16.8 <=18"
|