@rjsf/core 5.23.2 → 5.24.0

package/dist/index.js

@@ -3320,10 +3320,12 @@ var Form = class extends import_react17.Component {
      */
     this.onChange = (formData, newErrorSchema, id) => {
       const { extraErrors, omitExtraData, liveOmit, noValidate, liveValidate, onChange } = this.props;
-      const { schemaUtils, schema, retrievedSchema } = this.state;
+      const { schemaUtils, schema } = this.state;
+      let retrievedSchema = this.state.retrievedSchema;
       if ((0, import_utils39.isObject)(formData) || Array.isArray(formData)) {
-        const newState = this.getStateFromProps(this.props, formData, retrievedSchema);
+        const newState = this.getStateFromProps(this.props, formData);
         formData = newState.formData;
+        retrievedSchema = newState.retrievedSchema;
       }
       const mustValidate = !noValidate && liveValidate;
       let state = { formData, schema };
@@ -3540,8 +3542,9 @@ var Form = class extends import_react17.Component {
    */
   getSnapshotBeforeUpdate(prevProps, prevState) {
     if (!(0, import_utils39.deepEquals)(this.props, prevProps)) {
+      const formDataChangedFields = (0, import_utils39.getChangedFields)(this.props.formData, prevProps.formData);
       const isSchemaChanged = !(0, import_utils39.deepEquals)(prevProps.schema, this.props.schema);
-      const isFormDataChanged = !(0, import_utils39.deepEquals)(prevProps.formData, this.props.formData);
+      const isFormDataChanged = formDataChangedFields.length > 0 || !(0, import_utils39.deepEquals)(prevProps.formData, this.props.formData);
       const nextState = this.getStateFromProps(
         this.props,
         this.props.formData,
@@ -3549,7 +3552,8 @@ var Form = class extends import_react17.Component {
         // 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
+        isSchemaChanged,
+        formDataChangedFields
       );
       const shouldUpdate = !(0, import_utils39.deepEquals)(nextState, prevState);
       return { nextState, shouldUpdate };
@@ -3588,9 +3592,10 @@ var Form = class extends import_react17.Component {
    * @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.
+   * @param formDataChangedFields - The changed fields of `formData`
    * @returns - The new state for the `Form`
    */
-  getStateFromProps(props, inputFormData, retrievedSchema, isSchemaChanged = false) {
+  getStateFromProps(props, inputFormData, retrievedSchema, isSchemaChanged = false, formDataChangedFields = []) {
     const state = this.state || {};
     const schema = "schema" in props ? props.schema : this.props.schema;
     const uiSchema = ("uiSchema" in props ? props.uiSchema : this.props.uiSchema) || {};
@@ -3615,7 +3620,9 @@ var Form = class extends import_react17.Component {
       );
     }
     const formData = schemaUtils.getDefaultFormState(schema, inputFormData);
-    const _retrievedSchema = retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData);
+    const _retrievedSchema = this.updateRetrievedSchema(
+      retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData)
+    );
     const getCurrentErrors = () => {
       if (props.noValidate || isSchemaChanged) {
         return { errors: [], errorSchema: {} };
@@ -3652,6 +3659,17 @@ var Form = class extends import_react17.Component {
       const currentErrors = getCurrentErrors();
       errors = currentErrors.errors;
       errorSchema = currentErrors.errorSchema;
+      if (formDataChangedFields.length > 0) {
+        const newErrorSchema = formDataChangedFields.reduce((acc, key) => {
+          acc[key] = void 0;
+          return acc;
+        }, {});
+        errorSchema = schemaValidationErrorSchema = (0, import_utils39.mergeObjects)(
+          currentErrors.errorSchema,
+          newErrorSchema,
+          "preventDuplicates"
+        );
+      }
     }
     if (props.extraErrors) {
       const merged = (0, import_utils39.validationDataMerge)({ errorSchema, errors }, props.extraErrors);
@@ -3745,6 +3763,19 @@ var Form = class extends import_react17.Component {
     };
     return filterNilOrEmptyErrors(filteredErrors);
   }
+  /**
+   * If the retrievedSchema has changed the new retrievedSchema is returned.
+   * Otherwise, the old retrievedSchema is returned to persist reference.
+   * -  This ensures that AJV retrieves the schema from the cache when it has not changed,
+   *    avoiding the performance cost of recompiling the schema.
+   *
+   * @param retrievedSchema The new retrieved schema.
+   * @returns The new retrieved schema if it has changed, else the old retrieved schema.
+   */
+  updateRetrievedSchema(retrievedSchema) {
+    const isTheSame = (0, import_utils39.deepEquals)(retrievedSchema, this.state?.retrievedSchema);
+    return isTheSame ? this.state.retrievedSchema : retrievedSchema;
+  }
   /** Returns the registry for the form */
   getRegistry() {
     const { translateString: customTranslateString, uiSchema = {} } = this.props;