@instructure/ui-form-field 8.11.2-snapshot.72 → 8.12.1-snapshot.19
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/FormFieldGroup/index.js +1 -1
- package/es/FormFieldLayout/index.js +3 -3
- package/lib/FormFieldGroup/index.js +1 -1
- package/lib/FormFieldLayout/index.js +3 -3
- package/package.json +15 -15
- package/src/FormFieldGroup/index.tsx +6 -3
- package/src/FormFieldLayout/index.tsx +3 -4
- package/types/FormFieldGroup/index.d.ts.map +1 -1
- package/types/FormFieldLayout/index.d.ts.map +1 -1
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.12.0](https://github.com/instructure/instructure-ui/compare/v8.11.1...v8.12.0) (2021-11-17)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @instructure/ui-form-field
|
|
9
|
+
|
|
6
10
|
## [8.11.1](https://github.com/instructure/instructure-ui/compare/v8.11.0...v8.11.1) (2021-10-19)
|
|
7
11
|
|
|
8
12
|
**Note:** Version bump only for package @instructure/ui-form-field
|
|
@@ -80,7 +80,7 @@ let FormFieldGroup = (_dec = withStyle(generateStyle, generateComponentTheme), _
|
|
|
80
80
|
renderColumns() {
|
|
81
81
|
return Children.map(this.props.children, (child, index) => {
|
|
82
82
|
return child ? jsx(Grid.Col, {
|
|
83
|
-
width: child.props && child.props.width ? 'auto' :
|
|
83
|
+
width: child.props && child.props.width ? 'auto' : void 0,
|
|
84
84
|
key: index
|
|
85
85
|
}, child) : null;
|
|
86
86
|
});
|
|
@@ -124,8 +124,8 @@ let FormFieldLayout = (_dec = withStyle(generateStyle, null), _dec(_class = (_te
|
|
|
124
124
|
|
|
125
125
|
renderVisibleMessages() {
|
|
126
126
|
return this.hasMessages ? jsx(Grid.Row, null, jsx(Grid.Col, {
|
|
127
|
-
offset: this.inlineContainerAndLabel ?
|
|
128
|
-
textAlign: this.inlineContainerAndLabel ? 'end' :
|
|
127
|
+
offset: this.inlineContainerAndLabel ? void 0 : 3,
|
|
128
|
+
textAlign: this.inlineContainerAndLabel ? 'end' : void 0
|
|
129
129
|
}, jsx(FormFieldMessages, {
|
|
130
130
|
id: this._messagesId,
|
|
131
131
|
messages: this.props.messages
|
|
@@ -155,7 +155,7 @@ let FormFieldLayout = (_dec = withStyle(generateStyle, null), _dec(_class = (_te
|
|
|
155
155
|
colSpacing: "small",
|
|
156
156
|
startAt: layout === 'inline' && this.hasVisibleLabel ? 'medium' : null
|
|
157
157
|
}, pickProps(props, Grid.allowedProps)), jsx(Grid.Row, null, this.renderLabel(), jsx(Grid.Col, {
|
|
158
|
-
width: this.inlineContainerAndLabel ? 'auto' :
|
|
158
|
+
width: this.inlineContainerAndLabel ? 'auto' : void 0,
|
|
159
159
|
elementRef: this.handleInputContainerRef
|
|
160
160
|
}, children)), this.renderVisibleMessages()));
|
|
161
161
|
}
|
|
@@ -74,7 +74,7 @@ let FormFieldGroup = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.def
|
|
|
74
74
|
renderColumns() {
|
|
75
75
|
return _react.Children.map(this.props.children, (child, index) => {
|
|
76
76
|
return child ? (0, _emotion.jsx)(_Grid.Grid.Col, {
|
|
77
|
-
width: child.props && child.props.width ? 'auto' :
|
|
77
|
+
width: child.props && child.props.width ? 'auto' : void 0,
|
|
78
78
|
key: index
|
|
79
79
|
}, child) : null;
|
|
80
80
|
});
|
|
@@ -124,8 +124,8 @@ let FormFieldLayout = (_dec = (0, _emotion.withStyle)(_styles.default, null), _d
|
|
|
124
124
|
|
|
125
125
|
renderVisibleMessages() {
|
|
126
126
|
return this.hasMessages ? (0, _emotion.jsx)(_Grid.Grid.Row, null, (0, _emotion.jsx)(_Grid.Grid.Col, {
|
|
127
|
-
offset: this.inlineContainerAndLabel ?
|
|
128
|
-
textAlign: this.inlineContainerAndLabel ? 'end' :
|
|
127
|
+
offset: this.inlineContainerAndLabel ? void 0 : 3,
|
|
128
|
+
textAlign: this.inlineContainerAndLabel ? 'end' : void 0
|
|
129
129
|
}, (0, _emotion.jsx)(_FormFieldMessages.FormFieldMessages, {
|
|
130
130
|
id: this._messagesId,
|
|
131
131
|
messages: this.props.messages
|
|
@@ -153,7 +153,7 @@ let FormFieldLayout = (_dec = (0, _emotion.withStyle)(_styles.default, null), _d
|
|
|
153
153
|
colSpacing: "small",
|
|
154
154
|
startAt: layout === 'inline' && this.hasVisibleLabel ? 'medium' : null
|
|
155
155
|
}, (0, _pickProps.pickProps)(props, _Grid.Grid.allowedProps)), (0, _emotion.jsx)(_Grid.Grid.Row, null, this.renderLabel(), (0, _emotion.jsx)(_Grid.Grid.Col, {
|
|
156
|
-
width: this.inlineContainerAndLabel ? 'auto' :
|
|
156
|
+
width: this.inlineContainerAndLabel ? 'auto' : void 0,
|
|
157
157
|
elementRef: this.handleInputContainerRef
|
|
158
158
|
}, children)), this.renderVisibleMessages()));
|
|
159
159
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@instructure/ui-form-field",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.12.1-snapshot.19+63603ec19",
|
|
4
4
|
"description": "Form layout components.",
|
|
5
5
|
"author": "Instructure, Inc. Engineering and Product Design",
|
|
6
6
|
"type": "commonjs",
|
|
@@ -24,22 +24,22 @@
|
|
|
24
24
|
},
|
|
25
25
|
"license": "MIT",
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@instructure/ui-babel-preset": "8.
|
|
28
|
-
"@instructure/ui-test-utils": "8.
|
|
29
|
-
"@instructure/ui-themes": "8.
|
|
27
|
+
"@instructure/ui-babel-preset": "8.12.1-snapshot.19+63603ec19",
|
|
28
|
+
"@instructure/ui-test-utils": "8.12.1-snapshot.19+63603ec19",
|
|
29
|
+
"@instructure/ui-themes": "8.12.1-snapshot.19+63603ec19"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
32
|
"@babel/runtime": "^7.13.10",
|
|
33
|
-
"@instructure/console": "8.
|
|
34
|
-
"@instructure/emotion": "8.
|
|
35
|
-
"@instructure/shared-types": "8.
|
|
36
|
-
"@instructure/ui-a11y-content": "8.
|
|
37
|
-
"@instructure/ui-a11y-utils": "8.
|
|
38
|
-
"@instructure/ui-grid": "8.
|
|
39
|
-
"@instructure/ui-icons": "8.
|
|
40
|
-
"@instructure/ui-react-utils": "8.
|
|
41
|
-
"@instructure/ui-utils": "8.
|
|
42
|
-
"@instructure/uid": "8.
|
|
33
|
+
"@instructure/console": "8.12.1-snapshot.19+63603ec19",
|
|
34
|
+
"@instructure/emotion": "8.12.1-snapshot.19+63603ec19",
|
|
35
|
+
"@instructure/shared-types": "8.12.1-snapshot.19+63603ec19",
|
|
36
|
+
"@instructure/ui-a11y-content": "8.12.1-snapshot.19+63603ec19",
|
|
37
|
+
"@instructure/ui-a11y-utils": "8.12.1-snapshot.19+63603ec19",
|
|
38
|
+
"@instructure/ui-grid": "8.12.1-snapshot.19+63603ec19",
|
|
39
|
+
"@instructure/ui-icons": "8.12.1-snapshot.19+63603ec19",
|
|
40
|
+
"@instructure/ui-react-utils": "8.12.1-snapshot.19+63603ec19",
|
|
41
|
+
"@instructure/ui-utils": "8.12.1-snapshot.19+63603ec19",
|
|
42
|
+
"@instructure/uid": "8.12.1-snapshot.19+63603ec19",
|
|
43
43
|
"prop-types": "^15"
|
|
44
44
|
},
|
|
45
45
|
"peerDependencies": {
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
"publishConfig": {
|
|
49
49
|
"access": "public"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "63603ec190cf074dfe3fc57db7a381fae9d5c333"
|
|
52
52
|
}
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
*/
|
|
24
24
|
|
|
25
25
|
/** @jsx jsx */
|
|
26
|
-
import { Component, Children } from 'react'
|
|
26
|
+
import { Component, Children, ReactElement } from 'react'
|
|
27
27
|
|
|
28
28
|
import { Grid } from '@instructure/ui-grid'
|
|
29
29
|
import { pickProps, omitProps } from '@instructure/ui-react-utils'
|
|
@@ -97,8 +97,11 @@ class FormFieldGroup extends Component<FormFieldGroupProps> {
|
|
|
97
97
|
return Children.map(this.props.children, (child, index) => {
|
|
98
98
|
return child ? (
|
|
99
99
|
<Grid.Col
|
|
100
|
-
|
|
101
|
-
|
|
100
|
+
width={
|
|
101
|
+
(child as ReactElement).props && (child as ReactElement).props.width
|
|
102
|
+
? 'auto'
|
|
103
|
+
: undefined
|
|
104
|
+
}
|
|
102
105
|
key={index}
|
|
103
106
|
>
|
|
104
107
|
{child}
|
|
@@ -167,9 +167,8 @@ class FormFieldLayout extends Component<FormFieldLayoutProps> {
|
|
|
167
167
|
return this.hasMessages ? (
|
|
168
168
|
<Grid.Row>
|
|
169
169
|
<Grid.Col
|
|
170
|
-
offset={this.inlineContainerAndLabel ?
|
|
171
|
-
|
|
172
|
-
textAlign={this.inlineContainerAndLabel ? 'end' : null}
|
|
170
|
+
offset={this.inlineContainerAndLabel ? undefined : 3}
|
|
171
|
+
textAlign={this.inlineContainerAndLabel ? 'end' : undefined}
|
|
173
172
|
>
|
|
174
173
|
<FormFieldMessages
|
|
175
174
|
// @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call.
|
|
@@ -211,7 +210,7 @@ class FormFieldLayout extends Component<FormFieldLayoutProps> {
|
|
|
211
210
|
<Grid.Row>
|
|
212
211
|
{this.renderLabel()}
|
|
213
212
|
<Grid.Col
|
|
214
|
-
width={this.inlineContainerAndLabel ? 'auto' :
|
|
213
|
+
width={this.inlineContainerAndLabel ? 'auto' : undefined}
|
|
215
214
|
elementRef={this.handleInputContainerRef}
|
|
216
215
|
>
|
|
217
216
|
{children}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/FormFieldGroup/index.tsx"],"names":[],"mappings":"AAwBA,eAAe;AACf,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/FormFieldGroup/index.tsx"],"names":[],"mappings":"AAwBA,eAAe;AACf,OAAO,EAAE,SAAS,EAA0B,MAAM,OAAO,CAAA;AAIzD,OAAO,EAAa,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAQrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAA;AAE5E;;;;GAIG;AACH,cACM,cAAe,SAAQ,SAAS,CAAC,mBAAmB,CAAC;IACzD,MAAM,CAAC,QAAQ,CAAC,WAAW,oBAAmB;IAE9C,MAAM,CAAC,SAAS;;;;;;;;;;;;;OAAY;IAC5B,MAAM,CAAC,YAAY;;;;;;;;;;;;;SAAe;IAClC,MAAM,CAAC,YAAY;;;;;;;MAOlB;IAED,GAAG,EAAE,OAAO,GAAG,IAAI,CAAO;IAE1B,SAAS,OAAQ,OAAO,GAAG,IAAI,UAQ9B;IAED,iBAAiB;IAMjB,kBAAkB,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,QAAQ,KAAA;IAKjD,IAAI,mBAAmB,IAAI,wBAAwB,CAElD;IAED,IAAI,OAAO,YAOV;IAED,aAAa;IAiBb,cAAc;IAgBd,YAAY;IAUZ,MAAM;CAmBP;AAED,eAAe,cAAc,CAAA;AAC7B,OAAO,EAAE,cAAc,EAAE,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/FormFieldLayout/index.tsx"],"names":[],"mappings":"AAwBA,eAAe;AACf,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAajC,OAAO,EAAa,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAQrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAEnD;;;;GAIG;AACH,cACM,eAAgB,SAAQ,SAAS,CAAC,oBAAoB,CAAC;IAC3D,MAAM,CAAC,QAAQ,CAAC,WAAW,qBAAoB;IAE/C,MAAM,CAAC,SAAS;;;;;;;;;;;;;OAAY;IAC5B,MAAM,CAAC,YAAY;;;;;;;;;;;;;SAAe;IAClC,MAAM,CAAC,YAAY;;;;;;MAMT;gBAGE,KAAK,KAAA;IAejB,GAAG,EAAE,OAAO,GAAG,IAAI,CAAO;IAE1B,SAAS,OAAQ,OAAO,GAAG,IAAI,UAQ9B;IAED,iBAAiB;IAMjB,kBAAkB,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,QAAQ,KAAA;IAKjD,IAAI,eAAe,wCAElB;IAED,IAAI,WAAW,wBAEd;IAED,IAAI,WAAW,wEAEd;IAED,IAAI,uBAAuB,wBAG1B;IAGD,uBAAuB,sBAItB;IAED,WAAW;IAsBX,YAAY;IAaZ,qBAAqB;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/FormFieldLayout/index.tsx"],"names":[],"mappings":"AAwBA,eAAe;AACf,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAajC,OAAO,EAAa,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAQrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAEnD;;;;GAIG;AACH,cACM,eAAgB,SAAQ,SAAS,CAAC,oBAAoB,CAAC;IAC3D,MAAM,CAAC,QAAQ,CAAC,WAAW,qBAAoB;IAE/C,MAAM,CAAC,SAAS;;;;;;;;;;;;;OAAY;IAC5B,MAAM,CAAC,YAAY;;;;;;;;;;;;;SAAe;IAClC,MAAM,CAAC,YAAY;;;;;;MAMT;gBAGE,KAAK,KAAA;IAejB,GAAG,EAAE,OAAO,GAAG,IAAI,CAAO;IAE1B,SAAS,OAAQ,OAAO,GAAG,IAAI,UAQ9B;IAED,iBAAiB;IAMjB,kBAAkB,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,QAAQ,KAAA;IAKjD,IAAI,eAAe,wCAElB;IAED,IAAI,WAAW,wBAEd;IAED,IAAI,WAAW,wEAEd;IAED,IAAI,uBAAuB,wBAG1B;IAGD,uBAAuB,sBAItB;IAED,WAAW;IAsBX,YAAY;IAaZ,qBAAqB;IAiBrB,MAAM;CAyCP;AAED,eAAe,eAAe,CAAA;AAC9B,OAAO,EAAE,eAAe,EAAE,CAAA"}
|