@rjsf/utils 5.21.1 → 5.21.2

package/dist/utils.esm.js

@@ -580,9 +580,24 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
         return [...allOf, restOfSchema];
       }
       try {
+        const withContainsSchemas = [];
+        const withoutContainsSchemas = [];
+        resolvedSchema.allOf?.forEach((s2) => {
+          if (typeof s2 === "object" && s2.contains) {
+            withContainsSchemas.push(s2);
+          } else {
+            withoutContainsSchemas.push(s2);
+          }
+        });
+        if (withContainsSchemas.length) {
+          resolvedSchema = { ...resolvedSchema, allOf: withoutContainsSchemas };
+        }
         resolvedSchema = mergeAllOf(resolvedSchema, {
           deep: false
         });
+        if (withContainsSchemas.length) {
+          resolvedSchema.allOf = withContainsSchemas;
+        }
       } catch (e) {
         console.warn("could not merge subschemas in allOf:\n", e);
         const { allOf, ...resolvedSchemaWithoutAllOf } = resolvedSchema;
@@ -1907,6 +1922,7 @@ function enumOptionsSelectValue(valueIndex, selected, allEnumOptions = []) {
 import cloneDeep from "lodash/cloneDeep";
 import get11 from "lodash/get";
 import set3 from "lodash/set";
+import setWith from "lodash/setWith";
 var ErrorSchemaBuilder = class {
   /** Construct an `ErrorSchemaBuilder` with an optional initial set of errors in an `ErrorSchema`.
    *
@@ -1936,7 +1952,7 @@ var ErrorSchemaBuilder = class {
     let errorBlock = hasPath ? get11(this.errorSchema, pathOfError) : this.errorSchema;
     if (!errorBlock && pathOfError) {
       errorBlock = {};
-      set3(this.errorSchema, pathOfError, errorBlock);
+      setWith(this.errorSchema, pathOfError, errorBlock, Object);
     }
     return errorBlock;
   }