@rjsf/core 5.24.2 → 5.24.4

package/dist/index.js

@@ -3709,6 +3709,21 @@ var Form = class extends import_react17.Component {
   shouldComponentUpdate(nextProps, nextState) {
     return (0, import_utils39.shouldRender)(this, nextProps, nextState);
   }
+  /** Gets the previously raised customValidate errors.
+   *
+   * @returns the previous customValidate errors
+   */
+  getPreviousCustomValidateErrors() {
+    const { customValidate, uiSchema } = this.props;
+    const prevFormData = this.state.formData;
+    let customValidateErrors = {};
+    if (typeof customValidate === "function") {
+      const errorHandler = customValidate(prevFormData, (0, import_utils39.createErrorHandler)(prevFormData), uiSchema);
+      const userErrorSchema = (0, import_utils39.unwrapErrorHandler)(errorHandler);
+      customValidateErrors = userErrorSchema;
+    }
+    return customValidateErrors;
+  }
   /** Validates the `formData` against the `schema` using the `altSchemaUtils` (if provided otherwise it uses the
    * `schemaUtils` in the state), returning the results.
    *
@@ -3753,17 +3768,29 @@ var Form = class extends import_react17.Component {
     if (resolvedSchema?.type !== "object" && resolvedSchema?.type !== "array") {
       filteredErrors.__errors = schemaErrors.__errors;
     }
-    const filterNilOrEmptyErrors = (errors) => {
+    const prevCustomValidateErrors = this.getPreviousCustomValidateErrors();
+    const filterPreviousCustomErrors = (errors = [], prevCustomErrors) => {
+      if (errors.length === 0) {
+        return errors;
+      }
+      return errors.filter((error) => {
+        return !prevCustomErrors.includes(error);
+      });
+    };
+    const filterNilOrEmptyErrors = (errors, previousCustomValidateErrors = {}) => {
       (0, import_forEach.default)(errors, (errorAtKey, errorKey) => {
-        if ((0, import_isNil.default)(errorAtKey)) {
+        const prevCustomValidateErrorAtKey = previousCustomValidateErrors[errorKey];
+        if ((0, import_isNil.default)(errorAtKey) || Array.isArray(errorAtKey) && errorAtKey.length === 0) {
           delete errors[errorKey];
+        } else if ((0, import_utils39.isObject)(errorAtKey) && (0, import_utils39.isObject)(prevCustomValidateErrorAtKey) && Array.isArray(prevCustomValidateErrorAtKey?.__errors)) {
+          errors[errorKey] = filterPreviousCustomErrors(errorAtKey.__errors, prevCustomValidateErrorAtKey.__errors);
         } else if (typeof errorAtKey === "object" && !Array.isArray(errorAtKey.__errors)) {
-          filterNilOrEmptyErrors(errorAtKey);
+          filterNilOrEmptyErrors(errorAtKey, previousCustomValidateErrors[errorKey]);
         }
       });
       return errors;
     };
-    return filterNilOrEmptyErrors(filteredErrors);
+    return filterNilOrEmptyErrors(filteredErrors, prevCustomValidateErrors);
   }
   /**
    * If the retrievedSchema has changed the new retrievedSchema is returned.