@rjsf/core 5.17.1 → 5.18.0

package/dist/index.js

@@ -3466,10 +3466,16 @@ var Form = class extends import_react17.Component {
    */
   getSnapshotBeforeUpdate(prevProps, prevState) {
     if (!(0, import_utils39.deepEquals)(this.props, prevProps)) {
+      const isSchemaChanged = !(0, import_utils39.deepEquals)(prevProps.schema, this.props.schema);
+      const isFormDataChanged = !(0, import_utils39.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 = !(0, import_utils39.deepEquals)(nextState, prevState);
       return { nextState, shouldUpdate };
@@ -3506,9 +3512,11 @@ var Form = class extends import_react17.Component {
    *
    * @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) || {};
@@ -3524,7 +3532,7 @@ var Form = class extends import_react17.Component {
     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 {