diff --git a/CHANGELOG.md b/CHANGELOG.md index 87d27f4e91..c5022ef007 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ should change the heading of the (upcoming) version to include a major version b ## @rjsf/utils - fixed issue with customValidate errors are not cleared when the form is valid [4365](https://github.com/rjsf-team/react-jsonschema-form/pull/4365) due to regression +- Add missing `experimental_customMergeAllOf` argument to `ensureFormDataMatchingSchema` introduced by [4388](https://github.com/rjsf-team/react-jsonschema-form/pull/4388) # 5.24.3 diff --git a/packages/utils/src/schema/getDefaultFormState.ts b/packages/utils/src/schema/getDefaultFormState.ts index e3f480cae2..af3de03a35 100644 --- a/packages/utils/src/schema/getDefaultFormState.ts +++ b/packages/utils/src/schema/getDefaultFormState.ts @@ -344,7 +344,8 @@ export function computeDefaults( @@ -366,7 +367,8 @@ export function computeDefaults ): T | T[] | undefined { - const isSelectField = !isConstant(schema) && isSelect(validator, schema, rootSchema); + const isSelectField = !isConstant(schema) && isSelect(validator, schema, rootSchema, experimental_customMergeAllOf); let validFormData: T | T[] | undefined = formData; if (isSelectField) { const getOptionsList = optionsList(schema);