@rjsf/utils 5.7.3 → 5.8.0

package/dist/utils.esm.js

@@ -13,6 +13,7 @@ import set from 'lodash-es/set';
 import mergeAllOf from 'json-schema-merge-allof';
 import union from 'lodash-es/union';
 import isEqual from 'lodash-es/isEqual';
+import { isNil } from 'lodash-es';
 import cloneDeep from 'lodash-es/cloneDeep';
 import { jsx } from 'react/jsx-runtime';
 import { createElement } from 'react';
@@ -560,7 +561,7 @@ function resolveCondition(validator, schema, rootSchema, expandAllBranches, form
     then = schema.then,
     otherwise = schema["else"],
     resolvedSchemaLessConditional = _objectWithoutPropertiesLoose(schema, _excluded$1);
-  var conditionValue = validator.isValid(expression, formData, rootSchema);
+  var conditionValue = validator.isValid(expression, formData || {}, rootSchema);
   var resolvedSchemas = [resolvedSchemaLessConditional];
   var schemas = [];
   if (expandAllBranches) {
@@ -759,7 +760,11 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
       } catch (e) {
         console.warn('could not merge subschemas in allOf:\n', e);
         var _resolvedSchema = resolvedSchema,
+          allOf = _resolvedSchema.allOf,
           resolvedSchemaWithoutAllOf = _objectWithoutPropertiesLoose(_resolvedSchema, _excluded3);
+        if (expandAllBranches && allOf) {
+          return [resolvedSchemaWithoutAllOf].concat(allOf);
+        }
         return resolvedSchemaWithoutAllOf;
       }
     }
@@ -1096,6 +1101,7 @@ function getClosestMatchingOption(validator, rootSchema, formData, options, sele
       return allValidIndexes.push(i);
     });
   }
+  var scoreCount = new Set();
   // Score all the options in the list of valid indexes and return the index with the best score
   var _allValidIndexes$redu = allValidIndexes.reduce(function (scoreData, index) {
       var bestScore = scoreData.bestScore;
@@ -1104,6 +1110,7 @@ function getClosestMatchingOption(validator, rootSchema, formData, options, sele
         option = retrieveSchema(validator, option, rootSchema, formData);
       }
       var score = calculateIndexScore(validator, rootSchema, option, formData);
+      scoreCount.add(score);
       if (score > bestScore) {
         return {
           bestIndex: index,
@@ -1116,6 +1123,10 @@ function getClosestMatchingOption(validator, rootSchema, formData, options, sele
       bestScore: 0
     }),
     bestIndex = _allValidIndexes$redu.bestIndex;
+  // if all scores are the same go with selectedOption
+  if (scoreCount.size === 1 && selectedOption >= 0) {
+    return selectedOption;
+  }
   return bestIndex;
 }
 
@@ -2406,7 +2417,7 @@ function enumOptionsSelectValue(valueIndex, selected, allEnumOptions) {
     allEnumOptions = [];
   }
   var value = enumOptionsValueForIndex(valueIndex, allEnumOptions);
-  if (value) {
+  if (!isNil(value)) {
     var index = allEnumOptions.findIndex(function (opt) {
       return value === opt.value;
     });
@@ -2776,13 +2787,19 @@ function hashString(string) {
 
   return hash.toString(16);
 }
-/** Stringifies the schema and returns the hash of the resulting string.
+/** Stringifies the schema and returns the hash of the resulting string. Sorts schema fields
+ * in consistent order before stringify to prevent different hash ids for the same schema.
  *
  * @param schema - The schema for which the hash is desired
  * @returns - The string obtained from the hash of the stringified schema
  */
 function hashForSchema(schema) {
-  return hashString(JSON.stringify(schema));
+  var allKeys = new Set();
+  // solution source: https://stackoverflow.com/questions/16167581/sort-object-properties-and-json-stringify/53593328#53593328
+  JSON.stringify(schema, function (key, value) {
+    return allKeys.add(key), value;
+  });
+  return hashString(JSON.stringify(schema, Array.from(allKeys).sort()));
 }
 
 /** Detects whether the `widget` exists for the `schema` with the associated `registryWidgets` and returns true if it