@rjsf/core 6.3.0 → 6.4.0

package/dist/core.umd.js

@@ -82,7 +82,8 @@
     } = props;
     const { widgets: widgets2, schemaUtils, globalFormOptions, globalUiOptions } = registry;
     const itemsSchema = schemaUtils.retrieveSchema(schema.items, items);
-    const enumOptions = utils.optionsList(itemsSchema, uiSchema);
+    const itemsUiSchema = uiSchema?.items ?? {};
+    const enumOptions = utils.optionsList(itemsSchema, itemsUiSchema);
     const { widget = "select", title: uiTitle, ...options } = utils.getUiOptions(uiSchema, globalUiOptions);
     const Widget = utils.getWidget(schema, widget, widgets2);
     const label = uiTitle ?? schema.title ?? name;
@@ -3771,6 +3772,34 @@
      * This prevents componentDidUpdate from reverting oneOf/anyOf option switches.
      */
     _isProcessingUserChange = false;
+    /** When the `extraErrors` prop changes, re-merges `schemaValidationErrors` + `extraErrors` + `customErrors` into
+     * state before render, ensuring the updated errors are visible immediately in a single render cycle.
+     *
+     * @param props - The current props
+     * @param state - The current state
+     * @returns Partial state with re-merged errors if `extraErrors` changed, or `null` if no update is needed
+     */
+    static getDerivedStateFromProps(props, state) {
+      if (props.extraErrors !== state._prevExtraErrors) {
+        const baseErrors = {
+          errors: state.schemaValidationErrors || [],
+          errorSchema: state.schemaValidationErrorSchema || {}
+        };
+        let { errors, errorSchema } = baseErrors;
+        if (props.extraErrors) {
+          ({ errors, errorSchema } = utils.validationDataMerge(baseErrors, props.extraErrors));
+        }
+        if (state.customErrors) {
+          ({ errors, errorSchema } = utils.validationDataMerge(
+            { errors, errorSchema },
+            state.customErrors.ErrorSchema,
+            true
+          ));
+        }
+        return { _prevExtraErrors: props.extraErrors, errors, errorSchema };
+      }
+      return null;
+    }
     /** Constructs the `Form` from the `props`. Will setup the initial state from the props. It will also call the
      * `onChange` handler if the initially provided `formData` is modified to add missing default values as part of the
      * state construction.
@@ -3784,7 +3813,10 @@
       }
       const { formData: propsFormData, initialFormData, onChange } = props;
       const formData = propsFormData ?? initialFormData;
-      this.state = this.getStateFromProps(props, formData, void 0, void 0, void 0, true);
+      this.state = {
+        ...this.getStateFromProps(props, formData, void 0, void 0, void 0, true),
+        _prevExtraErrors: props.extraErrors
+      };
       if (onChange && !utils.deepEquals(this.state.formData, formData)) {
         onChange(toIChangeEvent(this.state));
       }
@@ -4471,17 +4503,9 @@
       const { extraErrors, extraErrorsBlockSubmit, focusOnFirstError, onError } = this.props;
       const { errors: prevErrors } = this.state;
       const schemaValidation = this.validate(formData);
-      let errors = schemaValidation.errors;
-      let errorSchema = schemaValidation.errorSchema;
-      const schemaValidationErrors = errors;
-      const schemaValidationErrorSchema = errorSchema;
-      const hasError = errors.length > 0 || extraErrors && extraErrorsBlockSubmit;
+      const { errors, errorSchema } = extraErrors ? this.mergeErrors(schemaValidation, extraErrors) : schemaValidation;
+      const hasError = schemaValidation.errors.length > 0 || extraErrors && extraErrorsBlockSubmit;
       if (hasError) {
-        if (extraErrors) {
-          const merged = utils.validationDataMerge(schemaValidation, extraErrors);
-          errorSchema = merged.errorSchema;
-          errors = merged.errors;
-        }
         if (focusOnFirstError) {
           if (typeof focusOnFirstError === "function") {
             focusOnFirstError(errors[0]);
@@ -4493,8 +4517,8 @@
           {
             errors,
             errorSchema,
-            schemaValidationErrors,
-            schemaValidationErrorSchema
+            schemaValidationErrors: schemaValidation.errors,
+            schemaValidationErrorSchema: schemaValidation.errorSchema
           },
           () => {
             if (onError) {
@@ -4504,6 +4528,13 @@
             }
           }
         );
+      } else if (errors.length > 0) {
+        this.setState({
+          errors,
+          errorSchema,
+          schemaValidationErrors: [],
+          schemaValidationErrorSchema: {}
+        });
       } else if (prevErrors.length > 0) {
         this.setState({
           errors: [],

package/dist/index.cjs

@@ -139,7 +139,8 @@ function ArrayAsMultiSelect(props) {
   } = props;
   const { widgets: widgets2, schemaUtils, globalFormOptions, globalUiOptions } = registry;
   const itemsSchema = schemaUtils.retrieveSchema(schema.items, items);
-  const enumOptions = (0, import_utils.optionsList)(itemsSchema, uiSchema);
+  const itemsUiSchema = uiSchema?.items ?? {};
+  const enumOptions = (0, import_utils.optionsList)(itemsSchema, itemsUiSchema);
   const { widget = "select", title: uiTitle, ...options } = (0, import_utils.getUiOptions)(uiSchema, globalUiOptions);
   const Widget = (0, import_utils.getWidget)(schema, widget, widgets2);
   const label = uiTitle ?? schema.title ?? name;
@@ -4117,6 +4118,34 @@ var Form = class extends import_react21.Component {
    * This prevents componentDidUpdate from reverting oneOf/anyOf option switches.
    */
   _isProcessingUserChange = false;
