@rjsf/utils 5.24.10 → 6.0.0-beta.1

package/dist/index.js

@@ -28,8 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   ADDITIONAL_PROPERTIES_KEY: () => ADDITIONAL_PROPERTIES_KEY,
   ADDITIONAL_PROPERTY_FLAG: () => ADDITIONAL_PROPERTY_FLAG,
   ALL_OF_KEY: () => ALL_OF_KEY,
@@ -38,20 +38,24 @@ __export(src_exports, {
   DEFAULT_KEY: () => DEFAULT_KEY,
   DEFINITIONS_KEY: () => DEFINITIONS_KEY,
   DEPENDENCIES_KEY: () => DEPENDENCIES_KEY,
+  DISCRIMINATOR_PATH: () => DISCRIMINATOR_PATH,
   ENUM_KEY: () => ENUM_KEY,
   ERRORS_KEY: () => ERRORS_KEY,
   ErrorSchemaBuilder: () => ErrorSchemaBuilder,
+  FORM_CONTEXT_NAME: () => FORM_CONTEXT_NAME,
   ID_KEY: () => ID_KEY,
   IF_KEY: () => IF_KEY,
   ITEMS_KEY: () => ITEMS_KEY,
   JUNK_OPTION_ID: () => JUNK_OPTION_ID,
+  LOOKUP_MAP_NAME: () => LOOKUP_MAP_NAME,
   NAME_KEY: () => NAME_KEY,
   ONE_OF_KEY: () => ONE_OF_KEY,
+  PATTERN_PROPERTIES_KEY: () => PATTERN_PROPERTIES_KEY,
   PROPERTIES_KEY: () => PROPERTIES_KEY,
+  READONLY_KEY: () => READONLY_KEY,
   REF_KEY: () => REF_KEY,
   REQUIRED_KEY: () => REQUIRED_KEY,
   RJSF_ADDITIONAL_PROPERTIES_FLAG: () => RJSF_ADDITIONAL_PROPERTIES_FLAG,
-  RJSF_ADDITONAL_PROPERTIES_FLAG: () => RJSF_ADDITONAL_PROPERTIES_FLAG,
   ROOT_SCHEMA_PREFIX: () => ROOT_SCHEMA_PREFIX,
   SUBMIT_BTN_OPTIONS_KEY: () => SUBMIT_BTN_OPTIONS_KEY,
   TranslatableString: () => TranslatableString,
@@ -62,6 +66,7 @@ __export(src_exports, {
   allowAdditionalItems: () => allowAdditionalItems,
   ariaDescribedByIds: () => ariaDescribedByIds,
   asNumber: () => asNumber,
+  buttonId: () => buttonId,
   canExpand: () => canExpand,
   createErrorHandler: () => createErrorHandler,
   createSchemaUtils: () => createSchemaUtils,
@@ -77,7 +82,9 @@ __export(src_exports, {
   enumOptionsValueForIndex: () => enumOptionsValueForIndex,
   errorId: () => errorId,
   examplesId: () => examplesId,
+  findFieldInSchema: () => findFieldInSchema,
   findSchemaDefinition: () => findSchemaDefinition,
+  findSelectedOptionInXxxOf: () => findSelectedOptionInXxxOf,
   getChangedFields: () => getChangedFields,
   getClosestMatchingOption: () => getClosestMatchingOption,
   getDateElementProps: () => getDateElementProps,
@@ -85,17 +92,20 @@ __export(src_exports, {
   getDiscriminatorFieldFromSchema: () => getDiscriminatorFieldFromSchema,
   getDisplayLabel: () => getDisplayLabel,
   getFirstMatchingOption: () => getFirstMatchingOption,
+  getFromSchema: () => getFromSchema,
   getInputProps: () => getInputProps,
-  getMatchingOption: () => getMatchingOption,
   getOptionMatchingSimpleDiscriminator: () => getOptionMatchingSimpleDiscriminator,
   getSchemaType: () => getSchemaType,
   getSubmitButtonOptions: () => getSubmitButtonOptions,
   getTemplate: () => getTemplate,
+  getTestIds: () => getTestIds,
   getUiOptions: () => getUiOptions,
   getWidget: () => getWidget,
   guessType: () => guessType,
   hasWidget: () => hasWidget,
   hashForSchema: () => hashForSchema,
+  hashObject: () => hashObject,
+  hashString: () => hashString,
   helpId: () => helpId,
   isConstant: () => isConstant,
   isCustomWidget: () => isCustomWidget,
@@ -106,10 +116,10 @@ __export(src_exports, {
   isSelect: () => isSelect,
   labelValue: () => labelValue,
   localToUTC: () => localToUTC,
+  lookupFromFormContext: () => lookupFromFormContext,
   mergeDefaultsWithFormData: () => mergeDefaultsWithFormData,
   mergeObjects: () => mergeObjects,
   mergeSchemas: () => mergeSchemas,
-  mergeValidationData: () => mergeValidationData,
   optionId: () => optionId,
   optionsList: () => optionsList,
   orderProperties: () => orderProperties,
@@ -122,6 +132,7 @@ __export(src_exports, {
   schemaParser: () => schemaParser,
   schemaRequiresTrueValue: () => schemaRequiresTrueValue,
   shouldRender: () => shouldRender,
+  sortedJSONStringify: () => sortedJSONStringify,
   titleId: () => titleId,
   toConstant: () => toConstant,
   toDateString: () => toDateString,
@@ -134,7 +145,7 @@ __export(src_exports, {
   validationDataMerge: () => validationDataMerge,
   withIdRefPrefix: () => withIdRefPrefix
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/isObject.ts
 function isObject(thing) {
@@ -197,11 +208,15 @@ var ITEMS_KEY = "items";
 var JUNK_OPTION_ID = "_$junk_option_schema_id$_";
 var NAME_KEY = "$name";
 var ONE_OF_KEY = "oneOf";
+var PATTERN_PROPERTIES_KEY = "patternProperties";
 var PROPERTIES_KEY = "properties";
+var READONLY_KEY = "readonly";
 var REQUIRED_KEY = "required";
 var SUBMIT_BTN_OPTIONS_KEY = "submitButtonOptions";
 var REF_KEY = "$ref";
-var RJSF_ADDITONAL_PROPERTIES_FLAG = "__rjsf_additionalProperties";
+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 UI_FIELD_KEY = "ui:field";
@@ -229,7 +244,7 @@ function getUiOptions(uiSchema = {}, globalOptions = {}) {
 
 // src/canExpand.ts
 function canExpand(schema, uiSchema = {}, formData) {
-  if (!schema.additionalProperties) {
+  if (!(schema.additionalProperties || schema.patternProperties)) {
     return false;
   }
   const { expandable = true } = getUiOptions(uiSchema);
@@ -243,7 +258,7 @@ function canExpand(schema, uiSchema = {}, formData) {
 }
 
 // src/createErrorHandler.ts
-var import_isPlainObject = __toESM(require("lodash/isPlainObject"));
+var import_isPlainObject = __toESM(require("lodash/isPlainObject"), 1);
 function createErrorHandler(formData) {
   const handler = {
     // We store the list of errors for this node in a property named __errors
@@ -269,7 +284,7 @@ function createErrorHandler(formData) {
 }
 
 // src/deepEquals.ts
-var import_isEqualWith = __toESM(require("lodash/isEqualWith"));
+var import_isEqualWith = __toESM(require("lodash/isEqualWith"), 1);
 function deepEquals(a, b) {
   return (0, import_isEqualWith.default)(a, b, (obj, other) => {
     if (typeof obj === "function" && typeof other === "function") {
@@ -279,13 +294,27 @@ function deepEquals(a, b) {
   });
 }
 
-// src/schema/getDefaultFormState.ts
-var import_get7 = __toESM(require("lodash/get"));
-var import_isEmpty = __toESM(require("lodash/isEmpty"));
+// src/schema/findFieldInSchema.ts
+var import_get7 = __toESM(require("lodash/get"), 1);
+var import_has3 = __toESM(require("lodash/has"), 1);
+
+// src/schema/findSelectedOptionInXxxOf.ts
+var import_get5 = __toESM(require("lodash/get"), 1);
+var import_isEqual = __toESM(require("lodash/isEqual"), 1);
+
+// src/schema/retrieveSchema.ts
+var import_get4 = __toESM(require("lodash/get"), 1);
+var import_set = __toESM(require("lodash/set"), 1);
+var import_times = __toESM(require("lodash/times"), 1);
+var import_transform = __toESM(require("lodash/transform"), 1);
+var import_merge = __toESM(require("lodash/merge"), 1);
+var import_flattenDeep = __toESM(require("lodash/flattenDeep"), 1);
+var import_uniq = __toESM(require("lodash/uniq"), 1);
+var import_json_schema_merge_allof = __toESM(require("json-schema-merge-allof"), 1);
 
 // src/findSchemaDefinition.ts
-var import_jsonpointer = __toESM(require("jsonpointer"));
-var import_omit = __toESM(require("lodash/omit"));
+var import_jsonpointer = __toESM(require("jsonpointer"), 1);
+var import_omit = __toESM(require("lodash/omit"), 1);
 function splitKeyElementFromObject(key, object) {
   const value = object[key];
   const remaining = (0, import_omit.default)(object, [key]);
@@ -327,113 +356,12 @@ function findSchemaDefinition($ref, rootSchema = {}) {
   return findSchemaDefinitionRecursive($ref, rootSchema, recurseList);
 }
 
-// src/schema/getClosestMatchingOption.ts
-var import_get5 = __toESM(require("lodash/get"));
-var import_has2 = __toESM(require("lodash/has"));
-var import_isNumber2 = __toESM(require("lodash/isNumber"));
-var import_isObject5 = __toESM(require("lodash/isObject"));
-var import_isString2 = __toESM(require("lodash/isString"));
-var import_reduce = __toESM(require("lodash/reduce"));
-var import_times2 = __toESM(require("lodash/times"));
-
-// src/schema/getMatchingOption.ts
-var import_get2 = __toESM(require("lodash/get"));
-var import_has = __toESM(require("lodash/has"));
-var import_isNumber = __toESM(require("lodash/isNumber"));
-
-// src/getOptionMatchingSimpleDiscriminator.ts
-var import_get = __toESM(require("lodash/get"));
-function getOptionMatchingSimpleDiscriminator(formData, options, discriminatorField) {
-  if (formData && discriminatorField) {
-    const value = (0, import_get.default)(formData, discriminatorField);
-    if (value === void 0) {
-      return;
-    }
-    for (let i = 0; i < options.length; i++) {
-      const option = options[i];
-      const discriminator = (0, import_get.default)(option, [PROPERTIES_KEY, discriminatorField], {});
-      if (discriminator.type === "object" || discriminator.type === "array") {
-        continue;
-      }
-      if (discriminator.const === value) {
-        return i;
-      }
-      if (discriminator.enum?.includes(value)) {
-        return i;
-      }
-    }
-  }
-  return;
-}
-
-// src/schema/getMatchingOption.ts
-function getMatchingOption(validator, formData, options, rootSchema, discriminatorField) {
-  if (formData === void 0) {
-    return 0;
-  }
-  const simpleDiscriminatorMatch = getOptionMatchingSimpleDiscriminator(formData, options, discriminatorField);
-  if ((0, import_isNumber.default)(simpleDiscriminatorMatch)) {
-    return simpleDiscriminatorMatch;
-  }
-  for (let i = 0; i < options.length; i++) {
-    const option = options[i];
-    if (discriminatorField && (0, import_has.default)(option, [PROPERTIES_KEY, discriminatorField])) {
-      const value = (0, import_get2.default)(formData, discriminatorField);
-      const discriminator = (0, import_get2.default)(option, [PROPERTIES_KEY, discriminatorField], {});
-      if (validator.isValid(discriminator, value, rootSchema)) {
-        return i;
-      }
-    } else if (option[PROPERTIES_KEY]) {
-      const requiresAnyOf = {
-        anyOf: Object.keys(option[PROPERTIES_KEY]).map((key) => ({
-          required: [key]
-        }))
-      };
-      let augmentedSchema;
-      if (option.anyOf) {
-        const { ...shallowClone } = option;
-        if (!shallowClone.allOf) {
-          shallowClone.allOf = [];
-        } else {
-          shallowClone.allOf = shallowClone.allOf.slice();
-        }
-        shallowClone.allOf.push(requiresAnyOf);
-        augmentedSchema = shallowClone;
-      } else {
-        augmentedSchema = Object.assign({}, option, requiresAnyOf);
-      }
-      delete augmentedSchema.required;
-      if (validator.isValid(augmentedSchema, formData, rootSchema)) {
-        return i;
-      }
-    } else if (validator.isValid(option, formData, rootSchema)) {
-      return i;
-    }
-  }
-  return 0;
-}
-
-// src/schema/getFirstMatchingOption.ts
-function getFirstMatchingOption(validator, formData, options, rootSchema, discriminatorField) {
-  return getMatchingOption(validator, formData, options, rootSchema, discriminatorField);
-}
-
-// src/schema/retrieveSchema.ts
-var import_get4 = __toESM(require("lodash/get"));
-var import_set = __toESM(require("lodash/set"));
-var import_times = __toESM(require("lodash/times"));
-var import_transform = __toESM(require("lodash/transform"));
-var import_merge = __toESM(require("lodash/merge"));
-var import_flattenDeep = __toESM(require("lodash/flattenDeep"));
-var import_uniq = __toESM(require("lodash/uniq"));
-var import_json_schema_merge_allof = __toESM(require("json-schema-merge-allof"));
-
 // src/getDiscriminatorFieldFromSchema.ts
-var import_get3 = __toESM(require("lodash/get"));
-var import_isString = __toESM(require("lodash/isString"));
+var import_get = __toESM(require("lodash/get"), 1);
+var import_isString = __toESM(require("lodash/isString"), 1);
 function getDiscriminatorFieldFromSchema(schema) {
   let discriminator;
-  const maybeString = (0, import_get3.default)(schema, "discriminator.propertyName", void 0);
+  const maybeString = (0, import_get.default)(schema, DISCRIMINATOR_PATH);
   if ((0, import_isString.default)(maybeString)) {
     discriminator = maybeString;
   } else if (maybeString !== void 0) {
@@ -466,7 +394,7 @@ function guessType(value) {
 }
 
 // src/mergeSchemas.ts
-var import_union = __toESM(require("lodash/union"));
+var import_union = __toESM(require("lodash/union"), 1);
 
 // src/getSchemaType.ts
 function getSchemaType(schema) {
@@ -477,7 +405,7 @@ function getSchemaType(schema) {
   if (!type && schema.enum) {
     return "string";
   }
-  if (!type && (schema.properties || schema.additionalProperties)) {
+  if (!type && (schema.properties || schema.additionalProperties || schema.patternProperties)) {
     return "object";
   }
   if (Array.isArray(type)) {
@@ -506,7 +434,85 @@ function mergeSchemas(obj1, obj2) {
   }, acc);
 }
 
+// src/schema/getFirstMatchingOption.ts
+var import_get3 = __toESM(require("lodash/get"), 1);
+var import_has = __toESM(require("lodash/has"), 1);
+var import_isNumber = __toESM(require("lodash/isNumber"), 1);
+
+// src/getOptionMatchingSimpleDiscriminator.ts
+var import_get2 = __toESM(require("lodash/get"), 1);
+function getOptionMatchingSimpleDiscriminator(formData, options, discriminatorField) {
+  if (formData && discriminatorField) {
+    const value = (0, import_get2.default)(formData, discriminatorField);
+    if (value === void 0) {
+      return;
+    }
+    for (let i = 0; i < options.length; i++) {
+      const option = options[i];
+      const discriminator = (0, import_get2.default)(option, [PROPERTIES_KEY, discriminatorField], {});
+      if (discriminator.type === "object" || discriminator.type === "array") {
+        continue;
+      }
+      if (discriminator.const === value) {
+        return i;
+      }
+      if (discriminator.enum?.includes(value)) {
+        return i;
+      }
+    }
+  }
+  return;
+}
+
+// src/schema/getFirstMatchingOption.ts
+function getFirstMatchingOption(validator, formData, options, rootSchema, discriminatorField) {
+  if (formData === void 0) {
+    return 0;
+  }
+  const simpleDiscriminatorMatch = getOptionMatchingSimpleDiscriminator(formData, options, discriminatorField);
+  if ((0, import_isNumber.default)(simpleDiscriminatorMatch)) {
+    return simpleDiscriminatorMatch;
+  }
+  for (let i = 0; i < options.length; i++) {
+    const option = options[i];
+    if (discriminatorField && (0, import_has.default)(option, [PROPERTIES_KEY, discriminatorField])) {
+      const value = (0, import_get3.default)(formData, discriminatorField);
+      const discriminator = (0, import_get3.default)(option, [PROPERTIES_KEY, discriminatorField], {});
+      if (validator.isValid(discriminator, value, rootSchema)) {
+        return i;
+      }
+    } else if (option[PROPERTIES_KEY]) {
+      const requiresAnyOf = {
+        anyOf: Object.keys(option[PROPERTIES_KEY]).map((key) => ({
+          required: [key]
+        }))
+      };
+      let augmentedSchema;
+      if (option.anyOf) {
+        const { ...shallowClone } = option;
+        if (!shallowClone.allOf) {
+          shallowClone.allOf = [];
+        } else {
+          shallowClone.allOf = shallowClone.allOf.slice();
+        }
+        shallowClone.allOf.push(requiresAnyOf);
+        augmentedSchema = shallowClone;
+      } else {
+        augmentedSchema = Object.assign({}, option, requiresAnyOf);
+      }
+      delete augmentedSchema.required;
+      if (validator.isValid(augmentedSchema, formData, rootSchema)) {
+        return i;
+      }
+    } else if (validator.isValid(option, formData, rootSchema)) {
+      return i;
+    }
+  }
+  return 0;
+}
+
 // src/schema/retrieveSchema.ts
+var import_isEmpty = __toESM(require("lodash/isEmpty"), 1);
 function retrieveSchema(validator, schema, rootSchema = {}, rawFormData, experimental_customMergeAllOf) {
   return retrieveSchemaInternal(
     validator,
@@ -595,6 +601,15 @@ function getAllPermutationsOfXxxOf(listOfLists) {
   );
   return allPermutations;
 }
+function getMatchingPatternProperties(schema, key) {
+  return Object.keys(schema.patternProperties).filter((pattern) => RegExp(pattern).test(key)).reduce(
+    (obj, pattern) => {
+      (0, import_set.default)(obj, [pattern], schema.patternProperties[pattern]);
+      return obj;
+    },
+    {}
+  );
+}
 function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
   const updatedSchemas = resolveReference(
     validator,
@@ -709,31 +724,50 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
     if (key in schema.properties) {
       return;
     }
-    let additionalProperties = {};
-    if (typeof schema.additionalProperties !== "boolean") {
-      if (REF_KEY in schema.additionalProperties) {
-        additionalProperties = retrieveSchema(
+    if (PATTERN_PROPERTIES_KEY in schema) {
+      const matchingProperties = getMatchingPatternProperties(schema, key);
+      if (!(0, import_isEmpty.default)(matchingProperties)) {
+        schema.properties[key] = retrieveSchema(
           validator,
-          { $ref: (0, import_get4.default)(schema.additionalProperties, [REF_KEY]) },
+          { allOf: Object.values(matchingProperties) },
           rootSchema,
           formData,
           experimental_customMergeAllOf
         );
-      } else if ("type" in schema.additionalProperties) {
-        additionalProperties = { ...schema.additionalProperties };
-      } else if (ANY_OF_KEY in schema.additionalProperties || ONE_OF_KEY in schema.additionalProperties) {
-        additionalProperties = {
-          type: "object",
-          ...schema.additionalProperties
-        };
+        (0, import_set.default)(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
+        return;
+      }
+    }
+    if (ADDITIONAL_PROPERTIES_KEY in schema && schema.additionalProperties !== false) {
+      let additionalProperties = {};
+      if (typeof schema.additionalProperties !== "boolean") {
+        if (REF_KEY in schema.additionalProperties) {
+          additionalProperties = retrieveSchema(
+            validator,
+            { $ref: (0, import_get4.default)(schema.additionalProperties, [REF_KEY]) },
+            rootSchema,
+            formData,
+            experimental_customMergeAllOf
+          );
+        } else if ("type" in schema.additionalProperties) {
+          additionalProperties = { ...schema.additionalProperties };
+        } else if (ANY_OF_KEY in schema.additionalProperties || ONE_OF_KEY in schema.additionalProperties) {
+          additionalProperties = {
+            type: "object",
+            ...schema.additionalProperties
+          };
+        } else {
+          additionalProperties = { type: guessType((0, import_get4.default)(formData, [key])) };
+        }
       } else {
         additionalProperties = { type: guessType((0, import_get4.default)(formData, [key])) };
       }
+      schema.properties[key] = additionalProperties;
+      (0, import_set.default)(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
     } else {
-      additionalProperties = { type: guessType((0, import_get4.default)(formData, [key])) };
+      schema.properties[key] = { type: "null" };
+      (0, import_set.default)(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
     }
-    schema.properties[key] = additionalProperties;
-    (0, import_set.default)(schema.properties, [key, ADDITIONAL_PROPERTY_FLAG], true);
   });
   return schema;
 }
@@ -793,7 +827,28 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
         return resolvedSchemaWithoutAllOf;
       }
     }
-    const hasAdditionalProperties = ADDITIONAL_PROPERTIES_KEY in resolvedSchema && resolvedSchema.additionalProperties !== false;
+    if (PROPERTIES_KEY in resolvedSchema && PATTERN_PROPERTIES_KEY in resolvedSchema) {
+      resolvedSchema = Object.keys(resolvedSchema.properties).reduce(
+        (schema2, key) => {
+          const matchingProperties = getMatchingPatternProperties(schema2, key);
+          if (!(0, import_isEmpty.default)(matchingProperties)) {
+            schema2.properties[key] = retrieveSchema(
+              validator,
+              { allOf: [schema2.properties[key], ...Object.values(matchingProperties)] },
+              rootSchema,
+              rawFormData,
+              experimental_customMergeAllOf
+            );
+          }
+          return schema2;
+        },
+        {
+          ...resolvedSchema,
+          properties: { ...resolvedSchema.properties }
+        }
+      );
+    }
+    const hasAdditionalProperties = PATTERN_PROPERTIES_KEY in resolvedSchema || ADDITIONAL_PROPERTIES_KEY in resolvedSchema && resolvedSchema.additionalProperties !== false;
     if (hasAdditionalProperties) {
       return stubExistingAdditionalProperties(
         validator,
@@ -976,7 +1031,159 @@ function withExactlyOneSubschema(validator, schema, rootSchema, dependencyKey, o
   });
 }
 
+// src/schema/findSelectedOptionInXxxOf.ts
+function findSelectedOptionInXxxOf(validator, rootSchema, schema, fallbackField, xxx, formData = {}, experimental_customMergeAllOf) {
+  if (Array.isArray(schema[xxx])) {
+    const discriminator = getDiscriminatorFieldFromSchema(schema);
+    const selectorField = discriminator || fallbackField;
+    const xxxOfs = schema[xxx].map(
+      (xxxOf) => retrieveSchema(validator, xxxOf, rootSchema, formData, experimental_customMergeAllOf)
+    );
+    const data = (0, import_get5.default)(formData, selectorField);
+    if (data !== void 0) {
+      return xxxOfs.find((xxx2) => {
+        return (0, import_isEqual.default)(
+          (0, import_get5.default)(xxx2, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], (0, import_get5.default)(xxx2, [PROPERTIES_KEY, selectorField, CONST_KEY])),
+          data
+        );
+      });
+    }
+  }
+  return void 0;
+}
+
+// src/schema/getFromSchema.ts
+var import_get6 = __toESM(require("lodash/get"), 1);
+var import_has2 = __toESM(require("lodash/has"), 1);
+var import_isEmpty2 = __toESM(require("lodash/isEmpty"), 1);
+function getFromSchemaInternal(validator, rootSchema, schema, path, experimental_customMergeAllOf) {
+  let fieldSchema = schema;
+  if ((0, import_has2.default)(schema, REF_KEY)) {
+    fieldSchema = retrieveSchema(validator, schema, rootSchema, void 0, experimental_customMergeAllOf);
+  }
+  if ((0, import_isEmpty2.default)(path)) {
+    return fieldSchema;
+  }
+  const pathList = Array.isArray(path) ? path : path.split(".");
+  const [part, ...nestedPath] = pathList;
+  if (part && (0, import_has2.default)(fieldSchema, part)) {
+    fieldSchema = (0, import_get6.default)(fieldSchema, part);
+    return getFromSchemaInternal(
+      validator,
+      rootSchema,
+      fieldSchema,
+      nestedPath,
+      experimental_customMergeAllOf
+    );
+  }
+  return void 0;
+}
+function getFromSchema(validator, rootSchema, schema, path, defaultValue, experimental_customMergeAllOf) {
+  const result = getFromSchemaInternal(validator, rootSchema, schema, path, experimental_customMergeAllOf);
+  if (result === void 0) {
+    return defaultValue;
+  }
+  return result;
+}
+
+// src/schema/findFieldInSchema.ts
+var NOT_FOUND_SCHEMA = { title: "!@#$_UNKNOWN_$#@!" };
+function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, experimental_customMergeAllOf) {
+  const pathList = Array.isArray(path) ? [...path] : path.split(".");
+  let parentField = schema;
+  const fieldName = pathList.pop();
+  if (pathList.length) {
+    pathList.forEach((subPath) => {
+      parentField = getFromSchema(
+        validator,
+        rootSchema,
+        parentField,
+        [PROPERTIES_KEY, subPath],
+        {},
+        experimental_customMergeAllOf
+      );
+      if ((0, import_has3.default)(parentField, ONE_OF_KEY)) {
+        parentField = findSelectedOptionInXxxOf(
+          validator,
+          rootSchema,
+          parentField,
+          fieldName,
+          ONE_OF_KEY,
+          (0, import_get7.default)(formData, subPath),
+          experimental_customMergeAllOf
+        );
+      } else if ((0, import_has3.default)(parentField, ANY_OF_KEY)) {
+        parentField = findSelectedOptionInXxxOf(
+          validator,
+          rootSchema,
+          parentField,
+          fieldName,
+          ANY_OF_KEY,
+          (0, import_get7.default)(formData, subPath),
+          experimental_customMergeAllOf
+        );
+      }
+    });
+  }
+  if ((0, import_has3.default)(parentField, ONE_OF_KEY)) {
+    parentField = findSelectedOptionInXxxOf(
+      validator,
+      rootSchema,
+      parentField,
+      fieldName,
+      ONE_OF_KEY,
+      formData,
+      experimental_customMergeAllOf
+    );
+  } else if ((0, import_has3.default)(parentField, ANY_OF_KEY)) {
+    parentField = findSelectedOptionInXxxOf(
+      validator,
+      rootSchema,
+      parentField,
+      fieldName,
+      ANY_OF_KEY,
+      formData,
+      experimental_customMergeAllOf
+    );
+  }
+  let field = getFromSchema(
+    validator,
+    rootSchema,
+    parentField,
+    [PROPERTIES_KEY, fieldName],
+    NOT_FOUND_SCHEMA,
+    experimental_customMergeAllOf
+  );
+  if (field === NOT_FOUND_SCHEMA) {
+    field = void 0;
+  }
+  const requiredArray = getFromSchema(
+    validator,
+    rootSchema,
+    parentField,
+    REQUIRED_KEY,
+    [],
+    experimental_customMergeAllOf
+  );
+  let isRequired;
+  if (field && Array.isArray(requiredArray)) {
+    isRequired = requiredArray.includes(fieldName);
+  }
+  return { field, isRequired };
+}
+
+// src/schema/getDefaultFormState.ts
+var import_get11 = __toESM(require("lodash/get"), 1);
+var import_isEmpty3 = __toESM(require("lodash/isEmpty"), 1);
+
 // src/schema/getClosestMatchingOption.ts
+var import_get8 = __toESM(require("lodash/get"), 1);
+var import_has4 = __toESM(require("lodash/has"), 1);
+var import_isNumber2 = __toESM(require("lodash/isNumber"), 1);
+var import_isObject5 = __toESM(require("lodash/isObject"), 1);
+var import_isString2 = __toESM(require("lodash/isString"), 1);
+var import_reduce = __toESM(require("lodash/reduce"), 1);
+var import_times2 = __toESM(require("lodash/times"), 1);
 var JUNK_OPTION = {
   type: "object",
   $id: JUNK_OPTION_ID,
@@ -993,11 +1200,11 @@ function calculateIndexScore(validator, rootSchema, schema, formData, experiment
       totalScore += (0, import_reduce.default)(
         schema.properties,
         (score, value, key) => {
-          const formValue = (0, import_get5.default)(formData, key);
+          const formValue = (0, import_get8.default)(formData, key);
           if (typeof value === "boolean") {
             return score;
           }
-          if ((0, import_has2.default)(value, REF_KEY)) {
+          if ((0, import_has4.default)(value, REF_KEY)) {
             const newSchema = retrieveSchema(
               validator,
               value,
@@ -1013,14 +1220,14 @@ function calculateIndexScore(validator, rootSchema, schema, formData, experiment
               experimental_customMergeAllOf
             );
           }
-          if (((0, import_has2.default)(value, ONE_OF_KEY) || (0, import_has2.default)(value, ANY_OF_KEY)) && formValue) {
-            const key2 = (0, import_has2.default)(value, ONE_OF_KEY) ? ONE_OF_KEY : ANY_OF_KEY;
+          if (((0, import_has4.default)(value, ONE_OF_KEY) || (0, import_has4.default)(value, ANY_OF_KEY)) && formValue) {
+            const key2 = (0, import_has4.default)(value, ONE_OF_KEY) ? ONE_OF_KEY : ANY_OF_KEY;
             const discriminator = getDiscriminatorFieldFromSchema(value);
             return score + getClosestMatchingOption(
               validator,
               rootSchema,
               formValue,
-              (0, import_get5.default)(value, key2),
+              (0, import_get8.default)(value, key2),
               -1,
               discriminator,
               experimental_customMergeAllOf
@@ -1099,8 +1306,8 @@ function isFixedItems(schema) {
 }
 
 // src/mergeDefaultsWithFormData.ts
-var import_get6 = __toESM(require("lodash/get"));
-var import_isNil = __toESM(require("lodash/isNil"));
+var import_get9 = __toESM(require("lodash/get"), 1);
+var import_isNil = __toESM(require("lodash/isNil"), 1);
 function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults = false, defaultSupercedesUndefined = false, overrideFormDataWithDefaults = false) {
   if (Array.isArray(formData)) {
     const defaultsArray = Array.isArray(defaults) ? defaults : [];
@@ -1126,11 +1333,11 @@ function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults =
   if (isObject(formData)) {
     const acc = Object.assign({}, defaults);
     return Object.keys(formData).reduce((acc2, key) => {
-      const keyValue = (0, import_get6.default)(formData, key);
+      const keyValue = (0, import_get9.default)(formData, key);
       const keyExistsInDefaults = isObject(defaults) && key in defaults;
       const keyExistsInFormData = key in formData;
       acc2[key] = mergeDefaultsWithFormData(
-        defaults ? (0, import_get6.default)(defaults, key) : {},
+        defaults ? (0, import_get9.default)(defaults, key) : {},
         keyValue,
         mergeExtraArrayDefaults,
         defaultSupercedesUndefined,
@@ -1149,26 +1356,29 @@ function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults =
 
 // src/mergeObjects.ts
 function mergeObjects(obj1, obj2, concatArrays = false) {
-  return Object.keys(obj2).reduce((acc, key) => {
-    const left = obj1 ? obj1[key] : {}, right = obj2[key];
-    if (obj1 && key in obj1 && isObject(right)) {
-      acc[key] = mergeObjects(left, right, concatArrays);
-    } else if (concatArrays && Array.isArray(left) && Array.isArray(right)) {
-      let toMerge = right;
-      if (concatArrays === "preventDuplicates") {
-        toMerge = right.reduce((result, value) => {
-          if (!left.includes(value)) {
-            result.push(value);
-          }
-          return result;
-        }, []);
+  return Object.keys(obj2).reduce(
+    (acc, key) => {
+      const left = obj1 ? obj1[key] : {}, right = obj2[key];
+      if (obj1 && key in obj1 && isObject(right)) {
+        acc[key] = mergeObjects(left, right, concatArrays);
+      } else if (concatArrays && Array.isArray(left) && Array.isArray(right)) {
+        let toMerge = right;
+        if (concatArrays === "preventDuplicates") {
+          toMerge = right.reduce((result, value) => {
+            if (!left.includes(value)) {
+              result.push(value);
+            }
+            return result;
+          }, []);
+        }
+        acc[key] = left.concat(toMerge);
+      } else {
+        acc[key] = right;
       }
-      acc[key] = left.concat(toMerge);
-    } else {
-      acc[key] = right;
-    }
-    return acc;
-  }, Object.assign({}, obj1));
+      return acc;
+    },
+    Object.assign({}, obj1)
+  );
 }
 
 // src/isConstant.ts
@@ -1198,13 +1408,16 @@ function isMultiSelect(validator, schema, rootSchema, experimental_customMergeAl
 }
 
 // src/constIsAjvDataReference.ts
-var import_isString3 = __toESM(require("lodash/isString"));
+var import_isString3 = __toESM(require("lodash/isString"), 1);
 function constIsAjvDataReference(schema) {
   const schemaConst = schema[CONST_KEY];
   const schemaType = getSchemaType(schema);
   return isObject(schemaConst) && (0, import_isString3.default)(schemaConst?.$data) && schemaType !== "object" && schemaType !== "array";
 }
 
+// src/optionsList.ts
+var import_get10 = __toESM(require("lodash/get"), 1);
+
 // src/toConstant.ts
 function toConstant(schema) {
   if (ENUM_KEY in schema && Array.isArray(schema.enum) && schema.enum.length === 1) {
@@ -1218,21 +1431,12 @@ function toConstant(schema) {
 
 // src/optionsList.ts
 function optionsList(schema, uiSchema) {
-  const schemaWithEnumNames = schema;
   if (schema.enum) {
     let enumNames;
     if (uiSchema) {
       const { enumNames: uiEnumNames } = getUiOptions(uiSchema);
       enumNames = uiEnumNames;
     }
-    if (!enumNames && schemaWithEnumNames.enumNames) {
-      if (true) {
-        console.warn(
-          'The "enumNames" property in the schema is deprecated and will be removed in a future major release. Use the "ui:enumNames" property in the uiSchema instead.'
-        );
-      }
-      enumNames = schemaWithEnumNames.enumNames;
-    }
     return schema.enum.map((value, i) => {
       const label = enumNames?.[i] || String(value);
       return { label, value };
@@ -1247,11 +1451,24 @@ function optionsList(schema, uiSchema) {
     altSchemas = schema.oneOf;
     altUiSchemas = uiSchema?.oneOf;
   }
+  let selectorField = getDiscriminatorFieldFromSchema(schema);
+  if (uiSchema) {
+    const { optionsSchemaSelector = selectorField } = getUiOptions(uiSchema);
+    selectorField = optionsSchemaSelector;
+  }
   return altSchemas && altSchemas.map((aSchemaDef, index) => {
     const { title } = getUiOptions(altUiSchemas?.[index]);
     const aSchema = aSchemaDef;
-    const value = toConstant(aSchema);
-    const label = title || aSchema.title || String(value);
+    let value;
+    let label = title;
+    if (selectorField) {
+      const innerSchema = (0, import_get10.default)(aSchema, [PROPERTIES_KEY, selectorField], {});
+      value = (0, import_get10.default)(innerSchema, DEFAULT_KEY, (0, import_get10.default)(innerSchema, CONST_KEY));
+      label = label || innerSchema?.title || aSchema.title || String(value);
+    } else {
+      value = toConstant(aSchema);
+      label = label || aSchema.title || String(value);
+    }
     return {
       schema: aSchema,
       label,
@@ -1286,10 +1503,10 @@ function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValu
     const isSelfOrParentRequired = isParentRequired === void 0 ? requiredFields.includes(key) : isParentRequired;
     if (isObject(computedDefault)) {
       if (emptyObjectFields === "skipEmptyDefaults") {
-        if (!(0, import_isEmpty.default)(computedDefault)) {
+        if (!(0, import_isEmpty3.default)(computedDefault)) {
           obj[key] = computedDefault;
         }
-      } else if ((!(0, import_isEmpty.default)(computedDefault) || requiredFields.includes(key)) && (isSelfOrParentRequired || emptyObjectFields !== "populateRequiredDefaults")) {
+      } else if ((!(0, import_isEmpty3.default)(computedDefault) || requiredFields.includes(key)) && (isSelfOrParentRequired || emptyObjectFields !== "populateRequiredDefaults")) {
         obj[key] = computedDefault;
       }
     } else if (
@@ -1473,7 +1690,7 @@ function getObjectDefaults(validator, rawSchema, {
     const parentConst = retrievedSchema[CONST_KEY];
     const objectDefaults = Object.keys(retrievedSchema.properties || {}).reduce(
       (acc, key) => {
-        const propertySchema = (0, import_get7.default)(retrievedSchema, [PROPERTIES_KEY, key]);
+        const propertySchema = (0, import_get11.default)(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, {
@@ -1482,8 +1699,8 @@ function getObjectDefaults(validator, rawSchema, {
           experimental_defaultFormStateBehavior,
           experimental_customMergeAllOf,
           includeUndefinedValues: includeUndefinedValues === true,
-          parentDefaults: (0, import_get7.default)(defaults, [key]),
-          rawFormData: (0, import_get7.default)(formData, [key]),
+          parentDefaults: (0, import_get11.default)(defaults, [key]),
+          rawFormData: (0, import_get11.default)(formData, [key]),
           required: retrievedSchema.required?.includes(key),
           shouldMergeDefaultsIntoFormData
         });
@@ -1519,8 +1736,8 @@ function getObjectDefaults(validator, rawSchema, {
           experimental_defaultFormStateBehavior,
           experimental_customMergeAllOf,
           includeUndefinedValues: includeUndefinedValues === true,
-          parentDefaults: (0, import_get7.default)(defaults, [key]),
-          rawFormData: (0, import_get7.default)(formData, [key]),
+          parentDefaults: (0, import_get11.default)(defaults, [key]),
+          rawFormData: (0, import_get11.default)(formData, [key]),
           required: retrievedSchema.required?.includes(key),
           shouldMergeDefaultsIntoFormData
         });
@@ -1581,7 +1798,7 @@ function getArrayDefaults(validator, rawSchema, {
           experimental_defaultFormStateBehavior,
           experimental_customMergeAllOf,
           rawFormData: item,
-          parentDefaults: (0, import_get7.default)(defaults, [idx]),
+          parentDefaults: (0, import_get11.default)(defaults, [idx]),
           required,
           shouldMergeDefaultsIntoFormData
         });
@@ -1621,6 +1838,7 @@ function getArrayDefaults(validator, rawSchema, {
 }
 function getDefaultBasedOnSchemaType(validator, rawSchema, computeDefaultsProps = {}, defaults) {
   switch (getSchemaType(rawSchema)) {
+    // We need to recurse for object schema inner default values.
     case "object": {
       return getObjectDefaults(validator, rawSchema, computeDefaultsProps, defaults);
     }
@@ -1707,45 +1925,29 @@ function getDisplayLabel(validator, schema, uiSchema = {}, rootSchema, globalOpt
   return displayLabel;
 }
 
-// src/schema/mergeValidationData.ts
-var import_isEmpty2 = __toESM(require("lodash/isEmpty"));
-function mergeValidationData(validator, validationData, additionalErrorSchema) {
-  if (!additionalErrorSchema) {
-    return validationData;
-  }
-  const { errors: oldErrors, errorSchema: oldErrorSchema } = validationData;
-  let errors = validator.toErrorList(additionalErrorSchema);
-  let errorSchema = additionalErrorSchema;
-  if (!(0, import_isEmpty2.default)(oldErrorSchema)) {
-    errorSchema = mergeObjects(oldErrorSchema, additionalErrorSchema, true);
-    errors = [...oldErrors].concat(errors);
-  }
-  return { errorSchema, errors };
-}
-
 // src/schema/sanitizeDataForNewSchema.ts
-var import_get8 = __toESM(require("lodash/get"));
-var import_has3 = __toESM(require("lodash/has"));
+var import_get12 = __toESM(require("lodash/get"), 1);
+var import_has5 = __toESM(require("lodash/has"), 1);
 var NO_VALUE = Symbol("no Value");
 function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, data = {}, experimental_customMergeAllOf) {
   let newFormData;
-  if ((0, import_has3.default)(newSchema, PROPERTIES_KEY)) {
+  if ((0, import_has5.default)(newSchema, PROPERTIES_KEY)) {
     const removeOldSchemaData = {};
-    if ((0, import_has3.default)(oldSchema, PROPERTIES_KEY)) {
-      const properties = (0, import_get8.default)(oldSchema, PROPERTIES_KEY, {});
+    if ((0, import_has5.default)(oldSchema, PROPERTIES_KEY)) {
+      const properties = (0, import_get12.default)(oldSchema, PROPERTIES_KEY, {});
       Object.keys(properties).forEach((key) => {
-        if ((0, import_has3.default)(data, key)) {
+        if ((0, import_has5.default)(data, key)) {
           removeOldSchemaData[key] = void 0;
         }
       });
     }
-    const keys2 = Object.keys((0, import_get8.default)(newSchema, PROPERTIES_KEY, {}));
+    const keys2 = Object.keys((0, import_get12.default)(newSchema, PROPERTIES_KEY, {}));
     const nestedData = {};
     keys2.forEach((key) => {
-      const formValue = (0, import_get8.default)(data, key);
-      let oldKeyedSchema = (0, import_get8.default)(oldSchema, [PROPERTIES_KEY, key], {});
-      let newKeyedSchema = (0, import_get8.default)(newSchema, [PROPERTIES_KEY, key], {});
-      if ((0, import_has3.default)(oldKeyedSchema, REF_KEY)) {
+      const formValue = (0, import_get12.default)(data, key);
+      let oldKeyedSchema = (0, import_get12.default)(oldSchema, [PROPERTIES_KEY, key], {});
+      let newKeyedSchema = (0, import_get12.default)(newSchema, [PROPERTIES_KEY, key], {});
+      if ((0, import_has5.default)(oldKeyedSchema, REF_KEY)) {
         oldKeyedSchema = retrieveSchema(
           validator,
           oldKeyedSchema,
@@ -1754,7 +1956,7 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
           experimental_customMergeAllOf
         );
       }
-      if ((0, import_has3.default)(newKeyedSchema, REF_KEY)) {
+      if ((0, import_has5.default)(newKeyedSchema, REF_KEY)) {
         newKeyedSchema = retrieveSchema(
           validator,
           newKeyedSchema,
@@ -1763,10 +1965,10 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
           experimental_customMergeAllOf
         );
       }
-      const oldSchemaTypeForKey = (0, import_get8.default)(oldKeyedSchema, "type");
-      const newSchemaTypeForKey = (0, import_get8.default)(newKeyedSchema, "type");
+      const oldSchemaTypeForKey = (0, import_get12.default)(oldKeyedSchema, "type");
+      const newSchemaTypeForKey = (0, import_get12.default)(newKeyedSchema, "type");
       if (!oldSchemaTypeForKey || oldSchemaTypeForKey === newSchemaTypeForKey) {
-        if ((0, import_has3.default)(removeOldSchemaData, key)) {
+        if ((0, import_has5.default)(removeOldSchemaData, key)) {
           delete removeOldSchemaData[key];
         }
         if (newSchemaTypeForKey === "object" || newSchemaTypeForKey === "array" && Array.isArray(formValue)) {
@@ -1782,17 +1984,17 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
             nestedData[key] = itemData;
           }
         } else {
-          const newOptionDefault = (0, import_get8.default)(newKeyedSchema, "default", NO_VALUE);
-          const oldOptionDefault = (0, import_get8.default)(oldKeyedSchema, "default", NO_VALUE);
+          const newOptionDefault = (0, import_get12.default)(newKeyedSchema, "default", NO_VALUE);
+          const oldOptionDefault = (0, import_get12.default)(oldKeyedSchema, "default", NO_VALUE);
           if (newOptionDefault !== NO_VALUE && newOptionDefault !== formValue) {
             if (oldOptionDefault === formValue) {
               removeOldSchemaData[key] = newOptionDefault;
-            } else if ((0, import_get8.default)(newKeyedSchema, "readOnly") === true) {
+            } else if ((0, import_get12.default)(newKeyedSchema, "readOnly") === true) {
               removeOldSchemaData[key] = void 0;
             }
           }
-          const newOptionConst = (0, import_get8.default)(newKeyedSchema, "const", NO_VALUE);
-          const oldOptionConst = (0, import_get8.default)(oldKeyedSchema, "const", NO_VALUE);
+          const newOptionConst = (0, import_get12.default)(newKeyedSchema, "const", NO_VALUE);
+          const oldOptionConst = (0, import_get12.default)(oldKeyedSchema, "const", NO_VALUE);
           if (newOptionConst !== NO_VALUE && newOptionConst !== formValue) {
             removeOldSchemaData[key] = oldOptionConst === formValue ? newOptionConst : void 0;
           }
@@ -1804,11 +2006,11 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
       ...removeOldSchemaData,
       ...nestedData
     };
-  } else if ((0, import_get8.default)(oldSchema, "type") === "array" && (0, import_get8.default)(newSchema, "type") === "array" && Array.isArray(data)) {
-    let oldSchemaItems = (0, import_get8.default)(oldSchema, "items");
-    let newSchemaItems = (0, import_get8.default)(newSchema, "items");
+  } else if ((0, import_get12.default)(oldSchema, "type") === "array" && (0, import_get12.default)(newSchema, "type") === "array" && Array.isArray(data)) {
+    let oldSchemaItems = (0, import_get12.default)(oldSchema, "items");
+    let newSchemaItems = (0, import_get12.default)(newSchema, "items");
     if (typeof oldSchemaItems === "object" && typeof newSchemaItems === "object" && !Array.isArray(oldSchemaItems) && !Array.isArray(newSchemaItems)) {
-      if ((0, import_has3.default)(oldSchemaItems, REF_KEY)) {
+      if ((0, import_has5.default)(oldSchemaItems, REF_KEY)) {
         oldSchemaItems = retrieveSchema(
           validator,
           oldSchemaItems,
@@ -1817,7 +2019,7 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
           experimental_customMergeAllOf
         );
       }
-      if ((0, import_has3.default)(newSchemaItems, REF_KEY)) {
+      if ((0, import_has5.default)(newSchemaItems, REF_KEY)) {
         newSchemaItems = retrieveSchema(
           validator,
           newSchemaItems,
@@ -1826,10 +2028,10 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
           experimental_customMergeAllOf
         );
       }
-      const oldSchemaType = (0, import_get8.default)(oldSchemaItems, "type");
-      const newSchemaType = (0, import_get8.default)(newSchemaItems, "type");
+      const oldSchemaType = (0, import_get12.default)(oldSchemaItems, "type");
+      const newSchemaType = (0, import_get12.default)(newSchemaItems, "type");
       if (!oldSchemaType || oldSchemaType === newSchemaType) {
-        const maxItems = (0, import_get8.default)(newSchema, "maxItems", -1);
+        const maxItems = (0, import_get12.default)(newSchema, "maxItems", -1);
         if (newSchemaType === "object") {
           newFormData = data.reduce((newValue, aValue) => {
             const itemValue = sanitizeDataForNewSchema(
@@ -1857,58 +2059,60 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
 }
 
 // src/schema/toIdSchema.ts
-var import_get9 = __toESM(require("lodash/get"));
+var import_get13 = __toESM(require("lodash/get"), 1);
 function toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
-  if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
-    const _schema = retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf);
-    const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals(item, _schema));
-    if (sameSchemaIndex === -1) {
+  const $id = id || idPrefix;
+  const idSchema = { $id };
+  if (typeof schema === "object") {
+    if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
+      const _schema = retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf);
+      const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals(item, _schema));
+      if (sameSchemaIndex === -1) {
+        return toIdSchemaInternal(
+          validator,
+          _schema,
+          idPrefix,
+          idSeparator,
+          id,
+          rootSchema,
+          formData,
+          _recurseList.concat(_schema),
+          experimental_customMergeAllOf
+        );
+      }
+    }
+    if (ITEMS_KEY in schema && !(0, import_get13.default)(schema, [ITEMS_KEY, REF_KEY])) {
       return toIdSchemaInternal(
         validator,
-        _schema,
+        (0, import_get13.default)(schema, ITEMS_KEY),
         idPrefix,
         idSeparator,
         id,
         rootSchema,
         formData,
-        _recurseList.concat(_schema),
-        experimental_customMergeAllOf
-      );
-    }
-  }
-  if (ITEMS_KEY in schema && !(0, import_get9.default)(schema, [ITEMS_KEY, REF_KEY])) {
-    return toIdSchemaInternal(
-      validator,
-      (0, import_get9.default)(schema, ITEMS_KEY),
-      idPrefix,
-      idSeparator,
-      id,
-      rootSchema,
-      formData,
-      _recurseList,
-      experimental_customMergeAllOf
-    );
-  }
-  const $id = id || idPrefix;
-  const idSchema = { $id };
-  if (getSchemaType(schema) === "object" && PROPERTIES_KEY in schema) {
-    for (const name in schema.properties) {
-      const field = (0, import_get9.default)(schema, [PROPERTIES_KEY, name]);
-      const fieldId = idSchema[ID_KEY] + idSeparator + name;
-      idSchema[name] = toIdSchemaInternal(
-        validator,
-        isObject(field) ? field : {},
-        idPrefix,
-        idSeparator,
-        fieldId,
-        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
-        (0, import_get9.default)(formData, [name]),
         _recurseList,
         experimental_customMergeAllOf
       );
     }
+    if (getSchemaType(schema) === "object" && PROPERTIES_KEY in schema) {
+      for (const name in schema.properties) {
+        const field = schema[PROPERTIES_KEY][name];
+        const fieldId = idSchema[ID_KEY] + idSeparator + name;
+        idSchema[name] = toIdSchemaInternal(
+          validator,
+          field,
+          idPrefix,
+          idSeparator,
+          fieldId,
+          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
+          (0, import_get13.default)(formData, [name]),
+          _recurseList,
+          experimental_customMergeAllOf
+        );
+      }
+    }
   }
   return idSchema;
 }
@@ -1927,8 +2131,8 @@ function toIdSchema(validator, schema, id, rootSchema, formData, idPrefix = "roo
 }
 
 // src/schema/toPathSchema.ts
-var import_get10 = __toESM(require("lodash/get"));
-var import_set2 = __toESM(require("lodash/set"));
+var import_get14 = __toESM(require("lodash/get"), 1);
+var import_set2 = __toESM(require("lodash/set"), 1);
 function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
   if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
     const _schema = retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf);
@@ -2020,7 +2224,7 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
     }
   } else if (PROPERTIES_KEY in schema) {
     for (const property in schema.properties) {
-      const field = (0, import_get10.default)(schema, [PROPERTIES_KEY, property]);
+      const field = (0, import_get14.default)(schema, [PROPERTIES_KEY, property], {});
       pathSchema[property] = toPathSchemaInternal(
         validator,
         field,
@@ -2028,7 +2232,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
-        (0, import_get10.default)(formData, [property]),
+        (0, import_get14.default)(formData, [property]),
         _recurseList,
         experimental_customMergeAllOf
       );
@@ -2078,6 +2282,47 @@ var SchemaUtils = class {
     }
     return this.validator !== validator || !deepEquals(this.rootSchema, rootSchema) || !deepEquals(this.experimental_defaultFormStateBehavior, experimental_defaultFormStateBehavior) || this.experimental_customMergeAllOf !== experimental_customMergeAllOf;
   }
+  /** Finds the field specified by the `path` within the root or recursed `schema`. If there is no field for the specified
+   * `path`, then the default `{ field: undefined, isRequired: undefined }` is returned. It determines whether a leaf
+   * field is in the `required` list for its parent and if so, it is marked as required on return.
+   *
+   * @param schema - The current node within the JSON schema
+   * @param path - The remaining keys in the path to the desired field
+   * @param [formData] - The form data that is used to determine which oneOf option
+   * @returns - An object that contains the field and its required state. If no field can be found then
+   *            `{ field: undefined, isRequired: undefined }` is returned.
+   */
+  findFieldInSchema(schema, path, formData) {
+    return findFieldInSchema(
+      this.validator,
+      this.rootSchema,
+      schema,
+      path,
+      formData,
+      this.experimental_customMergeAllOf
+    );
+  }
+  /** Finds the oneOf option inside the `schema['any/oneOf']` list which has the `properties[selectorField].default` that
+   * matches the `formData[selectorField]` value. For the purposes of this function, `selectorField` is either
+   * `schema.discriminator.propertyName` or `fallbackField`.
+   *
+   * @param schema - The schema element in which to search for the selected oneOf option
+   * @param fallbackField - The field to use as a backup selector field if the schema does not have a required field
+   * @param xxx - Either `oneOf` or `anyOf`, defines which value is being sought
+   * @param [formData={}] - The form data that is used to determine which oneOf option
+   * @returns - The anyOf/oneOf option that matches the selector field in the schema or undefined if nothing is selected
+   */
+  findSelectedOptionInXxxOf(schema, fallbackField, xxx, formData) {
+    return findSelectedOptionInXxxOf(
+      this.validator,
+      this.rootSchema,
+      schema,
+      fallbackField,
+      xxx,
+      formData,
+      this.experimental_customMergeAllOf
+    );
+  }
   /** Returns the superset of `formData` that includes the given set updated to include any missing fields that have
    * computed to have defaults provided in the `schema`.
    *
@@ -2153,18 +2398,16 @@ var SchemaUtils = class {
   getFirstMatchingOption(formData, options, discriminatorField) {
     return getFirstMatchingOption(this.validator, formData, options, this.rootSchema, discriminatorField);
   }
-  /** Given the `formData` and list of `options`, attempts to find the index of the option that best matches the data.
-   * Deprecated, use `getFirstMatchingOption()` instead.
-   *
-   * @param formData - The current formData, if any, onto which to provide any missing defaults
-   * @param options - The list of options to find a matching options from
-   * @param [discriminatorField] - The optional name of the field within the options object whose value is used to
-   *          determine which option is selected
-   * @returns - The index of the matched option or 0 if none is available
-   * @deprecated
-   */
-  getMatchingOption(formData, options, discriminatorField) {
-    return getMatchingOption(this.validator, formData, options, this.rootSchema, discriminatorField);
+  getFromSchema(schema, path, defaultValue) {
+    return getFromSchema(
+      this.validator,
+      this.rootSchema,
+      schema,
+      path,
+      // @ts-expect-error TS2769: No overload matches this call
+      defaultValue,
+      this.experimental_customMergeAllOf
+    );
   }
   /** Checks to see if the `schema` and `uiSchema` combination represents an array of files
    *
@@ -2191,20 +2434,6 @@ var SchemaUtils = class {
   isSelect(schema) {
     return isSelect(this.validator, schema, this.rootSchema, this.experimental_customMergeAllOf);
   }
-  /** Merges the errors in `additionalErrorSchema` into the existing `validationData` by combining the hierarchies in
-   * the two `ErrorSchema`s and then appending the error list from the `additionalErrorSchema` obtained by calling
-   * `getValidator().toErrorList()` onto the `errors` in the `validationData`. If no `additionalErrorSchema` is passed,
-   * then `validationData` is returned.
-   *
-   * @param validationData - The current `ValidationData` into which to merge the additional errors
-   * @param [additionalErrorSchema] - The additional set of errors
-   * @returns - The `validationData` with the additional errors from `additionalErrorSchema` merged into it, if provided.
-   * @deprecated - Use the `validationDataMerge()` function exported from `@rjsf/utils` instead. This function will be
-   *        removed in the next major release.
-   */
-  mergeValidationData(validationData, additionalErrorSchema) {
-    return mergeValidationData(this.validator, validationData, additionalErrorSchema);
-  }
   /** Retrieves an expanded schema that has had all of its conditions, additional properties, references and
    * dependencies resolved and merged into the `schema` given a `rawFormData` that is used to do the potentially
    * recursive resolution.
@@ -2407,7 +2636,7 @@ function enumOptionsIndexForValue(value, allEnumOptions = [], multiple = false)
 }
 
 // src/enumOptionsSelectValue.ts
-var import_isNil2 = __toESM(require("lodash/isNil"));
+var import_isNil2 = __toESM(require("lodash/isNil"), 1);
 function enumOptionsSelectValue(valueIndex, selected, allEnumOptions = []) {
   const value = enumOptionsValueForIndex(valueIndex, allEnumOptions);
   if (!(0, import_isNil2.default)(value)) {
@@ -2420,10 +2649,10 @@ function enumOptionsSelectValue(valueIndex, selected, allEnumOptions = []) {
 }
 
 // src/ErrorSchemaBuilder.ts
-var import_cloneDeep = __toESM(require("lodash/cloneDeep"));
-var import_get11 = __toESM(require("lodash/get"));
-var import_set3 = __toESM(require("lodash/set"));
-var import_setWith = __toESM(require("lodash/setWith"));
+var import_cloneDeep = __toESM(require("lodash/cloneDeep"), 1);
+var import_get15 = __toESM(require("lodash/get"), 1);
+var import_set3 = __toESM(require("lodash/set"), 1);
+var import_setWith = __toESM(require("lodash/setWith"), 1);
 var ErrorSchemaBuilder = class {
   /** Construct an `ErrorSchemaBuilder` with an optional initial set of errors in an `ErrorSchema`.
    *
@@ -2450,7 +2679,7 @@ var ErrorSchemaBuilder = class {
    */
   getOrCreateErrorBlock(pathOfError) {
     const hasPath = Array.isArray(pathOfError) && pathOfError.length > 0 || typeof pathOfError === "string";
-    let errorBlock = hasPath ? (0, import_get11.default)(this.errorSchema, pathOfError) : this.errorSchema;
+    let errorBlock = hasPath ? (0, import_get15.default)(this.errorSchema, pathOfError) : this.errorSchema;
     if (!errorBlock && pathOfError) {
       errorBlock = {};
       (0, import_setWith.default)(this.errorSchema, pathOfError, errorBlock, Object);
@@ -2476,7 +2705,7 @@ var ErrorSchemaBuilder = class {
    */
   addErrors(errorOrList, pathOfError) {
     const errorBlock = this.getOrCreateErrorBlock(pathOfError);
-    let errorsList = (0, import_get11.default)(errorBlock, ERRORS_KEY);
+    let errorsList = (0, import_get15.default)(errorBlock, ERRORS_KEY);
     if (!Array.isArray(errorsList)) {
       errorsList = [];
       errorBlock[ERRORS_KEY] = errorsList;
@@ -2612,6 +2841,10 @@ function getTemplate(name, registry, uiOptions = {}) {
   if (name === "ButtonTemplates") {
     return templates[name];
   }
+  if (Object.hasOwn(uiOptions, name) && typeof uiOptions[name] === "string" && Object.hasOwn(templates, uiOptions[name])) {
+    const key = uiOptions[name];
+    return templates[key];
+  }
   return (
     // Evaluating uiOptions[name] results in TS2590: Expression produces a union type that is too complex to represent
     // To avoid that, we cast uiOptions to `any` before accessing the name field
@@ -2619,11 +2852,32 @@ function getTemplate(name, registry, uiOptions = {}) {
   );
 }
 
+// src/getTestIds.ts
+var import_nanoid = require("nanoid");
+var import_get16 = __toESM(require("lodash/get"), 1);
+function getTestIds() {
+  if (typeof process === "undefined" || (0, import_get16.default)(process, "env.NODE_ENV") !== "test") {
+    return {};
+  }
+  const ids = /* @__PURE__ */ new Map();
+  return new Proxy(
+    {},
+    {
+      get(_obj, prop) {
+        if (!ids.has(prop)) {
+          ids.set(prop, (0, import_nanoid.nanoid)());
+        }
+        return ids.get(prop);
+      }
+    }
+  );
+}
+
 // src/getWidget.tsx
 var import_react = require("react");
-var import_react_is = __toESM(require("react-is"));
-var import_get12 = __toESM(require("lodash/get"));
-var import_set4 = __toESM(require("lodash/set"));
+var import_react_is = __toESM(require("react-is"), 1);
+var import_get17 = __toESM(require("lodash/get"), 1);
+var import_set4 = __toESM(require("lodash/set"), 1);
 var import_jsx_runtime = require("react/jsx-runtime");
 var widgetMap = {
   boolean: {
@@ -2678,7 +2932,7 @@ var widgetMap = {
   }
 };
 function mergeWidgetOptions(AWidget) {
-  let MergedWidget = (0, import_get12.default)(AWidget, "MergedWidget");
+  let MergedWidget = (0, import_get17.default)(AWidget, "MergedWidget");
   if (!MergedWidget) {
     const defaultOptions = AWidget.defaultProps && AWidget.defaultProps.options || {};
     MergedWidget = ({ options, ...props }) => {
@@ -2722,10 +2976,16 @@ function hashString(string) {
   }
   return hash.toString(16);
 }
-function hashForSchema(schema) {
+function sortedJSONStringify(object) {
   const allKeys = /* @__PURE__ */ new Set();
-  JSON.stringify(schema, (key, value) => (allKeys.add(key), value));
-  return hashString(JSON.stringify(schema, Array.from(allKeys).sort()));
+  JSON.stringify(object, (key, value) => (allKeys.add(key), value));
+  return JSON.stringify(object, Array.from(allKeys).sort());
+}
+function hashObject(object) {
+  return hashString(sortedJSONStringify(object));
+}
+function hashForSchema(schema) {
+  return hashObject(schema);
 }
 
 // src/hasWidget.ts
@@ -2743,7 +3003,7 @@ function hasWidget(schema, widget, registeredWidgets = {}) {
 }
 
 // src/idGenerators.ts
-var import_isString4 = __toESM(require("lodash/isString"));
+var import_isString4 = __toESM(require("lodash/isString"), 1);
 function idGenerator(id, suffix) {
   const theId = (0, import_isString4.default)(id) ? id : id[ID_KEY];
   return `${theId}__${suffix}`;
@@ -2770,6 +3030,9 @@ function ariaDescribedByIds(id, includeExamples = false) {
 function optionId(id, optionIndex) {
   return `${id}-${optionIndex}`;
 }
+function buttonId(id, btn) {
+  return idGenerator(id, btn);
+}
 
 // src/labelValue.ts
 function labelValue(label, hideLabel, fallback) {
@@ -2781,6 +3044,17 @@ function localToUTC(dateString) {
   return dateString ? new Date(dateString).toJSON() : void 0;
 }
 
+// src/lookupFromFormContext.ts
+var import_get18 = __toESM(require("lodash/get"), 1);
+var import_has6 = __toESM(require("lodash/has"), 1);
+function lookupFromFormContext(regOrFc, toLookup, fallback) {
+  const lookupPath = [LOOKUP_MAP_NAME];
+  if ((0, import_has6.default)(regOrFc, FORM_CONTEXT_NAME)) {
+    lookupPath.unshift(FORM_CONTEXT_NAME);
+  }
+  return (0, import_get18.default)(regOrFc, [...lookupPath, toLookup], fallback);
+}
+
 // src/orderProperties.ts
 function orderProperties(properties, order) {
   if (!Array.isArray(order)) {
@@ -2873,7 +3147,7 @@ function toDateString(dateObject, time = true) {
 }
 
 // src/toErrorList.ts
-var import_isPlainObject2 = __toESM(require("lodash/isPlainObject"));
+var import_isPlainObject2 = __toESM(require("lodash/isPlainObject"), 1);
 function toErrorList(errorSchema, fieldPath = []) {
   if (!errorSchema) {
     return [];
@@ -2903,7 +3177,7 @@ function toErrorList(errorSchema, fieldPath = []) {
 }
 
 // src/toErrorSchema.ts
-var import_toPath = __toESM(require("lodash/toPath"));
+var import_toPath = __toESM(require("lodash/toPath"), 1);
 function toErrorSchema(errors) {
   const builder = new ErrorSchemaBuilder();
   if (errors.length) {
@@ -2922,7 +3196,7 @@ function toErrorSchema(errors) {
 }
 
 // src/unwrapErrorHandler.ts
-var import_isPlainObject3 = __toESM(require("lodash/isPlainObject"));
+var import_isPlainObject3 = __toESM(require("lodash/isPlainObject"), 1);
 function unwrapErrorHandler(errorHandler) {
   return Object.keys(errorHandler).reduce((acc, key) => {
     if (key === "addError") {
@@ -2957,7 +3231,7 @@ function utcToLocal(jsonDate) {
 }
 
 // src/validationDataMerge.ts
-var import_isEmpty3 = __toESM(require("lodash/isEmpty"));
+var import_isEmpty4 = __toESM(require("lodash/isEmpty"), 1);
 function validationDataMerge(validationData, additionalErrorSchema) {
   if (!additionalErrorSchema) {
     return validationData;
@@ -2965,7 +3239,7 @@ function validationDataMerge(validationData, additionalErrorSchema) {
   const { errors: oldErrors, errorSchema: oldErrorSchema } = validationData;
   let errors = toErrorList(additionalErrorSchema);
   let errorSchema = additionalErrorSchema;
-  if (!(0, import_isEmpty3.default)(oldErrorSchema)) {
+  if (!(0, import_isEmpty4.default)(oldErrorSchema)) {
     errorSchema = mergeObjects(oldErrorSchema, additionalErrorSchema, true);
     errors = [...oldErrors].concat(errors);
   }
@@ -2973,7 +3247,7 @@ function validationDataMerge(validationData, additionalErrorSchema) {
 }
 
 // src/withIdRefPrefix.ts
-var import_isObject11 = __toESM(require("lodash/isObject"));
+var import_isObject10 = __toESM(require("lodash/isObject"), 1);
 function withIdRefPrefixObject(node) {
   for (const key in node) {
     const realObj = node;
@@ -2996,18 +3270,18 @@ function withIdRefPrefix(schemaNode) {
   if (Array.isArray(schemaNode)) {
     return withIdRefPrefixArray([...schemaNode]);
   }
-  if ((0, import_isObject11.default)(schemaNode)) {
+  if ((0, import_isObject10.default)(schemaNode)) {
     return withIdRefPrefixObject({ ...schemaNode });
   }
   return schemaNode;
 }
 
 // src/getChangedFields.ts
-var import_keys = __toESM(require("lodash/keys"));
-var import_pickBy = __toESM(require("lodash/pickBy"));
-var import_isPlainObject4 = __toESM(require("lodash/isPlainObject"));
-var import_get13 = __toESM(require("lodash/get"));
-var import_difference = __toESM(require("lodash/difference"));
+var import_keys = __toESM(require("lodash/keys"), 1);
+var import_pickBy = __toESM(require("lodash/pickBy"), 1);
+var import_isPlainObject4 = __toESM(require("lodash/isPlainObject"), 1);
+var import_get19 = __toESM(require("lodash/get"), 1);
+var import_difference = __toESM(require("lodash/difference"), 1);
 function getChangedFields(a, b) {
   const aIsPlainObject = (0, import_isPlainObject4.default)(a);
   const bIsPlainObject = (0, import_isPlainObject4.default)(b);
@@ -3019,7 +3293,7 @@ function getChangedFields(a, b) {
   } else if (!aIsPlainObject && bIsPlainObject) {
     return (0, import_keys.default)(b);
   } else {
-    const unequalFields = (0, import_keys.default)((0, import_pickBy.default)(a, (value, key) => !deepEquals(value, (0, import_get13.default)(b, key))));
+    const unequalFields = (0, import_keys.default)((0, import_pickBy.default)(a, (value, key) => !deepEquals(value, (0, import_get19.default)(b, key))));
     const diffFields = (0, import_difference.default)((0, import_keys.default)(b), (0, import_keys.default)(a));
     return [...unequalFields, ...diffFields];
   }
@@ -3029,6 +3303,7 @@ function getChangedFields(a, b) {
 var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
   TranslatableString2["ArrayItemTitle"] = "Item";
   TranslatableString2["MissingItems"] = "Missing items definition";
+  TranslatableString2["EmptyArray"] = "No items yet. Use the button below to add some.";
   TranslatableString2["YesLabel"] = "Yes";
   TranslatableString2["NoLabel"] = "No";
   TranslatableString2["CloseLabel"] = "Close";
@@ -3060,10 +3335,10 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
 })(TranslatableString || {});
 
 // src/parser/schemaParser.ts
-var import_forEach = __toESM(require("lodash/forEach"));
+var import_forEach = __toESM(require("lodash/forEach"), 1);
 
 // src/parser/ParserValidator.ts
-var import_get14 = __toESM(require("lodash/get"));
+var import_get20 = __toESM(require("lodash/get"), 1);
 var ParserValidator = class {
   /** Construct the ParserValidator for the given `rootSchema`. This `rootSchema` will be stashed in the `schemaMap`
    * first.
@@ -3089,7 +3364,7 @@ var ParserValidator = class {
    * @param hash - The hash value at which to map the schema
    */
   addSchema(schema, hash) {
-    const key = (0, import_get14.default)(schema, ID_KEY, hash);
+    const key = (0, import_get20.default)(schema, ID_KEY, hash);
     const identifiedSchema = { ...schema, [ID_KEY]: key };
     const existing = this.schemaMap[key];
     if (!existing) {