@rjsf/utils 6.6.2 → 6.7.0

package/dist/utils.esm.js

@@ -43,7 +43,7 @@ function asNumber(value) {
 }
 
 // src/constants.ts
-var ADDITIONAL_PROPERTY_FLAG = "__additional_property";
+var ADDITIONAL_PROPERTY_FLAG = /* @__PURE__ */ Symbol("__additional_property");
 var ADDITIONAL_PROPERTIES_KEY = "additionalProperties";
 var ALL_OF_KEY = "allOf";
 var ANY_OF_KEY = "anyOf";
@@ -65,15 +65,17 @@ var READONLY_KEY = "readonly";
 var REQUIRED_KEY = "required";
 var SUBMIT_BTN_OPTIONS_KEY = "submitButtonOptions";
 var REF_KEY = "$ref";
-var RJSF_REF_KEY = "__rjsf_ref";
+var RJSF_REF_KEY = /* @__PURE__ */ Symbol("__rjsf_ref");
+var RJSF_REF_CYCLE_KEY = /* @__PURE__ */ Symbol("__rjsf_ref_cycle");
 var SCHEMA_KEY = "$schema";
 var DEFAULT_ID_PREFIX = "root";
 var DEFAULT_ID_SEPARATOR = "_";
 var DISCRIMINATOR_PATH = ["discriminator", "propertyName"];
 var FORM_CONTEXT_NAME = "formContext";
 var LOOKUP_MAP_NAME = "layoutGridLookupMap";
-var RJSF_ADDITIONAL_PROPERTIES_FLAG = "__rjsf_additionalProperties";
-var ROOT_SCHEMA_PREFIX = "__rjsf_rootSchema";
+var RJSF_PREFIX_KEY = "__rjsf";
+var RJSF_ADDITIONAL_PROPERTIES_FLAG = `${RJSF_PREFIX_KEY}_additionalProperties`;
+var ROOT_SCHEMA_PREFIX = `${RJSF_PREFIX_KEY}_rootSchema`;
 var UI_FIELD_KEY = "ui:field";
 var UI_WIDGET_KEY = "ui:widget";
 var UI_OPTIONS_KEY = "ui:options";
@@ -144,7 +146,7 @@ function createErrorHandler(formData) {
 }
 
 // src/createSchemaUtils.ts
-import get17 from "lodash/get";
+import get16 from "lodash/get";
 
 // src/deepEquals.ts
 import { createCustomEqual } from "fast-equals";
