@rjsf/core 5.12.0 → 5.13.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/dist/core.umd.js +17 -11
- package/dist/index.esm.js +21 -17
- package/dist/index.esm.js.map +3 -3
- package/dist/index.js +15 -10
- package/dist/index.js.map +3 -3
- package/lib/components/Form.js +12 -4
- package/lib/components/Form.js.map +1 -1
- package/lib/components/fields/MultiSchemaField.js +4 -5
- package/lib/components/fields/MultiSchemaField.js.map +1 -1
- package/package.json +6 -6
- package/src/components/Form.tsx +11 -4
- package/src/components/fields/MultiSchemaField.tsx +3 -5
package/lib/components/Form.js
CHANGED
|
@@ -412,13 +412,14 @@ export default class Form extends Component {
|
|
|
412
412
|
*/
|
|
413
413
|
validateForm() {
|
|
414
414
|
const { extraErrors, extraErrorsBlockSubmit, focusOnFirstError, onError } = this.props;
|
|
415
|
-
const { formData } = this.state;
|
|
415
|
+
const { formData, errors: prevErrors } = this.state;
|
|
416
416
|
const schemaValidation = this.validate(formData);
|
|
417
417
|
let errors = schemaValidation.errors;
|
|
418
418
|
let errorSchema = schemaValidation.errorSchema;
|
|
419
419
|
const schemaValidationErrors = errors;
|
|
420
420
|
const schemaValidationErrorSchema = errorSchema;
|
|
421
|
-
|
|
421
|
+
const hasError = errors.length > 0 || (extraErrors && extraErrorsBlockSubmit);
|
|
422
|
+
if (hasError) {
|
|
422
423
|
if (extraErrors) {
|
|
423
424
|
const merged = validationDataMerge(schemaValidation, extraErrors);
|
|
424
425
|
errorSchema = merged.errorSchema;
|
|
@@ -445,9 +446,16 @@ export default class Form extends Component {
|
|
|
445
446
|
console.error('Form validation failed', errors);
|
|
446
447
|
}
|
|
447
448
|
});
|
|
448
|
-
return false;
|
|
449
449
|
}
|
|
450
|
-
|
|
450
|
+
else if (prevErrors.length > 0) {
|
|
451
|
+
this.setState({
|
|
452
|
+
errors: [],
|
|
453
|
+
errorSchema: {},
|
|
454
|
+
schemaValidationErrors: [],
|
|
455
|
+
schemaValidationErrorSchema: {},
|
|
456
|
+
});
|
|
457
|
+
}
|
|
458
|
+
return !hasError;
|
|
451
459
|
}
|
|
452
460
|
/** Renders the `Form` fields inside the <form> | `tagName` or `_internalFormWrapper`, rendering any errors if
|
|
453
461
|
* needed along with the submit button or any children of the form.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Form.js","sourceRoot":"","sources":["../../src/components/Form.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Form.js","sourceRoot":"","sources":["../../src/components/Form.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,7 @@ import { Component } from 'react';
|
|
|
4
4
|
import get from 'lodash/get';
|
|
5
5
|
import isEmpty from 'lodash/isEmpty';
|
|
6
6
|
import omit from 'lodash/omit';
|
|
7
|
-
import
|
|
8
|
-
import { ADDITIONAL_PROPERTY_FLAG, deepEquals, ERRORS_KEY, getDiscriminatorFieldFromSchema, getUiOptions, getWidget, mergeSchemas, TranslatableString, } from '@rjsf/utils';
|
|
7
|
+
import { deepEquals, ERRORS_KEY, getDiscriminatorFieldFromSchema, getUiOptions, getWidget, mergeSchemas, TranslatableString, } from '@rjsf/utils';
|
|
9
8
|
/** The `AnyOfField` component is used to render a field in the schema that is an `anyOf`, `allOf` or `oneOf`. It tracks
|
|
10
9
|
* the currently selected option and cleans up any irrelevant data in `formData`.
|
|
11
10
|
*
|
|
@@ -109,10 +108,10 @@ class AnyOfField extends Component {
|
|
|
109
108
|
const option = selectedOption >= 0 ? retrievedOptions[selectedOption] || null : null;
|
|
110
109
|
let optionSchema;
|
|
111
110
|
if (option) {
|
|
112
|
-
|
|
111
|
+
// merge top level required field
|
|
112
|
+
const { required } = schema;
|
|
113
113
|
// Merge in all the non-oneOf/anyOf properties and also skip the special ADDITIONAL_PROPERTY_FLAG property
|
|
114
|
-
|
|
115
|
-
optionSchema = !isEmpty(remaining) ? mergeSchemas(remaining, option) : option;
|
|
114
|
+
optionSchema = required ? mergeSchemas({ required }, option) : option;
|
|
116
115
|
}
|
|
117
116
|
const translateEnum = title
|
|
118
117
|
? TranslatableString.TitleOptionPrefix
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiSchemaField.js","sourceRoot":"","sources":["../../../src/components/fields/MultiSchemaField.tsx"],"names":[],"mappings":";;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,GAAG,MAAM,YAAY,CAAC;AAC7B,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,
|
|
1
|
+
{"version":3,"file":"MultiSchemaField.js","sourceRoot":"","sources":["../../../src/components/fields/MultiSchemaField.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rjsf/core",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.13.0",
|
|
4
4
|
"description": "A simple React component capable of building HTML forms out of a JSON schema.",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build:ts": "rimraf lib && tsc",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"node": ">=14"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
|
-
"@rjsf/utils": "^5.
|
|
41
|
+
"@rjsf/utils": "^5.12.x",
|
|
42
42
|
"react": "^16.14.0 || >=17"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
@@ -55,9 +55,9 @@
|
|
|
55
55
|
"@babel/preset-env": "^7.22.9",
|
|
56
56
|
"@babel/preset-react": "^7.22.5",
|
|
57
57
|
"@babel/preset-typescript": "^7.22.5",
|
|
58
|
-
"@rjsf/utils": "^5.
|
|
59
|
-
"@rjsf/validator-ajv6": "^5.
|
|
60
|
-
"@rjsf/validator-ajv8": "^5.
|
|
58
|
+
"@rjsf/utils": "^5.13.0",
|
|
59
|
+
"@rjsf/validator-ajv6": "^5.13.0",
|
|
60
|
+
"@rjsf/validator-ajv8": "^5.13.0",
|
|
61
61
|
"@types/lodash": "^4.14.196",
|
|
62
62
|
"@types/react": "^17.0.62",
|
|
63
63
|
"@types/react-dom": "^17.0.20",
|
|
@@ -103,5 +103,5 @@
|
|
|
103
103
|
"publishConfig": {
|
|
104
104
|
"access": "public"
|
|
105
105
|
},
|
|
106
|
-
"gitHead": "
|
|
106
|
+
"gitHead": "588b1c063095f75278585838cbca9b20252e13c9"
|
|
107
107
|
}
|
package/src/components/Form.tsx
CHANGED
|
@@ -729,13 +729,14 @@ export default class Form<
|
|
|
729
729
|
*/
|
|
730
730
|
validateForm() {
|
|
731
731
|
const { extraErrors, extraErrorsBlockSubmit, focusOnFirstError, onError } = this.props;
|
|
732
|
-
const { formData } = this.state;
|
|
732
|
+
const { formData, errors: prevErrors } = this.state;
|
|
733
733
|
const schemaValidation = this.validate(formData);
|
|
734
734
|
let errors = schemaValidation.errors;
|
|
735
735
|
let errorSchema = schemaValidation.errorSchema;
|
|
736
736
|
const schemaValidationErrors = errors;
|
|
737
737
|
const schemaValidationErrorSchema = errorSchema;
|
|
738
|
-
|
|
738
|
+
const hasError = errors.length > 0 || (extraErrors && extraErrorsBlockSubmit);
|
|
739
|
+
if (hasError) {
|
|
739
740
|
if (extraErrors) {
|
|
740
741
|
const merged = validationDataMerge(schemaValidation, extraErrors);
|
|
741
742
|
errorSchema = merged.errorSchema;
|
|
@@ -763,9 +764,15 @@ export default class Form<
|
|
|
763
764
|
}
|
|
764
765
|
}
|
|
765
766
|
);
|
|
766
|
-
|
|
767
|
+
} else if (prevErrors.length > 0) {
|
|
768
|
+
this.setState({
|
|
769
|
+
errors: [],
|
|
770
|
+
errorSchema: {},
|
|
771
|
+
schemaValidationErrors: [],
|
|
772
|
+
schemaValidationErrorSchema: {},
|
|
773
|
+
});
|
|
767
774
|
}
|
|
768
|
-
return
|
|
775
|
+
return !hasError;
|
|
769
776
|
}
|
|
770
777
|
|
|
771
778
|
/** Renders the `Form` fields inside the <form> | `tagName` or `_internalFormWrapper`, rendering any errors if
|
|
@@ -2,9 +2,7 @@ import { Component } from 'react';
|
|
|
2
2
|
import get from 'lodash/get';
|
|
3
3
|
import isEmpty from 'lodash/isEmpty';
|
|
4
4
|
import omit from 'lodash/omit';
|
|
5
|
-
import unset from 'lodash/unset';
|
|
6
5
|
import {
|
|
7
|
-
ADDITIONAL_PROPERTY_FLAG,
|
|
8
6
|
deepEquals,
|
|
9
7
|
ERRORS_KEY,
|
|
10
8
|
FieldProps,
|
|
@@ -172,10 +170,10 @@ class AnyOfField<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends For
|
|
|
172
170
|
let optionSchema: S;
|
|
173
171
|
|
|
174
172
|
if (option) {
|
|
175
|
-
|
|
173
|
+
// merge top level required field
|
|
174
|
+
const { required } = schema;
|
|
176
175
|
// Merge in all the non-oneOf/anyOf properties and also skip the special ADDITIONAL_PROPERTY_FLAG property
|
|
177
|
-
|
|
178
|
-
optionSchema = !isEmpty(remaining) ? (mergeSchemas(remaining, option) as S) : option;
|
|
176
|
+
optionSchema = required ? (mergeSchemas({ required }, option) as S) : option;
|
|
179
177
|
}
|
|
180
178
|
|
|
181
179
|
const translateEnum: TranslatableString = title
|