@instructure/ui-flex 8.17.1-snapshot.81 → 8.18.1-snapshot.0
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 +4 -0
- package/es/Flex/Item/index.js +19 -15
- package/es/Flex/index.js +17 -13
- package/es/Flex/theme.js +1 -1
- package/lib/Flex/Item/index.js +19 -15
- package/lib/Flex/index.js +17 -13
- package/lib/Flex/theme.js +1 -1
- package/package.json +10 -10
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,10 @@
|
|
|
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.18.0](https://github.com/instructure/instructure-ui/compare/v8.17.0...v8.18.0) (2022-02-23)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @instructure/ui-flex
|
|
9
|
+
|
|
6
10
|
# [8.17.0](https://github.com/instructure/instructure-ui/compare/v8.16.0...v8.17.0) (2022-02-07)
|
|
7
11
|
|
|
8
12
|
### Bug Fixes
|
package/es/Flex/Item/index.js
CHANGED
|
@@ -55,31 +55,35 @@ let Item = (_dec = withStyle(generateStyle, null), _dec(_class = (_temp = _class
|
|
|
55
55
|
}
|
|
56
56
|
|
|
57
57
|
componentDidMount() {
|
|
58
|
-
|
|
58
|
+
var _this$props$makeStyle, _this$props;
|
|
59
|
+
|
|
60
|
+
(_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props);
|
|
59
61
|
}
|
|
60
62
|
|
|
61
63
|
componentDidUpdate() {
|
|
62
|
-
|
|
64
|
+
var _this$props$makeStyle2, _this$props2;
|
|
65
|
+
|
|
66
|
+
(_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
|
|
63
67
|
}
|
|
64
68
|
|
|
65
69
|
render() {
|
|
66
70
|
const props = omitProps(this.props, Item.allowedProps);
|
|
67
|
-
const _this$
|
|
68
|
-
as = _this$
|
|
69
|
-
children = _this$
|
|
70
|
-
withVisualDebug = _this$
|
|
71
|
-
textAlign = _this$
|
|
72
|
-
size = _this$
|
|
73
|
-
direction = _this$
|
|
74
|
-
margin = _this$
|
|
75
|
-
padding = _this$
|
|
76
|
-
overflowX = _this$
|
|
77
|
-
overflowY = _this$
|
|
78
|
-
styles = _this$
|
|
71
|
+
const _this$props3 = this.props,
|
|
72
|
+
as = _this$props3.as,
|
|
73
|
+
children = _this$props3.children,
|
|
74
|
+
withVisualDebug = _this$props3.withVisualDebug,
|
|
75
|
+
textAlign = _this$props3.textAlign,
|
|
76
|
+
size = _this$props3.size,
|
|
77
|
+
direction = _this$props3.direction,
|
|
78
|
+
margin = _this$props3.margin,
|
|
79
|
+
padding = _this$props3.padding,
|
|
80
|
+
overflowX = _this$props3.overflowX,
|
|
81
|
+
overflowY = _this$props3.overflowY,
|
|
82
|
+
styles = _this$props3.styles;
|
|
79
83
|
const dirColumn = direction === 'column';
|
|
80
84
|
const dirRow = direction === 'row';
|
|
81
85
|
return jsx(View, Object.assign({}, props, {
|
|
82
|
-
css: styles
|
|
86
|
+
css: styles === null || styles === void 0 ? void 0 : styles.flexItem,
|
|
83
87
|
elementRef: this.handleRef,
|
|
84
88
|
as: as,
|
|
85
89
|
minHeight: dirColumn ? size : void 0,
|
package/es/Flex/index.js
CHANGED
|
@@ -57,11 +57,15 @@ let Flex = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class
|
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
componentDidMount() {
|
|
60
|
-
|
|
60
|
+
var _this$props$makeStyle, _this$props;
|
|
61
|
+
|
|
62
|
+
(_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props);
|
|
61
63
|
}
|
|
62
64
|
|
|
63
65
|
componentDidUpdate() {
|
|
64
|
-
|
|
66
|
+
var _this$props$makeStyle2, _this$props2;
|
|
67
|
+
|
|
68
|
+
(_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
|
|
65
69
|
}
|
|
66
70
|
|
|
67
71
|
renderChildren(children) {
|
|
@@ -80,21 +84,21 @@ let Flex = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class
|
|
|
80
84
|
}
|
|
81
85
|
|
|
82
86
|
render() {
|
|
83
|
-
const _this$
|
|
84
|
-
as = _this$
|
|
85
|
-
withVisualDebug = _this$
|
|
86
|
-
height = _this$
|
|
87
|
-
display = _this$
|
|
88
|
-
margin = _this$
|
|
89
|
-
padding = _this$
|
|
90
|
-
textAlign = _this$
|
|
91
|
-
width = _this$
|
|
92
|
-
styles = _this$
|
|
87
|
+
const _this$props3 = this.props,
|
|
88
|
+
as = _this$props3.as,
|
|
89
|
+
withVisualDebug = _this$props3.withVisualDebug,
|
|
90
|
+
height = _this$props3.height,
|
|
91
|
+
display = _this$props3.display,
|
|
92
|
+
margin = _this$props3.margin,
|
|
93
|
+
padding = _this$props3.padding,
|
|
94
|
+
textAlign = _this$props3.textAlign,
|
|
95
|
+
width = _this$props3.width,
|
|
96
|
+
styles = _this$props3.styles;
|
|
93
97
|
const children = callRenderProp(this.props.children);
|
|
94
98
|
|
|
95
99
|
if (children && Children.count(children) > 0) {
|
|
96
100
|
return jsx(View, Object.assign({}, passthroughProps(this.props), {
|
|
97
|
-
css: styles
|
|
101
|
+
css: styles === null || styles === void 0 ? void 0 : styles.flex,
|
|
98
102
|
elementRef: this.handleRef,
|
|
99
103
|
as: as,
|
|
100
104
|
display: display,
|
package/es/Flex/theme.js
CHANGED
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
const generateComponentTheme = theme => {
|
|
31
31
|
const typography = theme.typography;
|
|
32
32
|
const componentVariables = {
|
|
33
|
-
fontFamily: typography
|
|
33
|
+
fontFamily: typography === null || typography === void 0 ? void 0 : typography.fontFamily
|
|
34
34
|
};
|
|
35
35
|
return { ...componentVariables
|
|
36
36
|
};
|
package/lib/Flex/Item/index.js
CHANGED
|
@@ -44,31 +44,35 @@ let Item = (_dec = (0, _emotion.withStyle)(_styles.default, null), _dec(_class =
|
|
|
44
44
|
}
|
|
45
45
|
|
|
46
46
|
componentDidMount() {
|
|
47
|
-
|
|
47
|
+
var _this$props$makeStyle, _this$props;
|
|
48
|
+
|
|
49
|
+
(_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props);
|
|
48
50
|
}
|
|
49
51
|
|
|
50
52
|
componentDidUpdate() {
|
|
51
|
-
|
|
53
|
+
var _this$props$makeStyle2, _this$props2;
|
|
54
|
+
|
|
55
|
+
(_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
|
|
52
56
|
}
|
|
53
57
|
|
|
54
58
|
render() {
|
|
55
59
|
const props = (0, _omitProps.omitProps)(this.props, Item.allowedProps);
|
|
56
|
-
const _this$
|
|
57
|
-
as = _this$
|
|
58
|
-
children = _this$
|
|
59
|
-
withVisualDebug = _this$
|
|
60
|
-
textAlign = _this$
|
|
61
|
-
size = _this$
|
|
62
|
-
direction = _this$
|
|
63
|
-
margin = _this$
|
|
64
|
-
padding = _this$
|
|
65
|
-
overflowX = _this$
|
|
66
|
-
overflowY = _this$
|
|
67
|
-
styles = _this$
|
|
60
|
+
const _this$props3 = this.props,
|
|
61
|
+
as = _this$props3.as,
|
|
62
|
+
children = _this$props3.children,
|
|
63
|
+
withVisualDebug = _this$props3.withVisualDebug,
|
|
64
|
+
textAlign = _this$props3.textAlign,
|
|
65
|
+
size = _this$props3.size,
|
|
66
|
+
direction = _this$props3.direction,
|
|
67
|
+
margin = _this$props3.margin,
|
|
68
|
+
padding = _this$props3.padding,
|
|
69
|
+
overflowX = _this$props3.overflowX,
|
|
70
|
+
overflowY = _this$props3.overflowY,
|
|
71
|
+
styles = _this$props3.styles;
|
|
68
72
|
const dirColumn = direction === 'column';
|
|
69
73
|
const dirRow = direction === 'row';
|
|
70
74
|
return (0, _emotion.jsx)(_View.View, Object.assign({}, props, {
|
|
71
|
-
css: styles
|
|
75
|
+
css: styles === null || styles === void 0 ? void 0 : styles.flexItem,
|
|
72
76
|
elementRef: this.handleRef,
|
|
73
77
|
as: as,
|
|
74
78
|
minHeight: dirColumn ? size : void 0,
|
package/lib/Flex/index.js
CHANGED
|
@@ -63,11 +63,15 @@ let Flex = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
|
|
|
63
63
|
}
|
|
64
64
|
|
|
65
65
|
componentDidMount() {
|
|
66
|
-
|
|
66
|
+
var _this$props$makeStyle, _this$props;
|
|
67
|
+
|
|
68
|
+
(_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props);
|
|
67
69
|
}
|
|
68
70
|
|
|
69
71
|
componentDidUpdate() {
|
|
70
|
-
|
|
72
|
+
var _this$props$makeStyle2, _this$props2;
|
|
73
|
+
|
|
74
|
+
(_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
|
|
71
75
|
}
|
|
72
76
|
|
|
73
77
|
renderChildren(children) {
|
|
@@ -86,21 +90,21 @@ let Flex = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
|
|
|
86
90
|
}
|
|
87
91
|
|
|
88
92
|
render() {
|
|
89
|
-
const _this$
|
|
90
|
-
as = _this$
|
|
91
|
-
withVisualDebug = _this$
|
|
92
|
-
height = _this$
|
|
93
|
-
display = _this$
|
|
94
|
-
margin = _this$
|
|
95
|
-
padding = _this$
|
|
96
|
-
textAlign = _this$
|
|
97
|
-
width = _this$
|
|
98
|
-
styles = _this$
|
|
93
|
+
const _this$props3 = this.props,
|
|
94
|
+
as = _this$props3.as,
|
|
95
|
+
withVisualDebug = _this$props3.withVisualDebug,
|
|
96
|
+
height = _this$props3.height,
|
|
97
|
+
display = _this$props3.display,
|
|
98
|
+
margin = _this$props3.margin,
|
|
99
|
+
padding = _this$props3.padding,
|
|
100
|
+
textAlign = _this$props3.textAlign,
|
|
101
|
+
width = _this$props3.width,
|
|
102
|
+
styles = _this$props3.styles;
|
|
99
103
|
const children = (0, _callRenderProp.callRenderProp)(this.props.children);
|
|
100
104
|
|
|
101
105
|
if (children && _react.Children.count(children) > 0) {
|
|
102
106
|
return (0, _emotion.jsx)(_View.View, Object.assign({}, (0, _passthroughProps.passthroughProps)(this.props), {
|
|
103
|
-
css: styles
|
|
107
|
+
css: styles === null || styles === void 0 ? void 0 : styles.flex,
|
|
104
108
|
elementRef: this.handleRef,
|
|
105
109
|
as: as,
|
|
106
110
|
display: display,
|
package/lib/Flex/theme.js
CHANGED
|
@@ -37,7 +37,7 @@ exports.default = void 0;
|
|
|
37
37
|
const generateComponentTheme = theme => {
|
|
38
38
|
const typography = theme.typography;
|
|
39
39
|
const componentVariables = {
|
|
40
|
-
fontFamily: typography
|
|
40
|
+
fontFamily: typography === null || typography === void 0 ? void 0 : typography.fontFamily
|
|
41
41
|
};
|
|
42
42
|
return { ...componentVariables
|
|
43
43
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@instructure/ui-flex",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.18.1-snapshot.0+435c9ae79",
|
|
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.13.10",
|
|
27
|
-
"@instructure/console": "8.
|
|
28
|
-
"@instructure/emotion": "8.
|
|
29
|
-
"@instructure/shared-types": "8.
|
|
30
|
-
"@instructure/ui-react-utils": "8.
|
|
31
|
-
"@instructure/ui-view": "8.
|
|
27
|
+
"@instructure/console": "8.18.1-snapshot.0+435c9ae79",
|
|
28
|
+
"@instructure/emotion": "8.18.1-snapshot.0+435c9ae79",
|
|
29
|
+
"@instructure/shared-types": "8.18.1-snapshot.0+435c9ae79",
|
|
30
|
+
"@instructure/ui-react-utils": "8.18.1-snapshot.0+435c9ae79",
|
|
31
|
+
"@instructure/ui-view": "8.18.1-snapshot.0+435c9ae79",
|
|
32
32
|
"prop-types": "^15"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"@instructure/ui-babel-preset": "8.
|
|
36
|
-
"@instructure/ui-test-utils": "8.
|
|
37
|
-
"@instructure/ui-themes": "8.
|
|
35
|
+
"@instructure/ui-babel-preset": "8.18.1-snapshot.0+435c9ae79",
|
|
36
|
+
"@instructure/ui-test-utils": "8.18.1-snapshot.0+435c9ae79",
|
|
37
|
+
"@instructure/ui-themes": "8.18.1-snapshot.0+435c9ae79"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
|
40
40
|
"react": ">=16.8 <=17"
|
|
@@ -43,5 +43,5 @@
|
|
|
43
43
|
"access": "public"
|
|
44
44
|
},
|
|
45
45
|
"sideEffects": false,
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "435c9ae794c15e2bd103f700f8c4e946d91c1b59"
|
|
47
47
|
}
|