Skip to content

Pass experimental_customMergeAllOf to ensureFormDataMatchingSchema #4508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 4, 2025
Merged

Pass experimental_customMergeAllOf to ensureFormDataMatchingSchema #4508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71843e2
Pass experimental_customMergeAllOf to ensureFormDataMatchingSchema
MarekBodinger Feb 28, 2025
0e03d21
Update changelog
MarekBodinger Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 7 additions & 4 deletions packages/utils/src/schema/getDefaultFormState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,8 @@ export function computeDefaults<T = any, S extends StrictRJSFSchema = RJSFSchema
schema,
rootSchema,
rawFormData,
experimental_defaultFormStateBehavior
experimental_defaultFormStateBehavior,
experimental_customMergeAllOf
);
if (!isObject(rawFormData)) {
defaultsWithFormData = mergeDefaultsWithFormData<T>(
Expand All @@ -366,7 +367,8 @@ export function computeDefaults<T = any, S extends StrictRJSFSchema = RJSFSchema
* @param schema - The schema for which the formData state is desired
* @param rootSchema - The root schema, used to primarily to look up `$ref`s
* @param formData - The current formData
* @param experimental_defaultFormStateBehavior - Optional configuration object, if provided, allows users to override default form state behavior
* @param [experimental_defaultFormStateBehavior] - Optional configuration object, if provided, allows users to override default form state behavior
* @param [experimental_customMergeAllOf] - Optional function that allows for custom merging of `allOf` schemas
* @returns - valid formData that matches schema
*/
export function ensureFormDataMatchingSchema<
Expand All @@ -378,9 +380,10 @@ export function ensureFormDataMatchingSchema<
schema: S,
rootSchema: S,
formData: T | undefined,
experimental_defaultFormStateBehavior?: Experimental_DefaultFormStateBehavior
experimental_defaultFormStateBehavior?: Experimental_DefaultFormStateBehavior,
experimental_customMergeAllOf?: Experimental_CustomMergeAllOf<S>
): 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);
Expand Down