@rjsf/core 5.14.1 → 5.14.3

package/dist/core.umd.js

@@ -2991,17 +2991,18 @@
        */
       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 (utils.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 = {
@@ -3009,7 +3010,7 @@
           };
         }
         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;
@@ -3034,6 +3035,9 @@
             errors: utils.toErrorList(errorSchema)
           };
         }
+        if (_retrievedSchema) {
+          state.retrievedSchema = _retrievedSchema;
+        }
         this.setState(state, () => onChange && onChange({ ...this.state, ...state }, id));
       };
       /**
@@ -3150,7 +3154,11 @@
      */
     getSnapshotBeforeUpdate(prevProps, prevState) {
       if (!utils.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 = !utils.deepEquals(nextState, prevState);
         return { nextState, shouldUpdate };
       }
@@ -3188,7 +3196,7 @@
      * @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) || {};
@@ -3202,7 +3210,7 @@
         schemaUtils = utils.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: {} };
@@ -3222,7 +3230,7 @@
       let schemaValidationErrors = state.schemaValidationErrors;
       let schemaValidationErrorSchema = state.schemaValidationErrorSchema;
       if (mustValidate) {
-        const schemaValidation = this.validate(formData, schema, schemaUtils);
+        const schemaValidation = this.validate(formData, schema, schemaUtils, _retrievedSchema);
         errors = schemaValidation.errors;
         errorSchema = schemaValidation.errorSchema;
         schemaValidationErrors = errors;
@@ -3238,7 +3246,7 @@
         errors = merged.errors;
       }
       const idSchema = schemaUtils.toIdSchema(
-        retrievedSchema,
+        _retrievedSchema,
         uiSchema["ui:rootFieldId"],
         formData,
         props.idPrefix,
@@ -3254,7 +3262,8 @@
         errors,
         errorSchema,
         schemaValidationErrors,
-        schemaValidationErrorSchema
+        schemaValidationErrorSchema,
+        retrievedSchema: _retrievedSchema
       };
       return nextState;
     }
@@ -3274,10 +3283,10 @@
      * @param schema - The schema used to validate against
      * @param altSchemaUtils - The alternate schemaUtils to use for validation
      */
-    validate(formData, schema = this.props.schema, altSchemaUtils) {
+    validate(formData, schema = this.props.schema, altSchemaUtils, retrievedSchema) {
       const schemaUtils = altSchemaUtils ? altSchemaUtils : this.state.schemaUtils;
       const { customValidate, transformErrors, uiSchema } = this.props;
-      const resolvedSchema = schemaUtils.retrieveSchema(schema, formData);
+      const resolvedSchema = retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData);
       return schemaUtils.getValidator().validateFormData(formData, resolvedSchema, customValidate, transformErrors, uiSchema);
     }
     /** Renders any errors contained in the `state` in using the `ErrorList`, if not disabled by `showErrorList`. */

package/dist/index.esm.js

@@ -3337,17 +3337,18 @@ var Form = class extends Component5 {
      */
     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 (isObject5(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 = {
@@ -3355,7 +3356,7 @@ var Form = class extends Component5 {
         };
       }
       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;
@@ -3380,6 +3381,9 @@ var Form = class extends Component5 {
           errors: toErrorList(errorSchema)
         };
       }
+      if (_retrievedSchema) {
+        state.retrievedSchema = _retrievedSchema;
+      }
       this.setState(state, () => onChange && onChange({ ...this.state, ...state }, id));
     };
     /**
@@ -3496,7 +3500,11 @@ var Form = class extends Component5 {
    */
   getSnapshotBeforeUpdate(prevProps, prevState) {
     if (!deepEquals3(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 = !deepEquals3(nextState, prevState);
       return { nextState, shouldUpdate };
     }
@@ -3534,7 +3542,7 @@ var Form = class extends Component5 {
    * @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) || {};
@@ -3548,7 +3556,7 @@ var Form = class extends Component5 {
       schemaUtils = 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: {} };
@@ -3568,7 +3576,7 @@ var Form = class extends Component5 {
     let schemaValidationErrors = state.schemaValidationErrors;
     let schemaValidationErrorSchema = state.schemaValidationErrorSchema;
     if (mustValidate) {
-      const schemaValidation = this.validate(formData, schema, schemaUtils);
+      const schemaValidation = this.validate(formData, schema, schemaUtils, _retrievedSchema);
       errors = schemaValidation.errors;
       errorSchema = schemaValidation.errorSchema;
       schemaValidationErrors = errors;
@@ -3584,7 +3592,7 @@ var Form = class extends Component5 {
       errors = merged.errors;
     }
     const idSchema = schemaUtils.toIdSchema(
-      retrievedSchema,
+      _retrievedSchema,
       uiSchema["ui:rootFieldId"],
       formData,
       props.idPrefix,
@@ -3600,7 +3608,8 @@ var Form = class extends Component5 {
       errors,
       errorSchema,
       schemaValidationErrors,
-      schemaValidationErrorSchema
+      schemaValidationErrorSchema,
+      retrievedSchema: _retrievedSchema
     };
     return nextState;
   }
@@ -3620,10 +3629,10 @@ var Form = class extends Component5 {
    * @param schema - The schema used to validate against
    * @param altSchemaUtils - The alternate schemaUtils to use for validation
    */
-  validate(formData, schema = this.props.schema, altSchemaUtils) {
+  validate(formData, schema = this.props.schema, altSchemaUtils, retrievedSchema) {
     const schemaUtils = altSchemaUtils ? altSchemaUtils : this.state.schemaUtils;
     const { customValidate, transformErrors, uiSchema } = this.props;
-    const resolvedSchema = schemaUtils.retrieveSchema(schema, formData);
+    const resolvedSchema = retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData);
     return schemaUtils.getValidator().validateFormData(formData, resolvedSchema, customValidate, transformErrors, uiSchema);
   }
   /** Renders any errors contained in the `state` in using the `ErrorList`, if not disabled by `showErrorList`. */