Skip to content

Commit 667f733

Browse files
committed
fix(carbon): add support for submitErrors
1 parent f9616f4 commit 667f733

File tree

11 files changed

+24
-10
lines changed

11 files changed

+24
-10
lines changed

packages/carbon-component-mapper/src/files/checkbox.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Wrapper.propTypes = {
3131
const SingleCheckbox = (props) => {
3232
const { input, meta, validateOnMount, helperText, WrapperProps, ...rest } = useFieldApi(prepareProps({ ...props, type: 'checkbox' }));
3333

34-
const invalid = (meta.touched || validateOnMount) && meta.error;
34+
const invalid = (meta.touched || validateOnMount) && (meta.error || meta.submitError);
3535

3636
const warnText = (meta.touched || validateOnMount) && meta.warning;
3737

packages/carbon-component-mapper/src/files/date-picker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import HelperTextBlock from '../common/helper-text-block';
1010
const DatePicker = (props) => {
1111
const { input, datePickerType, meta, DatePickerProps, validateOnMount, helperText, WrapperProps, ...rest } = useFieldApi(prepareProps(props));
1212

13-
const invalid = (meta.touched || validateOnMount) && meta.error;
13+
const invalid = (meta.touched || validateOnMount) && (meta.error || meta.submitError);
1414
const warnText = (meta.touched || validateOnMount) && meta.warning;
1515

1616
return (

packages/carbon-component-mapper/src/files/field-array.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const FieldArray = (props) => {
7979
...buttonLabels
8080
};
8181

82-
const invalid = (meta.touched || validateOnMount) && !Array.isArray(meta.error) && meta.error;
82+
const invalid = (meta.touched || validateOnMount) && !Array.isArray(meta.error) && (meta.error || meta.submitError);
8383

8484
return (
8585
<FormGroup

packages/carbon-component-mapper/src/files/radio.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const Radio = (props) => {
1212
prepareProps({ type: 'radio', ...props })
1313
);
1414

15-
const invalid = (meta.touched || validateOnMount) && meta.error;
15+
const invalid = (meta.touched || validateOnMount) && (meta.error || meta.submitError);
1616
const warnText = (meta.touched || validateOnMount) && meta.warning;
1717

1818
return (

packages/carbon-component-mapper/src/files/select.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ const Select = (props) => {
236236
const Component =
237237
isMulti && isSearchClear ? ClearedMultiSelectFilterable : isMulti ? ClearedMultiSelect : isSearchClear ? ClearedSelectSearchable : ClearedSelect;
238238

239-
const invalidText = ((meta.touched || validateOnMount) && meta.error) || '';
239+
const invalidText = ((meta.touched || validateOnMount) && (meta.error || meta.submitError)) || '';
240240
const text = ((meta.touched || validateOnMount) && meta.warning) || helperText;
241241

242242
return (

packages/carbon-component-mapper/src/files/slider.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import HelperTextBlock from '../common/helper-text-block';
1010
const Slider = (props) => {
1111
const { input, meta, isRequired, validateOnMount, helperText, WrapperProps, ...rest } = useFieldApi(prepareProps(props));
1212

13-
const invalid = (meta.touched || validateOnMount) && meta.error;
13+
const invalid = (meta.touched || validateOnMount) && (meta.error || meta.submitError);
1414
const warnText = (meta.touched || validateOnMount) && meta.warning;
1515

1616
return (

packages/carbon-component-mapper/src/files/switch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import HelperTextBlock from '../common/helper-text-block';
1010
const Switch = (props) => {
1111
const { input, meta, onText, offText, validateOnMount, helperText, WrapperProps, ...rest } = useFieldApi(prepareProps(props));
1212

13-
const invalid = (meta.touched || validateOnMount) && meta.error;
13+
const invalid = (meta.touched || validateOnMount) && (meta.error || meta.submitError);
1414
const warnText = (meta.touched || validateOnMount) && meta.warning;
1515

1616
return (

packages/carbon-component-mapper/src/files/text-field.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import prepareProps from './prepare-props';
99
const TextField = (props) => {
1010
const { input, meta, validateOnMount, ...rest } = useFieldApi(prepareProps(props));
1111

12-
const invalid = (meta.touched || validateOnMount) && meta.error;
12+
const invalid = (meta.touched || validateOnMount) && (meta.error || meta.submitError);
1313
const warn = (meta.touched || validateOnMount) && meta.warning;
1414

1515
return (

packages/carbon-component-mapper/src/files/textarea.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import prepareProps from './prepare-props';
99
const Textarea = (props) => {
1010
const { input, meta, validateOnMount, helperText, ...rest } = useFieldApi(prepareProps(props));
1111

12-
const invalid = (meta.touched || validateOnMount) && meta.error;
12+
const invalid = (meta.touched || validateOnMount) && (meta.error || meta.submitError);
1313
const text = ((meta.touched || validateOnMount) && meta.warning) || helperText;
1414

1515
return <TextArea {...input} key={input.name} id={input.name} invalid={Boolean(invalid)} invalidText={invalid || ''} helperText={text} {...rest} />;

packages/carbon-component-mapper/src/files/time-picker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const TimePicker = (props) => {
1414
const [format, selectFormat] = useState('AM');
1515
const isMounted = useRef(false);
1616

17-
const invalid = (meta.touched || validateOnMount) && meta.error;
17+
const invalid = (meta.touched || validateOnMount) && (meta.error || meta.submitError);
1818
const warnText = (meta.touched || validateOnMount) && meta.warning;
1919

2020
let finalValue = input.value;

0 commit comments

Comments
 (0)