@rjsf/utils 6.0.0-beta.20 → 6.0.0-beta.22

package/dist/index.cjs

@@ -71,6 +71,7 @@ __export(index_exports, {
   allowAdditionalItems: () => allowAdditionalItems,
   ariaDescribedByIds: () => ariaDescribedByIds,
   asNumber: () => asNumber,
+  bracketNameGenerator: () => bracketNameGenerator,
   buttonId: () => buttonId,
   canExpand: () => canExpand,
   createErrorHandler: () => createErrorHandler,
@@ -79,6 +80,7 @@ __export(index_exports, {
   dateRangeOptions: () => dateRangeOptions,
   deepEquals: () => deepEquals,
   descriptionId: () => descriptionId,
+  dotNotationNameGenerator: () => dotNotationNameGenerator,
   englishStringTranslator: () => englishStringTranslator,
   enumOptionsDeselectValue: () => enumOptionsDeselectValue,
   enumOptionsIndexForValue: () => enumOptionsIndexForValue,
@@ -116,8 +118,10 @@ __export(index_exports, {
   isCustomWidget: () => isCustomWidget,
   isFilesArray: () => isFilesArray,
   isFixedItems: () => isFixedItems,
+  isFormDataAvailable: () => isFormDataAvailable,
   isMultiSelect: () => isMultiSelect,
   isObject: () => isObject,
+  isRootSchema: () => isRootSchema,
   isSelect: () => isSelect,
   labelValue: () => labelValue,
   localToUTC: () => localToUTC,
@@ -126,6 +130,7 @@ __export(index_exports, {
   mergeObjects: () => mergeObjects,
   mergeSchemas: () => mergeSchemas,
   optionId: () => optionId,
+  optionalControlsId: () => optionalControlsId,
   optionsList: () => optionsList,
   orderProperties: () => orderProperties,
   pad: () => pad,
@@ -138,6 +143,7 @@ __export(index_exports, {
   schemaRequiresTrueValue: () => schemaRequiresTrueValue,
   shallowEquals: () => shallowEquals,
   shouldRender: () => shouldRender,
+  shouldRenderOptionalField: () => shouldRenderOptionalField,
   sortedJSONStringify: () => sortedJSONStringify,
   titleId: () => titleId,
   toConstant: () => toConstant,
@@ -147,6 +153,7 @@ __export(index_exports, {
   toFieldPathId: () => toFieldPathId,
   toPathSchema: () => toPathSchema,
   unwrapErrorHandler: () => unwrapErrorHandler,
+  useDeepCompareMemo: () => useDeepCompareMemo,
   utcToLocal: () => utcToLocal,
   validationDataMerge: () => validationDataMerge,
   withIdRefPrefix: () => withIdRefPrefix
@@ -590,7 +597,7 @@ function getFirstMatchingOption(validator, formData, options, rootSchema, discri
 
 // src/schema/retrieveSchema.ts
 var import_isEmpty2 = __toESM(require("lodash/isEmpty"), 1);
-function retrieveSchema(validator, schema, rootSchema = {}, rawFormData, experimental_customMergeAllOf) {
+function retrieveSchema(validator, schema, rootSchema = {}, rawFormData, experimental_customMergeAllOf, resolveAnyOfOrOneOfRefs = false) {
   return retrieveSchemaInternal(
     validator,
     schema,
@@ -598,7 +605,8 @@ function retrieveSchema(validator, schema, rootSchema = {}, rawFormData, experim
     rawFormData,
     void 0,
     void 0,
-    experimental_customMergeAllOf
+    experimental_customMergeAllOf,
+    resolveAnyOfOrOneOfRefs
   )[0];
 }
 function resolveCondition(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
@@ -687,7 +695,7 @@ function getMatchingPatternProperties(schema, key) {
     {}
   );
 }
-function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
+function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf, resolveAnyOfOrOneOfRefs) {
   const updatedSchemas = resolveReference(
     validator,
     schema,
@@ -695,7 +703,8 @@ function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurse
     expandAllBranches,
     recurseList,
     formData,
-    experimental_customMergeAllOf
+    experimental_customMergeAllOf,
+    resolveAnyOfOrOneOfRefs
   );
   if (updatedSchemas.length > 1 || updatedSchemas[0] !== schema) {
     return updatedSchemas;
@@ -722,7 +731,7 @@ function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurse
       );
     });
   }
-  if (ALL_OF_KEY in schema && Array.isArray(schema.allOf)) {
+  if (ALL_OF_KEY in schema && Array.isArray(schema[ALL_OF_KEY])) {
     const allOfSchemaElements = schema.allOf.map(
       (allOfSubschema) => retrieveSchemaInternal(
         validator,
@@ -742,8 +751,8 @@ function resolveSchema(validator, schema, rootSchema, expandAllBranches, recurse
   }
   return [schema];
 }
-function resolveReference(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf) {
-  const updatedSchema = resolveAllReferences(schema, rootSchema, recurseList);
+function resolveReference(validator, schema, rootSchema, expandAllBranches, recurseList, formData, experimental_customMergeAllOf, resolveAnyOfOrOneOfRefs) {
+  const updatedSchema = resolveAllReferences(schema, rootSchema, recurseList, void 0, resolveAnyOfOrOneOfRefs);
   if (updatedSchema !== schema) {
     return retrieveSchemaInternal(
       validator,
@@ -752,12 +761,13 @@ function resolveReference(validator, schema, rootSchema, expandAllBranches, recu
       formData,
       expandAllBranches,
       recurseList,
-      experimental_customMergeAllOf
+      experimental_customMergeAllOf,
+      resolveAnyOfOrOneOfRefs
     );
   }
   return [schema];
 }
-function resolveAllReferences(schema, rootSchema, recurseList, baseURI) {
+function resolveAllReferences(schema, rootSchema, recurseList, baseURI, resolveAnyOfOrOneOfRefs) {
   if (!isObject(schema)) {
     return schema;
   }
@@ -780,7 +790,7 @@ function resolveAllReferences(schema, rootSchema, recurseList, baseURI) {
       resolvedSchema[PROPERTIES_KEY],
       (result, value, key) => {
         const childList = [...recurseList];
-        result[key] = resolveAllReferences(value, rootSchema, childList, baseURI);
+        result[key] = resolveAllReferences(value, rootSchema, childList, baseURI, resolveAnyOfOrOneOfRefs);
         childrenLists.push(childList);
       },
       {}
@@ -791,9 +801,28 @@ function resolveAllReferences(schema, rootSchema, recurseList, baseURI) {
   if (ITEMS_KEY in resolvedSchema && !Array.isArray(resolvedSchema.items) && typeof resolvedSchema.items !== "boolean") {
     resolvedSchema = {
       ...resolvedSchema,
-      items: resolveAllReferences(resolvedSchema.items, rootSchema, recurseList, baseURI)
+      items: resolveAllReferences(resolvedSchema.items, rootSchema, recurseList, baseURI, resolveAnyOfOrOneOfRefs)
     };
   }
+  if (resolveAnyOfOrOneOfRefs) {
+    let key;
+    let schemas;
+    if (ANY_OF_KEY in schema && Array.isArray(schema[ANY_OF_KEY])) {
+      key = ANY_OF_KEY;
+      schemas = resolvedSchema[ANY_OF_KEY];
+    } else if (ONE_OF_KEY in schema && Array.isArray(schema[ONE_OF_KEY])) {
+      key = ONE_OF_KEY;
+      schemas = resolvedSchema[ONE_OF_KEY];
+    }
+    if (key && schemas) {
+      resolvedSchema = {
+        ...resolvedSchema,
+        [key]: schemas.map(
+          (s) => resolveAllReferences(s, rootSchema, recurseList, baseURI, resolveAnyOfOrOneOfRefs)
+        )
+      };
+    }
+  }
   return deepEquals(schema, resolvedSchema) ? schema : resolvedSchema;
 }
 function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFormData, experimental_customMergeAllOf) {
@@ -821,7 +850,7 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
       }
     }
     if (ADDITIONAL_PROPERTIES_KEY in schema && schema.additionalProperties !== false) {
-      let additionalProperties = {};
+      let additionalProperties;
       if (typeof schema.additionalProperties !== "boolean") {
         if (REF_KEY in schema.additionalProperties) {
           additionalProperties = retrieveSchema(
@@ -853,7 +882,7 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
   });
   return schema;
 }
-function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expandAllBranches = false, recurseList = [], experimental_customMergeAllOf) {
+function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expandAllBranches = false, recurseList = [], experimental_customMergeAllOf, resolveAnyOfOrOneOfRefs) {
   if (!isObject(schema)) {
     return [{}];
   }
@@ -864,7 +893,8 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
     expandAllBranches,
     recurseList,
     rawFormData,
-    experimental_customMergeAllOf
+    experimental_customMergeAllOf,
+    resolveAnyOfOrOneOfRefs
   );
   return resolvedSchemas.flatMap((s) => {
     let resolvedSchema = s;
@@ -1635,7 +1665,8 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
     experimental_defaultFormStateBehavior = void 0,
     experimental_customMergeAllOf = void 0,
     required,
-    shouldMergeDefaultsIntoFormData = false
+    shouldMergeDefaultsIntoFormData = false,
+    initialDefaultsGenerated
   } = computeDefaultsProps;
   let formData = isObject(rawFormData) ? rawFormData : {};
   const schema = isObject(rawSchema) ? rawSchema : {};
@@ -1740,7 +1771,8 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
       parentDefaults: defaults,
       rawFormData: rawFormData ?? formData,
       required,
-      shouldMergeDefaultsIntoFormData
+      shouldMergeDefaultsIntoFormData,
+      initialDefaultsGenerated
     });
   }
   if (defaults === void 0) {
@@ -1792,7 +1824,8 @@ function getObjectDefaults(validator, rawSchema, {
   experimental_defaultFormStateBehavior = void 0,
   experimental_customMergeAllOf = void 0,
   required,
-  shouldMergeDefaultsIntoFormData
+  shouldMergeDefaultsIntoFormData,
+  initialDefaultsGenerated
 } = {}, defaults) {
   {
     const formData = isObject(rawFormData) ? rawFormData : {};
@@ -1813,7 +1846,8 @@ function getObjectDefaults(validator, rawSchema, {
           parentDefaults: (0, import_get12.default)(defaults, [key]),
           rawFormData: (0, import_get12.default)(formData, [key]),
           required: retrievedSchema.required?.includes(key),
-          shouldMergeDefaultsIntoFormData
+          shouldMergeDefaultsIntoFormData,
+          initialDefaultsGenerated
         });
         maybeAddDefaultToObject(
           acc,
@@ -1829,7 +1863,7 @@ function getObjectDefaults(validator, rawSchema, {
       },
       {}
     );
-    if (retrievedSchema.additionalProperties) {
+    if (retrievedSchema.additionalProperties && !initialDefaultsGenerated) {
       const additionalPropertiesSchema = isObject(retrievedSchema.additionalProperties) ? retrievedSchema.additionalProperties : {};
       const keys2 = /* @__PURE__ */ new Set();
       if (isObject(defaults)) {
@@ -1850,7 +1884,8 @@ function getObjectDefaults(validator, rawSchema, {
           parentDefaults: (0, import_get12.default)(defaults, [key]),
           rawFormData: (0, import_get12.default)(formData, [key]),
           required: retrievedSchema.required?.includes(key),
-          shouldMergeDefaultsIntoFormData
+          shouldMergeDefaultsIntoFormData,
+          initialDefaultsGenerated
         });
         maybeAddDefaultToObject(
           objectDefaults,
@@ -1872,7 +1907,9 @@ function getArrayDefaults(validator, rawSchema, {
   experimental_defaultFormStateBehavior = void 0,
   experimental_customMergeAllOf = void 0,
   required,
-  shouldMergeDefaultsIntoFormData
+  requiredAsRoot = false,
+  shouldMergeDefaultsIntoFormData,
+  initialDefaultsGenerated
 } = {}, defaults) {
   const schema = rawSchema;
   const arrayMinItemsStateBehavior = experimental_defaultFormStateBehavior?.arrayMinItems ?? {};
@@ -1893,7 +1930,8 @@ function getArrayDefaults(validator, rawSchema, {
         experimental_customMergeAllOf,
         parentDefaults: item,
         required,
-        shouldMergeDefaultsIntoFormData
+        shouldMergeDefaultsIntoFormData,
+        initialDefaultsGenerated
       });
     });
   }
@@ -1911,7 +1949,8 @@ function getArrayDefaults(validator, rawSchema, {
           rawFormData: item,
           parentDefaults: (0, import_get12.default)(defaults, [idx]),
           required,
-          shouldMergeDefaultsIntoFormData
+          shouldMergeDefaultsIntoFormData,
+          initialDefaultsGenerated
         });
       });
       const mergeExtraDefaults = (ignoreMinItemsFlagSet && required || isPopulateAll) && arrayMergeExtraDefaults;
@@ -1930,7 +1969,7 @@ function getArrayDefaults(validator, rawSchema, {
   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 ? defaults : emptyDefault;
+    arrayDefault = defaults || !required && !requiredAsRoot ? defaults : emptyDefault;
   } else {
     const defaultEntries = defaults || [];
     const fillerSchema = getInnerSchemaForArrayItem(schema, 1 /* Invert */);
@@ -1962,7 +2001,7 @@ function getDefaultBasedOnSchemaType(validator, rawSchema, computeDefaultsProps
     }
   }
 }
-function getDefaultFormState(validator, theSchema, formData, rootSchema, includeUndefinedValues = false, experimental_defaultFormStateBehavior, experimental_customMergeAllOf) {
+function getDefaultFormState(validator, theSchema, formData, rootSchema, includeUndefinedValues = false, experimental_defaultFormStateBehavior, experimental_customMergeAllOf, initialDefaultsGenerated) {
   if (!isObject(theSchema)) {
     throw new Error("Invalid schema: " + theSchema);
   }
@@ -1973,7 +2012,9 @@ function getDefaultFormState(validator, theSchema, formData, rootSchema, include
     experimental_defaultFormStateBehavior,
     experimental_customMergeAllOf,
     rawFormData: formData,
-    shouldMergeDefaultsIntoFormData: true
+    shouldMergeDefaultsIntoFormData: true,
+    initialDefaultsGenerated,
+    requiredAsRoot: true
   });
   if (schema.type !== "object" && isObject(schema.default)) {
     return {
@@ -2392,9 +2433,10 @@ var SchemaUtils = class {
    * @param [includeUndefinedValues=false] - Optional flag, if true, cause undefined values to be added as defaults.
    *          If "excludeObjectChildren", pass `includeUndefinedValues` as false when computing defaults for any nested
    *          object properties.
+   * @param initialDefaultsGenerated - Indicates whether or not initial defaults have been generated
    * @returns - The resulting `formData` with all the defaults provided
    */
-  getDefaultFormState(schema, formData, includeUndefinedValues = false) {
+  getDefaultFormState(schema, formData, includeUndefinedValues = false, initialDefaultsGenerated) {
     return getDefaultFormState(
       this.validator,
       schema,
@@ -2402,7 +2444,8 @@ var SchemaUtils = class {
       this.rootSchema,
       includeUndefinedValues,
       this.experimental_defaultFormStateBehavior,
-      this.experimental_customMergeAllOf
+      this.experimental_customMergeAllOf,
+      initialDefaultsGenerated
     );
   }
   /** Determines whether the combination of `schema` and `uiSchema` properties indicates that the label for the `schema`
@@ -2501,15 +2544,17 @@ var SchemaUtils = class {
    *
    * @param schema - The schema for which retrieving a schema is desired
    * @param [rawFormData] - The current formData, if any, to assist retrieving a schema
+   * @param [resolveAnyOfOrOneOfRefs] - Optional flag indicating whether to resolved refs in anyOf/oneOf lists
    * @returns - The schema having its conditions, additional properties, references and dependencies resolved
    */
-  retrieveSchema(schema, rawFormData) {
+  retrieveSchema(schema, rawFormData, resolveAnyOfOrOneOfRefs) {
     return retrieveSchema(
       this.validator,
       schema,
       this.rootSchema,
       rawFormData,
-      this.experimental_customMergeAllOf
+      this.experimental_customMergeAllOf,
+      resolveAnyOfOrOneOfRefs
     );
   }
   /** Sanitize the `data` associated with the `oldSchema` so it is considered appropriate for the `newSchema`. If the
@@ -2810,6 +2855,29 @@ var ErrorSchemaBuilder = class {
   }
 };
 
+// src/getChangedFields.ts
+var import_keys = __toESM(require("lodash/keys"), 1);
+var import_pickBy = __toESM(require("lodash/pickBy"), 1);
+var import_isPlainObject2 = __toESM(require("lodash/isPlainObject"), 1);
+var import_get17 = __toESM(require("lodash/get"), 1);
+var import_difference = __toESM(require("lodash/difference"), 1);
+function getChangedFields(a, b) {
+  const aIsPlainObject = (0, import_isPlainObject2.default)(a);
+  const bIsPlainObject = (0, import_isPlainObject2.default)(b);
+  if (a === b || !aIsPlainObject && !bIsPlainObject) {
+    return [];
+  }
+  if (aIsPlainObject && !bIsPlainObject) {
+    return (0, import_keys.default)(a);
+  } 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_get17.default)(b, key))));
+    const diffFields = (0, import_difference.default)((0, import_keys.default)(b), (0, import_keys.default)(a));
+    return [...unequalFields, ...diffFields];
+  }
+}
+
 // src/getDateElementProps.ts
 function getDateElementProps(date, time, yearRange = [1900, (/* @__PURE__ */ new Date()).getFullYear() + 2], format = "YMD") {
   const { day, month, year, hour, minute, second } = date;
@@ -2918,10 +2986,10 @@ function getTemplate(name, registry, uiOptions = {}) {
 }
 
 // src/getTestIds.ts
-var import_get17 = __toESM(require("lodash/get"), 1);
+var import_get18 = __toESM(require("lodash/get"), 1);
 var import_uniqueId = __toESM(require("lodash/uniqueId"), 1);
 function getTestIds() {
-  if (typeof process === "undefined" || (0, import_get17.default)(process, "env.NODE_ENV") !== "test") {
+  if (typeof process === "undefined" || (0, import_get18.default)(process, "env.NODE_ENV") !== "test") {
     return {};
   }
   const ids = /* @__PURE__ */ new Map();
@@ -2941,7 +3009,7 @@ function getTestIds() {
 // src/getWidget.tsx
 var import_react = require("react");
 var import_react_is = __toESM(require("react-is"), 1);
-var import_get18 = __toESM(require("lodash/get"), 1);
+var import_get19 = __toESM(require("lodash/get"), 1);
 var import_set4 = __toESM(require("lodash/set"), 1);
 var import_jsx_runtime = require("react/jsx-runtime");
 var widgetMap = {
@@ -2997,7 +3065,7 @@ var widgetMap = {
   }
 };
 function mergeWidgetOptions(AWidget) {
-  let MergedWidget = (0, import_get18.default)(AWidget, "MergedWidget");
+  let MergedWidget = (0, import_get19.default)(AWidget, "MergedWidget");
   if (!MergedWidget) {
     const defaultOptions = AWidget.defaultProps && AWidget.defaultProps.options || {};
     MergedWidget = ({ options, ...props }) => {
@@ -3098,6 +3166,31 @@ function optionId(id, optionIndex) {
 function buttonId(id, btn) {
   return idGenerator(id, btn);
 }
+function optionalControlsId(id, element) {
+  return idGenerator(id, `optional${element}`);
+}
+
+// src/isFormDataAvailable.ts
+var import_isNil3 = __toESM(require("lodash/isNil"), 1);
+var import_isEmpty5 = __toESM(require("lodash/isEmpty"), 1);
+var import_isObject11 = __toESM(require("lodash/isObject"), 1);
+function isFormDataAvailable(formData) {
+  return !(0, import_isNil3.default)(formData) && (!(0, import_isObject11.default)(formData) || Array.isArray(formData) || !(0, import_isEmpty5.default)(formData));
+}
+
+// src/isRootSchema.ts
+var import_isEqual2 = __toESM(require("lodash/isEqual"), 1);
+function isRootSchema(registry, schemaToCompare) {
+  const { rootSchema, schemaUtils } = registry;
+  if ((0, import_isEqual2.default)(schemaToCompare, rootSchema)) {
+    return true;
+  }
+  if (REF_KEY in rootSchema) {
+    const resolvedSchema = schemaUtils.retrieveSchema(rootSchema);
+    return (0, import_isEqual2.default)(schemaToCompare, resolvedSchema);
+  }
+  return false;
+}
 
 // src/labelValue.ts
 function labelValue(label, hideLabel, fallback) {
@@ -3110,14 +3203,14 @@ function localToUTC(dateString) {
 }
 
 // src/lookupFromFormContext.ts
-var import_get19 = __toESM(require("lodash/get"), 1);
+var import_get20 = __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_get19.default)(regOrFc, [...lookupPath, toLookup], fallback);
+  return (0, import_get20.default)(regOrFc, [...lookupPath, toLookup], fallback);
 }
 
 // src/orderProperties.ts
@@ -3210,6 +3303,28 @@ function shouldRender(component, nextProps, nextState, updateStrategy = "customD
   return !deepEquals(props, nextProps) || !deepEquals(state, nextState);
 }
 
+// src/shouldRenderOptionalField.ts
+var import_isObject12 = __toESM(require("lodash/isObject"), 1);
+var import_uniq2 = __toESM(require("lodash/uniq"), 1);
+function getSchemaTypesForXxxOf(schemas) {
+  const allTypes = (0, import_uniq2.default)(
+    schemas.map((s) => (0, import_isObject12.default)(s) ? getSchemaType(s) : void 0).flat().filter((t) => t !== void 0)
+  );
+  return allTypes.length === 1 ? allTypes[0] : allTypes;
+}
+function shouldRenderOptionalField(registry, schema, required, uiSchema) {
+  const { enableOptionalDataFieldForType = [] } = getUiOptions(uiSchema, registry.globalUiOptions);
+  let schemaType;
+  if (ANY_OF_KEY in schema && Array.isArray(schema[ANY_OF_KEY])) {
+    schemaType = getSchemaTypesForXxxOf(schema[ANY_OF_KEY]);
+  } else if (ONE_OF_KEY in schema && Array.isArray(schema[ONE_OF_KEY])) {
+    schemaType = getSchemaTypesForXxxOf(schema[ONE_OF_KEY]);
+  } else {
+    schemaType = getSchemaType(schema);
+  }
+  return !isRootSchema(registry, schema) && !required && !!schemaType && !Array.isArray(schemaType) && !!enableOptionalDataFieldForType.find((val) => val === schemaType);
+}
+
 // src/toDateString.ts
 function toDateString(dateObject, time = true) {
   const { year, month, day, hour = 0, minute = 0, second = 0 } = dateObject;
@@ -3219,7 +3334,7 @@ function toDateString(dateObject, time = true) {
 }
 
 // src/toErrorList.ts
-var import_isPlainObject2 = __toESM(require("lodash/isPlainObject"), 1);
+var import_isPlainObject3 = __toESM(require("lodash/isPlainObject"), 1);
 function toErrorList(errorSchema, fieldPath = []) {
   if (!errorSchema) {
     return [];
@@ -3240,7 +3355,7 @@ function toErrorList(errorSchema, fieldPath = []) {
   return Object.keys(errorSchema).reduce((acc, key) => {
     if (key !== ERRORS_KEY) {
       const childSchema = errorSchema[key];
-      if ((0, import_isPlainObject2.default)(childSchema)) {
+      if ((0, import_isPlainObject3.default)(childSchema)) {
         acc = acc.concat(toErrorList(childSchema, [...fieldPath, key]));
       }
     }
@@ -3268,23 +3383,27 @@ function toErrorSchema(errors) {
 }
 
 // src/toFieldPathId.ts
-function toFieldPathId(fieldPath, globalFormOptions, parentPath) {
+function toFieldPathId(fieldPath, globalFormOptions, parentPath, isMultiValue) {
   const basePath = Array.isArray(parentPath) ? parentPath : parentPath?.path;
   const childPath = fieldPath === "" ? [] : [fieldPath];
   const path = basePath ? basePath.concat(...childPath) : childPath;
   const id = [globalFormOptions.idPrefix, ...path].join(globalFormOptions.idSeparator);
-  return { path, [ID_KEY]: id };
+  let name;
+  if (globalFormOptions.nameGenerator && path.length > 0) {
+    name = globalFormOptions.nameGenerator(path, globalFormOptions.idPrefix, isMultiValue);
+  }
+  return { path, [ID_KEY]: id, ...name !== void 0 && { name } };
 }
 
 // src/unwrapErrorHandler.ts
-var import_isPlainObject3 = __toESM(require("lodash/isPlainObject"), 1);
+var import_isPlainObject4 = __toESM(require("lodash/isPlainObject"), 1);
 function unwrapErrorHandler(errorHandler) {
   return Object.keys(errorHandler).reduce((acc, key) => {
     if (key === "addError") {
       return acc;
     } else {
       const childSchema = errorHandler[key];
-      if ((0, import_isPlainObject3.default)(childSchema)) {
+      if ((0, import_isPlainObject4.default)(childSchema)) {
         return {
           ...acc,
           [key]: unwrapErrorHandler(childSchema)
@@ -3295,6 +3414,17 @@ function unwrapErrorHandler(errorHandler) {
   }, {});
 }
 
+// src/useDeepCompareMemo.ts
+var import_react2 = require("react");
+var import_isEqual3 = __toESM(require("lodash/isEqual"), 1);
+function useDeepCompareMemo(newValue) {
+  const valueRef = (0, import_react2.useRef)(newValue);
+  if (!(0, import_isEqual3.default)(newValue, valueRef.current)) {
+    valueRef.current = newValue;
+  }
+  return valueRef.current;
+}
+
 // src/utcToLocal.ts
 function utcToLocal(jsonDate) {
   if (!jsonDate) {
@@ -3312,23 +3442,27 @@ function utcToLocal(jsonDate) {
 }
 
 // src/validationDataMerge.ts
-var import_isEmpty5 = __toESM(require("lodash/isEmpty"), 1);
-function validationDataMerge(validationData, additionalErrorSchema) {
+var import_isEmpty6 = __toESM(require("lodash/isEmpty"), 1);
+function validationDataMerge(validationData, additionalErrorSchema, preventDuplicates = false) {
   if (!additionalErrorSchema) {
     return validationData;
   }
   const { errors: oldErrors, errorSchema: oldErrorSchema } = validationData;
   let errors = toErrorList(additionalErrorSchema);
   let errorSchema = additionalErrorSchema;
-  if (!(0, import_isEmpty5.default)(oldErrorSchema)) {
-    errorSchema = mergeObjects(oldErrorSchema, additionalErrorSchema, true);
+  if (!(0, import_isEmpty6.default)(oldErrorSchema)) {
+    errorSchema = mergeObjects(
+      oldErrorSchema,
+      additionalErrorSchema,
+      preventDuplicates ? "preventDuplicates" : true
+    );
     errors = [...oldErrors].concat(errors);
   }
   return { errorSchema, errors };
 }
 
 // src/withIdRefPrefix.ts
-var import_isObject11 = __toESM(require("lodash/isObject"), 1);
+var import_isObject13 = __toESM(require("lodash/isObject"), 1);
 function withIdRefPrefixObject(node) {
   for (const key in node) {
     const realObj = node;
@@ -3351,34 +3485,31 @@ function withIdRefPrefix(schemaNode) {
   if (Array.isArray(schemaNode)) {
     return withIdRefPrefixArray([...schemaNode]);
   }
-  if ((0, import_isObject11.default)(schemaNode)) {
+  if ((0, import_isObject13.default)(schemaNode)) {
     return withIdRefPrefixObject({ ...schemaNode });
   }
   return schemaNode;
 }
 
-// src/getChangedFields.ts
-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_get20 = __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);
-  if (a === b || !aIsPlainObject && !bIsPlainObject) {
-    return [];
+// src/nameGenerators.ts
+var bracketNameGenerator = (path, idPrefix, isMultiValue) => {
+  if (!path || path.length === 0) {
+    return idPrefix;
   }
-  if (aIsPlainObject && !bIsPlainObject) {
-    return (0, import_keys.default)(a);
-  } 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_get20.default)(b, key))));
-    const diffFields = (0, import_difference.default)((0, import_keys.default)(b), (0, import_keys.default)(a));
-    return [...unequalFields, ...diffFields];
+  const baseName = path.reduce((acc, pathUnit, index) => {
+    if (index === 0) {
+      return `${idPrefix}[${String(pathUnit)}]`;
+    }
+    return `${acc}[${String(pathUnit)}]`;
+  }, "");
+  return isMultiValue ? `${baseName}[]` : baseName;
+};
+var dotNotationNameGenerator = (path, idPrefix, _isMultiValue) => {
+  if (!path || path.length === 0) {
+    return idPrefix;
   }
-}
+  return `${idPrefix}.${path.map(String).join(".")}`;
+};
 
 // src/enums.ts
 var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
@@ -3402,6 +3533,9 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
   TranslatableString2["PreviewLabel"] = "Preview";
   TranslatableString2["DecrementAriaLabel"] = "Decrease value by 1";
   TranslatableString2["IncrementAriaLabel"] = "Increase value by 1";
+  TranslatableString2["OptionalObjectAdd"] = "Add data for optional field";
+  TranslatableString2["OptionalObjectRemove"] = "Remove data for optional field";
+  TranslatableString2["OptionalObjectEmptyMsg"] = "No data for optional field";
   TranslatableString2["UnknownFieldType"] = "Unknown field type %1";
   TranslatableString2["OptionPrefix"] = "Option %1";
   TranslatableString2["TitleOptionPrefix"] = "%1 option %2";