@rjsf/core 5.14.2 → 5.14.3

package/dist/index.js

@@ -3246,17 +3246,18 @@ var Form = class extends import_react17.Component {
      */
     this.onChange = (formData, newErrorSchema, id) => {
       const { extraErrors, omitExtraData, liveOmit, noValidate, liveValidate, onChange } = this.props;
-      const { schemaUtils, schema } = this.state;
+      const { schemaUtils, schema, retrievedSchema } = this.state;
       if ((0, import_utils39.isObject)(formData) || Array.isArray(formData)) {
-        const newState = this.getStateFromProps(this.props, formData);
+        const newState = this.getStateFromProps(this.props, formData, retrievedSchema);
         formData = newState.formData;
       }
       const mustValidate = !noValidate && liveValidate;
       let state = { formData, schema };
       let newFormData = formData;
+      let _retrievedSchema;
       if (omitExtraData === true && liveOmit === true) {
-        const retrievedSchema = schemaUtils.retrieveSchema(schema, formData);
-        const pathSchema = schemaUtils.toPathSchema(retrievedSchema, "", formData);
+        _retrievedSchema = schemaUtils.retrieveSchema(schema, formData);
+        const pathSchema = schemaUtils.toPathSchema(_retrievedSchema, "", formData);
         const fieldNames = this.getFieldNames(pathSchema, formData);
         newFormData = this.getUsedFormData(formData, fieldNames);
         state = {
@@ -3264,7 +3265,7 @@ var Form = class extends import_react17.Component {
         };
       }
       if (mustValidate) {
-        const schemaValidation = this.validate(newFormData);
+        const schemaValidation = this.validate(newFormData, schema, schemaUtils, retrievedSchema);
         let errors = schemaValidation.errors;
         let errorSchema = schemaValidation.errorSchema;
         const schemaValidationErrors = errors;
@@ -3289,6 +3290,9 @@ var Form = class extends import_react17.Component {
           errors: (0, import_utils39.toErrorList)(errorSchema)
         };
       }
+      if (_retrievedSchema) {
+        state.retrievedSchema = _retrievedSchema;
+      }
       this.setState(state, () => onChange && onChange({ ...this.state, ...state }, id));
     };
     /**
@@ -3405,7 +3409,11 @@ var Form = class extends import_react17.Component {
    */
   getSnapshotBeforeUpdate(prevProps, prevState) {
     if (!(0, import_utils39.deepEquals)(this.props, prevProps)) {
-      const nextState = this.getStateFromProps(this.props, this.props.formData);
+      const nextState = this.getStateFromProps(
+        this.props,
+        this.props.formData,
+        prevProps.schema !== this.props.schema ? void 0 : this.state.retrievedSchema
+      );
       const shouldUpdate = !(0, import_utils39.deepEquals)(nextState, prevState);
       return { nextState, shouldUpdate };
     }
@@ -3443,7 +3451,7 @@ var Form = class extends import_react17.Component {
    * @param inputFormData - The new or current data for the `Form`
    * @returns - The new state for the `Form`
    */
-  getStateFromProps(props, inputFormData) {
+  getStateFromProps(props, inputFormData, retrievedSchema) {
     const state = this.state || {};
     const schema = "schema" in props ? props.schema : this.props.schema;
     const uiSchema = ("uiSchema" in props ? props.uiSchema : this.props.uiSchema) || {};
@@ -3457,7 +3465,7 @@ var Form = class extends import_react17.Component {
       schemaUtils = (0, import_utils39.createSchemaUtils)(props.validator, rootSchema, experimental_defaultFormStateBehavior);
     }
     const formData = schemaUtils.getDefaultFormState(schema, inputFormData);
-    const retrievedSchema = schemaUtils.retrieveSchema(schema, formData);
+    const _retrievedSchema = retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData);
     const getCurrentErrors = () => {
       if (props.noValidate) {
         return { errors: [], errorSchema: {} };
@@ -3477,7 +3485,7 @@ var Form = class extends import_react17.Component {
     let schemaValidationErrors = state.schemaValidationErrors;
     let schemaValidationErrorSchema = state.schemaValidationErrorSchema;
     if (mustValidate) {
-      const schemaValidation = this.validate(formData, schema, schemaUtils, retrievedSchema);
+      const schemaValidation = this.validate(formData, schema, schemaUtils, _retrievedSchema);
       errors = schemaValidation.errors;
       errorSchema = schemaValidation.errorSchema;
       schemaValidationErrors = errors;
@@ -3493,7 +3501,7 @@ var Form = class extends import_react17.Component {
       errors = merged.errors;
     }
     const idSchema = schemaUtils.toIdSchema(
-      retrievedSchema,
+      _retrievedSchema,
       uiSchema["ui:rootFieldId"],
       formData,
       props.idPrefix,
@@ -3509,7 +3517,8 @@ var Form = class extends import_react17.Component {
       errors,
       errorSchema,
       schemaValidationErrors,
-      schemaValidationErrorSchema
+      schemaValidationErrorSchema,
+      retrievedSchema: _retrievedSchema
     };
     return nextState;
   }