@rjsf/utils 6.0.0-beta.17 → 6.0.0-beta.19

package/dist/utils.esm.js

@@ -537,7 +537,8 @@ function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurse
     rootSchema,
     expandAllBranches,
     recurseList,
-    formData
+    formData,
+    experimental_customMergeAllOf
   );
   if (updatedSchemas.length > 1 || updatedSchemas[0] !== schema) {
     return updatedSchemas;
@@ -549,7 +550,8 @@ function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurse
       rootSchema,
       expandAllBranches,
       recurseList,
-      formData
+      formData,
+      experimental_customMergeAllOf
     );
     return resolvedSchemas.flatMap((s) => {
       return retrieveSchemaInternal(
@@ -1432,6 +1434,11 @@ function getInnerSchemaForArrayItem(schema, additionalItems = 0 /* Ignore */, id
   }
   return {};
 }
+function computeDefaultBasedOnSchemaTypeAndDefaults(schema, computedDefault) {
+  const { default: schemaDefault, type } = schema;
+  const shouldReturnNullAsDefault = Array.isArray(type) && type.includes("null") && isEmpty4(computedDefault) && schemaDefault === null;
+  return shouldReturnNullAsDefault ? null : computedDefault;
+}
 function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValues, isParentRequired, requiredFields = [], experimental_defaultFormStateBehavior = {}, isConst = false) {
   const { emptyObjectFields = "populateAllDefaults" } = experimental_defaultFormStateBehavior;
   if (includeUndefinedValues === true || isConst) {
@@ -1698,7 +1705,7 @@ function getObjectDefaults(validator, rawSchema, {
         );
       });
     }
-    return objectDefaults;
+    return computeDefaultBasedOnSchemaTypeAndDefaults(rawSchema, objectDefaults);
   }
 }
 function getArrayDefaults(validator, rawSchema, {
@@ -1763,26 +1770,29 @@ function getArrayDefaults(validator, rawSchema, {
       return defaults ? defaults : void 0;
     }
   }
+  let arrayDefault;
   const defaultsLength = Array.isArray(defaults) ? defaults.length : 0;
   if (!schema.minItems || isMultiSelect(validator, schema, rootSchema, experimental_customMergeAllOf) || computeSkipPopulate(validator, schema, rootSchema) || schema.minItems <= defaultsLength) {
-    return defaults ? defaults : emptyDefault;
-  }
-  const defaultEntries = defaults || [];
-  const fillerSchema = getInnerSchemaForArrayItem(schema, 1 /* Invert */);
-  const fillerDefault = fillerSchema.default;
-  const fillerEntries = Array.from(
-    { length: schema.minItems - defaultsLength },
-    () => computeDefaults(validator, fillerSchema, {
-      parentDefaults: fillerDefault,
-      rootSchema,
-      _recurseList,
-      experimental_defaultFormStateBehavior,
-      experimental_customMergeAllOf,
-      required,
-      shouldMergeDefaultsIntoFormData
-    })
-  );
-  return defaultEntries.concat(fillerEntries);
+    arrayDefault = defaults ? defaults : emptyDefault;
+  } else {
+    const defaultEntries = defaults || [];
+    const fillerSchema = getInnerSchemaForArrayItem(schema, 1 /* Invert */);
+    const fillerDefault = fillerSchema.default;
+    const fillerEntries = Array.from(
+      { length: schema.minItems - defaultsLength },
+      () => computeDefaults(validator, fillerSchema, {
+        parentDefaults: fillerDefault,
+        rootSchema,
+        _recurseList,
+        experimental_defaultFormStateBehavior,
+        experimental_customMergeAllOf,
+        required,
+        shouldMergeDefaultsIntoFormData
+      })
+    );
+    arrayDefault = defaultEntries.concat(fillerEntries);
+  }
+  return computeDefaultBasedOnSchemaTypeAndDefaults(rawSchema, arrayDefault);
 }
 function getDefaultBasedOnSchemaType(validator, rawSchema, computeDefaultsProps = {}, defaults) {
   switch (getSchemaType(rawSchema)) {