@rjsf/utils 6.6.2 → 6.7.1

package/dist/utils.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('lodash/isPlainObject'), require('lodash/get'), require('fast-equals'), require('fast-uri'), require('jsonpointer'), require('lodash/isEmpty'), require('lodash/isObject'), require('lodash/omit'), require('lodash/has'), require('lodash/isString'), require('lodash/flattenDeep'), require('lodash/merge'), require('lodash/set'), require('lodash/times'), require('lodash/transform'), require('lodash/uniq'), require('lodash/union'), require('lodash/isNumber'), require('@x0k/json-schema-merge'), require('@x0k/json-schema-merge/lib/array'), require('lodash/reduce'), require('lodash/isNil'), require('lodash/pick'), require('lodash/cloneDeep'), require('lodash/setWith'), require('lodash/difference'), require('lodash/keys'), require('lodash/pickBy'), require('lodash/uniqueId'), require('react'), require('react-is'), require('react/jsx-runtime'), require('lodash/toPath'), require('lodash/forEach')) :
   typeof define === 'function' && define.amd ? define(['exports', 'lodash/isPlainObject', 'lodash/get', 'fast-equals', 'fast-uri', 'jsonpointer', 'lodash/isEmpty', 'lodash/isObject', 'lodash/omit', 'lodash/has', 'lodash/isString', 'lodash/flattenDeep', 'lodash/merge', 'lodash/set', 'lodash/times', 'lodash/transform', 'lodash/uniq', 'lodash/union', 'lodash/isNumber', '@x0k/json-schema-merge', '@x0k/json-schema-merge/lib/array', 'lodash/reduce', 'lodash/isNil', 'lodash/pick', 'lodash/cloneDeep', 'lodash/setWith', 'lodash/difference', 'lodash/keys', 'lodash/pickBy', 'lodash/uniqueId', 'react', 'react-is', 'react/jsx-runtime', 'lodash/toPath', 'lodash/forEach'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@rjsf/utils"] = {}, global.isPlainObject2, global.get15, global.fastEquals, global.UriResolver, global.jsonpointer, global.isEmpty4, global.isObject2, global.omit, global.has5, global.isString, global.flattenDeep, global.merge, global.set, global.times, global.transform, global.uniq, global.union, global.isNumber, global.jsonSchemaMerge, global.array, global.reduce, global.isNil, global.pick, global.cloneDeep, global.setWith, global.difference, global.keys, global.pickBy, global.uniqueId, global.react, global.ReactIs, global.jsxRuntime, global.toPath, global.forEach));
-})(this, (function (exports, isPlainObject2, get15, fastEquals, UriResolver, jsonpointer, isEmpty4, isObject2, omit, has5, isString, flattenDeep, merge, set, times, transform, uniq, union, isNumber, jsonSchemaMerge, array, reduce, isNil, pick, cloneDeep, setWith, difference, keys, pickBy, uniqueId, react, ReactIs, jsxRuntime, toPath, forEach) { 'use strict';
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@rjsf/utils"] = {}, global.isPlainObject2, global.get14, global.fastEquals, global.UriResolver, global.jsonpointer, global.isEmpty4, global.isObject2, global.omit, global.has5, global.isString, global.flattenDeep, global.merge, global.set3, global.times, global.transform, global.uniq, global.union, global.isNumber, global.jsonSchemaMerge, global.array, global.reduce, global.isNil, global.pick, global.cloneDeep, global.setWith, global.difference, global.keys, global.pickBy, global.uniqueId, global.react, global.ReactIs, global.jsxRuntime, global.toPath, global.forEach));
+})(this, (function (exports, isPlainObject2, get14, fastEquals, UriResolver, jsonpointer, isEmpty4, isObject2, omit, has5, isString, flattenDeep, merge, set3, times, transform, uniq, union, isNumber, jsonSchemaMerge, array, reduce, isNil, pick, cloneDeep, setWith, difference, keys, pickBy, uniqueId, react, ReactIs, jsxRuntime, toPath, forEach) { 'use strict';
 
   // src/isObject.ts
   function isObject(thing) {
@@ -26,6 +26,20 @@
     return isObject(schema.additionalItems);
   }
 
+  // src/getDecimalSeparator.ts
+  function getDecimalSeparator(languages) {
+    const locales = languages || (typeof navigator !== "undefined" ? navigator.languages : void 0);
+    if (locales) {
+      try {
+        const formatter = new Intl.NumberFormat(locales);
+        const parts = formatter.formatToParts(1.1);
+        return parts.find((part) => part.type === "decimal")?.value || ".";
+      } catch (e) {
+      }
+    }
+    return ".";
+  }
+
   // src/asNumber.ts
   function asNumber(value) {
     if (value === "") {
@@ -34,22 +48,24 @@
     if (value === null) {
       return null;
     }
-    if (/\.$/.test(value)) {
+    const separator = getDecimalSeparator();
+    const standardValue = typeof value === "string" && separator !== "." ? value.replace(separator, ".") : value;
+    if (/\.$/.test(standardValue)) {
       return value;
     }
-    if (/\.0$/.test(value)) {
+    if (/\.0$/.test(standardValue)) {
       return value;
     }
-    if (/\.\d*0$/.test(value)) {
+    if (/\.\d*0$/.test(standardValue)) {
       return value;
     }
-    const n = Number(value);
+    const n = Number(standardValue);
     const valid = typeof n === "number" && !Number.isNaN(n);
     return valid ? n : 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";
@@ -71,15 +87,17 @@
   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";
@@ -178,7 +196,7 @@
     return void 0;
   }
   function makeAllReferencesAbsolute(schema, baseURI) {
-    const currentURI = get15(schema, ID_KEY, baseURI);
+    const currentURI = get14(schema, ID_KEY, baseURI);
     let result = schema;
     if (REF_KEY in result) {
       result = { ...result, [REF_KEY]: UriResolver.resolve(currentURI, result[REF_KEY]) };
@@ -200,7 +218,7 @@
     const remaining = omit(object, [key]);
     return [remaining, value];
   }
-  function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [], baseURI = get15(rootSchema, [ID_KEY])) {
+  function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [], baseURI = get14(rootSchema, [ID_KEY])) {
     const ref = $ref || "";
     let current = void 0;
     let currentBaseURI = baseURI;
@@ -250,13 +268,13 @@
     }
     return current;
   }
-  function findSchemaDefinition($ref, rootSchema = {}, baseURI = get15(rootSchema, [ID_KEY])) {
+  function findSchemaDefinition($ref, rootSchema = {}, baseURI = get14(rootSchema, [ID_KEY])) {
     const recurseList = [];
     return findSchemaDefinitionRecursive($ref, rootSchema, recurseList, baseURI);
   }
   function getDiscriminatorFieldFromSchema(schema) {
     let discriminator;
-    const maybeString = get15(schema, DISCRIMINATOR_PATH);
+    const maybeString = get14(schema, DISCRIMINATOR_PATH);
     if (isString(maybeString)) {
       discriminator = maybeString;
     } else if (maybeString !== void 0) {
@@ -313,7 +331,7 @@
   // 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);
@@ -324,16 +342,20 @@
       }
       return accumulator;
     }, acc);
+    for (const sym of Object.getOwnPropertySymbols(obj2)) {
+      result[sym] = obj2[sym];
+    }
+    return result;
   }
   function getOptionMatchingSimpleDiscriminator(formData, options, discriminatorField) {
     if (formData && discriminatorField) {
-      const value = get15(formData, discriminatorField);
+      const value = get14(formData, discriminatorField);
       if (value === void 0) {
         return void 0;
       }
       for (let i = 0; i < options.length; i += 1) {
         const option = options[i];
-        const discriminator = get15(option, [PROPERTIES_KEY, discriminatorField], {});
+        const discriminator = get14(option, [PROPERTIES_KEY, discriminatorField], {});
         if (discriminator.type !== "object" && discriminator.type !== "array") {
           if (discriminator.const === value) {
             return i;
@@ -359,8 +381,8 @@
     for (let i = 0; i < options.length; i += 1) {
       const option = options[i];
       if (discriminatorField && has5(option, [PROPERTIES_KEY, discriminatorField])) {
-        const value = get15(formData, discriminatorField);
-        const discriminator = get15(option, [PROPERTIES_KEY, discriminatorField], {});
+        const value = get14(formData, discriminatorField);
+        const discriminator = get14(option, [PROPERTIES_KEY, discriminatorField], {});
         if (validator.isValid(discriminator, value, rootSchema)) {
           return i;
         }
@@ -413,6 +435,12 @@
       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);
@@ -420,10 +448,11 @@
     let schemas = [];
     if (expandAllBranches) {
       if (then && typeof then !== "boolean") {
+        const thenSchema = then;
         schemas = schemas.concat(
           retrieveSchemaInternal(
             validator,
-            then,
+            thenSchema,
             rootSchema,
             formData,
             expandAllBranches,
@@ -433,10 +462,11 @@
         );
       }
       if (otherwise && typeof otherwise !== "boolean") {
+        const otherwiseSchema = otherwise;
         schemas = schemas.concat(
           retrieveSchemaInternal(
             validator,
-            otherwise,
+            otherwiseSchema,
             rootSchema,
             formData,
             expandAllBranches,
@@ -446,8 +476,9 @@
         );
       }
     } 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,
@@ -493,7 +524,7 @@
   function getMatchingPatternProperties(schema, key) {
     return Object.keys(schema.patternProperties).filter((pattern) => RegExp(pattern).test(key)).reduce(
       (obj, pattern) => {
-        set(obj, [pattern], schema.patternProperties[pattern]);
+        set3(obj, [pattern], schema.patternProperties[pattern]);
         return obj;
       },
       {}
@@ -571,7 +602,7 @@
     }
     return [schema];
   }
-  function resolveAllReferences(schema, rootSchema, recurseList, baseURI, resolveAnyOfOrOneOfRefs) {
+  function resolveAllReferences(schema, rootSchema, recurseList, baseURI, resolveAnyOfOrOneOfRefs, markCycleOnDetection = false) {
     if (!isObject(schema)) {
       return schema;
     }
@@ -580,7 +611,7 @@
     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);
@@ -595,7 +626,14 @@
         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);
         },
         {}
@@ -606,6 +644,7 @@
     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,
@@ -653,10 +692,10 @@
             validator,
             { [ALL_OF_KEY]: Object.values(matchingProperties) },
             rootSchema,
-            get15(formData, [key]),
+            get14(formData, [key]),
             experimental_customMergeAllOf
           );
-          set(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
+          schema.properties[key][ADDITIONAL_PROPERTY_FLAG] = true;
           return;
         }
       }
@@ -666,9 +705,9 @@
           if (REF_KEY in schema.additionalProperties) {
             additionalProperties = retrieveSchema(
               validator,
-              { [REF_KEY]: get15(schema.additionalProperties, [REF_KEY]) },
+              { [REF_KEY]: get14(schema.additionalProperties, [REF_KEY]) },
               rootSchema,
-              formData,
+              get14(formData, [key]),
               experimental_customMergeAllOf
             );
           } else if ("type" in schema.additionalProperties) {
@@ -679,16 +718,16 @@
               ...schema.additionalProperties
             };
           } else {
-            additionalProperties = { type: guessType(get15(formData, [key])) };
+            additionalProperties = { type: guessType(get14(formData, [key])) };
           }
         } else {
-          additionalProperties = { type: guessType(get15(formData, [key])) };
+          additionalProperties = { type: guessType(get14(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;
@@ -731,17 +770,26 @@
         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;
           }
@@ -760,7 +808,7 @@
                 validator,
                 { allOf: [acc.properties[key], ...Object.values(matchingProperties)] },
                 rootSchema,
-                get15(rawFormData, [key]),
+                get14(rawFormData, [key]),
                 experimental_customMergeAllOf
               );
             }
@@ -810,7 +858,7 @@
   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;
@@ -841,7 +889,7 @@
   function processDependencies(validator, dependencies, resolvedSchema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
     let schemas = [resolvedSchema];
     for (const dependencyKey in dependencies) {
-      if ((expandAllBranches || get15(formData, [dependencyKey]) !== void 0) && (!resolvedSchema.properties || dependencyKey in resolvedSchema.properties)) {
+      if ((expandAllBranches || get14(formData, [dependencyKey]) !== void 0) && (!resolvedSchema.properties || dependencyKey in resolvedSchema.properties)) {
         const [remainingDependencies, dependencyValue] = splitKeyElementFromObject(
           dependencyKey,
           dependencies
@@ -924,7 +972,7 @@
   }
   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;
@@ -968,14 +1016,14 @@
       const xxxOfs = schema[xxx].map(
         (xxxOf) => retrieveSchema(validator, xxxOf, rootSchema, formData, experimental_customMergeAllOf)
       );
-      const data = get15(formData, selectorField);
+      const data = get14(formData, selectorField);
       if (data !== void 0) {
         return xxxOfs.find(
           (xxxOfOption) => deepEquals_default(
-            get15(
+            get14(
               xxxOfOption,
               [PROPERTIES_KEY, selectorField, DEFAULT_KEY],
-              get15(xxxOfOption, [PROPERTIES_KEY, selectorField, CONST_KEY])
+              get14(xxxOfOption, [PROPERTIES_KEY, selectorField, CONST_KEY])
             ),
             data
           )
@@ -995,7 +1043,7 @@
     const pathList = Array.isArray(path) ? [...path] : path.split(".");
     const [part, ...nestedPath] = pathList;
     if (part !== void 0 && part !== "" && has5(fieldSchema, part)) {
-      fieldSchema = get15(fieldSchema, part);
+      fieldSchema = get14(fieldSchema, part);
       return getFromSchemaInternal(
         validator,
         rootSchema,
@@ -1038,7 +1086,7 @@
             parentField,
             fieldNameKey,
             ONE_OF_KEY,
-            get15(formData, subPath),
+            get14(formData, subPath),
             experimental_customMergeAllOf
           );
         } else if (has5(parentField, ANY_OF_KEY)) {
@@ -1048,7 +1096,7 @@
             parentField,
             fieldNameKey,
             ANY_OF_KEY,
-            get15(formData, subPath),
+            get14(formData, subPath),
             experimental_customMergeAllOf
           );
         }
@@ -1116,7 +1164,7 @@
         totalScore += reduce(
           schema.properties,
           (score, value, key) => {
-            const formValue = get15(formData, key);
+            const formValue = get14(formData, key);
             if (typeof value === "boolean") {
               return score;
             }
@@ -1143,7 +1191,7 @@
                 validator,
                 rootSchema,
                 formValue,
-                get15(value, xxxOfKey),
+                get14(value, xxxOfKey),
                 -1,
                 discriminator,
                 experimental_customMergeAllOf
@@ -1224,7 +1272,7 @@
 
   // 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));
   }
   function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults = false, defaultSupercedesUndefined = false, overrideFormDataWithDefaults = false) {
     if (Array.isArray(formData)) {
@@ -1251,22 +1299,22 @@
     if (isObject(formData)) {
       const acc = Object.assign({}, defaults);
       return Object.keys(formData).reduce((accumulator, key) => {
-        const keyValue = get15(formData, key);
+        const keyValue = get14(formData, key);
         const keyExistsInDefaults = isObject(defaults) && key in defaults;
         const keyExistsInFormData = key in formData;
-        const keyDefault = get15(defaults, key) ?? {};
+        const keyDefault = get14(defaults, key) ?? {};
         const defaultValueIsNestedObject = keyExistsInDefaults && isObject(keyDefault) && Object.values(keyDefault).some((v) => isObject(v));
-        const keyDefaultIsObject = keyExistsInDefaults && isObject(get15(defaults, key));
+        const keyDefaultIsObject = keyExistsInDefaults && isObject(get14(defaults, key));
         const keyHasFormDataObject = keyExistsInFormData && isObject(keyValue);
         if (keyDefaultIsObject && keyHasFormDataObject && !defaultValueIsNestedObject) {
           accumulator[key] = {
-            ...get15(defaults, key),
+            ...get14(defaults, key),
             ...keyValue
           };
           return accumulator;
         }
         accumulator[key] = mergeDefaultsWithFormData(
-          get15(defaults, key),
+          get14(defaults, key),
           keyValue,
           mergeExtraArrayDefaults,
           defaultSupercedesUndefined,
@@ -1366,18 +1414,18 @@
       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;
       let label = title;
       if (selectorField) {
-        const innerSchema = get15(aSchema, [PROPERTIES_KEY, selectorField], {});
-        value = get15(innerSchema, DEFAULT_KEY, get15(innerSchema, CONST_KEY));
-        label = label || innerSchema?.title || aSchema.title || String(value);
+        const innerSchema = get14(aSchema, [PROPERTIES_KEY, selectorField], {});
+        value = get14(innerSchema, DEFAULT_KEY, get14(innerSchema, CONST_KEY));
+        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,
@@ -1467,8 +1515,8 @@
       rootSchema = {},
       includeUndefinedValues = false,
       _recurseList = [],
-      experimental_defaultFormStateBehavior = void 0,
-      experimental_customMergeAllOf = void 0,
+      experimental_defaultFormStateBehavior,
+      experimental_customMergeAllOf,
       required,
       shouldMergeDefaultsIntoFormData = false,
       initialDefaultsGenerated
@@ -1476,14 +1524,19 @@
     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];
@@ -1513,7 +1566,7 @@
         experimental_customMergeAllOf
       );
       [schemaToCompute] = resolvedSchema;
-    } else if (isFixedItems(schema)) {
+    } else if (isFixedItems(schema) && !preferParentDefaults) {
       defaults = schema.items.map(
         (itemSchema, idx) => computeDefaults(validator, itemSchema, {
           rootSchema,
@@ -1609,16 +1662,36 @@
     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 = get14(schemaToMatch, [PROPERTIES_KEY, key], {});
+          if (key in acc && (shouldRetrieveAllOf || isObject(propertySchema) && ALL_OF_KEY in propertySchema)) {
+            acc[key] = ensureFormDataMatchingSchema(
+              validator,
+              propertySchema,
+              rootSchema,
+              get14(acc, key),
+              experimental_defaultFormStateBehavior,
+              experimental_customMergeAllOf
+            );
+          }
+          return acc;
+        },
+        { ...validFormData }
+      );
     }
     return validFormData;
   }
@@ -1627,8 +1700,8 @@
     rootSchema = {},
     includeUndefinedValues = false,
     _recurseList = [],
-    experimental_defaultFormStateBehavior = void 0,
-    experimental_customMergeAllOf = void 0,
+    experimental_defaultFormStateBehavior,
+    experimental_customMergeAllOf,
     required,
     shouldMergeDefaultsIntoFormData,
     initialDefaultsGenerated
@@ -1641,7 +1714,7 @@
       const parentConst = retrievedSchema[CONST_KEY];
       const objectDefaults = Object.keys(retrievedSchema.properties || {}).reduce(
         (acc, key) => {
-          const propertySchema = get15(retrievedSchema, [PROPERTIES_KEY, key], {});
+          const propertySchema = get14(retrievedSchema, [PROPERTIES_KEY, key], {});
           const hasParentConst = isObject(parentConst) && parentConst[key] !== void 0;
           const hasConst = (isObject(propertySchema) && CONST_KEY in propertySchema || hasParentConst) && experimental_defaultFormStateBehavior?.constAsDefaults !== "never" && !constIsAjvDataReference(propertySchema);
           const computedDefault = computeDefaults(validator, propertySchema, {
@@ -1650,8 +1723,8 @@
             experimental_defaultFormStateBehavior,
             experimental_customMergeAllOf,
             includeUndefinedValues: includeUndefinedValues === true,
-            parentDefaults: get15(defaults, [key]),
-            rawFormData: get15(formData, [key]),
+            parentDefaults: get14(defaults, [key]),
+            rawFormData: get14(formData, [key]),
             required: retrievedSchema.required?.includes(key),
             shouldMergeDefaultsIntoFormData,
             initialDefaultsGenerated
@@ -1689,8 +1762,8 @@
             experimental_defaultFormStateBehavior,
             experimental_customMergeAllOf,
             includeUndefinedValues: includeUndefinedValues === true,
-            parentDefaults: get15(defaults, [key]),
-            rawFormData: get15(formData, [key]),
+            parentDefaults: get14(defaults, [key]),
+            rawFormData: get14(formData, [key]),
             required: retrievedSchema.required?.includes(key),
             shouldMergeDefaultsIntoFormData,
             initialDefaultsGenerated
@@ -1712,8 +1785,8 @@
     rawFormData,
     rootSchema = {},
     _recurseList = [],
-    experimental_defaultFormStateBehavior = void 0,
-    experimental_customMergeAllOf = void 0,
+    experimental_defaultFormStateBehavior,
+    experimental_customMergeAllOf,
     required,
     requiredAsRoot = false,
     shouldMergeDefaultsIntoFormData,
@@ -1758,7 +1831,7 @@
             experimental_defaultFormStateBehavior,
             experimental_customMergeAllOf,
             rawFormData: item,
-            parentDefaults: get15(defaults, [idx]),
+            parentDefaults: get14(defaults, [idx]),
             required,
             shouldMergeDefaultsIntoFormData,
             initialDefaultsGenerated
@@ -1768,14 +1841,17 @@
         defaults = mergeDefaultsWithFormData(defaults, itemDefaults, mergeExtraDefaults);
       }
     }
+    const defaultsLength = Array.isArray(defaults) ? defaults.length : 0;
     if (neverPopulate) {
+      if (shouldMergeDefaultsIntoFormData && !required) {
+        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 {
@@ -1835,9 +1911,17 @@
     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,
@@ -1883,7 +1967,7 @@
     let displayLabel = Boolean(label);
     if (displayLabel) {
       const schemaType = getSchemaType(schema);
-      const addedByAdditionalProperty = get15(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);
       }
@@ -1893,7 +1977,7 @@
       if (schemaType === "boolean" && uiSchema && !uiSchema[UI_WIDGET_KEY]) {
         displayLabel = false;
       }
-      if (uiSchema && uiSchema[UI_FIELD_KEY]) {
+      if (uiSchema?.[UI_FIELD_KEY]) {
         displayLabel = false;
       }
     }
@@ -1924,7 +2008,7 @@
           }
         } else if (key === NAME_KEY && data !== "") {
           paths.forEach((path) => {
-            const formValue = get15(formData, path);
+            const formValue = get14(formData, path);
             const isLeaf = objKeys.length === 1;
             if (formValueHasData(formValue, isLeaf) || Array.isArray(formValue) && formValue.every((val) => formValueHasData(val, isLeaf))) {
               acc.push(path);
@@ -1962,7 +2046,7 @@
       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) {
@@ -2031,17 +2115,17 @@
       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;
@@ -2053,7 +2137,7 @@
       }
       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)) {
@@ -2071,7 +2155,7 @@
       );
       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;
@@ -2081,7 +2165,7 @@
       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;
       }
@@ -2095,12 +2179,12 @@
       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;
       }
@@ -2110,10 +2194,16 @@
       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);
@@ -2132,7 +2222,7 @@
       }
       return handleDependencies(localSchema, source, handleConditions(localSchema, source, filtered));
     }
-    return omit3(schema, formData);
+    return omit2(schema, formData);
   }
   var NO_VALUE = /* @__PURE__ */ Symbol("no Value");
   function enumValuesForSchema(schema) {
@@ -2156,7 +2246,7 @@
     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;
     }
@@ -2167,19 +2257,19 @@
     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,
@@ -2198,8 +2288,8 @@
             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];
@@ -2217,17 +2307,17 @@
               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;
             }
@@ -2245,9 +2335,9 @@
         ...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(
@@ -2267,10 +2357,10 @@
             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(
@@ -2344,9 +2434,9 @@
       };
     }
     if (ADDITIONAL_PROPERTIES_KEY in schema && schema[ADDITIONAL_PROPERTIES_KEY] !== false) {
-      set(pathSchema, RJSF_ADDITIONAL_PROPERTIES_FLAG, true);
+      set3(pathSchema, RJSF_ADDITIONAL_PROPERTIES_FLAG, true);
       const additionalSchema = isObject2(schema[ADDITIONAL_PROPERTIES_KEY]) ? schema[ADDITIONAL_PROPERTIES_KEY] : {};
-      const definedProperties = get15(schema, PROPERTIES_KEY, {});
+      const definedProperties = get14(schema, PROPERTIES_KEY, {});
       for (const key of Object.keys(formData ?? {})) {
         if (!(key in definedProperties)) {
           pathSchema[key] = toPathSchemaInternal(
@@ -2354,7 +2444,7 @@
             additionalSchema,
             `${name}.${key}`,
             rootSchema,
-            get15(formData, [key]),
+            get14(formData, [key]),
             _recurseList,
             experimental_customMergeAllOf
           );
@@ -2404,7 +2494,7 @@
       }
     } else if (PROPERTIES_KEY in schema) {
       for (const property in schema.properties) {
-        const field = get15(schema, [PROPERTIES_KEY, property], {});
+        const field = get14(schema, [PROPERTIES_KEY, property], {});
         pathSchema[property] = toPathSchemaInternal(
           validator,
           field,
@@ -2412,7 +2502,7 @@
           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
-          get15(formData, [property]),
+          get14(formData, [property]),
           _recurseList,
           experimental_customMergeAllOf
         );
@@ -2434,8 +2524,8 @@
      * @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, get15(rootSchema, ID_KEY, "#"));
+      if (rootSchema?.[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
+        this.rootSchema = makeAllReferencesAbsolute(rootSchema, get14(rootSchema, ID_KEY, "#"));
       } else {
         this.rootSchema = rootSchema;
       }
@@ -2909,7 +2999,7 @@
      */
     getOrCreateErrorBlock(pathOfError) {
       const hasPath = Array.isArray(pathOfError) && pathOfError.length > 0 || typeof pathOfError === "string";
-      let errorBlock = hasPath ? get15(this.errorSchema, pathOfError) : this.errorSchema;
+      let errorBlock = hasPath ? get14(this.errorSchema, pathOfError) : this.errorSchema;
       if (!errorBlock && pathOfError) {
         errorBlock = {};
         setWith(this.errorSchema, pathOfError, errorBlock, Object);
@@ -2935,15 +3025,15 @@
      */
     addErrors(errorOrList, pathOfError) {
       const errorBlock = this.getOrCreateErrorBlock(pathOfError);
-      let errorsList = get15(errorBlock, ERRORS_KEY);
+      let errorsList = get14(errorBlock, ERRORS_KEY);
       if (!Array.isArray(errorsList)) {
         errorsList = [];
         errorBlock[ERRORS_KEY] = errorsList;
       }
       if (Array.isArray(errorOrList)) {
-        set(errorBlock, ERRORS_KEY, [.../* @__PURE__ */ new Set([...errorsList, ...errorOrList])]);
+        set3(errorBlock, ERRORS_KEY, [.../* @__PURE__ */ new Set([...errorsList, ...errorOrList])]);
       } else {
-        set(errorBlock, ERRORS_KEY, [.../* @__PURE__ */ new Set([...errorsList, errorOrList])]);
+        set3(errorBlock, ERRORS_KEY, [.../* @__PURE__ */ new Set([...errorsList, errorOrList])]);
       }
       return this;
     }
@@ -2958,7 +3048,7 @@
     setErrors(errorOrList, pathOfError) {
       const errorBlock = this.getOrCreateErrorBlock(pathOfError);
       const listToAdd = Array.isArray(errorOrList) ? [.../* @__PURE__ */ new Set([...errorOrList])] : [errorOrList];
-      set(errorBlock, ERRORS_KEY, listToAdd);
+      set3(errorBlock, ERRORS_KEY, listToAdd);
       return this;
     }
     /** Clears the error(s) in the `ErrorSchema` at either the root level or the location within the schema described by
@@ -2970,7 +3060,7 @@
      */
     clearErrors(pathOfError) {
       const errorBlock = this.getOrCreateErrorBlock(pathOfError);
-      set(errorBlock, ERRORS_KEY, []);
+      set3(errorBlock, ERRORS_KEY, []);
       return this;
     }
   };
@@ -2986,7 +3076,7 @@
     if (!aIsPlainObject && bIsPlainObject) {
       return keys(b);
     }
-    const unequalFields = keys(pickBy(a, (value, key) => !deepEquals_default(value, get15(b, key))));
+    const unequalFields = keys(pickBy(a, (value, key) => !deepEquals_default(value, get14(b, key))));
     const diffFields = difference(keys(b), keys(a));
     return [...unequalFields, ...diffFields];
   }
@@ -3087,7 +3177,7 @@
   };
   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 };
     }
@@ -3111,7 +3201,7 @@
     );
   }
   function getTestIds() {
-    if (get15(globalThis, "process.env.NODE_ENV") !== "test") {
+    if (get14(globalThis, "process.env.NODE_ENV") !== "test") {
       return {};
     }
     const ids = /* @__PURE__ */ new Map();
@@ -3180,11 +3270,11 @@
     }
   };
   function mergeWidgetOptions(AWidget) {
-    let MergedWidget = get15(AWidget, "MergedWidget");
+    let MergedWidget = get14(AWidget, "MergedWidget");
     if (!MergedWidget) {
-      const defaultOptions = AWidget.defaultProps && AWidget.defaultProps.options || {};
+      const defaultOptions = AWidget.defaultProps?.options || {};
       MergedWidget = ({ options, ...props }) => /* @__PURE__ */ jsxRuntime.jsx(AWidget, { options: { ...defaultOptions, ...options }, ...props });
-      set(AWidget, "MergedWidget", MergedWidget);
+      set3(AWidget, "MergedWidget", MergedWidget);
     }
     return MergedWidget;
   }
@@ -3234,7 +3324,7 @@
     return hashString(sortedJSONStringify(object));
   }
   function hashForSchema(schema) {
-    return hashObject(schema);
+    return hashString(sortedJSONStringify(schema));
   }
 
   // src/hasWidget.ts
@@ -3285,6 +3375,8 @@
   function isFormDataAvailable(formData) {
     return !isNil(formData) && (!isObject2(formData) || Array.isArray(formData) || !isEmpty4(formData));
   }
+
+  // src/isRootSchema.ts
   function isRootSchema(registry, schemaToCompare) {
     const { rootSchema, schemaUtils } = registry;
     if (deepEquals_default(schemaToCompare, rootSchema)) {
@@ -3292,7 +3384,7 @@
     }
     if (REF_KEY in rootSchema) {
       const resolvedSchema = schemaUtils.retrieveSchema(rootSchema);
-      return deepEquals_default(schemaToCompare, omit(resolvedSchema, RJSF_REF_KEY));
+      return deepEquals_default(schemaToCompare, resolvedSchema);
     }
     return false;
   }
@@ -3306,12 +3398,21 @@
   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}"`
+      );
+    }
+  }
   function lookupFromFormContext(regOrFc, toLookup, fallback) {
     const lookupPath = [LOOKUP_MAP_NAME];
     if (has5(regOrFc, FORM_CONTEXT_NAME)) {
       lookupPath.unshift(FORM_CONTEXT_NAME);
     }
-    return get15(regOrFc, [...lookupPath, toLookup], fallback);
+    return get14(regOrFc, [...lookupPath, toLookup], fallback);
   }
 
   // src/nameGenerators.ts
@@ -3497,13 +3598,13 @@
     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) {
@@ -3512,6 +3613,35 @@
     }
     return false;
   }
+  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__ */ jsxRuntime.jsx(
+      DescriptionFieldTemplate,
+      {
+        id: descriptionId(id),
+        description,
+        schema: option.schema,
+        uiSchema,
+        registry
+      }
+    );
+  }
 
   // src/shallowEquals.ts
   function shallowEquals(a, b) {
@@ -3753,7 +3883,7 @@
   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();
@@ -3778,7 +3908,7 @@
       reader.readAsDataURL(file);
     });
   }
-  function processFiles(files) {
+  async function processFiles(files) {
     return Promise.all(Array.from(files).map(processFile));
   }
   function extractFileInfo(dataURLs) {
@@ -3911,6 +4041,7 @@
     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";
@@ -3931,6 +4062,7 @@
     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`.";
@@ -3964,7 +4096,7 @@
      * @param hash - The hash value at which to map the schema
      */
     addSchema(schema, hash) {
-      const key = get15(schema, ID_KEY, hash);
+      const key = get14(schema, ID_KEY, hash);
       const identifiedSchema = { ...schema, [ID_KEY]: key };
       const existing = this.schemaMap[key];
       if (!existing) {
@@ -4086,10 +4218,13 @@
   exports.REF_KEY = REF_KEY;
   exports.REQUIRED_KEY = REQUIRED_KEY;
   exports.RJSF_ADDITIONAL_PROPERTIES_FLAG = RJSF_ADDITIONAL_PROPERTIES_FLAG;
+  exports.RJSF_PREFIX_KEY = RJSF_PREFIX_KEY;
+  exports.RJSF_REF_CYCLE_KEY = RJSF_REF_CYCLE_KEY;
   exports.RJSF_REF_KEY = RJSF_REF_KEY;
   exports.ROOT_SCHEMA_PREFIX = ROOT_SCHEMA_PREFIX;
   exports.SCHEMA_KEY = SCHEMA_KEY;
   exports.SUBMIT_BTN_OPTIONS_KEY = SUBMIT_BTN_OPTIONS_KEY;
+  exports.SelectedOptionDescription = SelectedOptionDescription;
   exports.TranslatableString = TranslatableString;
   exports.UI_DEFINITIONS_KEY = UI_DEFINITIONS_KEY;
   exports.UI_FIELD_KEY = UI_FIELD_KEY;
@@ -4126,6 +4261,7 @@
   exports.getChangedFields = getChangedFields;
   exports.getClosestMatchingOption = getClosestMatchingOption;
   exports.getDateElementProps = getDateElementProps;
+  exports.getDecimalSeparator = getDecimalSeparator;
   exports.getDefaultFormState = getDefaultFormState;
   exports.getDiscriminatorFieldFromSchema = getDiscriminatorFieldFromSchema;
   exports.getDisplayLabel = getDisplayLabel;
@@ -4160,6 +4296,7 @@
   exports.isValueEmpty = isValueEmpty;
   exports.labelValue = labelValue;
   exports.localToUTC = localToUTC;
+  exports.logUnsupportedDefaultForEnum = logUnsupportedDefaultForEnum;
   exports.lookupFromFormContext = lookupFromFormContext;
   exports.mergeDefaultsWithFormData = mergeDefaultsWithFormData;
   exports.mergeObjects = mergeObjects;