@rjsf/core 5.24.3 → 5.24.5

package/dist/core.umd.js

@@ -3452,6 +3452,21 @@
     shouldComponentUpdate(nextProps, nextState) {
       return utils.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, utils.createErrorHandler(prevFormData), uiSchema);
+        const userErrorSchema = utils.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.
      *
@@ -3496,17 +3511,29 @@
       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 = {}) => {
         _forEach(errors, (errorAtKey, errorKey) => {
-          if (_isNil(errorAtKey)) {
+          const prevCustomValidateErrorAtKey = previousCustomValidateErrors[errorKey];
+          if (_isNil(errorAtKey) || Array.isArray(errorAtKey) && errorAtKey.length === 0) {
             delete errors[errorKey];
+          } else if (utils.isObject(errorAtKey) && utils.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.

package/dist/index.esm.js

@@ -15,7 +15,9 @@ import {
   toErrorList,
   UI_GLOBAL_OPTIONS_KEY,
   UI_OPTIONS_KEY as UI_OPTIONS_KEY2,
-  validationDataMerge
+  validationDataMerge,
+  createErrorHandler,
+  unwrapErrorHandler
 } from "@rjsf/utils";
 import _forEach from "lodash/forEach";
 import _get from "lodash/get";
@@ -3804,6 +3806,21 @@ var Form = class extends Component5 {
   shouldComponentUpdate(nextProps, nextState) {
     return 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, createErrorHandler(prevFormData), uiSchema);
+      const userErrorSchema = 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.
    *
@@ -3848,17 +3865,29 @@ var Form = class extends Component5 {
     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 = {}) => {
       _forEach(errors, (errorAtKey, errorKey) => {
-        if (_isNil(errorAtKey)) {
+        const prevCustomValidateErrorAtKey = previousCustomValidateErrors[errorKey];
+        if (_isNil(errorAtKey) || Array.isArray(errorAtKey) && errorAtKey.length === 0) {
           delete errors[errorKey];
+        } else if (isObject5(errorAtKey) && isObject5(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.