@instructure/ui-flex 10.11.0 → 10.11.1-pr-snapshot-1741369431545
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/Flex/Item/index.js +4 -4
- package/lib/Flex/index.js +5 -8
- package/package.json +9 -9
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
|
+
## [10.11.1-pr-snapshot-1741369431545](https://github.com/instructure/instructure-ui/compare/v10.11.0...v10.11.1-pr-snapshot-1741369431545) (2025-03-07)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @instructure/ui-flex
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
6
14
|
# [10.11.0](https://github.com/instructure/instructure-ui/compare/v10.10.0...v10.11.0) (2025-02-03)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @instructure/ui-flex
|
package/lib/Flex/Item/index.js
CHANGED
|
@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.default = exports.Item = void 0;
|
|
8
8
|
var _react = require("react");
|
|
9
|
-
var
|
|
10
|
-
var
|
|
9
|
+
var _uiReactUtils = require("@instructure/ui-react-utils");
|
|
10
|
+
var _uiView = require("@instructure/ui-view");
|
|
11
11
|
var _emotion = require("@instructure/emotion");
|
|
12
12
|
var _styles = _interopRequireDefault(require("./styles"));
|
|
13
13
|
var _props = require("./props");
|
|
@@ -63,7 +63,7 @@ let Item = exports.Item = (_dec = (0, _emotion.withStyle)(_styles.default, null)
|
|
|
63
63
|
(_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
|
|
64
64
|
}
|
|
65
65
|
render() {
|
|
66
|
-
const props = (0,
|
|
66
|
+
const props = (0, _uiReactUtils.omitProps)(this.props, Item.allowedProps);
|
|
67
67
|
const _this$props3 = this.props,
|
|
68
68
|
as = _this$props3.as,
|
|
69
69
|
children = _this$props3.children,
|
|
@@ -78,7 +78,7 @@ let Item = exports.Item = (_dec = (0, _emotion.withStyle)(_styles.default, null)
|
|
|
78
78
|
styles = _this$props3.styles;
|
|
79
79
|
const dirColumn = direction === 'column';
|
|
80
80
|
const dirRow = direction === 'row';
|
|
81
|
-
return (0, _emotion.jsx)(
|
|
81
|
+
return (0, _emotion.jsx)(_uiView.View, Object.assign({}, props, {
|
|
82
82
|
css: styles === null || styles === void 0 ? void 0 : styles.flexItem,
|
|
83
83
|
elementRef: this.handleRef,
|
|
84
84
|
as: as,
|
package/lib/Flex/index.js
CHANGED
|
@@ -14,11 +14,8 @@ Object.defineProperty(exports, "FlexItem", {
|
|
|
14
14
|
});
|
|
15
15
|
exports.default = void 0;
|
|
16
16
|
var _react = _interopRequireWildcard(require("react"));
|
|
17
|
-
var
|
|
18
|
-
var
|
|
19
|
-
var _matchComponentTypes = require("@instructure/ui-react-utils/lib/matchComponentTypes.js");
|
|
20
|
-
var _callRenderProp = require("@instructure/ui-react-utils/lib/callRenderProp.js");
|
|
21
|
-
var _View = require("@instructure/ui-view/lib/View");
|
|
17
|
+
var _uiReactUtils = require("@instructure/ui-react-utils");
|
|
18
|
+
var _uiView = require("@instructure/ui-view");
|
|
22
19
|
var _emotion = require("@instructure/emotion");
|
|
23
20
|
var _Item = require("./Item");
|
|
24
21
|
var _styles = _interopRequireDefault(require("./styles"));
|
|
@@ -81,7 +78,7 @@ let Flex = exports.Flex = (_dec = (0, _emotion.withStyle)(_styles.default, _them
|
|
|
81
78
|
if (!child) {
|
|
82
79
|
return null;
|
|
83
80
|
}
|
|
84
|
-
return (0,
|
|
81
|
+
return (0, _uiReactUtils.matchComponentTypes)(child, ['Item']) ? (0, _uiReactUtils.safeCloneElement)(child, {
|
|
85
82
|
// child withVisualDebug prop should override parent
|
|
86
83
|
withVisualDebug: this.props.withVisualDebug,
|
|
87
84
|
...child.props,
|
|
@@ -102,11 +99,11 @@ let Flex = exports.Flex = (_dec = (0, _emotion.withStyle)(_styles.default, _them
|
|
|
102
99
|
styles = _this$props3.styles,
|
|
103
100
|
gap = _this$props3.gap,
|
|
104
101
|
wrap = _this$props3.wrap;
|
|
105
|
-
const children = (0,
|
|
102
|
+
const children = (0, _uiReactUtils.callRenderProp)(this.props.children);
|
|
106
103
|
const gapValuesArray = gap === null || gap === void 0 ? void 0 : gap.split(' ');
|
|
107
104
|
if (gapValuesArray.length > 1 && wrap === 'no-wrap') {}
|
|
108
105
|
if (children && _react.Children.count(children) > 0) {
|
|
109
|
-
return (0, _emotion.jsx)(
|
|
106
|
+
return (0, _emotion.jsx)(_uiView.View, Object.assign({}, (0, _uiReactUtils.passthroughProps)(this.props), {
|
|
110
107
|
css: styles === null || styles === void 0 ? void 0 : styles.flex,
|
|
111
108
|
elementRef: this.handleRef,
|
|
112
109
|
as: as,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@instructure/ui-flex",
|
|
3
|
-
"version": "10.11.
|
|
3
|
+
"version": "10.11.1-pr-snapshot-1741369431545",
|
|
4
4
|
"description": "A component that makes it easy to align content using flexbox CSS",
|
|
5
5
|
"author": "Instructure, Inc. Engineering and Product Design",
|
|
6
6
|
"module": "./es/index.js",
|
|
@@ -24,17 +24,17 @@
|
|
|
24
24
|
"license": "MIT",
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@babel/runtime": "^7.26.0",
|
|
27
|
-
"@instructure/console": "10.11.
|
|
28
|
-
"@instructure/emotion": "10.11.
|
|
29
|
-
"@instructure/shared-types": "10.11.
|
|
30
|
-
"@instructure/ui-react-utils": "10.11.
|
|
31
|
-
"@instructure/ui-view": "10.11.
|
|
27
|
+
"@instructure/console": "10.11.1-pr-snapshot-1741369431545",
|
|
28
|
+
"@instructure/emotion": "10.11.1-pr-snapshot-1741369431545",
|
|
29
|
+
"@instructure/shared-types": "10.11.1-pr-snapshot-1741369431545",
|
|
30
|
+
"@instructure/ui-react-utils": "10.11.1-pr-snapshot-1741369431545",
|
|
31
|
+
"@instructure/ui-view": "10.11.1-pr-snapshot-1741369431545",
|
|
32
32
|
"prop-types": "^15.8.1"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"@instructure/ui-babel-preset": "10.11.
|
|
36
|
-
"@instructure/ui-test-utils": "10.11.
|
|
37
|
-
"@instructure/ui-themes": "10.11.
|
|
35
|
+
"@instructure/ui-babel-preset": "10.11.1-pr-snapshot-1741369431545",
|
|
36
|
+
"@instructure/ui-test-utils": "10.11.1-pr-snapshot-1741369431545",
|
|
37
|
+
"@instructure/ui-themes": "10.11.1-pr-snapshot-1741369431545"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
|
40
40
|
"react": ">=16.14 <=18"
|