Fix failing cs-check, add to changelog

rjsf-team · Nov 23, 2022 · 552d69e · 552d69e
1 parent acb12fc
commit 552d69e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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;