@@ -348,7 +350,7 @@ function getSchemaType(schema) {
 // src/mergeSchemas.ts
 function mergeSchemas(obj1, obj2) {
   const acc = { ...obj1 };
-  return Object.keys(obj2).reduce((accumulator, key) => {
+  const result = Object.keys(obj2).reduce((accumulator, key) => {
     const left = obj1 ? obj1[key] : {}, right = obj2[key];
     if (obj1 && key in obj1 && isObject(right)) {
       accumulator[key] = mergeSchemas(left, right);
@@ -359,6 +361,10 @@ function mergeSchemas(obj1, obj2) {
     }
     return accumulator;
   }, acc);
+  for (const sym of Object.getOwnPropertySymbols(obj2)) {
+    result[sym] = obj2[sym];
+  }
+  return result;
 }
 
 // src/schema/getFirstMatchingOption.ts
@@ -460,6 +466,12 @@ function retrieveSchema(validator, schema, rootSchema = {}, rawFormData, experim
     resolveAnyOfOrOneOfRefs
   )[0];
 }
+function normalizeBooleanSchema(schema) {
+  if (typeof schema !== "boolean") {
+    return schema;
+  }
+  return schema ? {} : { not: {} };
+}
 function resolveCondition(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
   const { if: expression, then, else: otherwise, ...resolvedSchemaLessConditional } = schema;
   const conditionValue = validator.isValid(expression, formData || {}, rootSchema);
@@ -467,10 +479,11 @@ function resolveCondition(validator, schema, rootSchema, expandAllBranches, recu
   let schemas = [];
   if (expandAllBranches) {
     if (then && typeof then !== "boolean") {
+      const thenSchema = then;
       schemas = schemas.concat(
         retrieveSchemaInternal(
           validator,
-          then,
+          thenSchema,
           rootSchema,
           formData,
           expandAllBranches,
@@ -480,10 +493,11 @@ function resolveCondition(validator, schema, rootSchema, expandAllBranches, recu
       );
     }
     if (otherwise && typeof otherwise !== "boolean") {
+      const otherwiseSchema = otherwise;
       schemas = schemas.concat(
         retrieveSchemaInternal(
           validator,
-          otherwise,
+          otherwiseSchema,
           rootSchema,
           formData,
           expandAllBranches,
@@ -493,8 +507,9 @@ function resolveCondition(validator, schema, rootSchema, expandAllBranches, recu
       );
     }
   } else {
-    const conditionalSchema = conditionValue ? then : otherwise;
-    if (conditionalSchema && typeof conditionalSchema !== "boolean") {
+    const conditionalBranch = conditionValue ? then : otherwise;
+    if (conditionalBranch !== void 0) {
+      const conditionalSchema = normalizeBooleanSchema(conditionalBranch);
       schemas = schemas.concat(
         retrieveSchemaInternal(
           validator,
@@ -618,7 +633,7 @@ function resolveReference(validator, schema, rootSchema, expandAllBranches, recu
   }
   return [schema];
 }
-function resolveAllReferences(schema, rootSchema, recurseList, baseURI, resolveAnyOfOrOneOfRefs) {
+function resolveAllReferences(schema, rootSchema, recurseList, baseURI, resolveAnyOfOrOneOfRefs, markCycleOnDetection = false) {
   if (!isObject(schema)) {
     return schema;
   }
@@ -627,7 +642,7 @@ function resolveAllReferences(schema, rootSchema, recurseList, baseURI, resolveA
   if (REF_KEY in resolvedSchema) {
     const { $ref, ...localSchema } = resolvedSchema;
     if (recurseList.includes($ref)) {
-      return resolvedSchema;
+      return markCycleOnDetection ? { ...resolvedSchema, [RJSF_REF_CYCLE_KEY]: true } : resolvedSchema;
     }
     recurseList.push($ref);
     const refSchema = findSchemaDefinition($ref, rootSchema, currentBaseURI);
@@ -642,7 +657,14 @@ function resolveAllReferences(schema, rootSchema, recurseList, baseURI, resolveA
       resolvedSchema[PROPERTIES_KEY],
       (acc, value, key) => {
         const childList = [...recurseList];
-        acc[key] = resolveAllReferences(value, rootSchema, childList, currentBaseURI, resolveAnyOfOrOneOfRefs);
+        acc[key] = resolveAllReferences(
+          value,
+          rootSchema,
+          childList,
+          currentBaseURI,
+          resolveAnyOfOrOneOfRefs,
+          !resolveAnyOfOrOneOfRefs
+        );
         childrenLists.push(childList);
       },
       {}
@@ -653,6 +675,7 @@ function resolveAllReferences(schema, rootSchema, recurseList, baseURI, resolveA
   if (ITEMS_KEY in resolvedSchema && !Array.isArray(resolvedSchema.items) && typeof resolvedSchema.items !== "boolean") {
     resolvedSchema = {
       ...resolvedSchema,
+      // Array items are only rendered when data exists, so a $ref cycle here does NOT cause an infinite render.
       items: resolveAllReferences(
         resolvedSchema.items,
         rootSchema,
@@ -703,7 +726,7 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
           get5(formData, [key]),
           experimental_customMergeAllOf
         );
-        set(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
+        schema.properties[key][ADDITIONAL_PROPERTY_FLAG] = true;
         return;
       }
     }
@@ -715,7 +738,7 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
             validator,
             { [REF_KEY]: get5(schema.additionalProperties, [REF_KEY]) },
             rootSchema,
-            formData,
+            get5(formData, [key]),
             experimental_customMergeAllOf
           );
         } else if ("type" in schema.additionalProperties) {
@@ -732,10 +755,10 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
         additionalProperties = { type: guessType(get5(formData, [key])) };
       }
       schema.properties[key] = additionalProperties;
-      set(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
+      schema.properties[key][ADDITIONAL_PROPERTY_FLAG] = true;
     } else {
       schema.properties[key] = { type: "null" };
-      set(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
+      schema.properties[key][ADDITIONAL_PROPERTY_FLAG] = true;
     }
   });
   return schema;
@@ -778,17 +801,26 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
       try {
         const withContainsSchemas = [];
         const withoutContainsSchemas = [];
+        const allOfSymbols = {};
         resolvedSchema.allOf?.forEach((allOfItem) => {
           if (typeof allOfItem === "object" && allOfItem.contains) {
             withContainsSchemas.push(allOfItem);
           } else {
             withoutContainsSchemas.push(allOfItem);
+            for (const sym of Object.getOwnPropertySymbols(allOfItem)) {
+              if (!(sym in allOfSymbols)) {
+                allOfSymbols[sym] = allOfItem[sym];
+              }
+            }
           }
         });
         if (withContainsSchemas.length) {
           resolvedSchema = { ...resolvedSchema, allOf: withoutContainsSchemas };
         }
         resolvedSchema = experimental_customMergeAllOf ? experimental_customMergeAllOf(resolvedSchema) : mergeAllOf(resolvedSchema);
+        for (const sym of Object.getOwnPropertySymbols(allOfSymbols)) {
+          resolvedSchema[sym] = allOfSymbols[sym];
+        }
         if (withContainsSchemas.length) {
           resolvedSchema.allOf = withContainsSchemas;
         }
@@ -857,7 +889,7 @@ function resolveAnyOrOneOfSchemas(validator, schema, rootSchema, expandAllBranch
 function relaxOptionsForScoring(options, resolveRefs = false, rootSchema) {
   return options.map((d) => {
     if (!isObject(d)) {
-      return d ? {} : { not: {} };
+      return normalizeBooleanSchema(d);
     }
     const schema = resolveRefs && rootSchema ? resolveAllReferences(d, rootSchema, []) : d;
     return schema.additionalProperties === false ? { ...schema, additionalProperties: true } : schema;
@@ -971,7 +1003,7 @@ function withDependentSchema(validator, schema, rootSchema, dependencyKey, depen
 }
 function withExactlyOneSubschema(validator, schema, rootSchema, dependencyKey, oneOf, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
   const validSubschemas = oneOf.filter((subschema) => {
-    if (typeof subschema === "boolean" || !subschema || !subschema.properties) {
+    if (typeof subschema === "boolean" || !subschema?.properties) {
       return false;
     }
     const { [dependencyKey]: conditionPropertySchema } = subschema.properties;
@@ -1292,7 +1324,7 @@ function isConstant(schema) {
 
 // src/isFixedItems.ts
 function isFixedItems(schema) {
-  return Array.isArray(schema.items) && schema.items.length > 0 && schema.items.every((item) => isObject(item));
+  return Array.isArray(schema.items) && schema.items.every((item) => isObject(item));
 }
 
 // src/mergeDefaultsWithFormData.ts
@@ -1441,7 +1473,7 @@ function optionsList(schema, uiSchema) {
     const { optionsSchemaSelector = selectorField } = getUiOptions(uiSchema);
     selectorField = optionsSchemaSelector;
   }
-  return altSchemas && altSchemas.map((aSchemaDef, index) => {
+  return altSchemas?.map((aSchemaDef, index) => {
     const { title } = getUiOptions(altUiSchemas?.[index]);
     const aSchema = aSchemaDef;
     let value;
@@ -1449,10 +1481,10 @@ function optionsList(schema, uiSchema) {
     if (selectorField) {
       const innerSchema = get11(aSchema, [PROPERTIES_KEY, selectorField], {});
       value = get11(innerSchema, DEFAULT_KEY, get11(innerSchema, CONST_KEY));
-      label = label || innerSchema?.title || aSchema.title || String(value);
+      label = label ?? innerSchema?.title ?? aSchema.title ?? String(value);
     } else {
       value = toConstant(aSchema);
-      label = label || aSchema.title || String(value);
+      label = label ?? aSchema.title ?? String(value);
     }
     return {
       schema: aSchema,
@@ -1542,8 +1574,8 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
     rootSchema = {},
     includeUndefinedValues = false,
     _recurseList = [],
-    experimental_defaultFormStateBehavior = void 0,
-    experimental_customMergeAllOf = void 0,
+    experimental_defaultFormStateBehavior,
+    experimental_customMergeAllOf,
     required,
     shouldMergeDefaultsIntoFormData = false,
     initialDefaultsGenerated
@@ -1551,14 +1583,19 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
   let formData = isObject(rawFormData) ? rawFormData : {};
   const schema = isObject(rawSchema) ? rawSchema : {};
   let defaults = parentDefaults;
+  const preferParentDefaults = defaults && experimental_defaultFormStateBehavior?.nestedDefaultsPrecedence === "ancestorWins";
   let schemaToCompute = null;
   let experimental_dfsb_to_compute = experimental_defaultFormStateBehavior;
   let updatedRecurseList = _recurseList;
   if (schema[CONST_KEY] !== void 0 && experimental_defaultFormStateBehavior?.constAsDefaults !== "never" && !constIsAjvDataReference(schema)) {
     defaults = schema[CONST_KEY];
   } else if (isObject(defaults) && isObject(schema.default) && !schema[ANY_OF_KEY] && !schema[ONE_OF_KEY] && !schema[REF_KEY]) {
-    defaults = mergeObjects(defaults, schema.default);
-  } else if (DEFAULT_KEY in schema && !schema[ANY_OF_KEY] && !schema[ONE_OF_KEY] && !schema[REF_KEY]) {
+    if (preferParentDefaults) {
+      defaults = mergeObjects(schema.default, defaults);
+    } else {
+      defaults = mergeObjects(defaults, schema.default);
+    }
+  } else if (DEFAULT_KEY in schema && !preferParentDefaults && !schema[ANY_OF_KEY] && !schema[ONE_OF_KEY] && !schema[REF_KEY]) {
     defaults = schema.default;
   } else if (REF_KEY in schema) {
     const refName = schema[REF_KEY];
@@ -1588,7 +1625,7 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
       experimental_customMergeAllOf
     );
     [schemaToCompute] = resolvedSchema;
-  } else if (isFixedItems(schema)) {
+  } else if (isFixedItems(schema) && !preferParentDefaults) {
     defaults = schema.items.map(
       (itemSchema, idx) => computeDefaults(validator, itemSchema, {
         rootSchema,
@@ -1684,16 +1721,36 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
   return defaultsWithFormData;
 }
 function ensureFormDataMatchingSchema(validator, schema, rootSchema, formData, experimental_defaultFormStateBehavior, experimental_customMergeAllOf) {
-  const isSelectField = !isConstant(schema) && isSelect(validator, schema, rootSchema, experimental_customMergeAllOf);
+  const shouldRetrieveAllOf = experimental_defaultFormStateBehavior?.allOf === "populateDefaults" && ALL_OF_KEY in schema;
+  const schemaToMatch = shouldRetrieveAllOf ? retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf) : schema;
+  const isSelectField = !isConstant(schemaToMatch) && isSelect(validator, schemaToMatch, rootSchema, experimental_customMergeAllOf);
   let validFormData = formData;
   if (isSelectField) {
-    const getOptionsList = optionsList(schema);
+    const getOptionsList = optionsList(schemaToMatch);
     const isValid = getOptionsList?.some((option) => deepEquals_default(option.value, formData));
     validFormData = isValid ? formData : void 0;
   }
-  const constTakesPrecedence = schema[CONST_KEY] && experimental_defaultFormStateBehavior?.constAsDefaults === "always";
+  const constTakesPrecedence = schemaToMatch[CONST_KEY] && experimental_defaultFormStateBehavior?.constAsDefaults === "always";
   if (constTakesPrecedence) {
-    validFormData = schema.const;
+    validFormData = schemaToMatch.const;
+  } else if (isObject(validFormData) && isObject(schemaToMatch.properties)) {
+    validFormData = Object.keys(schemaToMatch.properties).reduce(
+      (acc, key) => {
+        const propertySchema = get12(schemaToMatch, [PROPERTIES_KEY, key], {});
+        if (key in acc && (shouldRetrieveAllOf || isObject(propertySchema) && ALL_OF_KEY in propertySchema)) {
+          acc[key] = ensureFormDataMatchingSchema(
+            validator,
+            propertySchema,
+            rootSchema,
+            get12(acc, key),
+            experimental_defaultFormStateBehavior,
+            experimental_customMergeAllOf
+          );
+        }
+        return acc;
+      },
+      { ...validFormData }
+    );
   }
   return validFormData;
 }
@@ -1702,8 +1759,8 @@ function getObjectDefaults(validator, rawSchema, {
   rootSchema = {},
   includeUndefinedValues = false,
   _recurseList = [],
-  experimental_defaultFormStateBehavior = void 0,
-  experimental_customMergeAllOf = void 0,
+  experimental_defaultFormStateBehavior,
+  experimental_customMergeAllOf,
   required,
   shouldMergeDefaultsIntoFormData,
   initialDefaultsGenerated
@@ -1787,8 +1844,8 @@ function getArrayDefaults(validator, rawSchema, {
   rawFormData,
   rootSchema = {},
   _recurseList = [],
-  experimental_defaultFormStateBehavior = void 0,
-  experimental_customMergeAllOf = void 0,
+  experimental_defaultFormStateBehavior,
+  experimental_customMergeAllOf,
   required,
   requiredAsRoot = false,
   shouldMergeDefaultsIntoFormData,
@@ -1843,14 +1900,21 @@ function getArrayDefaults(validator, rawSchema, {
       defaults = mergeDefaultsWithFormData(defaults, itemDefaults, mergeExtraDefaults);
     }
   }
+  const defaultsLength = Array.isArray(defaults) ? defaults.length : 0;
   if (neverPopulate) {
+    if (shouldMergeDefaultsIntoFormData) {
+      if (schema.minItems && schema.minItems > defaultsLength) {
+        const fillerEntries = Array.from({ length: schema.minItems - defaultsLength }, () => null);
+        return (defaults ?? []).concat(fillerEntries);
+      }
+      return defaults;
+    }
     return defaults ?? emptyDefault;
   }
   if (ignoreMinItemsFlagSet && !required) {
     return 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) {
     arrayDefault = defaults || !required && !requiredAsRoot ? defaults : emptyDefault;
   } else {
@@ -1910,9 +1974,17 @@ function getDefaultFormState(validator, theSchema, formData, rootSchema, include
   if (isObject(formData) || Array.isArray(formData)) {
     const { mergeDefaultsIntoFormData } = experimental_defaultFormStateBehavior || {};
     const defaultSupercedesUndefined = mergeDefaultsIntoFormData === "useDefaultIfFormDataUndefined";
+    const matchingFormData = ensureFormDataMatchingSchema(
+      validator,
+      schema,
+      rootSchema ?? schema,
+      formData,
+      experimental_defaultFormStateBehavior,
+      experimental_customMergeAllOf
+    );
     const result = mergeDefaultsWithFormData(
       defaults,
-      formData,
+      matchingFormData,
       true,
       // set to true to add any additional default array entries.
       defaultSupercedesUndefined,
@@ -1924,9 +1996,6 @@ function getDefaultFormState(validator, theSchema, formData, rootSchema, include
   return defaults;
 }
 
-// src/schema/getDisplayLabel.ts
-import get13 from "lodash/get";
-
 // src/isCustomWidget.ts
 function isCustomWidget(uiSchema = {}) {
   return (
@@ -1961,7 +2030,7 @@ function getDisplayLabel(validator, schema, uiSchema = {}, rootSchema, globalOpt
   let displayLabel = Boolean(label);
   if (displayLabel) {
     const schemaType = getSchemaType(schema);
-    const addedByAdditionalProperty = get13(schema, ADDITIONAL_PROPERTY_FLAG, false);
+    const addedByAdditionalProperty = Boolean(schema[ADDITIONAL_PROPERTY_FLAG]);
     if (schemaType === "array") {
       displayLabel = addedByAdditionalProperty || isMultiSelect(validator, schema, rootSchema, experimental_customMergeAllOf) || isFilesArray(validator, schema, uiSchema, rootSchema, experimental_customMergeAllOf) || isCustomWidget(uiSchema);
     }
@@ -1971,7 +2040,7 @@ function getDisplayLabel(validator, schema, uiSchema = {}, rootSchema, globalOpt
     if (schemaType === "boolean" && uiSchema && !uiSchema[UI_WIDGET_KEY]) {
       displayLabel = false;
     }
-    if (uiSchema && uiSchema[UI_FIELD_KEY]) {
+    if (uiSchema?.[UI_FIELD_KEY]) {
       displayLabel = false;
     }
   }
@@ -1979,7 +2048,7 @@ function getDisplayLabel(validator, schema, uiSchema = {}, rootSchema, globalOpt
 }
 
 // src/schema/omitExtraData.ts
-import get14 from "lodash/get";
+import get13 from "lodash/get";
 import isEmpty5 from "lodash/isEmpty";
 import isNil2 from "lodash/isNil";
 import pick from "lodash/pick";
@@ -2008,7 +2077,7 @@ function getFieldNames(pathSchema, formData) {
         }
       } else if (key === NAME_KEY && data !== "") {
         paths.forEach((path) => {
-          const formValue = get14(formData, path);
+          const formValue = get13(formData, path);
           const isLeaf = objKeys.length === 1;
           if (formValueHasData(formValue, isLeaf) || Array.isArray(formValue) && formValue.every((val) => formValueHasData(val, isLeaf))) {
             acc.push(path);
@@ -2046,7 +2115,7 @@ function omitExtraData(validator, schema, rootSchema = {}, formData, experimenta
     const { properties, additionalProperties, patternProperties, propertyNames } = childSchema;
     const requiredSet = new Set(childSchema.required ?? []);
     function setProperty(key, schemaDef, value, required = false) {
-      const v = omit3(schemaDef, value, target[key]);
+      const v = omit2(schemaDef, value, target[key]);
       if (!required && isObject(v)) {
         let sd = isSchemaObj(schemaDef) ? schemaDef : {};
         if (sd.$ref !== void 0) {
@@ -2115,17 +2184,17 @@ function omitExtraData(validator, schema, rootSchema = {}, formData, experimenta
     if (items !== void 0) {
       if (Array.isArray(items)) {
         for (let i = 0; i < items.length; i += 1) {
-          target.push(omit3(items[i], source[i]));
+          target.push(omit2(items[i], source[i]));
         }
       } else {
         for (let i = 0; i < source.length; i += 1) {
-          target.push(omit3(items, source[i]));
+          target.push(omit2(items, source[i]));
         }
       }
     }
     if (additionalItems) {
       for (let i = target.length; i < source.length; i += 1) {
-        target.push(omit3(additionalItems, source[i]));
+        target.push(omit2(additionalItems, source[i]));
       }
     }
     return target;
@@ -2137,7 +2206,7 @@ function omitExtraData(validator, schema, rootSchema = {}, formData, experimenta
     }
     const isThenBranch = isSchemaObj(condition) ? validator.isValid(condition, source, rootSchema) : condition;
     const branch = isThenBranch ? then : otherwise;
-    return branch === void 0 ? target : omit3(branch, source, target);
+    return branch === void 0 ? target : omit2(branch, source, target);
   }
   function handleOneOf(oneOf, childSchema, source, target) {
     if (!Array.isArray(oneOf) || isSelect(validator, childSchema, rootSchema, experimental_customMergeAllOf)) {
@@ -2155,7 +2224,7 @@ function omitExtraData(validator, schema, rootSchema = {}, formData, experimenta
     );
     const winning = oneOf[bestIndex];
     const resolved = isObject(winning) ? resolveAllReferences(winning, rootSchema, []) : scoringOptions[bestIndex];
-    return omit3(resolved, source, target);
+    return omit2(resolved, source, target);
   }
   function handleAnyOf(childSchema, source, target) {
     const { anyOf } = childSchema;
@@ -2165,7 +2234,7 @@ function omitExtraData(validator, schema, rootSchema = {}, formData, experimenta
     if (source === void 0 || Array.isArray(source) && source.length === 0 || isObject(source) && Object.keys(source).length === 0) {
       let result = target;
       for (const branch of anyOf) {
-        result = omit3(branch, source, result);
+        result = omit2(branch, source, result);
       }
       return result;
     }
@@ -2179,12 +2248,12 @@ function omitExtraData(validator, schema, rootSchema = {}, formData, experimenta
     let result = target;
     for (const [key, deps] of Object.entries(dependencies)) {
       if (key in source && !Array.isArray(deps)) {
-        result = omit3(deps, source, result);
+        result = omit2(deps, source, result);
       }
     }
     return result;
   }
-  function omit3(schemaDef, source, target) {
+  function omit2(schemaDef, source, target) {
     if (source === void 0 || schemaDef === false) {
       return void 0;
     }
@@ -2194,10 +2263,16 @@ function omitExtraData(validator, schema, rootSchema = {}, formData, experimenta
     let localSchema = schemaDef;
     const { $ref: ref, allOf } = localSchema;
     if (ref !== void 0) {
-      return omit3(findSchemaDefinition(ref, rootSchema), source, target);
+      return omit2(findSchemaDefinition(ref, rootSchema), source, target);
     }
     if (allOf) {
       localSchema = doMergeAllOf(localSchema, experimental_customMergeAllOf);
+      const remainingAllOf = localSchema.allOf;
+      if (remainingAllOf) {
+        for (let i = 0; i < remainingAllOf.length; i++) {
+          target = omit2(remainingAllOf[i], source, target);
+        }
+      }
     }
     let filtered = handleAnyOf(localSchema, source, handleOneOf(localSchema.oneOf, localSchema, source, target));
     const type = getSchemaType(localSchema);
@@ -2216,11 +2291,11 @@ function omitExtraData(validator, schema, rootSchema = {}, formData, experimenta
     }
     return handleDependencies(localSchema, source, handleConditions(localSchema, source, filtered));
   }
-  return omit3(schema, formData);
+  return omit2(schema, formData);
 }
 
 // src/schema/sanitizeDataForNewSchema.ts
-import get15 from "lodash/get";
+import get14 from "lodash/get";
 import has5 from "lodash/has";
 var NO_VALUE = /* @__PURE__ */ Symbol("no Value");
 function enumValuesForSchema(schema) {
@@ -2244,7 +2319,7 @@ function replacementForInvalidEnumValue(schema, formValue) {
   if (!enumValues || enumValues.some((value) => deepEquals_default(value, formValue))) {
     return NO_VALUE;
   }
-  const defaultValue = get15(schema, DEFAULT_KEY, NO_VALUE);
+  const defaultValue = get14(schema, DEFAULT_KEY, NO_VALUE);
   if (defaultValue !== NO_VALUE && enumValues.some((value) => deepEquals_default(value, defaultValue))) {
     return defaultValue;
   }
@@ -2255,19 +2330,19 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
   if (has5(newSchema, PROPERTIES_KEY)) {
     const removeOldSchemaData = {};
     if (has5(oldSchema, PROPERTIES_KEY)) {
-      const properties = get15(oldSchema, PROPERTIES_KEY, {});
+      const properties = get14(oldSchema, PROPERTIES_KEY, {});
       Object.keys(properties).forEach((key) => {
         if (has5(data, key)) {
           removeOldSchemaData[key] = void 0;
         }
       });
     }
-    const keys2 = Object.keys(get15(newSchema, PROPERTIES_KEY, {}));
+    const keys2 = Object.keys(get14(newSchema, PROPERTIES_KEY, {}));
     const nestedData = {};
     keys2.forEach((key) => {
-      const formValue = get15(data, key);
-      let oldKeyedSchema = get15(oldSchema, [PROPERTIES_KEY, key], {});
-      let newKeyedSchema = get15(newSchema, [PROPERTIES_KEY, key], {});
+      const formValue = get14(data, key);
+      let oldKeyedSchema = get14(oldSchema, [PROPERTIES_KEY, key], {});
+      let newKeyedSchema = get14(newSchema, [PROPERTIES_KEY, key], {});
       if (has5(oldKeyedSchema, REF_KEY)) {
         oldKeyedSchema = retrieveSchema(
           validator,
@@ -2286,8 +2361,8 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
           experimental_customMergeAllOf
         );
       }
-      const oldSchemaTypeForKey = get15(oldKeyedSchema, "type");
-      const newSchemaTypeForKey = get15(newKeyedSchema, "type");
+      const oldSchemaTypeForKey = get14(oldKeyedSchema, "type");
+      const newSchemaTypeForKey = get14(newKeyedSchema, "type");
       if (!oldSchemaTypeForKey || oldSchemaTypeForKey === newSchemaTypeForKey) {
         if (has5(removeOldSchemaData, key)) {
           delete removeOldSchemaData[key];
@@ -2305,17 +2380,17 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
             nestedData[key] = itemData;
           }
         } else {
-          const newOptionDefault = get15(newKeyedSchema, DEFAULT_KEY, NO_VALUE);
-          const oldOptionDefault = get15(oldKeyedSchema, DEFAULT_KEY, NO_VALUE);
+          const newOptionDefault = get14(newKeyedSchema, DEFAULT_KEY, NO_VALUE);
+          const oldOptionDefault = get14(oldKeyedSchema, DEFAULT_KEY, NO_VALUE);
           if (newOptionDefault !== NO_VALUE && newOptionDefault !== formValue) {
             if (oldOptionDefault === formValue) {
               removeOldSchemaData[key] = newOptionDefault;
-            } else if (get15(newKeyedSchema, "readOnly") === true) {
+            } else if (get14(newKeyedSchema, "readOnly") === true) {
               removeOldSchemaData[key] = void 0;
             }
           }
-          const newOptionConst = get15(newKeyedSchema, CONST_KEY, NO_VALUE);
-          const oldOptionConst = get15(oldKeyedSchema, CONST_KEY, NO_VALUE);
+          const newOptionConst = get14(newKeyedSchema, CONST_KEY, NO_VALUE);
+          const oldOptionConst = get14(oldKeyedSchema, CONST_KEY, NO_VALUE);
           if (newOptionConst !== NO_VALUE && newOptionConst !== formValue) {
             removeOldSchemaData[key] = oldOptionConst === formValue ? newOptionConst : void 0;
           }
@@ -2333,9 +2408,9 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
       ...removeOldSchemaData,
       ...nestedData
     };
-  } else if (get15(oldSchema, "type") === "array" && get15(newSchema, "type") === "array" && Array.isArray(data)) {
-    let oldSchemaItems = get15(oldSchema, "items");
-    let newSchemaItems = get15(newSchema, "items");
+  } else if (get14(oldSchema, "type") === "array" && get14(newSchema, "type") === "array" && Array.isArray(data)) {
+    let oldSchemaItems = get14(oldSchema, "items");
+    let newSchemaItems = get14(newSchema, "items");
     if (typeof oldSchemaItems === "object" && typeof newSchemaItems === "object" && !Array.isArray(oldSchemaItems) && !Array.isArray(newSchemaItems)) {
       if (has5(oldSchemaItems, REF_KEY)) {
         oldSchemaItems = retrieveSchema(
@@ -2355,10 +2430,10 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
           experimental_customMergeAllOf
         );
       }
-      const oldSchemaType = get15(oldSchemaItems, "type");
-      const newSchemaType = get15(newSchemaItems, "type");
+      const oldSchemaType = get14(oldSchemaItems, "type");
+      const newSchemaType = get14(newSchemaItems, "type");
       if (!oldSchemaType || oldSchemaType === newSchemaType) {
-        const maxItems = get15(newSchema, "maxItems", -1);
+        const maxItems = get14(newSchema, "maxItems", -1);
         if (newSchemaType === "object") {
           newFormData = data.reduce((newValue, aValue) => {
             const itemValue = sanitizeDataForNewSchema(
@@ -2388,7 +2463,7 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
 }
 
 // src/schema/toPathSchema.ts
-import get16 from "lodash/get";
+import get15 from "lodash/get";
 import isObject4 from "lodash/isObject";
 import set2 from "lodash/set";
 function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
@@ -2439,7 +2514,7 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
   if (ADDITIONAL_PROPERTIES_KEY in schema && schema[ADDITIONAL_PROPERTIES_KEY] !== false) {
     set2(pathSchema, RJSF_ADDITIONAL_PROPERTIES_FLAG, true);
     const additionalSchema = isObject4(schema[ADDITIONAL_PROPERTIES_KEY]) ? schema[ADDITIONAL_PROPERTIES_KEY] : {};
-    const definedProperties = get16(schema, PROPERTIES_KEY, {});
+    const definedProperties = get15(schema, PROPERTIES_KEY, {});
     for (const key of Object.keys(formData ?? {})) {
       if (!(key in definedProperties)) {
         pathSchema[key] = toPathSchemaInternal(
@@ -2447,7 +2522,7 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
           additionalSchema,
           `${name}.${key}`,
           rootSchema,
-          get16(formData, [key]),
+          get15(formData, [key]),
           _recurseList,
           experimental_customMergeAllOf
         );
@@ -2497,7 +2572,7 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
     }
   } else if (PROPERTIES_KEY in schema) {
     for (const property in schema.properties) {
-      const field = get16(schema, [PROPERTIES_KEY, property], {});
+      const field = get15(schema, [PROPERTIES_KEY, property], {});
       pathSchema[property] = toPathSchemaInternal(
         validator,
         field,
@@ -2505,7 +2580,7 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
         rootSchema,
         // It's possible that formData is not an object -- this can happen if an
         // array item has just been added, but not populated with data yet
-        get16(formData, [property]),
+        get15(formData, [property]),
         _recurseList,
         experimental_customMergeAllOf
       );
@@ -2527,8 +2602,8 @@ var SchemaUtils = class {
    * @param [experimental_customMergeAllOf] - Optional function that allows for custom merging of `allOf` schemas
    */
   constructor(validator, rootSchema, experimental_defaultFormStateBehavior, experimental_customMergeAllOf) {
-    if (rootSchema && rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
-      this.rootSchema = makeAllReferencesAbsolute(rootSchema, get17(rootSchema, ID_KEY, "#"));
+    if (rootSchema?.[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
+      this.rootSchema = makeAllReferencesAbsolute(rootSchema, get16(rootSchema, ID_KEY, "#"));
     } else {
       this.rootSchema = rootSchema;
     }
@@ -2985,7 +3060,7 @@ function enumOptionValueEncoder(value, index, format = "indexed") {
 
 // src/ErrorSchemaBuilder.ts
 import cloneDeep from "lodash/cloneDeep";
-import get18 from "lodash/get";
+import get17 from "lodash/get";
 import set3 from "lodash/set";
 import setWith from "lodash/setWith";
 var ErrorSchemaBuilder = class {
@@ -3014,7 +3089,7 @@ var ErrorSchemaBuilder = class {
    */
   getOrCreateErrorBlock(pathOfError) {
     const hasPath = Array.isArray(pathOfError) && pathOfError.length > 0 || typeof pathOfError === "string";
-    let errorBlock = hasPath ? get18(this.errorSchema, pathOfError) : this.errorSchema;
+    let errorBlock = hasPath ? get17(this.errorSchema, pathOfError) : this.errorSchema;
     if (!errorBlock && pathOfError) {
       errorBlock = {};
       setWith(this.errorSchema, pathOfError, errorBlock, Object);
@@ -3040,7 +3115,7 @@ var ErrorSchemaBuilder = class {
    */
   addErrors(errorOrList, pathOfError) {
     const errorBlock = this.getOrCreateErrorBlock(pathOfError);
-    let errorsList = get18(errorBlock, ERRORS_KEY);
+    let errorsList = get17(errorBlock, ERRORS_KEY);
     if (!Array.isArray(errorsList)) {
       errorsList = [];
       errorBlock[ERRORS_KEY] = errorsList;
@@ -3082,7 +3157,7 @@ var ErrorSchemaBuilder = class {
 
 // src/getChangedFields.ts
 import difference from "lodash/difference";
-import get19 from "lodash/get";
+import get18 from "lodash/get";
 import isPlainObject2 from "lodash/isPlainObject";
 import keys from "lodash/keys";
 import pickBy from "lodash/pickBy";
@@ -3098,7 +3173,7 @@ function getChangedFields(a, b) {
   if (!aIsPlainObject && bIsPlainObject) {
     return keys(b);
   }
-  const unequalFields = keys(pickBy(a, (value, key) => !deepEquals_default(value, get19(b, key))));
+  const unequalFields = keys(pickBy(a, (value, key) => !deepEquals_default(value, get18(b, key))));
   const diffFields = difference(keys(b), keys(a));
   return [...unequalFields, ...diffFields];
 }
@@ -3199,7 +3274,7 @@ var DEFAULT_OPTIONS = {
 };
 function getSubmitButtonOptions(uiSchema = {}) {
   const uiOptions = getUiOptions(uiSchema);
-  if (uiOptions && uiOptions[SUBMIT_BTN_OPTIONS_KEY]) {
+  if (uiOptions?.[SUBMIT_BTN_OPTIONS_KEY]) {
     const options = uiOptions[SUBMIT_BTN_OPTIONS_KEY];
     return { ...DEFAULT_OPTIONS, ...options };
   }
@@ -3224,10 +3299,10 @@ function getTemplate(name, registry, uiOptions = {}) {
 }
 
 // src/getTestIds.ts
-import get20 from "lodash/get";
+import get19 from "lodash/get";
 import uniqueId from "lodash/uniqueId";
 function getTestIds() {
-  if (get20(globalThis, "process.env.NODE_ENV") !== "test") {
+  if (get19(globalThis, "process.env.NODE_ENV") !== "test") {
     return {};
   }
   const ids = /* @__PURE__ */ new Map();
@@ -3246,7 +3321,7 @@ function getTestIds() {
 
 // src/getWidget.tsx
 import { createElement } from "react";
-import get21 from "lodash/get";
+import get20 from "lodash/get";
 import set4 from "lodash/set";
 import ReactIs from "react-is";
 import { jsx } from "react/jsx-runtime";
@@ -3303,9 +3378,9 @@ var widgetMap = {
   }
 };
 function mergeWidgetOptions(AWidget) {
-  let MergedWidget = get21(AWidget, "MergedWidget");
+  let MergedWidget = get20(AWidget, "MergedWidget");
   if (!MergedWidget) {
-    const defaultOptions = AWidget.defaultProps && AWidget.defaultProps.options || {};
+    const defaultOptions = AWidget.defaultProps?.options || {};
     MergedWidget = ({ options, ...props }) => /* @__PURE__ */ jsx(AWidget, { options: { ...defaultOptions, ...options }, ...props });
     set4(AWidget, "MergedWidget", MergedWidget);
   }
@@ -3357,7 +3432,7 @@ function hashObject(object) {
   return hashString(sortedJSONStringify(object));
 }
 function hashForSchema(schema) {
-  return hashObject(schema);
+  return hashString(sortedJSONStringify(schema));
 }
 
 // src/hasWidget.ts
@@ -3418,7 +3493,6 @@ function isFormDataAvailable(formData) {
 }
 
 // src/isRootSchema.ts
-import omit2 from "lodash/omit";
 function isRootSchema(registry, schemaToCompare) {
   const { rootSchema, schemaUtils } = registry;
   if (deepEquals_default(schemaToCompare, rootSchema)) {
@@ -3426,7 +3500,7 @@ function isRootSchema(registry, schemaToCompare) {
   }
   if (REF_KEY in rootSchema) {
     const resolvedSchema = schemaUtils.retrieveSchema(rootSchema);
-    return deepEquals_default(schemaToCompare, omit2(resolvedSchema, RJSF_REF_KEY));
+    return deepEquals_default(schemaToCompare, resolvedSchema);
   }
   return false;
 }
@@ -3441,15 +3515,24 @@ function localToUTC(dateString) {
   return dateString ? new Date(dateString).toJSON() : void 0;
 }
 
+// src/logUnsupportedDefaultForEnum.ts
+function logUnsupportedDefaultForEnum(id, schema, enumOptions, multiple = false) {
+  if (!multiple && Array.isArray(enumOptions) && schema.default !== void 0 && enumOptionsIndexForValue(schema.default, enumOptions, multiple) === void 0) {
+    console.error(
+      `The schema default value "${schema.default}" is not one of the values in the enum options for "${id}"`
+    );
+  }
+}
+
 // src/lookupFromFormContext.ts
-import get22 from "lodash/get";
+import get21 from "lodash/get";
 import has6 from "lodash/has";
 function lookupFromFormContext(regOrFc, toLookup, fallback) {
   const lookupPath = [LOOKUP_MAP_NAME];
   if (has6(regOrFc, FORM_CONTEXT_NAME)) {
     lookupPath.unshift(FORM_CONTEXT_NAME);
   }
-  return get22(regOrFc, [...lookupPath, toLookup], fallback);
+  return get21(regOrFc, [...lookupPath, toLookup], fallback);
 }
 
 // src/nameGenerators.ts
@@ -3638,13 +3721,13 @@ function schemaRequiresTrueValue(schema) {
   if (schema.const) {
     return true;
   }
-  if (schema.enum && schema.enum.length === 1 && schema.enum[0] === true) {
+  if (schema.enum?.length === 1 && schema.enum[0] === true) {
     return true;
   }
-  if (schema.anyOf && schema.anyOf.length === 1) {
+  if (schema.anyOf?.length === 1) {
     return schemaRequiresTrueValue(schema.anyOf[0]);
   }
-  if (schema.oneOf && schema.oneOf.length === 1) {
+  if (schema.oneOf?.length === 1) {
     return schemaRequiresTrueValue(schema.oneOf[0]);
   }
   if (schema.allOf) {
@@ -3654,6 +3737,38 @@ function schemaRequiresTrueValue(schema) {
   return false;
 }
 
+// src/SelectedOptionDescription.tsx
+import { jsx as jsx2 } from "react/jsx-runtime";
+function SelectedOptionDescription({ hideLabel, id, multiple, options, registry, uiSchema, value }) {
+  if (multiple || hideLabel) {
+    return null;
+  }
+  const { label = true } = getUiOptions(uiSchema, registry.globalUiOptions);
+  if (!label) {
+    return null;
+  }
+  const option = options.enumOptions?.find(({ value: enumValue }) => enumOptionsIsSelected(enumValue, value));
+  const description = option?.schema?.description;
+  if (!description) {
+    return null;
+  }
+  const DescriptionFieldTemplate = getTemplate(
+    "DescriptionFieldTemplate",
+    registry,
+    options
+  );
+  return /* @__PURE__ */ jsx2(
+    DescriptionFieldTemplate,
+    {
+      id: descriptionId(id),
+      description,
+      schema: option.schema,
+      uiSchema,
+      registry
+    }
+  );
+}
+
 // src/shallowEquals.ts
 function shallowEquals(a, b) {
   if (Object.is(a, b)) {
@@ -3804,7 +3919,7 @@ function unwrapErrorHandler(errorHandler) {
 
 // src/useAltDateWidgetProps.tsx
 import { useCallback, useEffect, useMemo, useState } from "react";
-import { jsx as jsx2 } from "react/jsx-runtime";
+import { jsx as jsx3 } from "react/jsx-runtime";
 function readyForChange(state) {
   return Object.values(state).every((value) => value !== -1);
 }
@@ -3827,7 +3942,7 @@ function DateElement(props) {
   const id = `${rootId}_${type}`;
   const { SelectWidget } = registry.widgets;
   const onChange = useCallback((newValue) => select(type, newValue), [select, type]);
-  return /* @__PURE__ */ jsx2(
+  return /* @__PURE__ */ jsx3(
     SelectWidget,
     {
       schema: { type: "integer" },
@@ -3917,7 +4032,7 @@ import { useCallback as useCallback2, useMemo as useMemo2 } from "react";
 function addNameToDataURL(dataURL, name) {
   return dataURL.replace(";base64", `;name=${encodeURIComponent(name)};base64`);
 }
-function processFile(file) {
+async function processFile(file) {
   const { name, size, type } = file;
   return new Promise((resolve, reject) => {
     const reader = new window.FileReader();
@@ -3942,7 +4057,7 @@ function processFile(file) {
     reader.readAsDataURL(file);
   });
 }
-function processFiles(files) {
+async function processFiles(files) {
   return Promise.all(Array.from(files).map(processFile));
 }
 function extractFileInfo(dataURLs) {
@@ -4081,6 +4196,7 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
   TranslatableString2["AddButton"] = "Add";
   TranslatableString2["AddItemButton"] = "Add Item";
   TranslatableString2["CopyButton"] = "Copy";
+  TranslatableString2["ExpandButton"] = "Expand Cycle";
   TranslatableString2["MoveDownButton"] = "Move down";
   TranslatableString2["MoveUpButton"] = "Move up";
   TranslatableString2["RemoveButton"] = "Remove";
@@ -4101,6 +4217,7 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
   TranslatableString2["TitleOptionPrefix"] = "%1 option %2";
   TranslatableString2["KeyLabel"] = "%1 Key";
   TranslatableString2["DeprecatedLabel"] = "%1 (deprecated)";
+  TranslatableString2["CycleDetected"] = 'Circular reference ($ref cycle) detected for field "%1". You may choose to expand to the next cycle break';
   TranslatableString2["InvalidObjectField"] = 'Invalid "%1" object field configuration: _%2_.';
   TranslatableString2["UnsupportedField"] = "Unsupported field schema.";
   TranslatableString2["UnsupportedFieldWithId"] = "Unsupported field schema for field `%1`.";
@@ -4114,7 +4231,7 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
 import forEach from "lodash/forEach";
 
 // src/parser/ParserValidator.ts
-import get23 from "lodash/get";
+import get22 from "lodash/get";
 var ParserValidator = class {
   /** Construct the ParserValidator for the given `rootSchema`. This `rootSchema` will be stashed in the `schemaMap`
    * first.
@@ -4140,7 +4257,7 @@ var ParserValidator = class {
    * @param hash - The hash value at which to map the schema
    */
   addSchema(schema, hash) {
-    const key = get23(schema, ID_KEY, hash);
+    const key = get22(schema, ID_KEY, hash);
     const identifiedSchema = { ...schema, [ID_KEY]: key };
     const existing = this.schemaMap[key];
     if (!existing) {
@@ -4262,10 +4379,13 @@ export {
   REF_KEY,
   REQUIRED_KEY,
   RJSF_ADDITIONAL_PROPERTIES_FLAG,
+  RJSF_PREFIX_KEY,
+  RJSF_REF_CYCLE_KEY,
   RJSF_REF_KEY,
   ROOT_SCHEMA_PREFIX,
   SCHEMA_KEY,
   SUBMIT_BTN_OPTIONS_KEY,
+  SelectedOptionDescription,
   TranslatableString,
   UI_DEFINITIONS_KEY,
   UI_FIELD_KEY,
@@ -4336,6 +4456,7 @@ export {
   isValueEmpty,
   labelValue,
   localToUTC,
+  logUnsupportedDefaultForEnum,
   lookupFromFormContext,
   mergeDefaultsWithFormData,
   mergeObjects,