+  /** When the `extraErrors` prop changes, re-merges `schemaValidationErrors` + `extraErrors` + `customErrors` into
+   * state before render, ensuring the updated errors are visible immediately in a single render cycle.
+   *
+   * @param props - The current props
+   * @param state - The current state
+   * @returns Partial state with re-merged errors if `extraErrors` changed, or `null` if no update is needed
+   */
+  static getDerivedStateFromProps(props, state) {
+    if (props.extraErrors !== state._prevExtraErrors) {
+      const baseErrors = {
+        errors: state.schemaValidationErrors || [],
+        errorSchema: state.schemaValidationErrorSchema || {}
+      };
+      let { errors, errorSchema } = baseErrors;
+      if (props.extraErrors) {
+        ({ errors, errorSchema } = (0, import_utils50.validationDataMerge)(baseErrors, props.extraErrors));
+      }
+      if (state.customErrors) {
+        ({ errors, errorSchema } = (0, import_utils50.validationDataMerge)(
+          { errors, errorSchema },
+          state.customErrors.ErrorSchema,
+          true
+        ));
+      }
+      return { _prevExtraErrors: props.extraErrors, errors, errorSchema };
+    }
+    return null;
+  }
   /** Constructs the `Form` from the `props`. Will setup the initial state from the props. It will also call the
    * `onChange` handler if the initially provided `formData` is modified to add missing default values as part of the
    * state construction.
@@ -4130,7 +4159,10 @@ var Form = class extends import_react21.Component {
     }
     const { formData: propsFormData, initialFormData, onChange } = props;
     const formData = propsFormData ?? initialFormData;
-    this.state = this.getStateFromProps(props, formData, void 0, void 0, void 0, true);
+    this.state = {
+      ...this.getStateFromProps(props, formData, void 0, void 0, void 0, true),
+      _prevExtraErrors: props.extraErrors
+    };
     if (onChange && !(0, import_utils50.deepEquals)(this.state.formData, formData)) {
       onChange(toIChangeEvent(this.state));
     }
@@ -4817,17 +4849,9 @@ var Form = class extends import_react21.Component {
     const { extraErrors, extraErrorsBlockSubmit, focusOnFirstError, onError } = this.props;
     const { errors: prevErrors } = this.state;
     const schemaValidation = this.validate(formData);
-    let errors = schemaValidation.errors;
-    let errorSchema = schemaValidation.errorSchema;
-    const schemaValidationErrors = errors;
-    const schemaValidationErrorSchema = errorSchema;
-    const hasError = errors.length > 0 || extraErrors && extraErrorsBlockSubmit;
+    const { errors, errorSchema } = extraErrors ? this.mergeErrors(schemaValidation, extraErrors) : schemaValidation;
+    const hasError = schemaValidation.errors.length > 0 || extraErrors && extraErrorsBlockSubmit;
     if (hasError) {
-      if (extraErrors) {
-        const merged = (0, import_utils50.validationDataMerge)(schemaValidation, extraErrors);
-        errorSchema = merged.errorSchema;
-        errors = merged.errors;
-      }
       if (focusOnFirstError) {
         if (typeof focusOnFirstError === "function") {
           focusOnFirstError(errors[0]);
@@ -4839,8 +4863,8 @@ var Form = class extends import_react21.Component {
         {
           errors,
           errorSchema,
-          schemaValidationErrors,
-          schemaValidationErrorSchema
+          schemaValidationErrors: schemaValidation.errors,
+          schemaValidationErrorSchema: schemaValidation.errorSchema
         },
         () => {
           if (onError) {
@@ -4850,6 +4874,13 @@ var Form = class extends import_react21.Component {
           }
         }
       );
+    } else if (errors.length > 0) {
+      this.setState({
+        errors,
+        errorSchema,
+        schemaValidationErrors: [],
+        schemaValidationErrorSchema: {}
+      });
     } else if (prevErrors.length > 0) {
       this.setState({
         errors: [],