@rjsf/core 5.12.1 → 5.13.1

package/dist/index.js

@@ -123,8 +123,20 @@ var ArrayField = class extends import_react.Component {
         if (event) {
           event.preventDefault();
         }
-        const { onChange } = this.props;
+        const { onChange, errorSchema } = this.props;
         const { keyedFormData } = this.state;
+        let newErrorSchema;
+        if (errorSchema) {
+          newErrorSchema = {};
+          for (const idx in errorSchema) {
+            const i = parseInt(idx);
+            if (i <= index) {
+              (0, import_set.default)(newErrorSchema, [i], errorSchema[idx]);
+            } else if (i > index) {
+              (0, import_set.default)(newErrorSchema, [i + 1], errorSchema[idx]);
+            }
+          }
+        }
         const newKeyedFormDataRow = {
           key: generateRowId(),
           item: (0, import_cloneDeep.default)(keyedFormData[index].item)
@@ -140,7 +152,7 @@ var ArrayField = class extends import_react.Component {
             keyedFormData: newKeyedFormData,
             updatedKeyedFormData: true
           },
-          () => onChange(keyedToPlainFormData(newKeyedFormData))
+          () => onChange(keyedToPlainFormData(newKeyedFormData), newErrorSchema)
         );
       };
     };
@@ -336,8 +348,20 @@ var ArrayField = class extends import_react.Component {
     if (event) {
       event.preventDefault();
     }
-    const { onChange } = this.props;
+    const { onChange, errorSchema } = this.props;
     const { keyedFormData } = this.state;
+    let newErrorSchema;
+    if (errorSchema) {
+      newErrorSchema = {};
+      for (const idx in errorSchema) {
+        const i = parseInt(idx);
+        if (index === void 0 || i < index) {
+          (0, import_set.default)(newErrorSchema, [i], errorSchema[idx]);
+        } else if (i >= index) {
+          (0, import_set.default)(newErrorSchema, [i + 1], errorSchema[idx]);
+        }
+      }
+    }
     const newKeyedFormDataRow = {
       key: generateRowId(),
       item: this._getNewFormDataRow()
@@ -353,7 +377,7 @@ var ArrayField = class extends import_react.Component {
         keyedFormData: newKeyedFormData,
         updatedKeyedFormData: true
       },
-      () => onChange(keyedToPlainFormData(newKeyedFormData))
+      () => onChange(keyedToPlainFormData(newKeyedFormData), newErrorSchema)
     );
   }
   /** Renders the `ArrayField` depending on the specific needs of the schema and uischema elements
@@ -892,7 +916,6 @@ var import_react2 = require("react");
 var import_get2 = __toESM(require("lodash/get"));
 var import_isEmpty = __toESM(require("lodash/isEmpty"));
 var import_omit = __toESM(require("lodash/omit"));
-var import_unset = __toESM(require("lodash/unset"));
 var import_utils3 = require("@rjsf/utils");
 var import_jsx_runtime3 = require("react/jsx-runtime");
 var AnyOfField = class extends import_react2.Component {
@@ -1015,9 +1038,8 @@ var AnyOfField = class extends import_react2.Component {
     const option = selectedOption >= 0 ? retrievedOptions[selectedOption] || null : null;
     let optionSchema;
     if (option) {
-      const { oneOf, anyOf, properties, ...remaining } = schema;
-      (0, import_unset.default)(remaining, import_utils3.ADDITIONAL_PROPERTY_FLAG);
-      optionSchema = !(0, import_isEmpty.default)(remaining) ? (0, import_utils3.mergeSchemas)(remaining, option) : option;
+      const { required } = schema;
+      optionSchema = required ? (0, import_utils3.mergeSchemas)({ required }, option) : option;
     }
     const translateEnum = title ? import_utils3.TranslatableString.TitleOptionPrefix : import_utils3.TranslatableString.OptionPrefix;
     const translateParams = title ? [title] : [];
@@ -1096,7 +1118,7 @@ var import_get3 = __toESM(require("lodash/get"));
 var import_has = __toESM(require("lodash/has"));
 var import_isObject3 = __toESM(require("lodash/isObject"));
 var import_set2 = __toESM(require("lodash/set"));
-var import_unset2 = __toESM(require("lodash/unset"));
+var import_unset = __toESM(require("lodash/unset"));
 var import_jsx_runtime5 = require("react/jsx-runtime");
 var ObjectField = class extends import_react4.Component {
   constructor() {
@@ -1142,7 +1164,7 @@ var ObjectField = class extends import_react4.Component {
         event.preventDefault();
         const { onChange, formData } = this.props;
         const copiedFormData = { ...formData };
-        (0, import_unset2.default)(copiedFormData, key);
+        (0, import_unset.default)(copiedFormData, key);
         onChange(copiedFormData);
       };
     };
@@ -3561,13 +3583,14 @@ var Form = class extends import_react17.Component {
    */
   validateForm() {
     const { extraErrors, extraErrorsBlockSubmit, focusOnFirstError, onError } = this.props;
-    const { formData } = this.state;
+    const { formData, errors: prevErrors } = this.state;
     const schemaValidation = this.validate(formData);
     let errors = schemaValidation.errors;
     let errorSchema = schemaValidation.errorSchema;
     const schemaValidationErrors = errors;
     const schemaValidationErrorSchema = errorSchema;
-    if (errors.length > 0 || extraErrors && extraErrorsBlockSubmit) {
+    const hasError = errors.length > 0 || extraErrors && extraErrorsBlockSubmit;
+    if (hasError) {
       if (extraErrors) {
         const merged = (0, import_utils39.validationDataMerge)(schemaValidation, extraErrors);
         errorSchema = merged.errorSchema;
@@ -3595,9 +3618,15 @@ var Form = class extends import_react17.Component {
           }
         }
       );
-      return false;
+    } else if (prevErrors.length > 0) {
+      this.setState({
+        errors: [],
+        errorSchema: {},
+        schemaValidationErrors: [],
+        schemaValidationErrorSchema: {}
+      });
     }
-    return true;
+    return !hasError;
   }
   /** Renders the `Form` fields inside the <form> | `tagName` or `_internalFormWrapper`, rendering any errors if
    * needed along with the submit button or any children of the form.