@rjsf/core 5.17.1 → 5.18.1

package/dist/core.umd.js

@@ -3211,10 +3211,16 @@
      */
     getSnapshotBeforeUpdate(prevProps, prevState) {
       if (!utils.deepEquals(this.props, prevProps)) {
+        const isSchemaChanged = !utils.deepEquals(prevProps.schema, this.props.schema);
+        const isFormDataChanged = !utils.deepEquals(prevProps.formData, this.props.formData);
         const nextState = this.getStateFromProps(
           this.props,
           this.props.formData,
-          prevProps.schema !== this.props.schema ? void 0 : this.state.retrievedSchema
+          // If the `schema` has changed, we need to update the retrieved schema.
+          // Or if the `formData` changes, for example in the case of a schema with dependencies that need to
+          //  match one of the subSchemas, the retrieved schema must be updated.
+          isSchemaChanged || isFormDataChanged ? void 0 : this.state.retrievedSchema,
+          isSchemaChanged
         );
         const shouldUpdate = !utils.deepEquals(nextState, prevState);
         return { nextState, shouldUpdate };
@@ -3251,9 +3257,11 @@
      *
      * @param props - The props passed to the `Form`
      * @param inputFormData - The new or current data for the `Form`
+     * @param retrievedSchema - An expanded schema, if not provided, it will be retrieved from the `schema` and `formData`.
+     * @param isSchemaChanged - A flag indicating whether the schema has changed.
      * @returns - The new state for the `Form`
      */
-    getStateFromProps(props, inputFormData, retrievedSchema) {
+    getStateFromProps(props, inputFormData, retrievedSchema, isSchemaChanged = false) {
       const state = this.state || {};
       const schema = "schema" in props ? props.schema : this.props.schema;
       const uiSchema = ("uiSchema" in props ? props.uiSchema : this.props.uiSchema) || {};
@@ -3269,7 +3277,7 @@
       const formData = schemaUtils.getDefaultFormState(schema, inputFormData);
       const _retrievedSchema = retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData);
       const getCurrentErrors = () => {
-        if (props.noValidate) {
+        if (props.noValidate || isSchemaChanged) {
           return { errors: [], errorSchema: {} };
         } else if (!props.liveValidate) {
           return {

package/dist/index.esm.js

@@ -3560,10 +3560,16 @@ var Form = class extends Component5 {
    */
   getSnapshotBeforeUpdate(prevProps, prevState) {
     if (!deepEquals3(this.props, prevProps)) {
+      const isSchemaChanged = !deepEquals3(prevProps.schema, this.props.schema);
+      const isFormDataChanged = !deepEquals3(prevProps.formData, this.props.formData);
       const nextState = this.getStateFromProps(
         this.props,
         this.props.formData,
-        prevProps.schema !== this.props.schema ? void 0 : this.state.retrievedSchema
+        // If the `schema` has changed, we need to update the retrieved schema.
+        // Or if the `formData` changes, for example in the case of a schema with dependencies that need to
+        //  match one of the subSchemas, the retrieved schema must be updated.
+        isSchemaChanged || isFormDataChanged ? void 0 : this.state.retrievedSchema,
+        isSchemaChanged
       );
       const shouldUpdate = !deepEquals3(nextState, prevState);
       return { nextState, shouldUpdate };
@@ -3600,9 +3606,11 @@ var Form = class extends Component5 {
    *
    * @param props - The props passed to the `Form`
    * @param inputFormData - The new or current data for the `Form`
+   * @param retrievedSchema - An expanded schema, if not provided, it will be retrieved from the `schema` and `formData`.
+   * @param isSchemaChanged - A flag indicating whether the schema has changed.
    * @returns - The new state for the `Form`
    */
-  getStateFromProps(props, inputFormData, retrievedSchema) {
+  getStateFromProps(props, inputFormData, retrievedSchema, isSchemaChanged = false) {
     const state = this.state || {};
     const schema = "schema" in props ? props.schema : this.props.schema;
     const uiSchema = ("uiSchema" in props ? props.uiSchema : this.props.uiSchema) || {};
@@ -3618,7 +3626,7 @@ var Form = class extends Component5 {
     const formData = schemaUtils.getDefaultFormState(schema, inputFormData);
     const _retrievedSchema = retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData);
     const getCurrentErrors = () => {
-      if (props.noValidate) {
+      if (props.noValidate || isSchemaChanged) {
         return { errors: [], errorSchema: {} };
       } else if (!props.liveValidate) {
         return {