@instructure/ui-form-field 8.56.1 → 8.56.2-pr-snapshot-1721749364069
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/FormField/__new-tests__/FormField.test.js +2 -2
- package/lib/FormField/index.js +2 -3
- package/lib/FormFieldGroup/__new-tests__/FormFieldGroup.test.js +2 -2
- package/lib/FormFieldGroup/index.js +6 -7
- package/lib/FormFieldLabel/__new-tests__/FormFieldLabel.test.js +2 -2
- package/lib/FormFieldLabel/index.js +3 -4
- package/lib/FormFieldLabel/styles.js +2 -2
- package/lib/FormFieldLayout/__new-tests__/FormFieldLayout.test.js +2 -2
- package/lib/FormFieldLayout/index.js +13 -16
- package/lib/FormFieldMessage/__new-tests__/FormFieldMessage.test.js +4 -4
- package/lib/FormFieldMessage/index.js +2 -2
- package/lib/FormFieldMessages/__new-tests__/FormFieldMessages.test.js +4 -4
- package/lib/FormFieldMessages/index.js +2 -2
- package/package.json +15 -15
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.2-pr-snapshot-1721749364069](https://github.com/instructure/instructure-ui/compare/v8.56.1...v8.56.2-pr-snapshot-1721749364069) (2024-07-23)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @instructure/ui-form-field
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
6
14
|
## [8.56.1](https://github.com/instructure/instructure-ui/compare/v8.56.0...v8.56.1) (2024-06-13)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @instructure/ui-form-field
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
4
|
var _react = _interopRequireDefault(require("react"));
|
|
5
5
|
var _react2 = require("@testing-library/react");
|
|
6
|
-
var
|
|
6
|
+
var _uiAxeCheck = require("@instructure/ui-axe-check");
|
|
7
7
|
require("@testing-library/jest-dom");
|
|
8
8
|
var _index = require("../index");
|
|
9
9
|
var _FormField, _FormField2, _FormField3;
|
|
@@ -54,7 +54,7 @@ describe('<FormField />', () => {
|
|
|
54
54
|
id: "bar"
|
|
55
55
|
}))),
|
|
56
56
|
container = _render.container;
|
|
57
|
-
const axeCheck = await (0,
|
|
57
|
+
const axeCheck = await (0, _uiAxeCheck.runAxeCheck)(container);
|
|
58
58
|
expect(axeCheck).toBe(true);
|
|
59
59
|
});
|
|
60
60
|
});
|
package/lib/FormField/index.js
CHANGED
|
@@ -6,8 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.default = exports.FormField = void 0;
|
|
8
8
|
var _react = _interopRequireWildcard(require("react"));
|
|
9
|
-
var
|
|
10
|
-
var _pickProps = require("@instructure/ui-react-utils/lib/pickProps.js");
|
|
9
|
+
var _uiReactUtils = require("@instructure/ui-react-utils");
|
|
11
10
|
var _FormFieldLayout = require("../FormFieldLayout");
|
|
12
11
|
var _props = require("./props");
|
|
13
12
|
/*
|
|
@@ -52,7 +51,7 @@ class FormField extends _react.Component {
|
|
|
52
51
|
};
|
|
53
52
|
}
|
|
54
53
|
render() {
|
|
55
|
-
return /*#__PURE__*/_react.default.createElement(_FormFieldLayout.FormFieldLayout, Object.assign({}, (0,
|
|
54
|
+
return /*#__PURE__*/_react.default.createElement(_FormFieldLayout.FormFieldLayout, Object.assign({}, (0, _uiReactUtils.omitProps)(this.props, FormField.allowedProps), (0, _uiReactUtils.pickProps)(this.props, _FormFieldLayout.FormFieldLayout.allowedProps), {
|
|
56
55
|
label: this.props.label,
|
|
57
56
|
vAlign: this.props.vAlign,
|
|
58
57
|
as: "label",
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
4
|
var _react = _interopRequireDefault(require("react"));
|
|
5
5
|
var _react2 = require("@testing-library/react");
|
|
6
|
-
var
|
|
6
|
+
var _uiAxeCheck = require("@instructure/ui-axe-check");
|
|
7
7
|
require("@testing-library/jest-dom");
|
|
8
8
|
var _index = require("../index");
|
|
9
9
|
var _FormFieldGroup, _label, _label2, _label3, _label4, _label5, _label6, _label7, _FormFieldGroup2;
|
|
@@ -91,7 +91,7 @@ describe('<FormFieldGroup />', () => {
|
|
|
91
91
|
description: "Please enter your full name"
|
|
92
92
|
}, /*#__PURE__*/_react.default.createElement("label", null, "First: ", /*#__PURE__*/_react.default.createElement("input", null)), /*#__PURE__*/_react.default.createElement("label", null, "Middle: ", /*#__PURE__*/_react.default.createElement("input", null)), /*#__PURE__*/_react.default.createElement("label", null, "Last: ", /*#__PURE__*/_react.default.createElement("input", null))))),
|
|
93
93
|
container = _render5.container;
|
|
94
|
-
const axeCheck = await (0,
|
|
94
|
+
const axeCheck = await (0, _uiAxeCheck.runAxeCheck)(container);
|
|
95
95
|
expect(axeCheck).toBe(true);
|
|
96
96
|
});
|
|
97
97
|
});
|
|
@@ -7,9 +7,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.default = exports.FormFieldGroup = void 0;
|
|
8
8
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
9
9
|
var _react = require("react");
|
|
10
|
-
var
|
|
11
|
-
var
|
|
12
|
-
var _omitProps = require("@instructure/ui-react-utils/lib/omitProps.js");
|
|
10
|
+
var _uiGrid = require("@instructure/ui-grid");
|
|
11
|
+
var _uiReactUtils = require("@instructure/ui-react-utils");
|
|
13
12
|
var _emotion = require("@instructure/emotion");
|
|
14
13
|
var _FormFieldLayout = require("../FormFieldLayout");
|
|
15
14
|
var _styles = _interopRequireDefault(require("./styles"));
|
|
@@ -78,19 +77,19 @@ let FormFieldGroup = exports.FormFieldGroup = (_dec = (0, _emotion.withStyle)(_s
|
|
|
78
77
|
}
|
|
79
78
|
renderColumns() {
|
|
80
79
|
return _react.Children.map(this.props.children, (child, index) => {
|
|
81
|
-
return child ? (0, _emotion.jsx)(
|
|
80
|
+
return child ? (0, _emotion.jsx)(_uiGrid.Grid.Col, {
|
|
82
81
|
width: child.props && child.props.width ? 'auto' : void 0,
|
|
83
82
|
key: index
|
|
84
83
|
}, child) : null;
|
|
85
84
|
});
|
|
86
85
|
}
|
|
87
86
|
renderChildren() {
|
|
88
|
-
return (0, _emotion.jsx)(
|
|
87
|
+
return (0, _emotion.jsx)(_uiGrid.Grid, {
|
|
89
88
|
colSpacing: this.props.colSpacing,
|
|
90
89
|
rowSpacing: this.props.rowSpacing,
|
|
91
90
|
vAlign: this.props.vAlign,
|
|
92
91
|
startAt: this.props.startAt || (this.props.layout === 'columns' ? 'medium' : null)
|
|
93
|
-
}, (0, _emotion.jsx)(
|
|
92
|
+
}, (0, _emotion.jsx)(_uiGrid.Grid.Row, null, this.renderColumns()));
|
|
94
93
|
}
|
|
95
94
|
renderFields() {
|
|
96
95
|
const styles = this.props.styles;
|
|
@@ -104,7 +103,7 @@ let FormFieldGroup = exports.FormFieldGroup = (_dec = (0, _emotion.withStyle)(_s
|
|
|
104
103
|
styles = _this$props3.styles,
|
|
105
104
|
makeStyles = _this$props3.makeStyles,
|
|
106
105
|
props = (0, _objectWithoutProperties2.default)(_this$props3, _excluded);
|
|
107
|
-
return (0, _emotion.jsx)(_FormFieldLayout.FormFieldLayout, Object.assign({}, (0,
|
|
106
|
+
return (0, _emotion.jsx)(_FormFieldLayout.FormFieldLayout, Object.assign({}, (0, _uiReactUtils.omitProps)(props, FormFieldGroup.allowedProps), (0, _uiReactUtils.pickProps)(props, _FormFieldLayout.FormFieldLayout.allowedProps), {
|
|
108
107
|
vAlign: props.vAlign,
|
|
109
108
|
layout: props.layout === 'inline' ? 'inline' : 'stacked',
|
|
110
109
|
label: props.description,
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
4
|
var _react = _interopRequireDefault(require("react"));
|
|
5
5
|
var _react2 = require("@testing-library/react");
|
|
6
|
-
var
|
|
6
|
+
var _uiAxeCheck = require("@instructure/ui-axe-check");
|
|
7
7
|
require("@testing-library/jest-dom");
|
|
8
8
|
var _index = require("../index");
|
|
9
9
|
var _FormFieldLabel, _FormFieldLabel2, _FormFieldLabel3;
|
|
@@ -50,7 +50,7 @@ describe('<FormFieldLabel />', () => {
|
|
|
50
50
|
it('should meet a11y standards', async () => {
|
|
51
51
|
const _render3 = (0, _react2.render)(_FormFieldLabel3 || (_FormFieldLabel3 = /*#__PURE__*/_react.default.createElement(_index.FormFieldLabel, null, "Foo"))),
|
|
52
52
|
container = _render3.container;
|
|
53
|
-
const axeCheck = await (0,
|
|
53
|
+
const axeCheck = await (0, _uiAxeCheck.runAxeCheck)(container);
|
|
54
54
|
expect(axeCheck).toBe(true);
|
|
55
55
|
});
|
|
56
56
|
});
|
|
@@ -6,8 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.default = exports.FormFieldLabel = void 0;
|
|
8
8
|
var _react = require("react");
|
|
9
|
-
var
|
|
10
|
-
var _getElementType = require("@instructure/ui-react-utils/lib/getElementType.js");
|
|
9
|
+
var _uiReactUtils = require("@instructure/ui-react-utils");
|
|
11
10
|
var _emotion = require("@instructure/emotion");
|
|
12
11
|
var _styles = _interopRequireDefault(require("./styles"));
|
|
13
12
|
var _theme = _interopRequireDefault(require("./theme"));
|
|
@@ -70,11 +69,11 @@ let FormFieldLabel = exports.FormFieldLabel = (_dec = (0, _emotion.withStyle)(_s
|
|
|
70
69
|
(_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
|
|
71
70
|
}
|
|
72
71
|
render() {
|
|
73
|
-
const ElementType = (0,
|
|
72
|
+
const ElementType = (0, _uiReactUtils.getElementType)(FormFieldLabel, this.props);
|
|
74
73
|
const _this$props3 = this.props,
|
|
75
74
|
styles = _this$props3.styles,
|
|
76
75
|
children = _this$props3.children;
|
|
77
|
-
return (0, _emotion.jsx)(ElementType, Object.assign({}, (0,
|
|
76
|
+
return (0, _emotion.jsx)(ElementType, Object.assign({}, (0, _uiReactUtils.omitProps)(this.props, FormFieldLabel.allowedProps), {
|
|
78
77
|
css: styles === null || styles === void 0 ? void 0 : styles.formFieldLabel,
|
|
79
78
|
ref: this.handleRef
|
|
80
79
|
}), children);
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
var
|
|
7
|
+
var _uiA11yUtils = require("@instructure/ui-a11y-utils");
|
|
8
8
|
/*
|
|
9
9
|
* The MIT License (MIT)
|
|
10
10
|
*
|
|
@@ -41,7 +41,7 @@ var _hasVisibleChildren = require("@instructure/ui-a11y-utils/lib/hasVisibleChil
|
|
|
41
41
|
*/
|
|
42
42
|
const generateStyle = (componentTheme, props) => {
|
|
43
43
|
const children = props.children;
|
|
44
|
-
const hasContent = (0,
|
|
44
|
+
const hasContent = (0, _uiA11yUtils.hasVisibleChildren)(children);
|
|
45
45
|
const labelStyles = {
|
|
46
46
|
all: 'initial',
|
|
47
47
|
display: 'block',
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
4
|
var _react = _interopRequireDefault(require("react"));
|
|
5
5
|
var _react2 = require("@testing-library/react");
|
|
6
|
-
var
|
|
6
|
+
var _uiAxeCheck = require("@instructure/ui-axe-check");
|
|
7
7
|
require("@testing-library/jest-dom");
|
|
8
8
|
var _index = require("../index");
|
|
9
9
|
var _FormFieldLayout, _FormFieldLayout2, _input;
|
|
@@ -47,7 +47,7 @@ describe('<FormFieldLayout />', () => {
|
|
|
47
47
|
label: "Username"
|
|
48
48
|
}))),
|
|
49
49
|
container = _render2.container;
|
|
50
|
-
const axeCheck = await (0,
|
|
50
|
+
const axeCheck = await (0, _uiAxeCheck.runAxeCheck)(container);
|
|
51
51
|
expect(axeCheck).toBe(true);
|
|
52
52
|
});
|
|
53
53
|
it('should provide a ref to the input container', () => {
|
|
@@ -7,14 +7,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.default = exports.FormFieldLayout = void 0;
|
|
8
8
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
9
9
|
var _react = require("react");
|
|
10
|
-
var
|
|
11
|
-
var
|
|
12
|
-
var
|
|
10
|
+
var _uiA11yUtils = require("@instructure/ui-a11y-utils");
|
|
11
|
+
var _uiA11yContent = require("@instructure/ui-a11y-content");
|
|
12
|
+
var _uiGrid = require("@instructure/ui-grid");
|
|
13
13
|
var _console = require("@instructure/console");
|
|
14
|
-
var
|
|
15
|
-
var _pickProps = require("@instructure/ui-react-utils/lib/pickProps.js");
|
|
16
|
-
var _getElementType = require("@instructure/ui-react-utils/lib/getElementType.js");
|
|
17
|
-
var _withDeterministicId = require("@instructure/ui-react-utils/lib/DeterministicIdContext/withDeterministicId.js");
|
|
14
|
+
var _uiReactUtils = require("@instructure/ui-react-utils");
|
|
18
15
|
var _emotion = require("@instructure/emotion");
|
|
19
16
|
var _FormFieldLabel = require("../FormFieldLabel");
|
|
20
17
|
var _FormFieldMessages = require("../FormFieldMessages");
|
|
@@ -51,7 +48,7 @@ var _dec, _dec2, _class, _class2;
|
|
|
51
48
|
parent: FormField
|
|
52
49
|
---
|
|
53
50
|
**/
|
|
54
|
-
let FormFieldLayout = exports.FormFieldLayout = (_dec = (0,
|
|
51
|
+
let FormFieldLayout = exports.FormFieldLayout = (_dec = (0, _uiReactUtils.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default, null), _dec(_class = _dec2(_class = (_class2 = class FormFieldLayout extends _react.Component {
|
|
55
52
|
constructor(props) {
|
|
56
53
|
super(props);
|
|
57
54
|
this._messagesId = void 0;
|
|
@@ -81,13 +78,13 @@ let FormFieldLayout = exports.FormFieldLayout = (_dec = (0, _withDeterministicId
|
|
|
81
78
|
(_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
|
|
82
79
|
}
|
|
83
80
|
get hasVisibleLabel() {
|
|
84
|
-
return this.props.label && (0,
|
|
81
|
+
return this.props.label && (0, _uiA11yUtils.hasVisibleChildren)(this.props.label);
|
|
85
82
|
}
|
|
86
83
|
get hasMessages() {
|
|
87
84
|
return this.props.messages && this.props.messages.length > 0;
|
|
88
85
|
}
|
|
89
86
|
get elementType() {
|
|
90
|
-
return (0,
|
|
87
|
+
return (0, _uiReactUtils.getElementType)(FormFieldLayout, this.props);
|
|
91
88
|
}
|
|
92
89
|
get inlineContainerAndLabel() {
|
|
93
90
|
// Return if both the component container and label will display inline
|
|
@@ -95,7 +92,7 @@ let FormFieldLayout = exports.FormFieldLayout = (_dec = (0, _withDeterministicId
|
|
|
95
92
|
}
|
|
96
93
|
renderLabel() {
|
|
97
94
|
if (this.hasVisibleLabel) {
|
|
98
|
-
return (0, _emotion.jsx)(
|
|
95
|
+
return (0, _emotion.jsx)(_uiGrid.Grid.Col, {
|
|
99
96
|
textAlign: this.props.labelAlign,
|
|
100
97
|
width: this.inlineContainerAndLabel ? 'auto' : 3
|
|
101
98
|
}, (0, _emotion.jsx)(_FormFieldLabel.FormFieldLabel, {
|
|
@@ -111,14 +108,14 @@ let FormFieldLayout = exports.FormFieldLayout = (_dec = (0, _withDeterministicId
|
|
|
111
108
|
renderLegend() {
|
|
112
109
|
// note: the legend element must be the first child of a fieldset element for SR
|
|
113
110
|
// so we render it twice in that case (once for SR-only and one that is visible)
|
|
114
|
-
return (0, _emotion.jsx)(
|
|
111
|
+
return (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, {
|
|
115
112
|
as: "legend"
|
|
116
113
|
}, this.props.label, this.hasMessages && (0, _emotion.jsx)(_FormFieldMessages.FormFieldMessages, {
|
|
117
114
|
messages: this.props.messages
|
|
118
115
|
}));
|
|
119
116
|
}
|
|
120
117
|
renderVisibleMessages() {
|
|
121
|
-
return this.hasMessages ? (0, _emotion.jsx)(
|
|
118
|
+
return this.hasMessages ? (0, _emotion.jsx)(_uiGrid.Grid.Row, null, (0, _emotion.jsx)(_uiGrid.Grid.Col, {
|
|
122
119
|
offset: this.inlineContainerAndLabel ? void 0 : 3,
|
|
123
120
|
textAlign: this.inlineContainerAndLabel ? 'end' : void 0
|
|
124
121
|
}, (0, _emotion.jsx)(_FormFieldMessages.FormFieldMessages, {
|
|
@@ -136,18 +133,18 @@ let FormFieldLayout = exports.FormFieldLayout = (_dec = (0, _withDeterministicId
|
|
|
136
133
|
const width = props.width,
|
|
137
134
|
layout = props.layout,
|
|
138
135
|
children = props.children;
|
|
139
|
-
return (0, _emotion.jsx)(ElementType, Object.assign({}, (0,
|
|
136
|
+
return (0, _emotion.jsx)(ElementType, Object.assign({}, (0, _uiReactUtils.omitProps)(props, [...FormFieldLayout.allowedProps, ..._uiGrid.Grid.allowedProps]), {
|
|
140
137
|
css: styles === null || styles === void 0 ? void 0 : styles.formFieldLayout,
|
|
141
138
|
style: {
|
|
142
139
|
width
|
|
143
140
|
},
|
|
144
141
|
"aria-describedby": this.hasMessages ? this._messagesId : void 0,
|
|
145
142
|
ref: this.handleRef
|
|
146
|
-
}), this.elementType === 'fieldset' && this.renderLegend(), (0, _emotion.jsx)(
|
|
143
|
+
}), this.elementType === 'fieldset' && this.renderLegend(), (0, _emotion.jsx)(_uiGrid.Grid, Object.assign({
|
|
147
144
|
rowSpacing: "small",
|
|
148
145
|
colSpacing: "small",
|
|
149
146
|
startAt: layout === 'inline' && this.hasVisibleLabel ? 'medium' : null
|
|
150
|
-
}, (0,
|
|
147
|
+
}, (0, _uiReactUtils.pickProps)(props, _uiGrid.Grid.allowedProps)), (0, _emotion.jsx)(_uiGrid.Grid.Row, null, this.renderLabel(), (0, _emotion.jsx)(_uiGrid.Grid.Col, {
|
|
151
148
|
width: this.inlineContainerAndLabel ? 'auto' : void 0,
|
|
152
149
|
elementRef: this.handleInputContainerRef
|
|
153
150
|
}, children)), this.renderVisibleMessages()));
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
4
|
var _react = _interopRequireDefault(require("react"));
|
|
5
5
|
var _react2 = require("@testing-library/react");
|
|
6
|
-
var
|
|
7
|
-
var
|
|
6
|
+
var _uiAxeCheck = require("@instructure/ui-axe-check");
|
|
7
|
+
var _uiIcons = require("@instructure/ui-icons");
|
|
8
8
|
require("@testing-library/jest-dom");
|
|
9
9
|
var _index = require("../index");
|
|
10
10
|
var _FormFieldMessage, _FormFieldMessage2, _FormFieldMessage3;
|
|
@@ -40,7 +40,7 @@ describe('<FormFieldMessage />', () => {
|
|
|
40
40
|
expect(formFieldMessage).toHaveTextContent('hello world');
|
|
41
41
|
});
|
|
42
42
|
it('should render message if Node is passed', () => {
|
|
43
|
-
const _render2 = (0, _react2.render)(_FormFieldMessage2 || (_FormFieldMessage2 = /*#__PURE__*/_react.default.createElement(_index.FormFieldMessage, null, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(
|
|
43
|
+
const _render2 = (0, _react2.render)(_FormFieldMessage2 || (_FormFieldMessage2 = /*#__PURE__*/_react.default.createElement(_index.FormFieldMessage, null, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_uiIcons.IconWarningLine, null), " Invalid name")))),
|
|
44
44
|
container = _render2.container;
|
|
45
45
|
const formFieldMessage = container.querySelector("span[class$='-formFieldMessage']");
|
|
46
46
|
const iconSvg = container.querySelector('svg[name="IconWarning"]');
|
|
@@ -51,7 +51,7 @@ describe('<FormFieldMessage />', () => {
|
|
|
51
51
|
it('should meet a11y standards', async () => {
|
|
52
52
|
const _render3 = (0, _react2.render)(_FormFieldMessage3 || (_FormFieldMessage3 = /*#__PURE__*/_react.default.createElement(_index.FormFieldMessage, null))),
|
|
53
53
|
container = _render3.container;
|
|
54
|
-
const axeCheck = await (0,
|
|
54
|
+
const axeCheck = await (0, _uiAxeCheck.runAxeCheck)(container);
|
|
55
55
|
expect(axeCheck).toBe(true);
|
|
56
56
|
});
|
|
57
57
|
});
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.default = exports.FormFieldMessage = void 0;
|
|
8
8
|
var _react = require("react");
|
|
9
|
-
var
|
|
9
|
+
var _uiA11yContent = require("@instructure/ui-a11y-content");
|
|
10
10
|
var _emotion = require("@instructure/emotion");
|
|
11
11
|
var _styles = _interopRequireDefault(require("./styles"));
|
|
12
12
|
var _theme = _interopRequireDefault(require("./theme"));
|
|
@@ -74,7 +74,7 @@ let FormFieldMessage = exports.FormFieldMessage = (_dec = (0, _emotion.withStyle
|
|
|
74
74
|
return this.props.variant !== 'screenreader-only' ? (0, _emotion.jsx)("span", {
|
|
75
75
|
css: styles === null || styles === void 0 ? void 0 : styles.formFieldMessage,
|
|
76
76
|
ref: this.handleRef
|
|
77
|
-
}, children) : (0, _emotion.jsx)(
|
|
77
|
+
}, children) : (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, {
|
|
78
78
|
elementRef: this.handleRef
|
|
79
79
|
}, children);
|
|
80
80
|
}
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
4
|
var _react = _interopRequireDefault(require("react"));
|
|
5
5
|
var _react2 = require("@testing-library/react");
|
|
6
|
-
var
|
|
7
|
-
var
|
|
6
|
+
var _uiAxeCheck = require("@instructure/ui-axe-check");
|
|
7
|
+
var _uiIcons = require("@instructure/ui-icons");
|
|
8
8
|
require("@testing-library/jest-dom");
|
|
9
9
|
var _index = require("../index");
|
|
10
10
|
var _span;
|
|
@@ -53,7 +53,7 @@ describe('<FormFieldMessages />', () => {
|
|
|
53
53
|
});
|
|
54
54
|
it('should render if Node is passed as message text', () => {
|
|
55
55
|
const messages = [{
|
|
56
|
-
text: _span || (_span = /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(
|
|
56
|
+
text: _span || (_span = /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_uiIcons.IconWarningLine, null), " Invalid name")),
|
|
57
57
|
type: 'error'
|
|
58
58
|
}];
|
|
59
59
|
const _render2 = (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_index.FormFieldMessages, {
|
|
@@ -81,7 +81,7 @@ describe('<FormFieldMessages />', () => {
|
|
|
81
81
|
messages: messages
|
|
82
82
|
})),
|
|
83
83
|
container = _render3.container;
|
|
84
|
-
const axeCheck = await (0,
|
|
84
|
+
const axeCheck = await (0, _uiAxeCheck.runAxeCheck)(container);
|
|
85
85
|
expect(axeCheck).toBe(true);
|
|
86
86
|
});
|
|
87
87
|
});
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.default = exports.FormFieldMessages = 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 _FormFieldMessage = require("../FormFieldMessage");
|
|
12
12
|
var _styles = _interopRequireDefault(require("./styles"));
|
|
@@ -77,7 +77,7 @@ let FormFieldMessages = exports.FormFieldMessages = (_dec = (0, _emotion.withSty
|
|
|
77
77
|
styles = _this$props3.styles;
|
|
78
78
|
return messages && messages.length > 0 ? (0, _emotion.jsx)("span", Object.assign({
|
|
79
79
|
css: styles === null || styles === void 0 ? void 0 : styles.formFieldMessages
|
|
80
|
-
}, (0,
|
|
80
|
+
}, (0, _uiReactUtils.omitProps)(this.props, FormFieldMessages.allowedProps), {
|
|
81
81
|
ref: this.handleRef
|
|
82
82
|
}), messages.map((msg, i) => {
|
|
83
83
|
return (0, _emotion.jsx)("span", {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@instructure/ui-form-field",
|
|
3
|
-
"version": "8.56.
|
|
3
|
+
"version": "8.56.2-pr-snapshot-1721749364069",
|
|
4
4
|
"description": "Form layout components.",
|
|
5
5
|
"author": "Instructure, Inc. Engineering and Product Design",
|
|
6
6
|
"module": "./es/index.js",
|
|
@@ -23,25 +23,25 @@
|
|
|
23
23
|
},
|
|
24
24
|
"license": "MIT",
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@instructure/ui-axe-check": "8.56.
|
|
27
|
-
"@instructure/ui-babel-preset": "8.56.
|
|
28
|
-
"@instructure/ui-test-utils": "8.56.
|
|
29
|
-
"@instructure/ui-themes": "8.56.
|
|
26
|
+
"@instructure/ui-axe-check": "8.56.2-pr-snapshot-1721749364069",
|
|
27
|
+
"@instructure/ui-babel-preset": "8.56.2-pr-snapshot-1721749364069",
|
|
28
|
+
"@instructure/ui-test-utils": "8.56.2-pr-snapshot-1721749364069",
|
|
29
|
+
"@instructure/ui-themes": "8.56.2-pr-snapshot-1721749364069",
|
|
30
30
|
"@testing-library/jest-dom": "^6.1.4",
|
|
31
31
|
"@testing-library/react": "^14.1.2"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@babel/runtime": "^7.23.2",
|
|
35
|
-
"@instructure/console": "8.56.
|
|
36
|
-
"@instructure/emotion": "8.56.
|
|
37
|
-
"@instructure/shared-types": "8.56.
|
|
38
|
-
"@instructure/ui-a11y-content": "8.56.
|
|
39
|
-
"@instructure/ui-a11y-utils": "8.56.
|
|
40
|
-
"@instructure/ui-grid": "8.56.
|
|
41
|
-
"@instructure/ui-icons": "8.56.
|
|
42
|
-
"@instructure/ui-react-utils": "8.56.
|
|
43
|
-
"@instructure/ui-utils": "8.56.
|
|
44
|
-
"@instructure/uid": "8.56.
|
|
35
|
+
"@instructure/console": "8.56.2-pr-snapshot-1721749364069",
|
|
36
|
+
"@instructure/emotion": "8.56.2-pr-snapshot-1721749364069",
|
|
37
|
+
"@instructure/shared-types": "8.56.2-pr-snapshot-1721749364069",
|
|
38
|
+
"@instructure/ui-a11y-content": "8.56.2-pr-snapshot-1721749364069",
|
|
39
|
+
"@instructure/ui-a11y-utils": "8.56.2-pr-snapshot-1721749364069",
|
|
40
|
+
"@instructure/ui-grid": "8.56.2-pr-snapshot-1721749364069",
|
|
41
|
+
"@instructure/ui-icons": "8.56.2-pr-snapshot-1721749364069",
|
|
42
|
+
"@instructure/ui-react-utils": "8.56.2-pr-snapshot-1721749364069",
|
|
43
|
+
"@instructure/ui-utils": "8.56.2-pr-snapshot-1721749364069",
|
|
44
|
+
"@instructure/uid": "8.56.2-pr-snapshot-1721749364069",
|
|
45
45
|
"prop-types": "^15.8.1"
|
|
46
46
|
},
|
|
47
47
|
"peerDependencies": {
|