@rjsf/utils 5.0.0-beta.5 → 5.0.0-beta.8

package/dist/utils.esm.js

@@ -1,11 +1,11 @@
 import isEqualWith from 'lodash-es/isEqualWith';
 import get from 'lodash-es/get';
+import isEmpty from 'lodash-es/isEmpty';
 import jsonpointer from 'jsonpointer';
 import omit from 'lodash-es/omit';
 import set from 'lodash-es/set';
 import mergeAllOf from 'json-schema-merge-allof';
 import union from 'lodash-es/union';
-import isEmpty from 'lodash-es/isEmpty';
 import React from 'react';
 import ReactIs from 'react-is';
 
@@ -974,7 +974,7 @@ function getInnerSchemaForArrayItem(schema, additionalItems, idx) {
   return {};
 }
 /** Computes the defaults for the current `schema` given the `rawFormData` and `parentDefaults` if any. This drills into
- * the each level of the schema, recursively, to fill out every level of defaults provided by the schema.
+ * each level of the schema, recursively, to fill out every level of defaults provided by the schema.
  *
  * @param validator - an implementation of the `ValidatorType` interface that will be used when necessary
  * @param schema - The schema for which the default state is desired
@@ -1014,9 +1014,9 @@ function computeDefaults(validator, schema, parentDefaults, rootSchema, rawFormD
   } else if (isFixedItems(schema)) {
     defaults = schema.items.map((itemSchema, idx) => computeDefaults(validator, itemSchema, Array.isArray(parentDefaults) ? parentDefaults[idx] : undefined, rootSchema, formData, includeUndefinedValues));
   } else if (ONE_OF_KEY in schema) {
-    schema = schema.oneOf[getMatchingOption(validator, undefined, schema.oneOf, rootSchema)];
+    schema = schema.oneOf[getMatchingOption(validator, isEmpty(formData) ? undefined : formData, schema.oneOf, rootSchema)];
   } else if (ANY_OF_KEY in schema) {
-    schema = schema.anyOf[getMatchingOption(validator, undefined, schema.anyOf, rootSchema)];
+    schema = schema.anyOf[getMatchingOption(validator, isEmpty(formData) ? undefined : formData, schema.anyOf, rootSchema)];
   } // Not defaults defined for this node, fallback to generic typed ones.