diff --git a/CHANGELOG.md b/CHANGELOG.md index a37377c983..74648b2d50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,11 @@ it according to semantic versioning. For example, if your PR adds a breaking cha should change the heading of the (upcoming) version to include a major version bump. --> +# 5.0.0-beta.14 + +## @rjsf/utils +- Fix improper merging of nested `allOf`s ([#3025](https://github.com/rjsf-team/react-jsonschema-form/pull/3025), [#3227](https://github.com/rjsf-team/react-jsonschema-form/pull/3227)) + # 5.0.0-beta.13 ## @rjsf/playground diff --git a/packages/utils/src/schema/retrieveSchema.ts b/packages/utils/src/schema/retrieveSchema.ts index 91c5a1cf19..2da8c4a453 100644 --- a/packages/utils/src/schema/retrieveSchema.ts +++ b/packages/utils/src/schema/retrieveSchema.ts @@ -245,7 +245,9 @@ export default function retrieveSchema< if (ALL_OF_KEY in schema) { try { - resolvedSchema = mergeAllOf( resolvedSchema, { deep: false } as Options) as S; + resolvedSchema = mergeAllOf(resolvedSchema, { + deep: false, + } as Options) as S; } catch (e) { console.warn("could not merge subschemas in allOf:\n" + e); const { allOf, ...resolvedSchemaWithoutAllOf } = resolvedSchema;