@rjsf/core 6.0.0-beta.2 → 6.0.0-beta.21

package/dist/index.esm.js

@@ -2,32 +2,39 @@
 import { Component as Component5, createRef } from "react";
 import {
   createSchemaUtils,
-  deepEquals as deepEquals3,
+  deepEquals as deepEquals2,
+  ErrorSchemaBuilder,
   getChangedFields,
-  getTemplate as getTemplate24,
-  getUiOptions as getUiOptions17,
+  getTemplate as getTemplate26,
+  getUiOptions as getUiOptions18,
   isObject as isObject6,
-  mergeObjects as mergeObjects3,
+  mergeObjects,
   NAME_KEY,
   RJSF_ADDITIONAL_PROPERTIES_FLAG,
-  shouldRender,
+  shouldRender as shouldRender2,
   SUBMIT_BTN_OPTIONS_KEY,
   toErrorList,
-  UI_GLOBAL_OPTIONS_KEY,
+  toFieldPathId as toFieldPathId4,
+  UI_GLOBAL_OPTIONS_KEY as UI_GLOBAL_OPTIONS_KEY2,
   UI_OPTIONS_KEY as UI_OPTIONS_KEY3,
   validationDataMerge,
-  createErrorHandler,
-  unwrapErrorHandler
+  DEFAULT_ID_SEPARATOR as DEFAULT_ID_SEPARATOR2,
+  DEFAULT_ID_PREFIX as DEFAULT_ID_PREFIX2,
+  ERRORS_KEY as ERRORS_KEY3
 } from "@rjsf/utils";
-import _forEach from "lodash/forEach";
+import _cloneDeep from "lodash/cloneDeep";
 import _get from "lodash/get";
 import _isEmpty from "lodash/isEmpty";
-import _isNil from "lodash/isNil";
 import _pick from "lodash/pick";
+import _set from "lodash/set";
 import _toPath from "lodash/toPath";
 
 // src/getDefaultRegistry.ts
-import { englishStringTranslator } from "@rjsf/utils";
+import {
+  DEFAULT_ID_PREFIX,
+  DEFAULT_ID_SEPARATOR,
+  englishStringTranslator
+} from "@rjsf/utils";
 
 // src/components/fields/ArrayField.tsx
 import { Component } from "react";
@@ -38,7 +45,10 @@ import {
   isFixedItems,
   allowAdditionalItems,
   isCustomWidget,
+  isFormDataAvailable,
   optionsList,
+  shouldRenderOptionalField,
+  toFieldPathId,
   TranslatableString,
   ITEMS_KEY
 } from "@rjsf/utils";
@@ -46,10 +56,10 @@ import cloneDeep from "lodash/cloneDeep";
 import get from "lodash/get";
 import isObject from "lodash/isObject";
 import set from "lodash/set";
-import { nanoid } from "nanoid";
+import uniqueId from "lodash/uniqueId";
 import { jsx } from "react/jsx-runtime";
 function generateRowId() {
-  return nanoid();
+  return uniqueId("rjsf-array-item-");
 }
 function generateKeyedFormData(formData) {
   return !Array.isArray(formData) ? [] : formData.map((item) => {
@@ -72,7 +82,7 @@ var ArrayField = class extends Component {
    */
   constructor(props) {
     super(props);
-    const { formData = [] } = props;
+    const { formData } = props;
     const keyedFormData = generateKeyedFormData(formData);
     this.state = {
       keyedFormData,
@@ -169,7 +179,7 @@ var ArrayField = class extends Component {
     if (event) {
       event.preventDefault();
     }
-    const { onChange, errorSchema } = this.props;
+    const { onChange, errorSchema, fieldPathId } = this.props;
     const { keyedFormData } = this.state;
     let newErrorSchema;
     if (errorSchema) {
@@ -198,7 +208,8 @@ var ArrayField = class extends Component {
         keyedFormData: newKeyedFormData,
         updatedKeyedFormData: true
       },
-      () => onChange(keyedToPlainFormData(newKeyedFormData), newErrorSchema)
+      // add click will pass the empty `path` array to the onChange which adds the appropriate path
+      () => onChange(keyedToPlainFormData(newKeyedFormData), fieldPathId.path, newErrorSchema)
     );
   }
   /** Callback handler for when the user clicks on the add button. Creates a new row of keyed form data at the end of
@@ -232,7 +243,7 @@ var ArrayField = class extends Component {
       if (event) {
         event.preventDefault();
       }
-      const { onChange, errorSchema } = this.props;
+      const { onChange, errorSchema, fieldPathId } = this.props;
       const { keyedFormData } = this.state;
       let newErrorSchema;
       if (errorSchema) {
@@ -261,7 +272,7 @@ var ArrayField = class extends Component {
           keyedFormData: newKeyedFormData,
           updatedKeyedFormData: true
         },
-        () => onChange(keyedToPlainFormData(newKeyedFormData), newErrorSchema)
+        () => onChange(keyedToPlainFormData(newKeyedFormData), fieldPathId.path, newErrorSchema)
       );
     };
   };
@@ -276,7 +287,7 @@ var ArrayField = class extends Component {
       if (event) {
         event.preventDefault();
       }
-      const { onChange, errorSchema } = this.props;
+      const { onChange, errorSchema, fieldPathId } = this.props;
       const { keyedFormData } = this.state;
       let newErrorSchema;
       if (errorSchema) {
@@ -296,7 +307,7 @@ var ArrayField = class extends Component {
           keyedFormData: newKeyedFormData,
           updatedKeyedFormData: true
         },
-        () => onChange(keyedToPlainFormData(newKeyedFormData), newErrorSchema)
+        () => onChange(keyedToPlainFormData(newKeyedFormData), fieldPathId.path, newErrorSchema)
       );
     };
   };
@@ -313,7 +324,7 @@ var ArrayField = class extends Component {
         event.preventDefault();
         event.currentTarget.blur();
       }
-      const { onChange, errorSchema } = this.props;
+      const { onChange, errorSchema, fieldPathId } = this.props;
       let newErrorSchema;
       if (errorSchema) {
         newErrorSchema = {};
@@ -340,7 +351,7 @@ var ArrayField = class extends Component {
         {
           keyedFormData: newKeyedFormData
         },
-        () => onChange(keyedToPlainFormData(newKeyedFormData), newErrorSchema)
+        () => onChange(keyedToPlainFormData(newKeyedFormData), fieldPathId.path, newErrorSchema)
       );
     };
   };
@@ -350,32 +361,49 @@ var ArrayField = class extends Component {
    * @param index - The index of the item being changed
    */
   onChangeForIndex = (index) => {
-    return (value, newErrorSchema, id) => {
-      const { formData, onChange, errorSchema } = this.props;
-      const arrayData = Array.isArray(formData) ? formData : [];
-      const newFormData = arrayData.map((item, i) => {
-        const jsonValue = typeof value === "undefined" ? null : value;
-        return index === i ? jsonValue : item;
-      });
+    return (value, path, newErrorSchema, id) => {
+      const { onChange } = this.props;
       onChange(
-        newFormData,
-        errorSchema && errorSchema && {
-          ...errorSchema,
-          [index]: newErrorSchema
-        },
+        // We need to treat undefined items as nulls to have validation.
+        // See https://github.com/tdegrunt/jsonschema/issues/206
+        value === void 0 ? null : value,
+        path,
+        newErrorSchema,
         id
       );
     };
   };
   /** Callback handler used to change the value for a checkbox */
   onSelectChange = (value) => {
-    const { onChange, idSchema } = this.props;
-    onChange(value, void 0, idSchema && idSchema.$id);
+    const { onChange, fieldPathId } = this.props;
+    onChange(value, fieldPathId.path, void 0, fieldPathId && fieldPathId.$id);
   };
+  /** Helper method to compute item UI schema for both normal and fixed arrays
+   * Handles both static object and dynamic function cases
+   *
+   * @param uiSchema - The parent UI schema containing items definition
+   * @param item - The item data
+   * @param index - The index of the item
+   * @param formContext - The form context
+   * @returns The computed UI schema for the item
+   */
+  computeItemUiSchema(uiSchema, item, index, formContext) {
+    if (typeof uiSchema.items === "function") {
+      try {
+        const result = uiSchema.items(item, index, formContext);
+        return result;
+      } catch (e) {
+        console.error(`Error executing dynamic uiSchema.items function for item at index ${index}:`, e);
+        return void 0;
+      }
+    } else {
+      return uiSchema.items;
+    }
+  }
   /** Renders the `ArrayField` depending on the specific needs of the schema and uischema elements
    */
   render() {
-    const { schema, uiSchema, idSchema, registry } = this.props;
+    const { schema, uiSchema, fieldPathId, registry } = this.props;
     const { schemaUtils, translateString } = registry;
     if (!(ITEMS_KEY in schema)) {
       const uiOptions = getUiOptions(uiSchema);
@@ -388,7 +416,7 @@ var ArrayField = class extends Component {
         UnsupportedFieldTemplate,
         {
           schema,
-          idSchema,
+          fieldPathId,
           reason: translateString(TranslatableString.MissingItems),
           registry
         }
@@ -415,7 +443,7 @@ var ArrayField = class extends Component {
       schema,
       uiSchema = {},
       errorSchema,
-      idSchema,
+      fieldPathId,
       name,
       title,
       disabled = false,
@@ -425,27 +453,31 @@ var ArrayField = class extends Component {
       registry,
       onBlur,
       onFocus,
-      idPrefix,
-      idSeparator = "_",
       rawErrors
     } = this.props;
     const { keyedFormData } = this.state;
     const fieldTitle = schema.title || title || name;
-    const { schemaUtils, formContext } = registry;
+    const { schemaUtils, fields: fields2, formContext, globalFormOptions } = registry;
+    const { OptionalDataControlsField: OptionalDataControlsField2 } = fields2;
     const uiOptions = getUiOptions(uiSchema);
     const _schemaItems = isObject(schema.items) ? schema.items : {};
     const itemsSchema = schemaUtils.retrieveSchema(_schemaItems);
     const formData = keyedToPlainFormData(this.state.keyedFormData);
-    const canAdd = this.canAddItem(formData);
+    const renderOptionalField = shouldRenderOptionalField(registry, schema, required, uiSchema);
+    const hasFormData = isFormDataAvailable(this.props.formData);
+    const canAdd = this.canAddItem(formData) && (!renderOptionalField || hasFormData);
+    const actualFormData = hasFormData ? keyedFormData : [];
+    const extraClass = renderOptionalField ? " rjsf-optional-array-field" : "";
+    const optionalDataControl = renderOptionalField ? /* @__PURE__ */ jsx(OptionalDataControlsField2, { ...this.props }) : void 0;
     const arrayProps = {
       canAdd,
-      items: keyedFormData.map((keyedItem, index) => {
+      items: actualFormData.map((keyedItem, index) => {
         const { key, item } = keyedItem;
         const itemCast = item;
         const itemSchema = schemaUtils.retrieveSchema(_schemaItems, itemCast);
         const itemErrorSchema = errorSchema ? errorSchema[index] : void 0;
-        const itemIdPrefix = idSchema.$id + idSeparator + index;
-        const itemIdSchema = schemaUtils.toIdSchema(itemSchema, itemIdPrefix, itemCast, idPrefix, idSeparator);
+        const itemFieldPathId = toFieldPathId(index, globalFormOptions, fieldPathId);
+        const itemUiSchema = this.computeItemUiSchema(uiSchema, item, index, formContext);
         return this.renderArrayFieldItem({
           key,
           index,
@@ -455,10 +487,10 @@ var ArrayField = class extends Component {
           canMoveUp: index > 0,
           canMoveDown: index < formData.length - 1,
           itemSchema,
-          itemIdSchema,
+          itemFieldPathId,
           itemErrorSchema,
           itemData: itemCast,
-          itemUiSchema: uiSchema.items,
+          itemUiSchema,
           autofocus: autofocus && index === 0,
           onBlur,
           onFocus,
@@ -466,19 +498,19 @@ var ArrayField = class extends Component {
           totalItems: keyedFormData.length
         });
       }),
-      className: `rjsf-field rjsf-field-array rjsf-field-array-of-${itemsSchema.type}`,
+      className: `rjsf-field rjsf-field-array rjsf-field-array-of-${itemsSchema.type}${extraClass}`,
       disabled,
-      idSchema,
+      fieldPathId,
       uiSchema,
       onAddClick: this.onAddClick,
       readonly,
       required,
       schema,
       title: fieldTitle,
-      formContext,
       formData,
       rawErrors,
-      registry
+      registry,
+      optionalDataControl
     };
     const Template = getTemplate("ArrayFieldTemplate", registry, uiOptions);
     return /* @__PURE__ */ jsx(Template, { ...arrayProps });
@@ -488,7 +520,7 @@ var ArrayField = class extends Component {
   renderCustomWidget() {
     const {
       schema,
-      idSchema,
+      fieldPathId,
       uiSchema,
       disabled = false,
       readonly = false,
@@ -511,7 +543,7 @@ var ArrayField = class extends Component {
     return /* @__PURE__ */ jsx(
       Widget,
       {
-        id: idSchema.$id,
+        id: fieldPathId.$id,
         name,
         multiple: true,
         onChange: this.onSelectChange,
@@ -540,7 +572,7 @@ var ArrayField = class extends Component {
   renderMultiSelect() {
     const {
       schema,
-      idSchema,
+      fieldPathId,
       uiSchema,
       formData: items = [],
       disabled = false,
@@ -564,7 +596,7 @@ var ArrayField = class extends Component {
     return /* @__PURE__ */ jsx(
       Widget,
       {
-        id: idSchema.$id,
+        id: fieldPathId.$id,
         name,
         multiple: true,
         onChange: this.onSelectChange,
@@ -593,7 +625,7 @@ var ArrayField = class extends Component {
     const {
       schema,
       uiSchema,
-      idSchema,
+      fieldPathId,
       name,
       disabled = false,
       readonly = false,
@@ -614,7 +646,7 @@ var ArrayField = class extends Component {
       Widget,
       {
         options,
-        id: idSchema.$id,
+        id: fieldPathId.$id,
         name,
         multiple: true,
         onChange: this.onSelectChange,
@@ -641,11 +673,9 @@ var ArrayField = class extends Component {
     const {
       schema,
       uiSchema = {},
-      formData = [],
+      formData,
       errorSchema,
-      idPrefix,
-      idSeparator = "_",
-      idSchema,
+      fieldPathId,
       name,
       title,
       disabled = false,
@@ -657,35 +687,48 @@ var ArrayField = class extends Component {
       onFocus,
       rawErrors
     } = this.props;
-    const { keyedFormData } = this.state;
     let { formData: items = [] } = this.props;
+    const { keyedFormData } = this.state;
     const fieldTitle = schema.title || title || name;
     const uiOptions = getUiOptions(uiSchema);
-    const { schemaUtils, formContext } = registry;
+    const { schemaUtils, fields: fields2, formContext, globalFormOptions } = registry;
+    const { OptionalDataControlsField: OptionalDataControlsField2 } = fields2;
+    const renderOptionalField = shouldRenderOptionalField(registry, schema, required, uiSchema);
+    const hasFormData = isFormDataAvailable(formData);
     const _schemaItems = isObject(schema.items) ? schema.items : [];
     const itemSchemas = _schemaItems.map(
-      (item, index) => schemaUtils.retrieveSchema(item, formData[index])
+      (item, index) => schemaUtils.retrieveSchema(item, items[index])
     );
     const additionalSchema = isObject(schema.additionalItems) ? schemaUtils.retrieveSchema(schema.additionalItems, formData) : null;
-    if (!items || items.length < itemSchemas.length) {
-      items = items || [];
+    if (items.length < itemSchemas.length) {
       items = items.concat(new Array(itemSchemas.length - items.length));
     }
-    const canAdd = this.canAddItem(items) && !!additionalSchema;
+    const actualFormData = hasFormData ? keyedFormData : [];
+    const extraClass = renderOptionalField ? " rjsf-optional-array-field" : "";
+    const optionalDataControl = renderOptionalField ? /* @__PURE__ */ jsx(OptionalDataControlsField2, { ...this.props }) : void 0;
+    const canAdd = this.canAddItem(items) && !!additionalSchema && (!renderOptionalField || hasFormData);
     const arrayProps = {
       canAdd,
-      className: "rjsf-field rjsf-field-array rjsf-field-array-fixed-items",
+      className: `rjsf-field rjsf-field-array rjsf-field-array-fixed-items${extraClass}`,
       disabled,
-      idSchema,
+      fieldPathId,
       formData,
-      items: keyedFormData.map((keyedItem, index) => {
+      items: actualFormData.map((keyedItem, index) => {
         const { key, item } = keyedItem;
         const itemCast = item;
         const additional = index >= itemSchemas.length;
         const itemSchema = (additional && isObject(schema.additionalItems) ? schemaUtils.retrieveSchema(schema.additionalItems, itemCast) : itemSchemas[index]) || {};
-        const itemIdPrefix = idSchema.$id + idSeparator + index;
-        const itemIdSchema = schemaUtils.toIdSchema(itemSchema, itemIdPrefix, itemCast, idPrefix, idSeparator);
-        const itemUiSchema = additional ? uiSchema.additionalItems || {} : Array.isArray(uiSchema.items) ? uiSchema.items[index] : uiSchema.items || {};
+        const itemFieldPathId = toFieldPathId(index, globalFormOptions, fieldPathId);
+        let itemUiSchema;
+        if (additional) {
+          itemUiSchema = uiSchema.additionalItems;
+        } else {
+          if (Array.isArray(uiSchema.items)) {
+            itemUiSchema = uiSchema.items[index];
+          } else {
+            itemUiSchema = this.computeItemUiSchema(uiSchema, item, index, formContext);
+          }
+        }
         const itemErrorSchema = errorSchema ? errorSchema[index] : void 0;
         return this.renderArrayFieldItem({
           key,
@@ -699,7 +742,7 @@ var ArrayField = class extends Component {
           itemSchema,
           itemData: itemCast,
           itemUiSchema,
-          itemIdSchema,
+          itemFieldPathId,
           itemErrorSchema,
           autofocus: autofocus && index === 0,
           onBlur,
@@ -715,9 +758,9 @@ var ArrayField = class extends Component {
       schema,
       uiSchema,
       title: fieldTitle,
-      formContext,
       errorSchema,
-      rawErrors
+      rawErrors,
+      optionalDataControl
     };
     const Template = getTemplate("ArrayFieldTemplate", registry, uiOptions);
     return /* @__PURE__ */ jsx(Template, { ...arrayProps });
@@ -739,7 +782,7 @@ var ArrayField = class extends Component {
       itemSchema,
       itemData,
       itemUiSchema,
-      itemIdSchema,
+      itemFieldPathId,
       itemErrorSchema,
       autofocus,
       onBlur,
@@ -748,7 +791,7 @@ var ArrayField = class extends Component {
       totalItems,
       title
     } = props;
-    const { disabled, hideError, idPrefix, idSeparator, readonly, uiSchema, registry, formContext } = this.props;
+    const { disabled, hideError, readonly, uiSchema, registry, formContext } = this.props;
     const {
       fields: { ArraySchemaField, SchemaField: SchemaField2 },
       globalUiOptions
@@ -775,9 +818,7 @@ var ArrayField = class extends Component {
           formData: itemData,
           formContext,
           errorSchema: itemErrorSchema,
-          idPrefix,
-          idSeparator,
-          idSchema: itemIdSchema,
+          fieldPathId: itemFieldPathId,
           required: this.isItemRequired(itemSchema),
           onChange: this.onChangeForIndex(index),
           onBlur,
@@ -791,7 +832,7 @@ var ArrayField = class extends Component {
         }
       ),
       buttonsProps: {
-        idSchema: itemIdSchema,
+        fieldPathId: itemFieldPathId,
         disabled,
         readonly,
         canAdd,
@@ -825,6 +866,7 @@ var ArrayField = class extends Component {
 var ArrayField_default = ArrayField;
 
 // src/components/fields/BooleanField.tsx
+import { useCallback } from "react";
 import {
   getWidget as getWidget2,
   getUiOptions as getUiOptions2,
@@ -838,7 +880,7 @@ function BooleanField(props) {
     schema,
     name,
     uiSchema,
-    idSchema,
+    fieldPathId,
     formData,
     registry,
     required,
@@ -900,15 +942,21 @@ function BooleanField(props) {
       enumOptions = optionsList2({ enum: enums }, uiSchema);
     }
   }
+  const onWidgetChange = useCallback(
+    (value, errorSchema, id) => {
+      return onChange(value, fieldPathId.path, errorSchema, id);
+    },
+    [onChange, fieldPathId]
+  );
   return /* @__PURE__ */ jsx2(
     Widget,
     {
       options: { ...options, enumOptions },
       schema,
       uiSchema,
-      id: idSchema.$id,
+      id: fieldPathId.$id,
       name,
-      onChange,
+      onChange: onWidgetChange,
       onFocus,
       onBlur,
       label,
@@ -938,13 +986,14 @@ import {
   hashObject,
   ID_KEY,
   lookupFromFormContext,
-  mergeObjects,
   ONE_OF_KEY,
   PROPERTIES_KEY,
   READONLY_KEY,
-  UI_OPTIONS_KEY
+  toFieldPathId as toFieldPathId2,
+  UI_OPTIONS_KEY,
+  UI_GLOBAL_OPTIONS_KEY,
+  ITEMS_KEY as ITEMS_KEY2
 } from "@rjsf/utils";
-import cloneDeep2 from "lodash/cloneDeep";
 import each from "lodash/each";
 import flatten from "lodash/flatten";
 import get2 from "lodash/get";
@@ -958,16 +1007,19 @@ import isObject3 from "lodash/isObject";
 import isPlainObject from "lodash/isPlainObject";
 import isString from "lodash/isString";
 import isUndefined from "lodash/isUndefined";
+import last from "lodash/last";
 import set2 from "lodash/set";
 import { jsx as jsx3 } from "react/jsx-runtime";
 import { createElement } from "react";
 var LOOKUP_REGEX = /^\$lookup=(.+)/;
 var LAYOUT_GRID_UI_OPTION = "layoutGrid";
 var LAYOUT_GRID_OPTION = `ui:${LAYOUT_GRID_UI_OPTION}`;
-var UI_GLOBAL_OPTIONS = "ui:global_options";
 function getNonNullishValue(value, fallback) {
   return value ?? fallback;
 }
+function isNumericIndex(str) {
+  return /^\d+?$/.test(str);
+}
 var LayoutGridField = class _LayoutGridField extends PureComponent {
   static defaultProps = {
     layoutGridSchema: void 0
@@ -987,7 +1039,7 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
    * @param [forceReadonly] - Optional flag indicating whether the Form itself is in readonly mode
    */
   static computeFieldUiSchema(field, uiProps, uiSchema, schemaReadonly, forceReadonly) {
-    const globalUiOptions = get2(uiSchema, [UI_GLOBAL_OPTIONS], {});
+    const globalUiOptions = get2(uiSchema, [UI_GLOBAL_OPTIONS_KEY], {});
     const localUiSchema = get2(uiSchema, field);
     const localUiOptions = { ...get2(localUiSchema, [UI_OPTIONS_KEY], {}), ...uiProps, ...globalUiOptions };
     const fieldUiSchema = { ...localUiSchema };
@@ -995,7 +1047,7 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
       set2(fieldUiSchema, [UI_OPTIONS_KEY], localUiOptions);
     }
     if (!isEmpty(globalUiOptions)) {
-      set2(fieldUiSchema, [UI_GLOBAL_OPTIONS], globalUiOptions);
+      set2(fieldUiSchema, [UI_GLOBAL_OPTIONS_KEY], globalUiOptions);
     }
     let { readonly: uiReadonly } = getUiOptions3(fieldUiSchema);
     if (forceReadonly === true || isUndefined(uiReadonly) && schemaReadonly === true) {
@@ -1067,60 +1119,74 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
     }
     return { children, gridProps };
   }
-  /** Generates an idSchema for the `schema` using `@rjsf`'s `toIdSchema` util, passing the `baseIdSchema`'s `$id` value
-   * as the id prefix.
+  /** Computes the `rawSchema` and `fieldPathId` for a `schema` and a `potentialIndex`. If the `schema` is of type array,
+   * has an `ITEMS_KEY` element and `potentialIndex` represents a numeric value, the element at `ITEMS_KEY` is checked
+   * to see if it is an array. If it is AND the `potentialIndex`th element is available, it is used as the `rawSchema`,
+   * otherwise the last value of the element is used. If it is not, then the element is used as the `rawSchema`. In
+   * either case, an `fieldPathId` is computed for the array index. If the `schema` does not represent an array or the
+   * `potentialIndex` is not a numeric value, then `rawSchema` is returned as undefined and given `fieldPathId` is returned
+   * as is.
    *
-   * @param schemaUtils - The `SchemaUtilsType` used to call `toIdSchema`
-   * @param schema - The schema to generate the idSchema for
-   * @param baseIdSchema - The IdSchema for the base
-   * @param formData - The formData to pass the `toIdSchema`
-   * @param [idSeparator] - The param to pass into the `toIdSchema` util which will use it to join the `idSchema` paths
-   * @returns - The generated `idSchema` for the `schema`
+   * @param schema - The schema to generate the fieldPathId for
+   * @param fieldPathId - The FieldPathId for the schema
+   * @param potentialIndex - A string containing a potential index
+   * @returns - An object containing the `rawSchema` and `fieldPathId` of an array item, otherwise an undefined `rawSchema`
    */
-  static getIdSchema(schemaUtils, baseIdSchema, formData, schema = {}, idSeparator) {
-    const baseId = get2(baseIdSchema, ID_KEY);
-    return schemaUtils.toIdSchema(schema, baseId, formData, baseId, idSeparator);
+  static computeArraySchemasIfPresent(schema, fieldPathId, potentialIndex) {
+    let rawSchema;
+    if (isNumericIndex(potentialIndex) && schema && schema?.type === "array" && has(schema, ITEMS_KEY2)) {
+      const index = Number(potentialIndex);
+      const items = schema[ITEMS_KEY2];
+      if (Array.isArray(items)) {
+        if (index > items.length) {
+          rawSchema = last(items);
+        } else {
+          rawSchema = items[index];
+        }
+      } else {
+        rawSchema = items;
+      }
+      fieldPathId = {
+        [ID_KEY]: fieldPathId[ID_KEY],
+        path: [...fieldPathId.path.slice(0, fieldPathId.path.length - 1), index]
+      };
+    }
+    return { rawSchema, fieldPathId };
   }
   /** Given a `dottedPath` to a field in the `initialSchema`, iterate through each individual path in the schema until
    * the leaf path is found and returned (along with whether that leaf path `isRequired`) OR no schema exists for an
    * element in the path. If the leaf schema element happens to be a oneOf/anyOf then also return the oneOf/anyOf as
    * `options`.
    *
-   * @param schemaUtils - The `SchemaUtilsType` used to call `retrieveSchema`
+   * @param registry - The registry
    * @param dottedPath - The dotted-path to the field for which to get the schema
    * @param initialSchema - The initial schema to start the search from
    * @param formData - The formData, useful for resolving a oneOf/anyOf selection in the path hierarchy
-   * @param initialIdSchema - The initial idSchema to start the search from
-   * @param [idSeparator] - The param to pass into the `toIdSchema` util which will use it to join the `idSchema` paths
+   * @param initialFieldIdPath - The initial fieldPathId to start the search from
    * @returns - An object containing the destination schema, isRequired and isReadonly flags for the field and options
    *            info if a oneOf/anyOf
    */
-  static getSchemaDetailsForField(schemaUtils, dottedPath, initialSchema, formData, initialIdSchema, idSeparator) {
+  static getSchemaDetailsForField(registry, dottedPath, initialSchema, formData, initialFieldIdPath) {
+    const { schemaUtils, globalFormOptions } = registry;
     let rawSchema = initialSchema;
-    let idSchema = initialIdSchema;
+    let fieldPathId = initialFieldIdPath;
     const parts = dottedPath.split(".");
     const leafPath = parts.pop();
     let schema = schemaUtils.retrieveSchema(rawSchema, formData);
     let innerData = formData;
     let isReadonly = schema.readOnly;
     parts.forEach((part) => {
+      fieldPathId = toFieldPathId2(part, globalFormOptions, fieldPathId);
       if (has(schema, PROPERTIES_KEY)) {
         rawSchema = get2(schema, [PROPERTIES_KEY, part], {});
-        idSchema = get2(idSchema, part, {});
       } else if (schema && (has(schema, ONE_OF_KEY) || has(schema, ANY_OF_KEY))) {
         const xxx = has(schema, ONE_OF_KEY) ? ONE_OF_KEY : ANY_OF_KEY;
         const selectedSchema = schemaUtils.findSelectedOptionInXxxOf(schema, part, xxx, innerData);
-        const selectedIdSchema = _LayoutGridField.getIdSchema(
-          schemaUtils,
-          idSchema,
-          formData,
-          selectedSchema,
-          idSeparator
-        );
         rawSchema = get2(selectedSchema, [PROPERTIES_KEY, part], {});
-        idSchema = get2(selectedIdSchema, part, {});
       } else {
-        rawSchema = {};
+        const result = _LayoutGridField.computeArraySchemasIfPresent(schema, fieldPathId, part);
+        rawSchema = result.rawSchema ?? {};
+        fieldPathId = result.fieldPathId;
       }
       innerData = get2(innerData, part, {});
       schema = schemaUtils.retrieveSchema(rawSchema, innerData);
@@ -1135,13 +1201,17 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
       if (schema && (has(schema, ONE_OF_KEY) || has(schema, ANY_OF_KEY))) {
         const xxx = has(schema, ONE_OF_KEY) ? ONE_OF_KEY : ANY_OF_KEY;
         schema = schemaUtils.findSelectedOptionInXxxOf(schema, leafPath, xxx, innerData);
-        const rawIdSchema = _LayoutGridField.getIdSchema(schemaUtils, idSchema, formData, schema, idSeparator);
-        idSchema = mergeObjects(rawIdSchema, idSchema);
       }
+      fieldPathId = toFieldPathId2(leafPath, globalFormOptions, fieldPathId);
       isRequired = schema !== void 0 && Array.isArray(schema.required) && includes(schema.required, leafPath);
-      schema = get2(schema, [PROPERTIES_KEY, leafPath]);
-      schema = schema ? schemaUtils.retrieveSchema(schema) : schema;
-      idSchema = get2(idSchema, leafPath, {});
+      const result = _LayoutGridField.computeArraySchemasIfPresent(schema, fieldPathId, leafPath);
+      if (result.rawSchema) {
+        schema = result.rawSchema;
+        fieldPathId = result.fieldPathId;
+      } else {
+        schema = get2(schema, [PROPERTIES_KEY, leafPath]);
+        schema = schema ? schemaUtils.retrieveSchema(schema) : schema;
+      }
       isReadonly = getNonNullishValue(schema?.readOnly, isReadonly);
       if (schema && (has(schema, ONE_OF_KEY) || has(schema, ANY_OF_KEY))) {
         const xxx = has(schema, ONE_OF_KEY) ? ONE_OF_KEY : ANY_OF_KEY;
@@ -1149,7 +1219,7 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
         optionsInfo = { options: schema[xxx], hasDiscriminator: !!discriminator };
       }
     }
-    return { schema, isRequired, isReadonly, optionsInfo, idSchema };
+    return { schema, isRequired, isReadonly, optionsInfo, fieldPathId };
   }
   /** Gets the custom render component from the `render`, by either determining that it is either already a function or
    * it is a non-function value that can be used to look up the function in the registry. If no function can be found,
@@ -1185,7 +1255,7 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
     if (isString(gridSchema) || isUndefined(gridSchema)) {
       name = gridSchema ?? "";
     } else {
-      const { name: innerName, render, ...innerProps } = gridSchema;
+      const { name: innerName = "", render, ...innerProps } = gridSchema;
       name = innerName;
       uiProps = innerProps;
       if (!isEmpty(uiProps)) {
@@ -1218,19 +1288,12 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
    * elements, they will then be passed on to the `onChange` handler of the `LayoutFieldGrid`.
    *
    * @param dottedPath - The dotted-path to the field for which to generate the onChange handler
-   * @returns - The `onChange` handling function for the `dottedPath` field
+   * @returns - The `onChange` handling function for the `dottedPath` field of the `schemaType` type
    */
   onFieldChange = (dottedPath) => {
-    return (value, errSchema, id) => {
-      const { onChange, errorSchema, formData } = this.props;
-      const newFormData = cloneDeep2(formData || {});
-      let newErrorSchema = errorSchema;
-      if (errSchema && errorSchema) {
-        newErrorSchema = cloneDeep2(errorSchema);
-        set2(newErrorSchema, dottedPath, errSchema);
-      }
-      set2(newFormData, dottedPath, value);
-      onChange(newFormData, newErrorSchema, id);
+    return (value, path, errSchema, id) => {
+      const { onChange } = this.props;
+      onChange(value, path, errSchema, id);
     };
   };
   /** Renders the `children` of the `GridType.CONDITION` if it passes. The `layoutGridSchema` for the
@@ -1318,20 +1381,20 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
     const GridTemplate2 = getTemplate2("GridTemplate", registry, uiOptions);
     return /* @__PURE__ */ jsx3(GridTemplate2, { ...gridProps, "data-testid": _LayoutGridField.TEST_IDS.row, children: this.renderChildren(children) });
   }
-  /** Iterates through all the `childrenLayoutGridSchema`, rendering a nested `LayoutGridField` for each item in the
+  /** Iterates through all the `childrenLayoutGrfieldPathId`, rendering a nested `LayoutGridField` for each item in the
    * list, passing all the props for the current `LayoutGridField` along, updating the `schema` by calling
    * `retrieveSchema()` on it to resolve any `$ref`s. In addition to the updated `schema`, each item in
-   * `childrenLayoutGridSchema` is passed as `layoutGridSchema`.
+   * `childrenLayoutGrfieldPathId` is passed as `layoutGridSchema`.
    *
-   * @param childrenLayoutGridSchema - The list of strings or objects that represents the configurations for the
+   * @param childrenLayoutGrfieldPathId - The list of strings or objects that represents the configurations for the
    *          children fields
    * @returns - The nested `LayoutGridField`s
    */
-  renderChildren(childrenLayoutGridSchema) {
+  renderChildren(childrenLayoutGrfieldPathId) {
     const { registry, schema: rawSchema, formData } = this.props;
     const { schemaUtils } = registry;
     const schema = schemaUtils.retrieveSchema(rawSchema, formData);
-    return childrenLayoutGridSchema.map((layoutGridSchema) => /* @__PURE__ */ createElement(
+    return childrenLayoutGrfieldPathId.map((layoutGridSchema) => /* @__PURE__ */ createElement(
       _LayoutGridField,
       {
         ...this.props,
@@ -1347,7 +1410,7 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
    * specified props for that component. If `name` exists, we take the name, the initial & root schemas and the formData
    * and get the destination schema, is required state and optional oneOf/anyOf options for it. If the destination
    * schema was located along with oneOf/anyOf options then a `LayoutMultiSchemaField` will be rendered with the
-   * `uiSchema`, `errorSchema`, `idSchema` and `formData` drilled down to the dotted-path field, spreading any other
+   * `uiSchema`, `errorSchema`, `fieldPathId` and `formData` drilled down to the dotted-path field, spreading any other
    * props from `gridSchema` into the `ui:options`. If the destination schema located without any oneOf/anyOf options,
    * then a `SchemaField` will be rendered with the same props as mentioned in the previous sentence. If no destination
    * schema was located, but a custom render component was found, then it will be rendered with many of the non-event
@@ -1361,18 +1424,17 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
       schema: initialSchema,
       uiSchema,
       errorSchema,
-      idSchema,
+      fieldPathId,
       onBlur,
       onFocus,
       formData,
       readonly,
       registry,
-      idSeparator,
       layoutGridSchema,
       // Used to pull this out of otherProps since we don't want to pass it through
       ...otherProps
     } = this.props;
-    const { fields: fields2, schemaUtils } = registry;
+    const { fields: fields2 } = registry;
     const { SchemaField: SchemaField2, LayoutMultiSchemaField: LayoutMultiSchemaField2 } = fields2;
     const uiComponentProps = _LayoutGridField.computeUIComponentPropsFromGridSchema(registry, gridSchema);
     if (uiComponentProps.rendered) {
@@ -1384,15 +1446,8 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
       isRequired,
       isReadonly,
       optionsInfo,
-      idSchema: fieldIdSchema
-    } = _LayoutGridField.getSchemaDetailsForField(
-      schemaUtils,
-      name,
-      initialSchema,
-      formData,
-      idSchema,
-      idSeparator
-    );
+      fieldPathId: fieldIdSchema
+    } = _LayoutGridField.getSchemaDetailsForField(registry, name, initialSchema, formData, fieldPathId);
     if (schema) {
       const Field = optionsInfo?.hasDiscriminator ? LayoutMultiSchemaField2 : SchemaField2;
       const { fieldUiSchema, uiReadonly } = _LayoutGridField.computeFieldUiSchema(
@@ -1413,8 +1468,7 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
           schema,
           uiSchema: fieldUiSchema,
           errorSchema: get2(errorSchema, name),
-          idSchema: fieldIdSchema,
-          idSeparator,
+          fieldPathId: fieldIdSchema,
           formData: get2(formData, name),
           onChange: this.onFieldChange(name),
           onBlur,
@@ -1437,8 +1491,7 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
           errorSchema,
           uiSchema,
           schema: initialSchema,
-          idSchema,
-          idSeparator,
+          fieldPathId,
           onBlur,
           onFocus,
           registry,
@@ -1488,7 +1541,7 @@ import {
 } from "@rjsf/utils";
 import { jsx as jsx4 } from "react/jsx-runtime";
 function LayoutHeaderField(props) {
-  const { idSchema, title, schema, uiSchema, required, registry, name } = props;
+  const { fieldPathId, title, schema, uiSchema, required, registry, name } = props;
   const options = getUiOptions4(uiSchema, registry.globalUiOptions);
   const { title: uiTitle } = options;
   const { title: schemaTitle } = schema;
@@ -1504,7 +1557,7 @@ function LayoutHeaderField(props) {
   return /* @__PURE__ */ jsx4(
     TitleFieldTemplate,
     {
-      id: titleId(idSchema),
+      id: titleId(fieldPathId),
       title: fieldTitle,
       required,
       schema,
@@ -1567,7 +1620,7 @@ function LayoutMultiSchemaField(props) {
     baseType,
     disabled = false,
     formData,
-    idSchema,
+    fieldPathId,
     onBlur,
     onChange,
     options,
@@ -1584,7 +1637,7 @@ function LayoutMultiSchemaField(props) {
   } = props;
   const { widgets: widgets2, schemaUtils, globalUiOptions } = registry;
   const [enumOptions, setEnumOptions] = useState(computeEnumOptions(schema, options, schemaUtils, uiSchema, formData));
-  const id = get3(idSchema, ID_KEY2);
+  const id = get3(fieldPathId, ID_KEY2);
   const discriminator = getDiscriminatorFieldFromSchema2(schema);
   const FieldErrorTemplate2 = getTemplate4("FieldErrorTemplate", registry, options);
   const FieldTemplate2 = getTemplate4("FieldTemplate", registry, options);
@@ -1625,10 +1678,10 @@ function LayoutMultiSchemaField(props) {
     if (newFormData) {
       set3(newFormData, selectorField, opt);
     }
-    onChange(newFormData, void 0, id);
+    onChange(newFormData, fieldPathId.path, void 0, id);
   };
   const widgetOptions = { enumOptions, ...uiOptions };
-  const errors = !hideFieldError && rawErrors.length > 0 ? /* @__PURE__ */ jsx5(FieldErrorTemplate2, { idSchema, schema, errors: rawErrors, registry }) : void 0;
+  const errors = !hideFieldError && rawErrors.length > 0 ? /* @__PURE__ */ jsx5(FieldErrorTemplate2, { fieldPathId, schema, errors: rawErrors, registry }) : void 0;
   const ignored = (value) => noop;
   return /* @__PURE__ */ jsx5(
     FieldTemplate2,
@@ -1638,7 +1691,6 @@ function LayoutMultiSchemaField(props) {
       label: (title || schema.title) ?? "",
       disabled: disabled || Array.isArray(enumOptions) && isEmpty2(enumOptions),
       uiSchema,
-      formContext,
       required,
       readonly: !!readonly,
       registry,
@@ -1688,13 +1740,14 @@ import {
   deepEquals,
   ERRORS_KEY as ERRORS_KEY2,
   getDiscriminatorFieldFromSchema as getDiscriminatorFieldFromSchema3,
+  getTemplate as getTemplate5,
   getUiOptions as getUiOptions6,
   getWidget as getWidget4,
   mergeSchemas,
   ONE_OF_KEY as ONE_OF_KEY3,
   TranslatableString as TranslatableString3
 } from "@rjsf/utils";
-import { jsx as jsx6, jsxs } from "react/jsx-runtime";
+import { jsx as jsx6 } from "react/jsx-runtime";
 var AnyOfField = class extends Component2 {
   /** Constructs an `AnyOfField` with the given `props` to initialize the initially selected option in state
    *
@@ -1720,7 +1773,7 @@ var AnyOfField = class extends Component2 {
    * @param prevState - The previous `AnyOfFieldState` for this template
    */
   componentDidUpdate(prevProps, prevState) {
-    const { formData, options, idSchema } = this.props;
+    const { formData, options, fieldPathId } = this.props;
     const { selectedOption } = this.state;
     let newState = this.state;
     if (!deepEquals(prevProps.options, options)) {
@@ -1730,7 +1783,7 @@ var AnyOfField = class extends Component2 {
       const retrievedOptions = options.map((opt) => schemaUtils.retrieveSchema(opt, formData));
       newState = { selectedOption, retrievedOptions };
     }
-    if (!deepEquals(formData, prevProps.formData) && idSchema.$id === prevProps.idSchema.$id) {
+    if (!deepEquals(formData, prevProps.formData) && fieldPathId.$id === prevProps.fieldPathId.$id) {
       const { retrievedOptions } = newState;
       const matchingOption = this.getMatchingOption(selectedOption, formData, retrievedOptions);
       if (prevState && matchingOption !== selectedOption) {
@@ -1764,7 +1817,7 @@ var AnyOfField = class extends Component2 {
    */
   onOptionChange = (option) => {
     const { selectedOption, retrievedOptions } = this.state;
-    const { formData, onChange, registry } = this.props;
+    const { formData, onChange, registry, fieldPathId } = this.props;
     const { schemaUtils } = registry;
     const intOption = option !== void 0 ? parseInt(option, 10) : -1;
     if (intOption === selectedOption) {
@@ -1777,12 +1830,12 @@ var AnyOfField = class extends Component2 {
       newFormData = schemaUtils.getDefaultFormState(newOption, newFormData, "excludeObjectChildren");
     }
     this.setState({ selectedOption: intOption }, () => {
-      onChange(newFormData, void 0, this.getFieldId());
+      onChange(newFormData, fieldPathId.path, void 0, this.getFieldId());
     });
   };
   getFieldId() {
-    const { idSchema, schema } = this.props;
-    return `${idSchema.$id}${schema.oneOf ? "__oneof_select" : "__anyof_select"}`;
+    const { fieldPathId, schema } = this.props;
+    return `${fieldPathId.$id}${schema.oneOf ? "__oneof_select" : "__anyof_select"}`;
   }
   /** Renders the `AnyOfField` selector along with a `SchemaField` for the value of the `formData`
    */
@@ -1801,6 +1854,11 @@ var AnyOfField = class extends Component2 {
     } = this.props;
     const { widgets: widgets2, fields: fields2, translateString, globalUiOptions, schemaUtils } = registry;
     const { SchemaField: _SchemaField } = fields2;
+    const MultiSchemaFieldTemplate2 = getTemplate5(
+      "MultiSchemaFieldTemplate",
+      registry,
+      globalUiOptions
+    );
     const { selectedOption, retrievedOptions } = this.state;
     const {
       widget = "select",
@@ -1847,41 +1905,51 @@ var AnyOfField = class extends Component2 {
         value: index
       };
     });
-    return /* @__PURE__ */ jsxs("div", { className: "panel panel-default panel-body", children: [
-      /* @__PURE__ */ jsx6("div", { className: "form-group", children: /* @__PURE__ */ jsx6(
-        Widget,
-        {
-          id: this.getFieldId(),
-          name: `${name}${schema.oneOf ? "__oneof_select" : "__anyof_select"}`,
-          schema: { type: "number", default: 0 },
-          onChange: this.onOptionChange,
-          onBlur,
-          onFocus,
-          disabled: disabled || isEmpty3(enumOptions),
-          multiple: false,
-          rawErrors,
-          errorSchema: fieldErrorSchema,
-          value: selectedOption >= 0 ? selectedOption : void 0,
-          options: { enumOptions, ...uiOptions },
-          registry,
-          formContext,
-          placeholder,
-          autocomplete,
-          autofocus,
-          label: title ?? name,
-          hideLabel: !displayLabel,
-          readonly
-        }
-      ) }),
-      optionSchema && optionSchema.type !== "null" && /* @__PURE__ */ jsx6(_SchemaField, { ...this.props, schema: optionSchema, uiSchema: optionUiSchema })
-    ] });
+    const selector = /* @__PURE__ */ jsx6(
+      Widget,
+      {
+        id: this.getFieldId(),
+        name: `${name}${schema.oneOf ? "__oneof_select" : "__anyof_select"}`,
+        schema: { type: "number", default: 0 },
+        onChange: this.onOptionChange,
+        onBlur,
+        onFocus,
+        disabled: disabled || isEmpty3(enumOptions),
+        multiple: false,
+        rawErrors,
+        errorSchema: fieldErrorSchema,
+        value: selectedOption >= 0 ? selectedOption : void 0,
+        options: { enumOptions, ...uiOptions },
+        registry,
+        formContext,
+        placeholder,
+        autocomplete,
+        autofocus,
+        label: title ?? name,
+        hideLabel: !displayLabel,
+        readonly
+      }
+    );
+    const optionsSchemaField = optionSchema && optionSchema.type !== "null" && /* @__PURE__ */ jsx6(_SchemaField, { ...this.props, schema: optionSchema, uiSchema: optionUiSchema }) || null;
+    return /* @__PURE__ */ jsx6(
+      MultiSchemaFieldTemplate2,
+      {
+        schema,
+        registry,
+        uiSchema,
+        selector,
+        optionSchemaField: optionsSchemaField
+      }
+    );
   }
 };
 var MultiSchemaField_default = AnyOfField;
 
 // src/components/fields/NumberField.tsx
-import { useState as useState2, useCallback } from "react";
-import { asNumber } from "@rjsf/utils";
+import { useState as useState2, useCallback as useCallback2 } from "react";
+import {
+  asNumber
+} from "@rjsf/utils";
 import { jsx as jsx7 } from "react/jsx-runtime";
 var trailingCharMatcherWithPrefix = /\.([0-9]*0)*$/;
 var trailingCharMatcher = /[0.]0*$/;
@@ -1890,14 +1958,14 @@ function NumberField(props) {
   const [lastValue, setLastValue] = useState2(initialValue);
   const { StringField: StringField2 } = registry.fields;
   let value = formData;
-  const handleChange = useCallback(
-    (value2, errorSchema, id) => {
+  const handleChange = useCallback2(
+    (value2, path, errorSchema, id) => {
       setLastValue(value2);
       if (`${value2}`.charAt(0) === ".") {
         value2 = `0${value2}`;
       }
       const processed = typeof value2 === "string" && value2.match(trailingCharMatcherWithPrefix) ? asNumber(value2.replace(trailingCharMatcher, "")) : asNumber(value2);
-      onChange(processed, errorSchema, id);
+      onChange(processed, path, errorSchema, id);
     },
     [onChange]
   );
@@ -1914,15 +1982,18 @@ var NumberField_default = NumberField;
 // src/components/fields/ObjectField.tsx
 import { Component as Component3 } from "react";
 import {
-  getTemplate as getTemplate5,
+  getTemplate as getTemplate6,
   getUiOptions as getUiOptions7,
   orderProperties,
+  shouldRenderOptionalField as shouldRenderOptionalField2,
+  toFieldPathId as toFieldPathId3,
   TranslatableString as TranslatableString4,
   ADDITIONAL_PROPERTY_FLAG,
   PROPERTIES_KEY as PROPERTIES_KEY3,
   REF_KEY,
   ANY_OF_KEY as ANY_OF_KEY4,
-  ONE_OF_KEY as ONE_OF_KEY4
+  ONE_OF_KEY as ONE_OF_KEY4,
+  isFormDataAvailable as isFormDataAvailable2
 } from "@rjsf/utils";
 import Markdown from "markdown-to-jsx";
 import get5 from "lodash/get";
@@ -1930,7 +2001,7 @@ import has3 from "lodash/has";
 import isObject4 from "lodash/isObject";
 import set4 from "lodash/set";
 import unset from "lodash/unset";
-import { jsx as jsx8, jsxs as jsxs2 } from "react/jsx-runtime";
+import { jsx as jsx8, jsxs } from "react/jsx-runtime";
 var ObjectField = class extends Component3 {
   /** Set up the initial state */
   state = {
@@ -1955,20 +2026,12 @@ var ObjectField = class extends Component3 {
    * @returns - The onPropertyChange callback for the `name` property
    */
   onPropertyChange = (name, addedByAdditionalProperties = false) => {
-    return (value, newErrorSchema, id) => {
-      const { formData, onChange, errorSchema } = this.props;
+    return (value, path, newErrorSchema, id) => {
+      const { onChange } = this.props;
       if (value === void 0 && addedByAdditionalProperties) {
         value = "";
       }
-      const newFormData = { ...formData, [name]: value };
-      onChange(
-        newFormData,
-        errorSchema && errorSchema && {
-          ...errorSchema,
-          [name]: newErrorSchema
-        },
-        id
-      );
+      onChange(value, path, newErrorSchema, id);
     };
   };
   /** Returns a callback to handle the onDropPropertyClick event for the given `key` which removes the old `key` data
@@ -1980,10 +2043,10 @@ var ObjectField = class extends Component3 {
   onDropPropertyClick = (key) => {
     return (event) => {
       event.preventDefault();
-      const { onChange, formData } = this.props;
+      const { onChange, formData, fieldPathId } = this.props;
       const copiedFormData = { ...formData };
       unset(copiedFormData, key);
-      onChange(copiedFormData);
+      onChange(copiedFormData, fieldPathId.path);
     };
   };
   /** Computes the next available key name from the `preferredKey`, indexing through the already existing keys until one
@@ -2010,11 +2073,11 @@ var ObjectField = class extends Component3 {
    * @returns - The key change callback function
    */
   onKeyChange = (oldValue) => {
-    return (value, newErrorSchema) => {
+    return (value) => {
       if (oldValue === value) {
         return;
       }
-      const { formData, onChange, errorSchema } = this.props;
+      const { formData, onChange, fieldPathId } = this.props;
       value = this.getAvailableKey(value, formData);
       const newFormData = {
         ...formData
@@ -2026,13 +2089,7 @@ var ObjectField = class extends Component3 {
       });
       const renamedObj = Object.assign({}, ...keyValues);
       this.setState({ wasPropertyKeyModified: true });
-      onChange(
-        renamedObj,
-        errorSchema && errorSchema && {
-          ...errorSchema,
-          [value]: newErrorSchema
-        }
-      );
+      onChange(renamedObj, fieldPathId.path);
     };
   };
   /** Returns a default value to be used for a new additional schema property of the given `type`
@@ -2068,7 +2125,7 @@ var ObjectField = class extends Component3 {
     if (!(schema.additionalProperties || schema.patternProperties)) {
       return;
     }
-    const { formData, onChange, registry } = this.props;
+    const { formData, onChange, registry, fieldPathId } = this.props;
     const newFormData = { ...formData };
     const newKey = this.getAvailableKey("newKey", newFormData);
     if (schema.patternProperties) {
@@ -2096,7 +2153,7 @@ var ObjectField = class extends Component3 {
       const newValue = constValue ?? defaultValue ?? this.getDefaultValue(type);
       set4(newFormData, newKey, newValue);
     }
-    onChange(newFormData);
+    onChange(newFormData, fieldPathId.path);
   };
   /** Renders the `ObjectField` from the given props
    */
@@ -2106,37 +2163,40 @@ var ObjectField = class extends Component3 {
       uiSchema = {},
       formData,
       errorSchema,
-      idSchema,
+      fieldPathId,
       name,
       required = false,
       disabled,
       readonly,
       hideError,
-      idPrefix,
-      idSeparator,
       onBlur,
       onFocus,
       registry,
       title
     } = this.props;
-    const { fields: fields2, formContext, schemaUtils, translateString, globalUiOptions } = registry;
-    const { SchemaField: SchemaField2 } = fields2;
-    const schema = schemaUtils.retrieveSchema(rawSchema, formData);
+    const { fields: fields2, formContext, schemaUtils, translateString, globalFormOptions, globalUiOptions } = registry;
+    const { OptionalDataControlsField: OptionalDataControlsField2, SchemaField: SchemaField2 } = fields2;
+    const schema = schemaUtils.retrieveSchema(rawSchema, formData, true);
     const uiOptions = getUiOptions7(uiSchema, globalUiOptions);
     const { properties: schemaProperties = {} } = schema;
     const templateTitle = uiOptions.title ?? schema.title ?? title ?? name;
     const description = uiOptions.description ?? schema.description;
-    let orderedProperties;
-    try {
-      const properties = Object.keys(schemaProperties);
-      orderedProperties = orderProperties(properties, uiOptions.order);
-    } catch (err) {
-      return /* @__PURE__ */ jsxs2("div", { children: [
-        /* @__PURE__ */ jsx8("p", { className: "rjsf-config-error", style: { color: "red" }, children: /* @__PURE__ */ jsx8(Markdown, { options: { disableParsingRawHTML: true }, children: translateString(TranslatableString4.InvalidObjectField, [name || "root", err.message]) }) }),
-        /* @__PURE__ */ jsx8("pre", { children: JSON.stringify(schema) })
-      ] });
+    const renderOptionalField = shouldRenderOptionalField2(registry, schema, required, uiSchema);
+    const hasFormData = isFormDataAvailable2(formData);
+    let orderedProperties = [];
+    if (!renderOptionalField || hasFormData) {
+      try {
+        const properties = Object.keys(schemaProperties);
+        orderedProperties = orderProperties(properties, uiOptions.order);
+      } catch (err) {
+        return /* @__PURE__ */ jsxs("div", { children: [
+          /* @__PURE__ */ jsx8("p", { className: "rjsf-config-error", style: { color: "red" }, children: /* @__PURE__ */ jsx8(Markdown, { options: { disableParsingRawHTML: true }, children: translateString(TranslatableString4.InvalidObjectField, [name || "root", err.message]) }) }),
+          /* @__PURE__ */ jsx8("pre", { children: JSON.stringify(schema) })
+        ] });
+      }
     }
-    const Template = getTemplate5("ObjectFieldTemplate", registry, uiOptions);
+    const Template = getTemplate6("ObjectFieldTemplate", registry, uiOptions);
+    const optionalDataControl = renderOptionalField ? /* @__PURE__ */ jsx8(OptionalDataControlsField2, { ...this.props, schema }) : void 0;
     const templateProps = {
       // getDisplayLabel() always returns false for object types, so just check the `uiOptions.label`
       title: uiOptions.label === false ? "" : templateTitle,
@@ -2145,7 +2205,7 @@ var ObjectField = class extends Component3 {
         const addedByAdditionalProperties = has3(schema, [PROPERTIES_KEY3, name2, ADDITIONAL_PROPERTY_FLAG]);
         const fieldUiSchema = addedByAdditionalProperties ? uiSchema.additionalProperties : uiSchema[name2];
         const hidden = getUiOptions7(fieldUiSchema).widget === "hidden";
-        const fieldIdSchema = get5(idSchema, [name2], {});
+        const innerFieldIdPathId = toFieldPathId3(name2, globalFormOptions, fieldPathId);
         return {
           content: /* @__PURE__ */ jsx8(
             SchemaField2,
@@ -2155,9 +2215,7 @@ var ObjectField = class extends Component3 {
               schema: get5(schema, [PROPERTIES_KEY3, name2], {}),
               uiSchema: fieldUiSchema,
               errorSchema: get5(errorSchema, name2),
-              idSchema: fieldIdSchema,
-              idPrefix,
-              idSeparator,
+              fieldPathId: innerFieldIdPathId,
               formData: get5(formData, name2),
               formContext,
               wasPropertyKeyModified: this.state.wasPropertyKeyModified,
@@ -2183,36 +2241,105 @@ var ObjectField = class extends Component3 {
       readonly,
       disabled,
       required,
-      idSchema,
+      fieldPathId,
       uiSchema,
       errorSchema,
       schema,
       formData,
       formContext,
-      registry
+      registry,
+      optionalDataControl,
+      className: renderOptionalField ? "rjsf-optional-object-field" : void 0
     };
     return /* @__PURE__ */ jsx8(Template, { ...templateProps, onAddClick: this.handleAddClick });
   }
 };
 var ObjectField_default = ObjectField;
 
+// src/components/fields/OptionalDataControlsField.tsx
+import {
+  getSchemaType,
+  getTemplate as getTemplate7,
+  getUiOptions as getUiOptions8,
+  isFormDataAvailable as isFormDataAvailable3,
+  optionalControlsId,
+  TranslatableString as TranslatableString5
+} from "@rjsf/utils";
+import { jsx as jsx9 } from "react/jsx-runtime";
+function OptionalDataControlsField(props) {
+  const {
+    schema,
+    uiSchema = {},
+    formData,
+    disabled = false,
+    readonly = false,
+    onChange,
+    errorSchema,
+    fieldPathId,
+    registry
+  } = props;
+  const { globalUiOptions = {}, schemaUtils, translateString } = registry;
+  const uiOptions = getUiOptions8(uiSchema, globalUiOptions);
+  const OptionalDataControlsTemplate2 = getTemplate7(
+    "OptionalDataControlsTemplate",
+    registry,
+    uiOptions
+  );
+  const hasFormData = isFormDataAvailable3(formData);
+  let id;
+  let label;
+  let onAddClick;
+  let onRemoveClick;
+  if (disabled || readonly) {
+    id = optionalControlsId(fieldPathId, "Msg");
+    label = hasFormData ? void 0 : translateString(TranslatableString5.OptionalObjectEmptyMsg);
+  } else {
+    const labelEnum = hasFormData ? TranslatableString5.OptionalObjectRemove : TranslatableString5.OptionalObjectAdd;
+    label = translateString(labelEnum);
+    if (hasFormData) {
+      id = optionalControlsId(fieldPathId, "Remove");
+      onRemoveClick = () => onChange(void 0, fieldPathId.path, errorSchema);
+    } else {
+      id = optionalControlsId(fieldPathId, "Add");
+      onAddClick = () => {
+        let newFormData = schemaUtils.getDefaultFormState(schema, formData, "excludeObjectChildren");
+        if (newFormData === void 0) {
+          newFormData = getSchemaType(schema) === "array" ? [] : {};
+        }
+        onChange(newFormData, fieldPathId.path, errorSchema);
+      };
+    }
+  }
+  return label && /* @__PURE__ */ jsx9(
+    OptionalDataControlsTemplate2,
+    {
+      id,
+      registry,
+      schema,
+      uiSchema,
+      label,
+      onAddClick,
+      onRemoveClick
+    }
+  );
+}
+
 // src/components/fields/SchemaField.tsx
-import { useCallback as useCallback2, Component as Component4 } from "react";
+import { useCallback as useCallback3, Component as Component4 } from "react";
 import {
   ADDITIONAL_PROPERTY_FLAG as ADDITIONAL_PROPERTY_FLAG2,
-  deepEquals as deepEquals2,
   descriptionId,
-  getSchemaType,
-  getTemplate as getTemplate6,
-  getUiOptions as getUiOptions8,
+  getSchemaType as getSchemaType2,
+  getTemplate as getTemplate8,
+  getUiOptions as getUiOptions9,
   ID_KEY as ID_KEY3,
-  mergeObjects as mergeObjects2,
-  TranslatableString as TranslatableString5,
+  shouldRender,
+  TranslatableString as TranslatableString6,
   UI_OPTIONS_KEY as UI_OPTIONS_KEY2
 } from "@rjsf/utils";
 import isObject5 from "lodash/isObject";
 import omit3 from "lodash/omit";
-import { Fragment, jsx as jsx9, jsxs as jsxs3 } from "react/jsx-runtime";
+import { Fragment, jsx as jsx10, jsxs as jsxs2 } from "react/jsx-runtime";
 var COMPONENT_TYPES = {
   array: "ArrayField",
   boolean: "BooleanField",
@@ -2222,7 +2349,7 @@ var COMPONENT_TYPES = {
   string: "StringField",
   null: "NullField"
 };
-function getFieldComponent(schema, uiOptions, idSchema, registry) {
+function getFieldComponent(schema, uiOptions, fieldPathId, registry) {
   const field = uiOptions.field;
   const { fields: fields2, translateString } = registry;
   if (typeof field === "function") {
@@ -2231,7 +2358,7 @@ function getFieldComponent(schema, uiOptions, idSchema, registry) {
   if (typeof field === "string" && field in fields2) {
     return fields2[field];
   }
-  const schemaType = getSchemaType(schema);
+  const schemaType = getSchemaType2(schema);
   const type = Array.isArray(schemaType) ? schemaType[0] : schemaType || "";
   const schemaId = schema.$id;
   let componentName = COMPONENT_TYPES[type];
@@ -2242,17 +2369,17 @@ function getFieldComponent(schema, uiOptions, idSchema, registry) {
     return () => null;
   }
   return componentName in fields2 ? fields2[componentName] : () => {
-    const UnsupportedFieldTemplate = getTemplate6(
+    const UnsupportedFieldTemplate = getTemplate8(
       "UnsupportedFieldTemplate",
       registry,
       uiOptions
     );
-    return /* @__PURE__ */ jsx9(
+    return /* @__PURE__ */ jsx10(
       UnsupportedFieldTemplate,
       {
         schema,
-        idSchema,
-        reason: translateString(TranslatableString5.UnknownFieldType, [String(schema.type)]),
+        fieldPathId,
+        reason: translateString(TranslatableString6.UnknownFieldType, [String(schema.type)]),
         registry
       }
     );
@@ -2261,12 +2388,10 @@ function getFieldComponent(schema, uiOptions, idSchema, registry) {
 function SchemaFieldRender(props) {
   const {
     schema: _schema,
-    idSchema: _idSchema,
+    fieldPathId,
     uiSchema,
     formData,
     errorSchema,
-    idPrefix,
-    idSeparator,
     name,
     onChange,
     onKeyChange,
@@ -2276,29 +2401,25 @@ function SchemaFieldRender(props) {
     wasPropertyKeyModified = false
   } = props;
   const { formContext, schemaUtils, globalUiOptions } = registry;
-  const uiOptions = getUiOptions8(uiSchema, globalUiOptions);
-  const FieldTemplate2 = getTemplate6("FieldTemplate", registry, uiOptions);
-  const DescriptionFieldTemplate = getTemplate6(
+  const uiOptions = getUiOptions9(uiSchema, globalUiOptions);
+  const FieldTemplate2 = getTemplate8("FieldTemplate", registry, uiOptions);
+  const DescriptionFieldTemplate = getTemplate8(
     "DescriptionFieldTemplate",
     registry,
     uiOptions
   );
-  const FieldHelpTemplate2 = getTemplate6("FieldHelpTemplate", registry, uiOptions);
-  const FieldErrorTemplate2 = getTemplate6("FieldErrorTemplate", registry, uiOptions);
+  const FieldHelpTemplate2 = getTemplate8("FieldHelpTemplate", registry, uiOptions);
+  const FieldErrorTemplate2 = getTemplate8("FieldErrorTemplate", registry, uiOptions);
   const schema = schemaUtils.retrieveSchema(_schema, formData);
-  const fieldId = _idSchema[ID_KEY3];
-  const idSchema = mergeObjects2(
-    schemaUtils.toIdSchema(schema, fieldId, formData, idPrefix, idSeparator),
-    _idSchema
-  );
-  const handleFieldComponentChange = useCallback2(
-    (formData2, newErrorSchema, id2) => {
+  const fieldId = fieldPathId[ID_KEY3];
+  const handleFieldComponentChange = useCallback3(
+    (formData2, path, newErrorSchema, id2) => {
       const theId = id2 || fieldId;
-      return onChange(formData2, newErrorSchema, theId);
+      return onChange(formData2, path, newErrorSchema, theId);
     },
     [fieldId, onChange]
   );
-  const FieldComponent = getFieldComponent(schema, uiOptions, idSchema, registry);
+  const FieldComponent = getFieldComponent(schema, uiOptions, fieldPathId, registry);
   const disabled = Boolean(uiOptions.disabled ?? props.disabled);
   const readonly = Boolean(uiOptions.readonly ?? (props.readonly || props.schema.readOnly || schema.readOnly));
   const uiSchemaHideError = uiOptions.hideError;
@@ -2313,12 +2434,12 @@ function SchemaFieldRender(props) {
   if (UI_OPTIONS_KEY2 in fieldUiSchema) {
     fieldUiSchema[UI_OPTIONS_KEY2] = omit3(fieldUiSchema[UI_OPTIONS_KEY2], ["classNames", "style"]);
   }
-  const field = /* @__PURE__ */ jsx9(
+  const field = /* @__PURE__ */ jsx10(
     FieldComponent,
     {
       ...props,
       onChange: handleFieldComponentChange,
-      idSchema,
+      fieldPathId,
       schema,
       uiSchema: fieldUiSchema,
       disabled,
@@ -2330,7 +2451,7 @@ function SchemaFieldRender(props) {
       rawErrors: __errors
     }
   );
-  const id = idSchema[ID_KEY3];
+  const id = fieldPathId[ID_KEY3];
   let label;
   if (wasPropertyKeyModified) {
     label = name;
@@ -2340,37 +2461,37 @@ function SchemaFieldRender(props) {
   const description = uiOptions.description || props.schema.description || schema.description || "";
   const help = uiOptions.help;
   const hidden = uiOptions.widget === "hidden";
-  const classNames = ["rjsf-field", `rjsf-field-${getSchemaType(schema)}`];
+  const classNames = ["rjsf-field", `rjsf-field-${getSchemaType2(schema)}`];
   if (!hideError && __errors && __errors.length > 0) {
     classNames.push("rjsf-field-error");
   }
   if (uiOptions.classNames) {
     classNames.push(uiOptions.classNames);
   }
-  const helpComponent = /* @__PURE__ */ jsx9(
+  const helpComponent = /* @__PURE__ */ jsx10(
     FieldHelpTemplate2,
     {
       help,
-      idSchema,
+      fieldPathId,
       schema,
       uiSchema,
       hasErrors: !hideError && __errors && __errors.length > 0,
       registry
     }
   );
-  const errorsComponent = hideError || (schema.anyOf || schema.oneOf) && !schemaUtils.isSelect(schema) ? void 0 : /* @__PURE__ */ jsx9(
+  const errorsComponent = hideError || (schema.anyOf || schema.oneOf) && !schemaUtils.isSelect(schema) ? void 0 : /* @__PURE__ */ jsx10(
     FieldErrorTemplate2,
     {
       errors: __errors,
       errorSchema,
-      idSchema,
+      fieldPathId,
       schema,
       uiSchema,
       registry
     }
   );
   const fieldProps = {
-    description: /* @__PURE__ */ jsx9(
+    description: /* @__PURE__ */ jsx10(
       DescriptionFieldTemplate,
       {
         id: descriptionId(id),
@@ -2398,7 +2519,6 @@ function SchemaFieldRender(props) {
     displayLabel,
     classNames: classNames.join(" ").trim(),
     style: uiOptions.style,
-    formContext,
     formData,
     schema,
     uiSchema,
@@ -2407,9 +2527,9 @@ function SchemaFieldRender(props) {
   const _AnyOfField = registry.fields.AnyOfField;
   const _OneOfField = registry.fields.OneOfField;
   const isReplacingAnyOrOneOf = uiSchema?.["ui:field"] && uiSchema?.["ui:fieldReplacesAnyOrOneOf"] === true;
-  return /* @__PURE__ */ jsx9(FieldTemplate2, { ...fieldProps, children: /* @__PURE__ */ jsxs3(Fragment, { children: [
+  return /* @__PURE__ */ jsx10(FieldTemplate2, { ...fieldProps, children: /* @__PURE__ */ jsxs2(Fragment, { children: [
     field,
-    schema.anyOf && !isReplacingAnyOrOneOf && !schemaUtils.isSelect(schema) && /* @__PURE__ */ jsx9(
+    schema.anyOf && !isReplacingAnyOrOneOf && !schemaUtils.isSelect(schema) && /* @__PURE__ */ jsx10(
       _AnyOfField,
       {
         name,
@@ -2419,9 +2539,7 @@ function SchemaFieldRender(props) {
         errorSchema,
         formData,
         formContext,
-        idPrefix,
-        idSchema,
-        idSeparator,
+        fieldPathId,
         onBlur: props.onBlur,
         onChange: props.onChange,
         onFocus: props.onFocus,
@@ -2434,7 +2552,7 @@ function SchemaFieldRender(props) {
         uiSchema
       }
     ),
-    schema.oneOf && !isReplacingAnyOrOneOf && !schemaUtils.isSelect(schema) && /* @__PURE__ */ jsx9(
+    schema.oneOf && !isReplacingAnyOrOneOf && !schemaUtils.isSelect(schema) && /* @__PURE__ */ jsx10(
       _OneOfField,
       {
         name,
@@ -2444,9 +2562,7 @@ function SchemaFieldRender(props) {
         errorSchema,
         formData,
         formContext,
-        idPrefix,
-        idSchema,
-        idSeparator,
+        fieldPathId,
         onBlur: props.onBlur,
         onChange: props.onChange,
         onFocus: props.onFocus,
@@ -2463,28 +2579,33 @@ function SchemaFieldRender(props) {
 }
 var SchemaField = class extends Component4 {
   shouldComponentUpdate(nextProps) {
-    return !deepEquals2(this.props, nextProps);
+    const {
+      registry: { globalFormOptions }
+    } = this.props;
+    const { experimental_componentUpdateStrategy = "customDeep" } = globalFormOptions;
+    return shouldRender(this, nextProps, this.state, experimental_componentUpdateStrategy);
   }
   render() {
-    return /* @__PURE__ */ jsx9(SchemaFieldRender, { ...this.props });
+    return /* @__PURE__ */ jsx10(SchemaFieldRender, { ...this.props });
   }
 };
 var SchemaField_default = SchemaField;
 
 // src/components/fields/StringField.tsx
+import { useCallback as useCallback4 } from "react";
 import {
   getWidget as getWidget5,
-  getUiOptions as getUiOptions9,
+  getUiOptions as getUiOptions10,
   optionsList as optionsList4,
   hasWidget
 } from "@rjsf/utils";
-import { jsx as jsx10 } from "react/jsx-runtime";
+import { jsx as jsx11 } from "react/jsx-runtime";
 function StringField(props) {
   const {
     schema,
     name,
     uiSchema,
-    idSchema,
+    fieldPathId,
     formData,
     required,
     disabled = false,
@@ -2504,23 +2625,29 @@ function StringField(props) {
   if (format && hasWidget(schema, format, widgets2)) {
     defaultWidget = format;
   }
-  const { widget = defaultWidget, placeholder = "", title: uiTitle, ...options } = getUiOptions9(uiSchema);
+  const { widget = defaultWidget, placeholder = "", title: uiTitle, ...options } = getUiOptions10(uiSchema);
   const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema, globalUiOptions);
   const label = uiTitle ?? title ?? name;
   const Widget = getWidget5(schema, widget, widgets2);
-  return /* @__PURE__ */ jsx10(
+  const onWidgetChange = useCallback4(
+    (value, errorSchema, id) => {
+      return onChange(value, fieldPathId.path, errorSchema, id);
+    },
+    [onChange, fieldPathId]
+  );
+  return /* @__PURE__ */ jsx11(
     Widget,
     {
       options: { ...options, enumOptions },
       schema,
       uiSchema,
-      id: idSchema.$id,
+      id: fieldPathId.$id,
       name,
       label,
       hideLabel: !displayLabel,
       hideError,
       value: formData,
-      onChange,
+      onChange: onWidgetChange,
       onBlur,
       onFocus,
       required,
@@ -2539,12 +2666,12 @@ var StringField_default = StringField;
 // src/components/fields/NullField.tsx
 import { useEffect as useEffect2 } from "react";
 function NullField(props) {
-  const { formData, onChange } = props;
+  const { formData, onChange, fieldPathId } = props;
   useEffect2(() => {
     if (formData === void 0) {
-      onChange(null);
+      onChange(null, fieldPathId.path);
     }
-  }, [formData, onChange]);
+  }, [fieldPathId, formData, onChange]);
   return null;
 }
 var NullField_default = NullField;
@@ -2562,6 +2689,7 @@ function fields() {
     NumberField: NumberField_default,
     ObjectField: ObjectField_default,
     OneOfField: MultiSchemaField_default,
+    OptionalDataControlsField,
     SchemaField: SchemaField_default,
     StringField: StringField_default,
     NullField: NullField_default
@@ -2572,26 +2700,26 @@ var fields_default = fields;
 // src/components/templates/ArrayFieldDescriptionTemplate.tsx
 import {
   descriptionId as descriptionId2,
-  getTemplate as getTemplate7,
-  getUiOptions as getUiOptions10
+  getTemplate as getTemplate9,
+  getUiOptions as getUiOptions11
 } from "@rjsf/utils";
-import { jsx as jsx11 } from "react/jsx-runtime";
+import { jsx as jsx12 } from "react/jsx-runtime";
 function ArrayFieldDescriptionTemplate(props) {
-  const { idSchema, description, registry, schema, uiSchema } = props;
-  const options = getUiOptions10(uiSchema, registry.globalUiOptions);
+  const { fieldPathId, description, registry, schema, uiSchema } = props;
+  const options = getUiOptions11(uiSchema, registry.globalUiOptions);
   const { label: displayLabel = true } = options;
   if (!description || !displayLabel) {
     return null;
   }
-  const DescriptionFieldTemplate = getTemplate7(
+  const DescriptionFieldTemplate = getTemplate9(
     "DescriptionFieldTemplate",
     registry,
     options
   );
-  return /* @__PURE__ */ jsx11(
+  return /* @__PURE__ */ jsx12(
     DescriptionFieldTemplate,
     {
-      id: descriptionId2(idSchema),
+      id: descriptionId2(fieldPathId),
       description,
       schema,
       uiSchema,
@@ -2602,14 +2730,14 @@ function ArrayFieldDescriptionTemplate(props) {
 
 // src/components/templates/ArrayFieldItemTemplate.tsx
 import {
-  getTemplate as getTemplate8,
-  getUiOptions as getUiOptions11
+  getTemplate as getTemplate10,
+  getUiOptions as getUiOptions12
 } from "@rjsf/utils";
-import { jsx as jsx12, jsxs as jsxs4 } from "react/jsx-runtime";
+import { jsx as jsx13, jsxs as jsxs3 } from "react/jsx-runtime";
 function ArrayFieldItemTemplate(props) {
   const { children, className, buttonsProps, hasToolbar, registry, uiSchema } = props;
-  const uiOptions = getUiOptions11(uiSchema);
-  const ArrayFieldItemButtonsTemplate2 = getTemplate8(
+  const uiOptions = getUiOptions12(uiSchema);
+  const ArrayFieldItemButtonsTemplate2 = getTemplate10(
     "ArrayFieldItemButtonsTemplate",
     registry,
     uiOptions
@@ -2620,9 +2748,9 @@ function ArrayFieldItemTemplate(props) {
     paddingRight: 6,
     fontWeight: "bold"
   };
-  return /* @__PURE__ */ jsxs4("div", { className, children: [
-    /* @__PURE__ */ jsx12("div", { className: hasToolbar ? "col-xs-9" : "col-xs-12", children }),
-    hasToolbar && /* @__PURE__ */ jsx12("div", { className: "col-xs-3 array-item-toolbox", children: /* @__PURE__ */ jsx12(
+  return /* @__PURE__ */ jsxs3("div", { className, children: [
+    /* @__PURE__ */ jsx13("div", { className: hasToolbar ? "col-xs-9" : "col-xs-12", children }),
+    hasToolbar && /* @__PURE__ */ jsx13("div", { className: "col-xs-3 array-item-toolbox", children: /* @__PURE__ */ jsx13(
       "div",
       {
         className: "btn-group",
@@ -2630,7 +2758,7 @@ function ArrayFieldItemTemplate(props) {
           display: "flex",
           justifyContent: "space-around"
         },
-        children: /* @__PURE__ */ jsx12(ArrayFieldItemButtonsTemplate2, { ...buttonsProps, style: btnStyle })
+        children: /* @__PURE__ */ jsx13(ArrayFieldItemButtonsTemplate2, { ...buttonsProps, style: btnStyle })
       }
     ) })
   ] });
@@ -2641,7 +2769,7 @@ import { useMemo } from "react";
 import {
   buttonId
 } from "@rjsf/utils";
-import { Fragment as Fragment2, jsx as jsx13, jsxs as jsxs5 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx14, jsxs as jsxs4 } from "react/jsx-runtime";
 function ArrayFieldItemButtonsTemplate(props) {
   const {
     disabled,
@@ -2649,7 +2777,7 @@ function ArrayFieldItemButtonsTemplate(props) {
     hasMoveDown,
     hasMoveUp,
     hasRemove,
-    idSchema,
+    fieldPathId,
     index,
     onCopyIndexClick,
     onDropIndexClick,
@@ -2663,11 +2791,11 @@ function ArrayFieldItemButtonsTemplate(props) {
   const onRemoveClick = useMemo(() => onDropIndexClick(index), [index, onDropIndexClick]);
   const onArrowUpClick = useMemo(() => onReorderClick(index, index - 1), [index, onReorderClick]);
   const onArrowDownClick = useMemo(() => onReorderClick(index, index + 1), [index, onReorderClick]);
-  return /* @__PURE__ */ jsxs5(Fragment2, { children: [
-    (hasMoveUp || hasMoveDown) && /* @__PURE__ */ jsx13(
+  return /* @__PURE__ */ jsxs4(Fragment2, { children: [
+    (hasMoveUp || hasMoveDown) && /* @__PURE__ */ jsx14(
       MoveUpButton2,
       {
-        id: buttonId(idSchema, "moveUp"),
+        id: buttonId(fieldPathId, "moveUp"),
         className: "rjsf-array-item-move-up",
         disabled: disabled || readonly || !hasMoveUp,
         onClick: onArrowUpClick,
@@ -2675,10 +2803,10 @@ function ArrayFieldItemButtonsTemplate(props) {
         registry
       }
     ),
-    (hasMoveUp || hasMoveDown) && /* @__PURE__ */ jsx13(
+    (hasMoveUp || hasMoveDown) && /* @__PURE__ */ jsx14(
       MoveDownButton2,
       {
-        id: buttonId(idSchema, "moveDown"),
+        id: buttonId(fieldPathId, "moveDown"),
         className: "rjsf-array-item-move-down",
         disabled: disabled || readonly || !hasMoveDown,
         onClick: onArrowDownClick,
@@ -2686,10 +2814,10 @@ function ArrayFieldItemButtonsTemplate(props) {
         registry
       }
     ),
-    hasCopy && /* @__PURE__ */ jsx13(
+    hasCopy && /* @__PURE__ */ jsx14(
       CopyButton2,
       {
-        id: buttonId(idSchema, "copy"),
+        id: buttonId(fieldPathId, "copy"),
         className: "rjsf-array-item-copy",
         disabled: disabled || readonly,
         onClick: onCopyClick,
@@ -2697,10 +2825,10 @@ function ArrayFieldItemButtonsTemplate(props) {
         registry
       }
     ),
-    hasRemove && /* @__PURE__ */ jsx13(
+    hasRemove && /* @__PURE__ */ jsx14(
       RemoveButton2,
       {
-        id: buttonId(idSchema, "remove"),
+        id: buttonId(fieldPathId, "remove"),
         className: "rjsf-array-item-remove",
         disabled: disabled || readonly,
         onClick: onRemoveClick,
@@ -2713,19 +2841,20 @@ function ArrayFieldItemButtonsTemplate(props) {
 
 // src/components/templates/ArrayFieldTemplate.tsx
 import {
-  getTemplate as getTemplate9,
-  getUiOptions as getUiOptions12,
+  getTemplate as getTemplate11,
+  getUiOptions as getUiOptions13,
   buttonId as buttonId2
 } from "@rjsf/utils";
-import { jsx as jsx14, jsxs as jsxs6 } from "react/jsx-runtime";
+import { jsx as jsx15, jsxs as jsxs5 } from "react/jsx-runtime";
 function ArrayFieldTemplate(props) {
   const {
     canAdd,
     className,
     disabled,
-    idSchema,
+    fieldPathId,
     uiSchema,
     items,
+    optionalDataControl,
     onAddClick,
     readonly,
     registry,
@@ -2733,52 +2862,55 @@ function ArrayFieldTemplate(props) {
     schema,
     title
   } = props;
-  const uiOptions = getUiOptions12(uiSchema);
-  const ArrayFieldDescriptionTemplate2 = getTemplate9(
+  const uiOptions = getUiOptions13(uiSchema);
+  const ArrayFieldDescriptionTemplate2 = getTemplate11(
     "ArrayFieldDescriptionTemplate",
     registry,
     uiOptions
   );
-  const ArrayFieldItemTemplate2 = getTemplate9(
+  const ArrayFieldItemTemplate2 = getTemplate11(
     "ArrayFieldItemTemplate",
     registry,
     uiOptions
   );
-  const ArrayFieldTitleTemplate2 = getTemplate9(
+  const ArrayFieldTitleTemplate2 = getTemplate11(
     "ArrayFieldTitleTemplate",
     registry,
     uiOptions
   );
+  const showOptionalDataControlInTitle = !readonly && !disabled;
   const {
     ButtonTemplates: { AddButton: AddButton2 }
   } = registry.templates;
-  return /* @__PURE__ */ jsxs6("fieldset", { className, id: idSchema.$id, children: [
-    /* @__PURE__ */ jsx14(
+  return /* @__PURE__ */ jsxs5("fieldset", { className, id: fieldPathId.$id, children: [
+    /* @__PURE__ */ jsx15(
       ArrayFieldTitleTemplate2,
       {
-        idSchema,
+        fieldPathId,
         title: uiOptions.title || title,
         required,
         schema,
         uiSchema,
-        registry
+        registry,
+        optionalDataControl: showOptionalDataControlInTitle ? optionalDataControl : void 0
       }
     ),
-    /* @__PURE__ */ jsx14(
+    /* @__PURE__ */ jsx15(
       ArrayFieldDescriptionTemplate2,
       {
-        idSchema,
+        fieldPathId,
         description: uiOptions.description || schema.description,
         schema,
         uiSchema,
         registry
       }
     ),
-    /* @__PURE__ */ jsx14("div", { className: "row array-item-list", children: items && items.map(({ key, ...itemProps }) => /* @__PURE__ */ jsx14(ArrayFieldItemTemplate2, { ...itemProps }, key)) }),
-    canAdd && /* @__PURE__ */ jsx14(
+    !showOptionalDataControlInTitle ? optionalDataControl : void 0,
+    /* @__PURE__ */ jsx15("div", { className: "row array-item-list", children: items && items.map(({ key, ...itemProps }) => /* @__PURE__ */ jsx15(ArrayFieldItemTemplate2, { ...itemProps }, key)) }),
+    canAdd && /* @__PURE__ */ jsx15(
       AddButton2,
       {
-        id: buttonId2(idSchema, "add"),
+        id: buttonId2(fieldPathId, "add"),
         className: "rjsf-array-item-add",
         onClick: onAddClick,
         disabled: disabled || readonly,
@@ -2791,44 +2923,45 @@ function ArrayFieldTemplate(props) {
 
 // src/components/templates/ArrayFieldTitleTemplate.tsx
 import {
-  getTemplate as getTemplate10,
-  getUiOptions as getUiOptions13,
+  getTemplate as getTemplate12,
+  getUiOptions as getUiOptions14,
   titleId as titleId2
 } from "@rjsf/utils";
-import { jsx as jsx15 } from "react/jsx-runtime";
+import { jsx as jsx16 } from "react/jsx-runtime";
 function ArrayFieldTitleTemplate(props) {
-  const { idSchema, title, schema, uiSchema, required, registry } = props;
-  const options = getUiOptions13(uiSchema, registry.globalUiOptions);
+  const { fieldPathId, title, schema, uiSchema, required, registry, optionalDataControl } = props;
+  const options = getUiOptions14(uiSchema, registry.globalUiOptions);
   const { label: displayLabel = true } = options;
   if (!title || !displayLabel) {
     return null;
   }
-  const TitleFieldTemplate = getTemplate10(
+  const TitleFieldTemplate = getTemplate12(
     "TitleFieldTemplate",
     registry,
     options
   );
-  return /* @__PURE__ */ jsx15(
+  return /* @__PURE__ */ jsx16(
     TitleFieldTemplate,
     {
-      id: titleId2(idSchema),
+      id: titleId2(fieldPathId),
       title,
       required,
       schema,
       uiSchema,
-      registry
+      registry,
+      optionalDataControl
     }
   );
 }
 
 // src/components/templates/BaseInputTemplate.tsx
-import { useCallback as useCallback3 } from "react";
+import { useCallback as useCallback5 } from "react";
 import {
   ariaDescribedByIds,
   examplesId,
   getInputProps
 } from "@rjsf/utils";
-import { Fragment as Fragment3, jsx as jsx16, jsxs as jsxs7 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx17, jsxs as jsxs6 } from "react/jsx-runtime";
 function BaseInputTemplate(props) {
   const {
     id,
@@ -2869,20 +3002,20 @@ function BaseInputTemplate(props) {
   } else {
     inputValue = value == null ? "" : value;
   }
-  const _onChange = useCallback3(
+  const _onChange = useCallback5(
     ({ target: { value: value2 } }) => onChange(value2 === "" ? options.emptyValue : value2),
     [onChange, options]
   );
-  const _onBlur = useCallback3(
+  const _onBlur = useCallback5(
     ({ target }) => onBlur(id, target && target.value),
     [onBlur, id]
   );
-  const _onFocus = useCallback3(
+  const _onFocus = useCallback5(
     ({ target }) => onFocus(id, target && target.value),
     [onFocus, id]
   );
-  return /* @__PURE__ */ jsxs7(Fragment3, { children: [
-    /* @__PURE__ */ jsx16(
+  return /* @__PURE__ */ jsxs6(Fragment3, { children: [
+    /* @__PURE__ */ jsx17(
       "input",
       {
         id,
@@ -2900,74 +3033,76 @@ function BaseInputTemplate(props) {
         "aria-describedby": ariaDescribedByIds(id, !!schema.examples)
       }
     ),
-    Array.isArray(schema.examples) && /* @__PURE__ */ jsx16("datalist", { id: examplesId(id), children: schema.examples.concat(schema.default && !schema.examples.includes(schema.default) ? [schema.default] : []).map((example) => {
-      return /* @__PURE__ */ jsx16("option", { value: example }, example);
+    Array.isArray(schema.examples) && /* @__PURE__ */ jsx17("datalist", { id: examplesId(id), children: schema.examples.concat(schema.default && !schema.examples.includes(schema.default) ? [schema.default] : []).map((example) => {
+      return /* @__PURE__ */ jsx17("option", { value: example }, example);
     }) }, `datalist_${id}`)
   ] });
 }
 
 // src/components/templates/ButtonTemplates/SubmitButton.tsx
 import { getSubmitButtonOptions } from "@rjsf/utils";
-import { jsx as jsx17 } from "react/jsx-runtime";
+import { jsx as jsx18 } from "react/jsx-runtime";
 function SubmitButton({ uiSchema }) {
   const { submitText, norender, props: submitButtonProps = {} } = getSubmitButtonOptions(uiSchema);
   if (norender) {
     return null;
   }
-  return /* @__PURE__ */ jsx17("div", { children: /* @__PURE__ */ jsx17("button", { type: "submit", ...submitButtonProps, className: `btn btn-info ${submitButtonProps.className || ""}`, children: submitText }) });
+  return /* @__PURE__ */ jsx18("div", { children: /* @__PURE__ */ jsx18("button", { type: "submit", ...submitButtonProps, className: `btn btn-info ${submitButtonProps.className || ""}`, children: submitText }) });
 }
 
 // src/components/templates/ButtonTemplates/AddButton.tsx
-import { TranslatableString as TranslatableString7 } from "@rjsf/utils";
+import { TranslatableString as TranslatableString8 } from "@rjsf/utils";
 
 // src/components/templates/ButtonTemplates/IconButton.tsx
-import { TranslatableString as TranslatableString6 } from "@rjsf/utils";
-import { jsx as jsx18 } from "react/jsx-runtime";
+import { TranslatableString as TranslatableString7 } from "@rjsf/utils";
+import { jsx as jsx19 } from "react/jsx-runtime";
 function IconButton(props) {
   const { iconType = "default", icon, className, uiSchema, registry, ...otherProps } = props;
-  return /* @__PURE__ */ jsx18("button", { type: "button", className: `btn btn-${iconType} ${className}`, ...otherProps, children: /* @__PURE__ */ jsx18("i", { className: `glyphicon glyphicon-${icon}` }) });
+  return /* @__PURE__ */ jsx19("button", { type: "button", className: `btn btn-${iconType} ${className}`, ...otherProps, children: /* @__PURE__ */ jsx19("i", { className: `glyphicon glyphicon-${icon}` }) });
 }
 function CopyButton(props) {
   const {
     registry: { translateString }
   } = props;
-  return /* @__PURE__ */ jsx18(IconButton, { title: translateString(TranslatableString6.CopyButton), ...props, icon: "copy" });
+  return /* @__PURE__ */ jsx19(IconButton, { title: translateString(TranslatableString7.CopyButton), ...props, icon: "copy" });
 }
 function MoveDownButton(props) {
   const {
     registry: { translateString }
   } = props;
-  return /* @__PURE__ */ jsx18(IconButton, { title: translateString(TranslatableString6.MoveDownButton), ...props, icon: "arrow-down" });
+  return /* @__PURE__ */ jsx19(IconButton, { title: translateString(TranslatableString7.MoveDownButton), ...props, icon: "arrow-down" });
 }
 function MoveUpButton(props) {
   const {
     registry: { translateString }
   } = props;
-  return /* @__PURE__ */ jsx18(IconButton, { title: translateString(TranslatableString6.MoveUpButton), ...props, icon: "arrow-up" });
+  return /* @__PURE__ */ jsx19(IconButton, { title: translateString(TranslatableString7.MoveUpButton), ...props, icon: "arrow-up" });
 }
 function RemoveButton(props) {
   const {
     registry: { translateString }
   } = props;
-  return /* @__PURE__ */ jsx18(IconButton, { title: translateString(TranslatableString6.RemoveButton), ...props, iconType: "danger", icon: "remove" });
+  return /* @__PURE__ */ jsx19(IconButton, { title: translateString(TranslatableString7.RemoveButton), ...props, iconType: "danger", icon: "remove" });
 }
 
 // src/components/templates/ButtonTemplates/AddButton.tsx
-import { jsx as jsx19 } from "react/jsx-runtime";
+import { jsx as jsx20 } from "react/jsx-runtime";
 function AddButton({
+  id,
   className,
   onClick,
   disabled,
   registry
 }) {
   const { translateString } = registry;
-  return /* @__PURE__ */ jsx19("div", { className: "row", children: /* @__PURE__ */ jsx19("p", { className: `col-xs-3 col-xs-offset-9 text-right ${className}`, children: /* @__PURE__ */ jsx19(
+  return /* @__PURE__ */ jsx20("div", { className: "row", children: /* @__PURE__ */ jsx20("p", { className: `col-xs-3 col-xs-offset-9 text-right ${className}`, children: /* @__PURE__ */ jsx20(
     IconButton,
     {
+      id,
       iconType: "info",
       icon: "plus",
       className: "btn-add col-xs-12",
-      title: translateString(TranslatableString7.AddButton),
+      title: translateString(TranslatableString8.AddButton),
       onClick,
       disabled,
       registry
@@ -2991,84 +3126,84 @@ var ButtonTemplates_default = buttonTemplates;
 // src/components/RichDescription.tsx
 import {
   getTestIds as getTestIds2,
-  getUiOptions as getUiOptions14
+  getUiOptions as getUiOptions15
 } from "@rjsf/utils";
 import Markdown2 from "markdown-to-jsx";
-import { jsx as jsx20 } from "react/jsx-runtime";
+import { jsx as jsx21 } from "react/jsx-runtime";
 var TEST_IDS = getTestIds2();
 function RichDescription({ description, registry, uiSchema = {} }) {
   const { globalUiOptions } = registry;
-  const uiOptions = getUiOptions14(uiSchema, globalUiOptions);
+  const uiOptions = getUiOptions15(uiSchema, globalUiOptions);
   if (uiOptions.enableMarkdownInDescription && typeof description === "string") {
-    return /* @__PURE__ */ jsx20(Markdown2, { options: { disableParsingRawHTML: true }, "data-testid": TEST_IDS.markdown, children: description });
+    return /* @__PURE__ */ jsx21(Markdown2, { options: { disableParsingRawHTML: true }, "data-testid": TEST_IDS.markdown, children: description });
   }
   return description;
 }
 RichDescription.TEST_IDS = TEST_IDS;
 
 // src/components/templates/DescriptionField.tsx
-import { jsx as jsx21 } from "react/jsx-runtime";
+import { jsx as jsx22 } from "react/jsx-runtime";
 function DescriptionField(props) {
   const { id, description, registry, uiSchema } = props;
   if (!description) {
     return null;
   }
-  return /* @__PURE__ */ jsx21("div", { id, className: "field-description", children: /* @__PURE__ */ jsx21(RichDescription, { description, registry, uiSchema }) });
+  return /* @__PURE__ */ jsx22("div", { id, className: "field-description", children: /* @__PURE__ */ jsx22(RichDescription, { description, registry, uiSchema }) });
 }
 
 // src/components/templates/ErrorList.tsx
 import {
-  TranslatableString as TranslatableString8
+  TranslatableString as TranslatableString9
 } from "@rjsf/utils";
-import { jsx as jsx22, jsxs as jsxs8 } from "react/jsx-runtime";
+import { jsx as jsx23, jsxs as jsxs7 } from "react/jsx-runtime";
 function ErrorList({
   errors,
   registry
 }) {
   const { translateString } = registry;
-  return /* @__PURE__ */ jsxs8("div", { className: "panel panel-danger errors", children: [
-    /* @__PURE__ */ jsx22("div", { className: "panel-heading", children: /* @__PURE__ */ jsx22("h3", { className: "panel-title", children: translateString(TranslatableString8.ErrorsLabel) }) }),
-    /* @__PURE__ */ jsx22("ul", { className: "list-group", children: errors.map((error, i) => {
-      return /* @__PURE__ */ jsx22("li", { className: "list-group-item text-danger", children: error.stack }, i);
+  return /* @__PURE__ */ jsxs7("div", { className: "panel panel-danger errors", children: [
+    /* @__PURE__ */ jsx23("div", { className: "panel-heading", children: /* @__PURE__ */ jsx23("h3", { className: "panel-title", children: translateString(TranslatableString9.ErrorsLabel) }) }),
+    /* @__PURE__ */ jsx23("ul", { className: "list-group", children: errors.map((error, i) => {
+      return /* @__PURE__ */ jsx23("li", { className: "list-group-item text-danger", children: error.stack }, i);
     }) })
   ] });
 }
 
 // src/components/templates/FieldTemplate/FieldTemplate.tsx
 import {
-  getTemplate as getTemplate11,
-  getUiOptions as getUiOptions15
+  getTemplate as getTemplate13,
+  getUiOptions as getUiOptions16
 } from "@rjsf/utils";
 
 // src/components/templates/FieldTemplate/Label.tsx
-import { jsx as jsx23, jsxs as jsxs9 } from "react/jsx-runtime";
+import { jsx as jsx24, jsxs as jsxs8 } from "react/jsx-runtime";
 var REQUIRED_FIELD_SYMBOL = "*";
 function Label(props) {
   const { label, required, id } = props;
   if (!label) {
     return null;
   }
-  return /* @__PURE__ */ jsxs9("label", { className: "control-label", htmlFor: id, children: [
+  return /* @__PURE__ */ jsxs8("label", { className: "control-label", htmlFor: id, children: [
     label,
-    required && /* @__PURE__ */ jsx23("span", { className: "required", children: REQUIRED_FIELD_SYMBOL })
+    required && /* @__PURE__ */ jsx24("span", { className: "required", children: REQUIRED_FIELD_SYMBOL })
   ] });
 }
 
 // src/components/templates/FieldTemplate/FieldTemplate.tsx
-import { jsx as jsx24, jsxs as jsxs10 } from "react/jsx-runtime";
+import { jsx as jsx25, jsxs as jsxs9 } from "react/jsx-runtime";
 function FieldTemplate(props) {
   const { id, label, children, errors, help, description, hidden, required, displayLabel, registry, uiSchema } = props;
-  const uiOptions = getUiOptions15(uiSchema);
-  const WrapIfAdditionalTemplate2 = getTemplate11(
+  const uiOptions = getUiOptions16(uiSchema);
+  const WrapIfAdditionalTemplate2 = getTemplate13(
     "WrapIfAdditionalTemplate",
     registry,
     uiOptions
   );
   if (hidden) {
-    return /* @__PURE__ */ jsx24("div", { className: "hidden", children });
+    return /* @__PURE__ */ jsx25("div", { className: "hidden", children });
   }
-  return /* @__PURE__ */ jsxs10(WrapIfAdditionalTemplate2, { ...props, children: [
-    displayLabel && /* @__PURE__ */ jsx24(Label, { label, required, id }),
+  return /* @__PURE__ */ jsxs9(WrapIfAdditionalTemplate2, { ...props, children: [
+    displayLabel && /* @__PURE__ */ jsx25(Label, { label, required, id }),
     displayLabel && description ? description : null,
     children,
     errors,
@@ -3081,57 +3216,69 @@ var FieldTemplate_default = FieldTemplate;
 
 // src/components/templates/FieldErrorTemplate.tsx
 import { errorId } from "@rjsf/utils";
-import { jsx as jsx25 } from "react/jsx-runtime";
+import { jsx as jsx26 } from "react/jsx-runtime";
 function FieldErrorTemplate(props) {
-  const { errors = [], idSchema } = props;
+  const { errors = [], fieldPathId } = props;
   if (errors.length === 0) {
     return null;
   }
-  const id = errorId(idSchema);
-  return /* @__PURE__ */ jsx25("div", { children: /* @__PURE__ */ jsx25("ul", { id, className: "error-detail bs-callout bs-callout-info", children: errors.filter((elem) => !!elem).map((error, index) => {
-    return /* @__PURE__ */ jsx25("li", { className: "text-danger", children: error }, index);
+  const id = errorId(fieldPathId);
+  return /* @__PURE__ */ jsx26("div", { children: /* @__PURE__ */ jsx26("ul", { id, className: "error-detail bs-callout bs-callout-info", children: errors.filter((elem) => !!elem).map((error, index) => {
+    return /* @__PURE__ */ jsx26("li", { className: "text-danger", children: error }, index);
   }) }) });
 }
 
 // src/components/templates/FieldHelpTemplate.tsx
 import { helpId } from "@rjsf/utils";
-import { jsx as jsx26 } from "react/jsx-runtime";
+import { jsx as jsx27 } from "react/jsx-runtime";
 function FieldHelpTemplate(props) {
-  const { idSchema, help } = props;
+  const { fieldPathId, help } = props;
   if (!help) {
     return null;
   }
-  const id = helpId(idSchema);
+  const id = helpId(fieldPathId);
   if (typeof help === "string") {
-    return /* @__PURE__ */ jsx26("p", { id, className: "help-block", children: help });
+    return /* @__PURE__ */ jsx27("p", { id, className: "help-block", children: help });
   }
-  return /* @__PURE__ */ jsx26("div", { id, className: "help-block", children: help });
+  return /* @__PURE__ */ jsx27("div", { id, className: "help-block", children: help });
 }
 
 // src/components/templates/GridTemplate.tsx
-import { jsx as jsx27 } from "react/jsx-runtime";
+import { jsx as jsx28 } from "react/jsx-runtime";
 function GridTemplate(props) {
   const { children, column, className, ...rest } = props;
-  return /* @__PURE__ */ jsx27("div", { className, ...rest, children });
+  return /* @__PURE__ */ jsx28("div", { className, ...rest, children });
+}
+
+// src/components/templates/MultiSchemaFieldTemplate.tsx
+import { jsx as jsx29, jsxs as jsxs10 } from "react/jsx-runtime";
+function MultiSchemaFieldTemplate(props) {
+  const { selector, optionSchemaField } = props;
+  return /* @__PURE__ */ jsxs10("div", { className: "panel panel-default panel-body", children: [
+    /* @__PURE__ */ jsx29("div", { className: "form-group", children: selector }),
+    optionSchemaField
+  ] });
 }
 
 // src/components/templates/ObjectFieldTemplate.tsx
 import {
   canExpand,
   descriptionId as descriptionId3,
-  getTemplate as getTemplate12,
-  getUiOptions as getUiOptions16,
+  getTemplate as getTemplate14,
+  getUiOptions as getUiOptions17,
   titleId as titleId3,
   buttonId as buttonId3
 } from "@rjsf/utils";
-import { jsx as jsx28, jsxs as jsxs11 } from "react/jsx-runtime";
+import { jsx as jsx30, jsxs as jsxs11 } from "react/jsx-runtime";
 function ObjectFieldTemplate(props) {
   const {
+    className,
     description,
     disabled,
     formData,
-    idSchema,
+    fieldPathId,
     onAddClick,
+    optionalDataControl,
     properties,
     readonly,
     registry,
@@ -3140,43 +3287,46 @@ function ObjectFieldTemplate(props) {
     title,
     uiSchema
   } = props;
-  const options = getUiOptions16(uiSchema);
-  const TitleFieldTemplate = getTemplate12("TitleFieldTemplate", registry, options);
-  const DescriptionFieldTemplate = getTemplate12(
+  const options = getUiOptions17(uiSchema);
+  const TitleFieldTemplate = getTemplate14("TitleFieldTemplate", registry, options);
+  const DescriptionFieldTemplate = getTemplate14(
     "DescriptionFieldTemplate",
     registry,
     options
   );
+  const showOptionalDataControlInTitle = !readonly && !disabled;
   const {
     ButtonTemplates: { AddButton: AddButton2 }
   } = registry.templates;
-  return /* @__PURE__ */ jsxs11("fieldset", { id: idSchema.$id, children: [
-    title && /* @__PURE__ */ jsx28(
+  return /* @__PURE__ */ jsxs11("fieldset", { className, id: fieldPathId.$id, children: [
+    title && /* @__PURE__ */ jsx30(
       TitleFieldTemplate,
       {
-        id: titleId3(idSchema),
+        id: titleId3(fieldPathId),
         title,
         required,
         schema,
         uiSchema,
-        registry
+        registry,
+        optionalDataControl: showOptionalDataControlInTitle ? optionalDataControl : void 0
       }
     ),
-    description && /* @__PURE__ */ jsx28(
+    description && /* @__PURE__ */ jsx30(
       DescriptionFieldTemplate,
       {
-        id: descriptionId3(idSchema),
+        id: descriptionId3(fieldPathId),
         description,
         schema,
         uiSchema,
         registry
       }
     ),
+    !showOptionalDataControlInTitle ? optionalDataControl : void 0,
     properties.map((prop) => prop.content),
-    canExpand(schema, uiSchema, formData) && /* @__PURE__ */ jsx28(
+    canExpand(schema, uiSchema, formData) && /* @__PURE__ */ jsx30(
       AddButton2,
       {
-        id: buttonId3(idSchema, "add"),
+        id: buttonId3(fieldPathId, "add"),
         className: "rjsf-object-property-expand",
         onClick: onAddClick(schema),
         disabled: disabled || readonly,
@@ -3187,37 +3337,70 @@ function ObjectFieldTemplate(props) {
   ] });
 }
 
+// src/components/templates/OptionalDataControlsTemplate.tsx
+import { jsx as jsx31 } from "react/jsx-runtime";
+function OptionalDataControlsTemplate(props) {
+  const { id, registry, label, onAddClick, onRemoveClick } = props;
+  if (onAddClick) {
+    return /* @__PURE__ */ jsx31(
+      IconButton,
+      {
+        id,
+        registry,
+        icon: "plus",
+        className: "rjsf-add-optional-data btn-sm",
+        onClick: onAddClick,
+        title: label
+      }
+    );
+  } else if (onRemoveClick) {
+    return /* @__PURE__ */ jsx31(
+      IconButton,
+      {
+        id,
+        registry,
+        icon: "remove",
+        className: "rjsf-remove-optional-data btn-sm",
+        onClick: onRemoveClick,
+        title: label
+      }
+    );
+  }
+  return /* @__PURE__ */ jsx31("em", { id, children: label });
+}
+
 // src/components/templates/TitleField.tsx
-import { jsx as jsx29, jsxs as jsxs12 } from "react/jsx-runtime";
+import { jsx as jsx32, jsxs as jsxs12 } from "react/jsx-runtime";
 var REQUIRED_FIELD_SYMBOL2 = "*";
 function TitleField(props) {
-  const { id, title, required } = props;
+  const { id, title, required, optionalDataControl } = props;
   return /* @__PURE__ */ jsxs12("legend", { id, children: [
     title,
-    required && /* @__PURE__ */ jsx29("span", { className: "required", children: REQUIRED_FIELD_SYMBOL2 })
+    required && /* @__PURE__ */ jsx32("span", { className: "required", children: REQUIRED_FIELD_SYMBOL2 }),
+    optionalDataControl && /* @__PURE__ */ jsx32("span", { className: "pull-right", style: { marginBottom: "2px" }, children: optionalDataControl })
   ] });
 }
 
 // src/components/templates/UnsupportedField.tsx
-import { TranslatableString as TranslatableString9 } from "@rjsf/utils";
+import { TranslatableString as TranslatableString10 } from "@rjsf/utils";
 import Markdown3 from "markdown-to-jsx";
-import { jsx as jsx30, jsxs as jsxs13 } from "react/jsx-runtime";
+import { jsx as jsx33, jsxs as jsxs13 } from "react/jsx-runtime";
 function UnsupportedField(props) {
-  const { schema, idSchema, reason, registry } = props;
+  const { schema, fieldPathId, reason, registry } = props;
   const { translateString } = registry;
-  let translateEnum = TranslatableString9.UnsupportedField;
+  let translateEnum = TranslatableString10.UnsupportedField;
   const translateParams = [];
-  if (idSchema && idSchema.$id) {
-    translateEnum = TranslatableString9.UnsupportedFieldWithId;
-    translateParams.push(idSchema.$id);
+  if (fieldPathId && fieldPathId.$id) {
+    translateEnum = TranslatableString10.UnsupportedFieldWithId;
+    translateParams.push(fieldPathId.$id);
   }
   if (reason) {
-    translateEnum = translateEnum === TranslatableString9.UnsupportedField ? TranslatableString9.UnsupportedFieldWithReason : TranslatableString9.UnsupportedFieldWithIdAndReason;
+    translateEnum = translateEnum === TranslatableString10.UnsupportedField ? TranslatableString10.UnsupportedFieldWithReason : TranslatableString10.UnsupportedFieldWithIdAndReason;
     translateParams.push(reason);
   }
   return /* @__PURE__ */ jsxs13("div", { className: "unsupported-field", children: [
-    /* @__PURE__ */ jsx30("p", { children: /* @__PURE__ */ jsx30(Markdown3, { options: { disableParsingRawHTML: true }, children: translateString(translateEnum, translateParams) }) }),
-    schema && /* @__PURE__ */ jsx30("pre", { children: JSON.stringify(schema, null, 2) })
+    /* @__PURE__ */ jsx33("p", { children: /* @__PURE__ */ jsx33(Markdown3, { options: { disableParsingRawHTML: true }, children: translateString(translateEnum, translateParams) }) }),
+    schema && /* @__PURE__ */ jsx33("pre", { children: JSON.stringify(schema, null, 2) })
   ] });
 }
 var UnsupportedField_default = UnsupportedField;
@@ -3226,9 +3409,9 @@ var UnsupportedField_default = UnsupportedField;
 import {
   ADDITIONAL_PROPERTY_FLAG as ADDITIONAL_PROPERTY_FLAG3,
   buttonId as buttonId4,
-  TranslatableString as TranslatableString10
+  TranslatableString as TranslatableString11
 } from "@rjsf/utils";
-import { jsx as jsx31, jsxs as jsxs14 } from "react/jsx-runtime";
+import { jsx as jsx34, jsxs as jsxs14 } from "react/jsx-runtime";
 function WrapIfAdditionalTemplate(props) {
   const {
     id,
@@ -3249,7 +3432,7 @@ function WrapIfAdditionalTemplate(props) {
   } = props;
   const { templates: templates2, translateString } = registry;
   const { RemoveButton: RemoveButton2 } = templates2.ButtonTemplates;
-  const keyLabel = translateString(TranslatableString10.KeyLabel, [label]);
+  const keyLabel = translateString(TranslatableString11.KeyLabel, [label]);
   const additional = ADDITIONAL_PROPERTY_FLAG3 in schema;
   const classNamesList = ["form-group", classNames];
   if (!hideError && rawErrors && rawErrors.length > 0) {
@@ -3257,12 +3440,12 @@ function WrapIfAdditionalTemplate(props) {
   }
   const uiClassNames = classNamesList.join(" ").trim();
   if (!additional) {
-    return /* @__PURE__ */ jsx31("div", { className: uiClassNames, style, children });
+    return /* @__PURE__ */ jsx34("div", { className: uiClassNames, style, children });
   }
-  return /* @__PURE__ */ jsx31("div", { className: uiClassNames, style, children: /* @__PURE__ */ jsxs14("div", { className: "row", children: [
-    /* @__PURE__ */ jsx31("div", { className: "col-xs-5 form-additional", children: /* @__PURE__ */ jsxs14("div", { className: "form-group", children: [
-      /* @__PURE__ */ jsx31(Label, { label: keyLabel, required, id: `${id}-key` }),
-      /* @__PURE__ */ jsx31(
+  return /* @__PURE__ */ jsx34("div", { className: uiClassNames, style, children: /* @__PURE__ */ jsxs14("div", { className: "row", children: [
+    /* @__PURE__ */ jsx34("div", { className: "col-xs-5 form-additional", children: /* @__PURE__ */ jsxs14("div", { className: "form-group", children: [
+      /* @__PURE__ */ jsx34(Label, { label: keyLabel, required, id: `${id}-key` }),
+      /* @__PURE__ */ jsx34(
         "input",
         {
           className: "form-control",
@@ -3273,8 +3456,8 @@ function WrapIfAdditionalTemplate(props) {
         }
       )
     ] }) }),
-    /* @__PURE__ */ jsx31("div", { className: "form-additional form-group col-xs-5", children }),
-    /* @__PURE__ */ jsx31("div", { className: "col-xs-2", children: /* @__PURE__ */ jsx31(
+    /* @__PURE__ */ jsx34("div", { className: "form-additional form-group col-xs-5", children }),
+    /* @__PURE__ */ jsx34("div", { className: "col-xs-2", children: /* @__PURE__ */ jsx34(
       RemoveButton2,
       {
         id: buttonId4(id, "remove"),
@@ -3305,7 +3488,9 @@ function templates() {
     FieldErrorTemplate,
     FieldHelpTemplate,
     GridTemplate,
+    MultiSchemaFieldTemplate,
     ObjectFieldTemplate,
+    OptionalDataControlsTemplate,
     TitleFieldTemplate: TitleField,
     UnsupportedFieldTemplate: UnsupportedField_default,
     WrapIfAdditionalTemplate
@@ -3314,16 +3499,16 @@ function templates() {
 var templates_default = templates;
 
 // src/components/widgets/AltDateWidget.tsx
-import { useCallback as useCallback4, useEffect as useEffect3, useReducer, useState as useState3 } from "react";
+import { useCallback as useCallback6, useEffect as useEffect3, useState as useState3 } from "react";
 import {
   ariaDescribedByIds as ariaDescribedByIds2,
   dateRangeOptions,
   parseDateString,
   toDateString,
-  TranslatableString as TranslatableString11,
+  TranslatableString as TranslatableString12,
   getDateElementProps
 } from "@rjsf/utils";
-import { jsx as jsx32, jsxs as jsxs15 } from "react/jsx-runtime";
+import { jsx as jsx35, jsxs as jsxs15 } from "react/jsx-runtime";
 function readyForChange(state) {
   return Object.values(state).every((value) => value !== -1);
 }
@@ -3343,7 +3528,7 @@ function DateElement({
 }) {
   const id = rootId + "_" + type;
   const { SelectWidget: SelectWidget2 } = registry.widgets;
-  return /* @__PURE__ */ jsx32(
+  return /* @__PURE__ */ jsx35(
     SelectWidget2,
     {
       schema: { type: "integer" },
@@ -3380,26 +3565,25 @@ function AltDateWidget({
   value
 }) {
   const { translateString } = registry;
-  const [lastValue, setLastValue] = useState3(value);
-  const [state, setState] = useReducer(
-    (state2, action) => {
-      return { ...state2, ...action };
+  const [state, setState] = useState3(parseDateString(value, time));
+  useEffect3(() => {
+    setState(parseDateString(value, time));
+  }, [time, value]);
+  const handleChange = useCallback6(
+    (property, value2) => {
+      const nextState = {
+        ...state,
+        [property]: typeof value2 === "undefined" ? -1 : value2
+      };
+      if (readyForChange(nextState)) {
+        onChange(toDateString(nextState, time));
+      } else {
+        setState(nextState);
+      }
     },
-    parseDateString(value, time)
+    [state, onChange, time]
   );
-  useEffect3(() => {
-    const stateValue = toDateString(state, time);
-    if (readyForChange(state) && stateValue !== value) {
-      onChange(stateValue);
-    } else if (lastValue !== value) {
-      setLastValue(value);
-      setState(parseDateString(value, time));
-    }
-  }, [time, value, onChange, state, lastValue]);
-  const handleChange = useCallback4((property, value2) => {
-    setState({ [property]: value2 });
-  }, []);
-  const handleSetNow = useCallback4(
+  const handleSetNow = useCallback6(
     (event) => {
       event.preventDefault();
       if (disabled || readonly) {
@@ -3408,9 +3592,9 @@ function AltDateWidget({
       const nextState = parseDateString((/* @__PURE__ */ new Date()).toJSON(), time);
       onChange(toDateString(nextState, time));
     },
-    [disabled, readonly, time]
+    [disabled, readonly, time, onChange]
   );
-  const handleClear = useCallback4(
+  const handleClear = useCallback6(
     (event) => {
       event.preventDefault();
       if (disabled || readonly) {
@@ -3426,7 +3610,7 @@ function AltDateWidget({
       time,
       options.yearsRange,
       options.format
-    ).map((elemProps, i) => /* @__PURE__ */ jsx32("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx32(
+    ).map((elemProps, i) => /* @__PURE__ */ jsx35("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx35(
       DateElement,
       {
         rootId: id,
@@ -3441,33 +3625,33 @@ function AltDateWidget({
         autofocus: autofocus && i === 0
       }
     ) }, i)),
-    (options.hideNowButton !== "undefined" ? !options.hideNowButton : true) && /* @__PURE__ */ jsx32("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx32("a", { href: "#", className: "btn btn-info btn-now", onClick: handleSetNow, children: translateString(TranslatableString11.NowLabel) }) }),
-    (options.hideClearButton !== "undefined" ? !options.hideClearButton : true) && /* @__PURE__ */ jsx32("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx32("a", { href: "#", className: "btn btn-warning btn-clear", onClick: handleClear, children: translateString(TranslatableString11.ClearLabel) }) })
+    (options.hideNowButton !== "undefined" ? !options.hideNowButton : true) && /* @__PURE__ */ jsx35("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx35("a", { href: "#", className: "btn btn-info btn-now", onClick: handleSetNow, children: translateString(TranslatableString12.NowLabel) }) }),
+    (options.hideClearButton !== "undefined" ? !options.hideClearButton : true) && /* @__PURE__ */ jsx35("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx35("a", { href: "#", className: "btn btn-warning btn-clear", onClick: handleClear, children: translateString(TranslatableString12.ClearLabel) }) })
   ] });
 }
 var AltDateWidget_default = AltDateWidget;
 
 // src/components/widgets/AltDateTimeWidget.tsx
-import { jsx as jsx33 } from "react/jsx-runtime";
+import { jsx as jsx36 } from "react/jsx-runtime";
 function AltDateTimeWidget({
   time = true,
   ...props
 }) {
   const { AltDateWidget: AltDateWidget2 } = props.registry.widgets;
-  return /* @__PURE__ */ jsx33(AltDateWidget2, { time, ...props });
+  return /* @__PURE__ */ jsx36(AltDateWidget2, { time, ...props });
 }
 var AltDateTimeWidget_default = AltDateTimeWidget;
 
 // src/components/widgets/CheckboxWidget.tsx
-import { useCallback as useCallback5 } from "react";
+import { useCallback as useCallback7 } from "react";
 import {
   ariaDescribedByIds as ariaDescribedByIds3,
   descriptionId as descriptionId4,
-  getTemplate as getTemplate13,
+  getTemplate as getTemplate15,
   labelValue,
   schemaRequiresTrueValue
 } from "@rjsf/utils";
-import { jsx as jsx34, jsxs as jsxs16 } from "react/jsx-runtime";
+import { jsx as jsx37, jsxs as jsxs16 } from "react/jsx-runtime";
 function CheckboxWidget({
   schema,
   uiSchema,
@@ -3484,27 +3668,27 @@ function CheckboxWidget({
   onChange,
   registry
 }) {
-  const DescriptionFieldTemplate = getTemplate13(
+  const DescriptionFieldTemplate = getTemplate15(
     "DescriptionFieldTemplate",
     registry,
     options
   );
   const required = schemaRequiresTrueValue(schema);
-  const handleChange = useCallback5(
+  const handleChange = useCallback7(
     (event) => onChange(event.target.checked),
     [onChange]
   );
-  const handleBlur = useCallback5(
+  const handleBlur = useCallback7(
     (event) => onBlur(id, event.target.checked),
     [onBlur, id]
   );
-  const handleFocus = useCallback5(
+  const handleFocus = useCallback7(
     (event) => onFocus(id, event.target.checked),
     [onFocus, id]
   );
   const description = options.description ?? schema.description;
   return /* @__PURE__ */ jsxs16("div", { className: `checkbox ${disabled || readonly ? "disabled" : ""}`, children: [
-    !hideLabel && description && /* @__PURE__ */ jsx34(
+    !hideLabel && description && /* @__PURE__ */ jsx37(
       DescriptionFieldTemplate,
       {
         id: descriptionId4(id),
@@ -3515,7 +3699,7 @@ function CheckboxWidget({
       }
     ),
     /* @__PURE__ */ jsxs16("label", { children: [
-      /* @__PURE__ */ jsx34(
+      /* @__PURE__ */ jsx37(
         "input",
         {
           type: "checkbox",
@@ -3531,14 +3715,14 @@ function CheckboxWidget({
           "aria-describedby": ariaDescribedByIds3(id)
         }
       ),
-      labelValue(/* @__PURE__ */ jsx34("span", { children: label }), hideLabel)
+      labelValue(/* @__PURE__ */ jsx37("span", { children: label }), hideLabel)
     ] })
   ] });
 }
 var CheckboxWidget_default = CheckboxWidget;
 
 // src/components/widgets/CheckboxesWidget.tsx
-import { useCallback as useCallback6 } from "react";
+import { useCallback as useCallback8 } from "react";
 import {
   ariaDescribedByIds as ariaDescribedByIds4,
   enumOptionsDeselectValue,
@@ -3547,7 +3731,7 @@ import {
   enumOptionsValueForIndex,
   optionId
 } from "@rjsf/utils";
-import { jsx as jsx35, jsxs as jsxs17 } from "react/jsx-runtime";
+import { jsx as jsx38, jsxs as jsxs17 } from "react/jsx-runtime";
 function CheckboxesWidget({
   id,
   disabled,
@@ -3560,15 +3744,15 @@ function CheckboxesWidget({
   onFocus
 }) {
   const checkboxesValues = Array.isArray(value) ? value : [value];
-  const handleBlur = useCallback6(
+  const handleBlur = useCallback8(
     ({ target }) => onBlur(id, enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue)),
-    [onBlur, id]
+    [onBlur, id, enumOptions, emptyValue]
   );
-  const handleFocus = useCallback6(
+  const handleFocus = useCallback8(
     ({ target }) => onFocus(id, enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue)),
-    [onFocus, id]
+    [onFocus, id, enumOptions, emptyValue]
   );
-  return /* @__PURE__ */ jsx35("div", { className: "checkboxes", id, children: Array.isArray(enumOptions) && enumOptions.map((option, index) => {
+  return /* @__PURE__ */ jsx38("div", { className: "checkboxes", id, children: Array.isArray(enumOptions) && enumOptions.map((option, index) => {
     const checked = enumOptionsIsSelected(option.value, checkboxesValues);
     const itemDisabled = Array.isArray(enumDisabled) && enumDisabled.indexOf(option.value) !== -1;
     const disabledCls = disabled || itemDisabled || readonly ? "disabled" : "";
@@ -3580,7 +3764,7 @@ function CheckboxesWidget({
       }
     };
     const checkbox = /* @__PURE__ */ jsxs17("span", { children: [
-      /* @__PURE__ */ jsx35(
+      /* @__PURE__ */ jsx38(
         "input",
         {
           type: "checkbox",
@@ -3596,44 +3780,44 @@ function CheckboxesWidget({
           "aria-describedby": ariaDescribedByIds4(id)
         }
       ),
-      /* @__PURE__ */ jsx35("span", { children: option.label })
+      /* @__PURE__ */ jsx38("span", { children: option.label })
     ] });
-    return inline ? /* @__PURE__ */ jsx35("label", { className: `checkbox-inline ${disabledCls}`, children: checkbox }, index) : /* @__PURE__ */ jsx35("div", { className: `checkbox ${disabledCls}`, children: /* @__PURE__ */ jsx35("label", { children: checkbox }) }, index);
+    return inline ? /* @__PURE__ */ jsx38("label", { className: `checkbox-inline ${disabledCls}`, children: checkbox }, index) : /* @__PURE__ */ jsx38("div", { className: `checkbox ${disabledCls}`, children: /* @__PURE__ */ jsx38("label", { children: checkbox }) }, index);
   }) });
 }
 var CheckboxesWidget_default = CheckboxesWidget;
 
 // src/components/widgets/ColorWidget.tsx
-import { getTemplate as getTemplate14 } from "@rjsf/utils";
-import { jsx as jsx36 } from "react/jsx-runtime";
+import { getTemplate as getTemplate16 } from "@rjsf/utils";
+import { jsx as jsx39 } from "react/jsx-runtime";
 function ColorWidget(props) {
   const { disabled, readonly, options, registry } = props;
-  const BaseInputTemplate2 = getTemplate14("BaseInputTemplate", registry, options);
-  return /* @__PURE__ */ jsx36(BaseInputTemplate2, { type: "color", ...props, disabled: disabled || readonly });
+  const BaseInputTemplate2 = getTemplate16("BaseInputTemplate", registry, options);
+  return /* @__PURE__ */ jsx39(BaseInputTemplate2, { type: "color", ...props, disabled: disabled || readonly });
 }
 
 // src/components/widgets/DateWidget.tsx
-import { useCallback as useCallback7 } from "react";
-import { getTemplate as getTemplate15 } from "@rjsf/utils";
-import { jsx as jsx37 } from "react/jsx-runtime";
+import { useCallback as useCallback9 } from "react";
+import { getTemplate as getTemplate17 } from "@rjsf/utils";
+import { jsx as jsx40 } from "react/jsx-runtime";
 function DateWidget(props) {
   const { onChange, options, registry } = props;
-  const BaseInputTemplate2 = getTemplate15("BaseInputTemplate", registry, options);
-  const handleChange = useCallback7((value) => onChange(value || void 0), [onChange]);
-  return /* @__PURE__ */ jsx37(BaseInputTemplate2, { type: "date", ...props, onChange: handleChange });
+  const BaseInputTemplate2 = getTemplate17("BaseInputTemplate", registry, options);
+  const handleChange = useCallback9((value) => onChange(value || void 0), [onChange]);
+  return /* @__PURE__ */ jsx40(BaseInputTemplate2, { type: "date", ...props, onChange: handleChange });
 }
 
 // src/components/widgets/DateTimeWidget.tsx
 import {
-  getTemplate as getTemplate16,
+  getTemplate as getTemplate18,
   localToUTC,
   utcToLocal
 } from "@rjsf/utils";
-import { jsx as jsx38 } from "react/jsx-runtime";
+import { jsx as jsx41 } from "react/jsx-runtime";
 function DateTimeWidget(props) {
   const { onChange, value, options, registry } = props;
-  const BaseInputTemplate2 = getTemplate16("BaseInputTemplate", registry, options);
-  return /* @__PURE__ */ jsx38(
+  const BaseInputTemplate2 = getTemplate18("BaseInputTemplate", registry, options);
+  return /* @__PURE__ */ jsx41(
     BaseInputTemplate2,
     {
       type: "datetime-local",
@@ -3645,23 +3829,23 @@ function DateTimeWidget(props) {
 }
 
 // src/components/widgets/EmailWidget.tsx
-import { getTemplate as getTemplate17 } from "@rjsf/utils";
-import { jsx as jsx39 } from "react/jsx-runtime";
+import { getTemplate as getTemplate19 } from "@rjsf/utils";
+import { jsx as jsx42 } from "react/jsx-runtime";
 function EmailWidget(props) {
   const { options, registry } = props;
-  const BaseInputTemplate2 = getTemplate17("BaseInputTemplate", registry, options);
-  return /* @__PURE__ */ jsx39(BaseInputTemplate2, { type: "email", ...props });
+  const BaseInputTemplate2 = getTemplate19("BaseInputTemplate", registry, options);
+  return /* @__PURE__ */ jsx42(BaseInputTemplate2, { type: "email", ...props });
 }
 
 // src/components/widgets/FileWidget.tsx
-import { useCallback as useCallback8, useMemo as useMemo2 } from "react";
+import { useCallback as useCallback10, useMemo as useMemo2 } from "react";
 import {
   dataURItoBlob,
-  getTemplate as getTemplate18,
-  TranslatableString as TranslatableString12
+  getTemplate as getTemplate20,
+  TranslatableString as TranslatableString13
 } from "@rjsf/utils";
 import Markdown4 from "markdown-to-jsx";
-import { Fragment as Fragment4, jsx as jsx40, jsxs as jsxs18 } from "react/jsx-runtime";
+import { Fragment as Fragment4, jsx as jsx43, jsxs as jsxs18 } from "react/jsx-runtime";
 function addNameToDataURL(dataURL, name) {
   if (dataURL === null) {
     return null;
@@ -3706,11 +3890,11 @@ function FileInfoPreview({
     return null;
   }
   if (["image/jpeg", "image/png"].includes(type)) {
-    return /* @__PURE__ */ jsx40("img", { src: dataURL, style: { maxWidth: "100%" }, className: "file-preview" });
+    return /* @__PURE__ */ jsx43("img", { src: dataURL, style: { maxWidth: "100%" }, className: "file-preview" });
   }
   return /* @__PURE__ */ jsxs18(Fragment4, { children: [
     " ",
-    /* @__PURE__ */ jsx40("a", { download: `preview-${name}`, href: dataURL, className: "file-download", children: translateString(TranslatableString12.PreviewLabel) })
+    /* @__PURE__ */ jsx43("a", { download: `preview-${name}`, href: dataURL, className: "file-download", children: translateString(TranslatableString13.PreviewLabel) })
   ] });
 }
 function FilesInfo({
@@ -3724,14 +3908,14 @@ function FilesInfo({
     return null;
   }
   const { translateString } = registry;
-  const { RemoveButton: RemoveButton2 } = getTemplate18("ButtonTemplates", registry, options);
-  return /* @__PURE__ */ jsx40("ul", { className: "file-info", children: filesInfo.map((fileInfo, key) => {
+  const { RemoveButton: RemoveButton2 } = getTemplate20("ButtonTemplates", registry, options);
+  return /* @__PURE__ */ jsx43("ul", { className: "file-info", children: filesInfo.map((fileInfo, key) => {
     const { name, size, type } = fileInfo;
     const handleRemove = () => onRemove(key);
     return /* @__PURE__ */ jsxs18("li", { children: [
-      /* @__PURE__ */ jsx40(Markdown4, { children: translateString(TranslatableString12.FilesInfo, [name, type, String(size)]) }),
-      preview && /* @__PURE__ */ jsx40(FileInfoPreview, { fileInfo, registry }),
-      /* @__PURE__ */ jsx40(RemoveButton2, { onClick: handleRemove, registry })
+      /* @__PURE__ */ jsx43(Markdown4, { children: translateString(TranslatableString13.FilesInfo, [name, type, String(size)]) }),
+      preview && /* @__PURE__ */ jsx43(FileInfoPreview, { fileInfo, registry }),
+      /* @__PURE__ */ jsx43(RemoveButton2, { onClick: handleRemove, registry })
     ] }, key);
   }) });
 }
@@ -3758,8 +3942,8 @@ function extractFileInfo(dataURLs) {
 }
 function FileWidget(props) {
   const { disabled, readonly, required, multiple, onChange, value, options, registry } = props;
-  const BaseInputTemplate2 = getTemplate18("BaseInputTemplate", registry, options);
-  const handleChange = useCallback8(
+  const BaseInputTemplate2 = getTemplate20("BaseInputTemplate", registry, options);
+  const handleChange = useCallback10(
     (event) => {
       if (!event.target.files) {
         return;
@@ -3776,7 +3960,7 @@ function FileWidget(props) {
     [multiple, value, onChange]
   );
   const filesInfo = useMemo2(() => extractFileInfo(Array.isArray(value) ? value : [value]), [value]);
-  const rmFile = useCallback8(
+  const rmFile = useCallback10(
     (index) => {
       if (multiple) {
         const newValue = value.filter((_, i) => i !== index);
@@ -3788,7 +3972,7 @@ function FileWidget(props) {
     [multiple, value, onChange]
   );
   return /* @__PURE__ */ jsxs18("div", { children: [
-    /* @__PURE__ */ jsx40(
+    /* @__PURE__ */ jsx43(
       BaseInputTemplate2,
       {
         ...props,
@@ -3800,7 +3984,7 @@ function FileWidget(props) {
         accept: options.accept ? String(options.accept) : void 0
       }
     ),
-    /* @__PURE__ */ jsx40(
+    /* @__PURE__ */ jsx43(
       FilesInfo,
       {
         filesInfo,
@@ -3815,33 +3999,33 @@ function FileWidget(props) {
 var FileWidget_default = FileWidget;
 
 // src/components/widgets/HiddenWidget.tsx
-import { jsx as jsx41 } from "react/jsx-runtime";
+import { jsx as jsx44 } from "react/jsx-runtime";
 function HiddenWidget({
   id,
   value
 }) {
-  return /* @__PURE__ */ jsx41("input", { type: "hidden", id, name: id, value: typeof value === "undefined" ? "" : value });
+  return /* @__PURE__ */ jsx44("input", { type: "hidden", id, name: id, value: typeof value === "undefined" ? "" : value });
 }
 var HiddenWidget_default = HiddenWidget;
 
 // src/components/widgets/PasswordWidget.tsx
-import { getTemplate as getTemplate19 } from "@rjsf/utils";
-import { jsx as jsx42 } from "react/jsx-runtime";
+import { getTemplate as getTemplate21 } from "@rjsf/utils";
+import { jsx as jsx45 } from "react/jsx-runtime";
 function PasswordWidget(props) {
   const { options, registry } = props;
-  const BaseInputTemplate2 = getTemplate19("BaseInputTemplate", registry, options);
-  return /* @__PURE__ */ jsx42(BaseInputTemplate2, { type: "password", ...props });
+  const BaseInputTemplate2 = getTemplate21("BaseInputTemplate", registry, options);
+  return /* @__PURE__ */ jsx45(BaseInputTemplate2, { type: "password", ...props });
 }
 
 // src/components/widgets/RadioWidget.tsx
-import { useCallback as useCallback9 } from "react";
+import { useCallback as useCallback11 } from "react";
 import {
   ariaDescribedByIds as ariaDescribedByIds5,
   enumOptionsIsSelected as enumOptionsIsSelected2,
   enumOptionsValueForIndex as enumOptionsValueForIndex2,
   optionId as optionId2
 } from "@rjsf/utils";
-import { jsx as jsx43, jsxs as jsxs19 } from "react/jsx-runtime";
+import { jsx as jsx46, jsxs as jsxs19 } from "react/jsx-runtime";
 function RadioWidget({
   options,
   value,
@@ -3855,21 +4039,21 @@ function RadioWidget({
   id
 }) {
   const { enumOptions, enumDisabled, inline, emptyValue } = options;
-  const handleBlur = useCallback9(
+  const handleBlur = useCallback11(
     ({ target }) => onBlur(id, enumOptionsValueForIndex2(target && target.value, enumOptions, emptyValue)),
     [onBlur, enumOptions, emptyValue, id]
   );
-  const handleFocus = useCallback9(
+  const handleFocus = useCallback11(
     ({ target }) => onFocus(id, enumOptionsValueForIndex2(target && target.value, enumOptions, emptyValue)),
     [onFocus, enumOptions, emptyValue, id]
   );
-  return /* @__PURE__ */ jsx43("div", { className: "field-radio-group", id, role: "radiogroup", children: Array.isArray(enumOptions) && enumOptions.map((option, i) => {
+  return /* @__PURE__ */ jsx46("div", { className: "field-radio-group", id, role: "radiogroup", children: Array.isArray(enumOptions) && enumOptions.map((option, i) => {
     const checked = enumOptionsIsSelected2(option.value, value);
     const itemDisabled = Array.isArray(enumDisabled) && enumDisabled.indexOf(option.value) !== -1;
     const disabledCls = disabled || itemDisabled || readonly ? "disabled" : "";
     const handleChange = () => onChange(option.value);
     const radio = /* @__PURE__ */ jsxs19("span", { children: [
-      /* @__PURE__ */ jsx43(
+      /* @__PURE__ */ jsx46(
         "input",
         {
           type: "radio",
@@ -3886,15 +4070,15 @@ function RadioWidget({
           "aria-describedby": ariaDescribedByIds5(id)
         }
       ),
-      /* @__PURE__ */ jsx43("span", { children: option.label })
+      /* @__PURE__ */ jsx46("span", { children: option.label })
     ] });
-    return inline ? /* @__PURE__ */ jsx43("label", { className: `radio-inline ${disabledCls}`, children: radio }, i) : /* @__PURE__ */ jsx43("div", { className: `radio ${disabledCls}`, children: /* @__PURE__ */ jsx43("label", { children: radio }) }, i);
+    return inline ? /* @__PURE__ */ jsx46("label", { className: `radio-inline ${disabledCls}`, children: radio }, i) : /* @__PURE__ */ jsx46("div", { className: `radio ${disabledCls}`, children: /* @__PURE__ */ jsx46("label", { children: radio }) }, i);
   }) });
 }
 var RadioWidget_default = RadioWidget;
 
 // src/components/widgets/RangeWidget.tsx
-import { jsx as jsx44, jsxs as jsxs20 } from "react/jsx-runtime";
+import { jsx as jsx47, jsxs as jsxs20 } from "react/jsx-runtime";
 function RangeWidget(props) {
   const {
     value,
@@ -3903,14 +4087,14 @@ function RangeWidget(props) {
     }
   } = props;
   return /* @__PURE__ */ jsxs20("div", { className: "field-range-wrapper", children: [
-    /* @__PURE__ */ jsx44(BaseInputTemplate2, { type: "range", ...props }),
-    /* @__PURE__ */ jsx44("span", { className: "range-view", children: value })
+    /* @__PURE__ */ jsx47(BaseInputTemplate2, { type: "range", ...props }),
+    /* @__PURE__ */ jsx47("span", { className: "range-view", children: value })
   ] });
 }
 
 // src/components/widgets/RatingWidget.tsx
-import { useCallback as useCallback10 } from "react";
-import { Fragment as Fragment5, jsx as jsx45, jsxs as jsxs21 } from "react/jsx-runtime";
+import { useCallback as useCallback12 } from "react";
+import { Fragment as Fragment5, jsx as jsx48, jsxs as jsxs21 } from "react/jsx-runtime";
 function RatingWidget({
   id,
   value,
@@ -3927,7 +4111,7 @@ function RatingWidget({
   const { stars = 5, shape = "star" } = options;
   const numStars = schema.maximum ? Math.min(schema.maximum, 5) : Math.min(Math.max(stars, 1), 5);
   const min = schema.minimum || 0;
-  const handleStarClick = useCallback10(
+  const handleStarClick = useCallback12(
     (starValue) => {
       if (!disabled && !readonly) {
         onChange(starValue);
@@ -3935,7 +4119,7 @@ function RatingWidget({
     },
     [onChange, disabled, readonly]
   );
-  const handleFocus = useCallback10(
+  const handleFocus = useCallback12(
     (event) => {
       if (onFocus) {
         const starValue = Number(event.target.dataset.value);
@@ -3944,7 +4128,7 @@ function RatingWidget({
     },
     [onFocus, id]
   );
-  const handleBlur = useCallback10(
+  const handleBlur = useCallback12(
     (event) => {
       if (onBlur) {
         const starValue = Number(event.target.dataset.value);
@@ -3959,7 +4143,7 @@ function RatingWidget({
     }
     return isFilled ? "\u2605" : "\u2606";
   };
-  return /* @__PURE__ */ jsx45(Fragment5, { children: /* @__PURE__ */ jsxs21(
+  return /* @__PURE__ */ jsx48(Fragment5, { children: /* @__PURE__ */ jsxs21(
     "div",
     {
       className: "rating-widget",
@@ -3972,7 +4156,7 @@ function RatingWidget({
         [...Array(numStars)].map((_, index) => {
           const starValue = min + index;
           const isFilled = starValue <= value;
-          return /* @__PURE__ */ jsx45(
+          return /* @__PURE__ */ jsx48(
             "span",
             {
               onClick: () => handleStarClick(starValue),
@@ -3994,7 +4178,7 @@ function RatingWidget({
             index
           );
         }),
-        /* @__PURE__ */ jsx45(
+        /* @__PURE__ */ jsx48(
           "input",
           {
             type: "hidden",
@@ -4012,13 +4196,13 @@ function RatingWidget({
 }
 
 // src/components/widgets/SelectWidget.tsx
-import { useCallback as useCallback11 } from "react";
+import { useCallback as useCallback13 } from "react";
 import {
   ariaDescribedByIds as ariaDescribedByIds6,
   enumOptionsIndexForValue,
   enumOptionsValueForIndex as enumOptionsValueForIndex3
 } from "@rjsf/utils";
-import { jsx as jsx46, jsxs as jsxs22 } from "react/jsx-runtime";
+import { jsx as jsx49, jsxs as jsxs22 } from "react/jsx-runtime";
 function getValue(event, multiple) {
   if (multiple) {
     return Array.from(event.target.options).slice().filter((o) => o.selected).map((o) => o.value);
@@ -4042,21 +4226,21 @@ function SelectWidget({
 }) {
   const { enumOptions, enumDisabled, emptyValue: optEmptyVal } = options;
   const emptyValue = multiple ? [] : "";
-  const handleFocus = useCallback11(
+  const handleFocus = useCallback13(
     (event) => {
       const newValue = getValue(event, multiple);
       return onFocus(id, enumOptionsValueForIndex3(newValue, enumOptions, optEmptyVal));
     },
     [onFocus, id, multiple, enumOptions, optEmptyVal]
   );
-  const handleBlur = useCallback11(
+  const handleBlur = useCallback13(
     (event) => {
       const newValue = getValue(event, multiple);
       return onBlur(id, enumOptionsValueForIndex3(newValue, enumOptions, optEmptyVal));
     },
     [onBlur, id, multiple, enumOptions, optEmptyVal]
   );
-  const handleChange = useCallback11(
+  const handleChange = useCallback13(
     (event) => {
       const newValue = getValue(event, multiple);
       return onChange(enumOptionsValueForIndex3(newValue, enumOptions, optEmptyVal));
@@ -4082,10 +4266,10 @@ function SelectWidget({
       onChange: handleChange,
       "aria-describedby": ariaDescribedByIds6(id),
       children: [
-        showPlaceholderOption && /* @__PURE__ */ jsx46("option", { value: "", children: placeholder }),
+        showPlaceholderOption && /* @__PURE__ */ jsx49("option", { value: "", children: placeholder }),
         Array.isArray(enumOptions) && enumOptions.map(({ value: value2, label }, i) => {
           const disabled2 = enumDisabled && enumDisabled.indexOf(value2) !== -1;
-          return /* @__PURE__ */ jsx46("option", { value: String(i), disabled: disabled2, children: label }, i);
+          return /* @__PURE__ */ jsx49("option", { value: String(i), disabled: disabled2, children: label }, i);
         })
       ]
     }
@@ -4094,9 +4278,9 @@ function SelectWidget({
 var SelectWidget_default = SelectWidget;
 
 // src/components/widgets/TextareaWidget.tsx
-import { useCallback as useCallback12 } from "react";
+import { useCallback as useCallback14 } from "react";
 import { ariaDescribedByIds as ariaDescribedByIds7 } from "@rjsf/utils";
-import { jsx as jsx47 } from "react/jsx-runtime";
+import { jsx as jsx50 } from "react/jsx-runtime";
 function TextareaWidget({
   id,
   options = {},
@@ -4110,19 +4294,19 @@ function TextareaWidget({
   onBlur,
   onFocus
 }) {
-  const handleChange = useCallback12(
+  const handleChange = useCallback14(
     ({ target: { value: value2 } }) => onChange(value2 === "" ? options.emptyValue : value2),
     [onChange, options.emptyValue]
   );
-  const handleBlur = useCallback12(
+  const handleBlur = useCallback14(
     ({ target }) => onBlur(id, target && target.value),
     [onBlur, id]
   );
-  const handleFocus = useCallback12(
+  const handleFocus = useCallback14(
     ({ target }) => onFocus(id, target && target.value),
     [id, onFocus]
   );
-  return /* @__PURE__ */ jsx47(
+  return /* @__PURE__ */ jsx50(
     "textarea",
     {
       id,
@@ -4149,41 +4333,41 @@ TextareaWidget.defaultProps = {
 var TextareaWidget_default = TextareaWidget;
 
 // src/components/widgets/TextWidget.tsx
-import { getTemplate as getTemplate20 } from "@rjsf/utils";
-import { jsx as jsx48 } from "react/jsx-runtime";
+import { getTemplate as getTemplate22 } from "@rjsf/utils";
+import { jsx as jsx51 } from "react/jsx-runtime";
 function TextWidget(props) {
   const { options, registry } = props;
-  const BaseInputTemplate2 = getTemplate20("BaseInputTemplate", registry, options);
-  return /* @__PURE__ */ jsx48(BaseInputTemplate2, { ...props });
+  const BaseInputTemplate2 = getTemplate22("BaseInputTemplate", registry, options);
+  return /* @__PURE__ */ jsx51(BaseInputTemplate2, { ...props });
 }
 
 // src/components/widgets/TimeWidget.tsx
-import { useCallback as useCallback13 } from "react";
-import { getTemplate as getTemplate21 } from "@rjsf/utils";
-import { jsx as jsx49 } from "react/jsx-runtime";
+import { useCallback as useCallback15 } from "react";
+import { getTemplate as getTemplate23 } from "@rjsf/utils";
+import { jsx as jsx52 } from "react/jsx-runtime";
 function TimeWidget(props) {
   const { onChange, options, registry } = props;
-  const BaseInputTemplate2 = getTemplate21("BaseInputTemplate", registry, options);
-  const handleChange = useCallback13((value) => onChange(value ? `${value}:00` : void 0), [onChange]);
-  return /* @__PURE__ */ jsx49(BaseInputTemplate2, { type: "time", ...props, onChange: handleChange });
+  const BaseInputTemplate2 = getTemplate23("BaseInputTemplate", registry, options);
+  const handleChange = useCallback15((value) => onChange(value ? `${value}:00` : void 0), [onChange]);
+  return /* @__PURE__ */ jsx52(BaseInputTemplate2, { type: "time", ...props, onChange: handleChange });
 }
 
 // src/components/widgets/URLWidget.tsx
-import { getTemplate as getTemplate22 } from "@rjsf/utils";
-import { jsx as jsx50 } from "react/jsx-runtime";
+import { getTemplate as getTemplate24 } from "@rjsf/utils";
+import { jsx as jsx53 } from "react/jsx-runtime";
 function URLWidget(props) {
   const { options, registry } = props;
-  const BaseInputTemplate2 = getTemplate22("BaseInputTemplate", registry, options);
-  return /* @__PURE__ */ jsx50(BaseInputTemplate2, { type: "url", ...props });
+  const BaseInputTemplate2 = getTemplate24("BaseInputTemplate", registry, options);
+  return /* @__PURE__ */ jsx53(BaseInputTemplate2, { type: "url", ...props });
 }
 
 // src/components/widgets/UpDownWidget.tsx
-import { getTemplate as getTemplate23 } from "@rjsf/utils";
-import { jsx as jsx51 } from "react/jsx-runtime";
+import { getTemplate as getTemplate25 } from "@rjsf/utils";
+import { jsx as jsx54 } from "react/jsx-runtime";
 function UpDownWidget(props) {
   const { options, registry } = props;
-  const BaseInputTemplate2 = getTemplate23("BaseInputTemplate", registry, options);
-  return /* @__PURE__ */ jsx51(BaseInputTemplate2, { type: "number", ...props });
+  const BaseInputTemplate2 = getTemplate25("BaseInputTemplate", registry, options);
+  return /* @__PURE__ */ jsx54(BaseInputTemplate2, { type: "number", ...props });
 }
 
 // src/components/widgets/index.ts
@@ -4221,17 +4405,21 @@ function getDefaultRegistry() {
     widgets: widgets_default(),
     rootSchema: {},
     formContext: {},
-    translateString: englishStringTranslator
+    translateString: englishStringTranslator,
+    globalFormOptions: { idPrefix: DEFAULT_ID_PREFIX, idSeparator: DEFAULT_ID_SEPARATOR }
   };
 }
 
 // src/components/Form.tsx
-import { jsx as jsx52, jsxs as jsxs23 } from "react/jsx-runtime";
+import { jsx as jsx55, jsxs as jsxs23 } from "react/jsx-runtime";
 var Form = class extends Component5 {
   /** The ref used to hold the `form` element, this needs to be `any` because `tagName` or `_internalFormWrapper` can
    * provide any possible type here
    */
   formElement;
+  /** The list of pending changes
+   */
+  pendingChanges = [];
   /** Constructs the `Form` from the `props`. Will setup the initial state from the props. It will also call the
    * `onChange` handler if the initially provided `formData` is modified to add missing default values as part of the
    * state construction.
@@ -4244,7 +4432,7 @@ var Form = class extends Component5 {
       throw new Error("A validator is required for Form functionality to work");
     }
     this.state = this.getStateFromProps(props, props.formData);
-    if (this.props.onChange && !deepEquals3(this.state.formData, this.props.formData)) {
+    if (this.props.onChange && !deepEquals2(this.state.formData, this.props.formData)) {
       this.props.onChange(this.state);
     }
     this.formElement = createRef();
@@ -4268,10 +4456,12 @@ var Form = class extends Component5 {
    *        with a flag indicating that an update is not necessary.
    */
   getSnapshotBeforeUpdate(prevProps, prevState) {
-    if (!deepEquals3(this.props, prevProps)) {
+    if (!deepEquals2(this.props, prevProps)) {
       const formDataChangedFields = getChangedFields(this.props.formData, prevProps.formData);
-      const isSchemaChanged = !deepEquals3(prevProps.schema, this.props.schema);
-      const isFormDataChanged = formDataChangedFields.length > 0 || !deepEquals3(prevProps.formData, this.props.formData);
+      const stateDataChangedFields = getChangedFields(this.props.formData, this.state.formData);
+      const isSchemaChanged = !deepEquals2(prevProps.schema, this.props.schema);
+      const isFormDataChanged = formDataChangedFields.length > 0 || !deepEquals2(prevProps.formData, this.props.formData);
+      const isStateDataChanged = stateDataChangedFields.length > 0 || !deepEquals2(this.state.formData, this.props.formData);
       const nextState = this.getStateFromProps(
         this.props,
         this.props.formData,
@@ -4280,9 +4470,11 @@ var Form = class extends Component5 {
         //  match one of the subSchemas, the retrieved schema must be updated.
         isSchemaChanged || isFormDataChanged ? void 0 : this.state.retrievedSchema,
         isSchemaChanged,
-        formDataChangedFields
+        formDataChangedFields,
+        // Skip live validation for this request if no form data has changed from the last state
+        !isStateDataChanged
       );
-      const shouldUpdate = !deepEquals3(nextState, prevState);
+      const shouldUpdate = !deepEquals2(nextState, prevState);
       return { nextState, shouldUpdate };
     }
     return { shouldUpdate: false };
@@ -4302,7 +4494,7 @@ var Form = class extends Component5 {
   componentDidUpdate(_, prevState, snapshot) {
     if (snapshot.shouldUpdate) {
       const { nextState } = snapshot;
-      if (!deepEquals3(nextState.formData, this.props.formData) && !deepEquals3(nextState.formData, prevState.formData) && this.props.onChange) {
+      if (!deepEquals2(nextState.formData, this.props.formData) && !deepEquals2(nextState.formData, prevState.formData) && this.props.onChange) {
         this.props.onChange(nextState);
       }
       this.setState(nextState);
@@ -4317,35 +4509,42 @@ var Form = class extends Component5 {
    * @param retrievedSchema - An expanded schema, if not provided, it will be retrieved from the `schema` and `formData`.
    * @param isSchemaChanged - A flag indicating whether the schema has changed.
    * @param formDataChangedFields - The changed fields of `formData`
+   * @param skipLiveValidate - Optional flag, if true, means that we are not running live validation
    * @returns - The new state for the `Form`
    */
-  getStateFromProps(props, inputFormData, retrievedSchema, isSchemaChanged = false, formDataChangedFields = []) {
+  getStateFromProps(props, inputFormData, retrievedSchema, isSchemaChanged = false, formDataChangedFields = [], skipLiveValidate = false) {
     const state = this.state || {};
     const schema = "schema" in props ? props.schema : this.props.schema;
+    const validator2 = "validator" in props ? props.validator : this.props.validator;
     const uiSchema = ("uiSchema" in props ? props.uiSchema : this.props.uiSchema) || {};
     const edit = typeof inputFormData !== "undefined";
     const liveValidate = "liveValidate" in props ? props.liveValidate : this.props.liveValidate;
     const mustValidate = edit && !props.noValidate && liveValidate;
-    const rootSchema = schema;
     const experimental_defaultFormStateBehavior = "experimental_defaultFormStateBehavior" in props ? props.experimental_defaultFormStateBehavior : this.props.experimental_defaultFormStateBehavior;
     const experimental_customMergeAllOf = "experimental_customMergeAllOf" in props ? props.experimental_customMergeAllOf : this.props.experimental_customMergeAllOf;
     let schemaUtils = state.schemaUtils;
     if (!schemaUtils || schemaUtils.doesSchemaUtilsDiffer(
-      props.validator,
-      rootSchema,
+      validator2,
+      schema,
       experimental_defaultFormStateBehavior,
       experimental_customMergeAllOf
     )) {
       schemaUtils = createSchemaUtils(
-        props.validator,
-        rootSchema,
+        validator2,
+        schema,
         experimental_defaultFormStateBehavior,
         experimental_customMergeAllOf
       );
     }
-    const formData = schemaUtils.getDefaultFormState(schema, inputFormData);
+    const rootSchema = schemaUtils.getRootSchema();
+    const formData = schemaUtils.getDefaultFormState(
+      rootSchema,
+      inputFormData,
+      false,
+      state.initialDefaultsGenerated
+    );
     const _retrievedSchema = this.updateRetrievedSchema(
-      retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData)
+      retrievedSchema ?? schemaUtils.retrieveSchema(rootSchema, formData)
     );
     const getCurrentErrors = () => {
       if (props.noValidate || isSchemaChanged) {
@@ -4365,25 +4564,28 @@ var Form = class extends Component5 {
     let errorSchema;
     let schemaValidationErrors = state.schemaValidationErrors;
     let schemaValidationErrorSchema = state.schemaValidationErrorSchema;
-    if (mustValidate) {
-      const schemaValidation = this.validate(formData, schema, schemaUtils, _retrievedSchema);
-      errors = schemaValidation.errors;
-      if (retrievedSchema === void 0) {
-        errorSchema = schemaValidation.errorSchema;
-      } else {
-        errorSchema = mergeObjects3(
-          this.state?.errorSchema,
-          schemaValidation.errorSchema,
-          "preventDuplicates"
-        );
-      }
-      schemaValidationErrors = errors;
-      schemaValidationErrorSchema = errorSchema;
+    if (mustValidate && !skipLiveValidate) {
+      const liveValidation = this.liveValidate(
+        rootSchema,
+        schemaUtils,
+        state.errorSchema,
+        formData,
+        void 0,
+        state.customErrors,
+        retrievedSchema,
+        // If retrievedSchema is undefined which means the schema or formData has changed, we do not merge state.
+        // Else in the case where it hasn't changed,
+        retrievedSchema !== void 0
+      );
+      errors = liveValidation.errors;
+      errorSchema = liveValidation.errorSchema;
+      schemaValidationErrors = liveValidation.schemaValidationErrors;
+      schemaValidationErrorSchema = liveValidation.schemaValidationErrorSchema;
     } else {
       const currentErrors = getCurrentErrors();
       errors = currentErrors.errors;
       errorSchema = currentErrors.errorSchema;
-      if (formDataChangedFields.length > 0) {
+      if (formDataChangedFields.length > 0 && !mustValidate) {
         const newErrorSchema = formDataChangedFields.reduce(
           (acc, key) => {
             acc[key] = void 0;
@@ -4391,37 +4593,30 @@ var Form = class extends Component5 {
           },
           {}
         );
-        errorSchema = schemaValidationErrorSchema = mergeObjects3(
+        errorSchema = schemaValidationErrorSchema = mergeObjects(
           currentErrors.errorSchema,
           newErrorSchema,
           "preventDuplicates"
         );
       }
+      const mergedErrors = this.mergeErrors({ errorSchema, errors }, props.extraErrors, state.customErrors);
+      errors = mergedErrors.errors;
+      errorSchema = mergedErrors.errorSchema;
     }
-    if (props.extraErrors) {
-      const merged = validationDataMerge({ errorSchema, errors }, props.extraErrors);
-      errorSchema = merged.errorSchema;
-      errors = merged.errors;
-    }
-    const idSchema = schemaUtils.toIdSchema(
-      _retrievedSchema,
-      uiSchema["ui:rootFieldId"],
-      formData,
-      props.idPrefix,
-      props.idSeparator
-    );
+    const fieldPathId = toFieldPathId4("", this.getGlobalFormOptions(this.props));
     const nextState = {
       schemaUtils,
-      schema,
+      schema: rootSchema,
       uiSchema,
-      idSchema,
+      fieldPathId,
       formData,
       edit,
       errors,
       errorSchema,
       schemaValidationErrors,
       schemaValidationErrorSchema,
-      retrievedSchema: _retrievedSchema
+      retrievedSchema: _retrievedSchema,
+      initialDefaultsGenerated: true
     };
     return nextState;
   }
@@ -4432,31 +4627,18 @@ var Form = class extends Component5 {
    * @returns - True if the component should be updated, false otherwise
    */
   shouldComponentUpdate(nextProps, nextState) {
-    return shouldRender(this, nextProps, nextState);
-  }
-  /** Gets the previously raised customValidate errors.
-   *
-   * @returns the previous customValidate errors
-   */
-  getPreviousCustomValidateErrors() {
-    const { customValidate, uiSchema } = this.props;
-    const prevFormData = this.state.formData;
-    let customValidateErrors = {};
-    if (typeof customValidate === "function") {
-      const errorHandler = customValidate(prevFormData, createErrorHandler(prevFormData), uiSchema);
-      const userErrorSchema = unwrapErrorHandler(errorHandler);
-      customValidateErrors = userErrorSchema;
-    }
-    return customValidateErrors;
+    const { experimental_componentUpdateStrategy = "customDeep" } = this.props;
+    return shouldRender2(this, nextProps, nextState, experimental_componentUpdateStrategy);
   }
   /** Validates the `formData` against the `schema` using the `altSchemaUtils` (if provided otherwise it uses the
    * `schemaUtils` in the state), returning the results.
    *
    * @param formData - The new form data to validate
    * @param schema - The schema used to validate against
-   * @param altSchemaUtils - The alternate schemaUtils to use for validation
+   * @param [altSchemaUtils] - The alternate schemaUtils to use for validation
+   * @param [retrievedSchema] - An optionally retrieved schema for per
    */
-  validate(formData, schema = this.props.schema, altSchemaUtils, retrievedSchema) {
+  validate(formData, schema = this.state.schema, altSchemaUtils, retrievedSchema) {
     const schemaUtils = altSchemaUtils ? altSchemaUtils : this.state.schemaUtils;
     const { customValidate, transformErrors, uiSchema } = this.props;
     const resolvedSchema = retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData);
@@ -4465,24 +4647,75 @@ var Form = class extends Component5 {
   /** Renders any errors contained in the `state` in using the `ErrorList`, if not disabled by `showErrorList`. */
   renderErrors(registry) {
     const { errors, errorSchema, schema, uiSchema } = this.state;
-    const { formContext } = this.props;
-    const options = getUiOptions17(uiSchema);
-    const ErrorListTemplate = getTemplate24("ErrorListTemplate", registry, options);
+    const options = getUiOptions18(uiSchema);
+    const ErrorListTemplate = getTemplate26("ErrorListTemplate", registry, options);
     if (errors && errors.length) {
-      return /* @__PURE__ */ jsx52(
+      return /* @__PURE__ */ jsx55(
         ErrorListTemplate,
         {
           errors,
           errorSchema: errorSchema || {},
           schema,
           uiSchema,
-          formContext,
           registry
         }
       );
     }
     return null;
   }
+  /** Merges any `extraErrors` or `customErrors` into the given `schemaValidation` object, returning the result
+   *
+   * @param schemaValidation - The `ValidationData` object into which additional errors are merged
+   * @param [extraErrors] - The extra errors from the props
+   * @param [customErrors] - The customErrors from custom components
+   * @return - The `extraErrors` and `customErrors` merged into the `schemaValidation`
+   * @private
+   */
+  mergeErrors(schemaValidation, extraErrors, customErrors) {
+    let errorSchema = schemaValidation.errorSchema;
+    let errors = schemaValidation.errors;
+    if (extraErrors) {
+      const merged = validationDataMerge(schemaValidation, extraErrors);
+      errorSchema = merged.errorSchema;
+      errors = merged.errors;
+    }
+    if (customErrors) {
+      const merged = validationDataMerge(schemaValidation, customErrors.ErrorSchema, true);
+      errorSchema = merged.errorSchema;
+      errors = merged.errors;
+    }
+    return { errors, errorSchema };
+  }
+  /** Performs live validation and then updates and returns the errors and error schemas by potentially merging in
+   * `extraErrors` and `customErrors`.
+   *
+   * @param rootSchema - The `rootSchema` from the state
+   * @param schemaUtils - The `SchemaUtilsType` from the state
+   * @param originalErrorSchema - The original `ErrorSchema` from the state
+   * @param [formData] - The new form data to validate
+   * @param [extraErrors] - The extra errors from the props
+   * @param [customErrors] - The customErrors from custom components
+   * @param [retrievedSchema] - An expanded schema, if not provided, it will be retrieved from the `schema` and `formData`
+   * @param [mergeIntoOriginalErrorSchema=false] - Optional flag indicating whether we merge into original schema
+   * @returns - An object containing `errorSchema`, `errors`, `schemaValidationErrors` and `schemaValidationErrorSchema`
+   * @private
+   */
+  liveValidate(rootSchema, schemaUtils, originalErrorSchema, formData, extraErrors, customErrors, retrievedSchema, mergeIntoOriginalErrorSchema = false) {
+    const schemaValidation = this.validate(formData, rootSchema, schemaUtils, retrievedSchema);
+    const errors = schemaValidation.errors;
+    let errorSchema = schemaValidation.errorSchema;
+    if (mergeIntoOriginalErrorSchema) {
+      errorSchema = mergeObjects(
+        originalErrorSchema,
+        schemaValidation.errorSchema,
+        "preventDuplicates"
+      );
+    }
+    const schemaValidationErrors = errors;
+    const schemaValidationErrorSchema = errorSchema;
+    const mergedErrors = this.mergeErrors({ errorSchema, errors }, extraErrors, customErrors);
+    return { ...mergedErrors, schemaValidationErrors, schemaValidationErrorSchema };
+  }
   /** Returns the `formData` with only the elements specified in the `fields` list
    *
    * @param formData - The data for the `Form`
@@ -4504,19 +4737,23 @@ var Form = class extends Component5 {
    * @param [formData] - The form data to use while checking for empty objects/arrays
    */
   getFieldNames = (pathSchema, formData) => {
+    const formValueHasData = (value, isLeaf) => typeof value !== "object" || _isEmpty(value) || isLeaf && !_isEmpty(value);
     const getAllPaths = (_obj, acc = [], paths = [[]]) => {
-      Object.keys(_obj).forEach((key) => {
-        if (typeof _obj[key] === "object") {
+      const objKeys = Object.keys(_obj);
+      objKeys.forEach((key) => {
+        const data = _obj[key];
+        if (typeof data === "object") {
           const newPaths = paths.map((path) => [...path, key]);
-          if (_obj[key][RJSF_ADDITIONAL_PROPERTIES_FLAG] && _obj[key][NAME_KEY] !== "") {
-            acc.push(_obj[key][NAME_KEY]);
+          if (data[RJSF_ADDITIONAL_PROPERTIES_FLAG] && data[NAME_KEY] !== "") {
+            acc.push(data[NAME_KEY]);
           } else {
-            getAllPaths(_obj[key], acc, newPaths);
+            getAllPaths(data, acc, newPaths);
           }
-        } else if (key === NAME_KEY && _obj[key] !== "") {
+        } else if (key === NAME_KEY && data !== "") {
           paths.forEach((path) => {
             const formValue = _get(formData, path);
-            if (typeof formValue !== "object" || _isEmpty(formValue) || Array.isArray(formValue) && formValue.every((val) => typeof val !== "object")) {
+            const isLeaf = objKeys.length === 1;
+            if (formValueHasData(formValue, isLeaf) || Array.isArray(formValue) && formValue.every((val) => formValueHasData(val, isLeaf))) {
               acc.push(path);
             }
           });
@@ -4536,60 +4773,49 @@ var Form = class extends Component5 {
     const retrievedSchema = schemaUtils.retrieveSchema(schema, formData);
     const pathSchema = schemaUtils.toPathSchema(retrievedSchema, "", formData);
     const fieldNames = this.getFieldNames(pathSchema, formData);
-    const newFormData = this.getUsedFormData(formData, fieldNames);
-    return newFormData;
+    return this.getUsedFormData(formData, fieldNames);
   };
-  // Filtering errors based on your retrieved schema to only show errors for properties in the selected branch.
-  filterErrorsBasedOnSchema(schemaErrors, resolvedSchema, formData) {
-    const { retrievedSchema, schemaUtils } = this.state;
-    const _retrievedSchema = resolvedSchema ?? retrievedSchema;
-    const pathSchema = schemaUtils.toPathSchema(_retrievedSchema, "", formData);
-    const fieldNames = this.getFieldNames(pathSchema, formData);
-    const filteredErrors = _pick(schemaErrors, fieldNames);
-    if (resolvedSchema?.type !== "object" && resolvedSchema?.type !== "array") {
-      filteredErrors.__errors = schemaErrors.__errors;
-    }
-    const prevCustomValidateErrors = this.getPreviousCustomValidateErrors();
-    const filterPreviousCustomErrors = (errors = [], prevCustomErrors) => {
-      if (errors.length === 0) {
-        return errors;
-      }
-      return errors.filter((error) => {
-        return !prevCustomErrors.includes(error);
-      });
-    };
-    const filterNilOrEmptyErrors = (errors, previousCustomValidateErrors = {}) => {
-      _forEach(errors, (errorAtKey, errorKey) => {
-        const prevCustomValidateErrorAtKey = previousCustomValidateErrors[errorKey];
-        if (_isNil(errorAtKey) || Array.isArray(errorAtKey) && errorAtKey.length === 0) {
-          delete errors[errorKey];
-        } else if (isObject6(errorAtKey) && isObject6(prevCustomValidateErrorAtKey) && Array.isArray(prevCustomValidateErrorAtKey?.__errors)) {
-          errors[errorKey] = filterPreviousCustomErrors(errorAtKey.__errors, prevCustomValidateErrorAtKey.__errors);
-        } else if (typeof errorAtKey === "object" && !Array.isArray(errorAtKey.__errors)) {
-          filterNilOrEmptyErrors(errorAtKey, previousCustomValidateErrors[errorKey]);
-        }
-      });
-      return errors;
-    };
-    return filterNilOrEmptyErrors(filteredErrors, prevCustomValidateErrors);
-  }
-  /** Function to handle changes made to a field in the `Form`. This handler receives an entirely new copy of the
-   * `formData` along with a new `ErrorSchema`. It will first update the `formData` with any missing default fields and
-   * then, if `omitExtraData` and `liveOmit` are turned on, the `formData` will be filtered to remove any extra data not
-   * in a form field. Then, the resulting formData will be validated if required. The state will be updated with the new
-   * updated (potentially filtered) `formData`, any errors that resulted from validation. Finally the `onChange`
-   * callback will be called if specified with the updated state.
+  /** Pushes the given change information into the `pendingChanges` array and then calls `processPendingChanges()` if
+   * the array only contains a single pending change.
    *
-   * @param formData - The new form data from a change to a field
-   * @param newErrorSchema - The new `ErrorSchema` based on the field change
-   * @param id - The id of the field that caused the change
+   * @param newValue - The new form data from a change to a field
+   * @param path - The path to the change into which to set the formData
+   * @param [newErrorSchema] - The new `ErrorSchema` based on the field change
+   * @param [id] - The id of the field that caused the change
    */
-  onChange = (formData, newErrorSchema, id) => {
+  onChange = (newValue, path, newErrorSchema, id) => {
+    this.pendingChanges.push({ newValue, path, newErrorSchema, id });
+    if (this.pendingChanges.length === 1) {
+      this.processPendingChange();
+    }
+  };
+  /** Function to handle changes made to a field in the `Form`. This handler gets the first change from the
+   * `pendingChanges` list, containing the `newValue` for the `formData` and the `path` at which the `newValue` is to be
+   * updated, along with a new, optional `ErrorSchema` for that same `path` and potentially the `id` of the field being
+   * changed. It will first update the `formData` with any missing default fields and then, if `omitExtraData` and
+   * `liveOmit` are turned on, the `formData` will be filtered to remove any extra data not in a form field. Then, the
+   * resulting `formData` will be validated if required. The state will be updated with the new updated (potentially
+   * filtered) `formData`, any errors that resulted from validation. Finally the `onChange` callback will be called, if
+   * specified, with the updated state and the `processPendingChange()` function is called again.
+   */
+  processPendingChange() {
+    if (this.pendingChanges.length === 0) {
+      return;
+    }
+    const { newValue, path, id } = this.pendingChanges[0];
+    const { newErrorSchema } = this.pendingChanges[0];
     const { extraErrors, omitExtraData, liveOmit, noValidate, liveValidate, onChange } = this.props;
-    const { schemaUtils, schema } = this.state;
+    const { formData: oldFormData, schemaUtils, schema, fieldPathId, schemaValidationErrorSchema, errors } = this.state;
+    let { customErrors, errorSchema: originalErrorSchema } = this.state;
+    const rootPathId = fieldPathId.path[0] || "";
+    const isRootPath = !path || path.length === 0 || path.length === 1 && path[0] === rootPathId;
     let retrievedSchema = this.state.retrievedSchema;
+    let formData = isRootPath ? newValue : _cloneDeep(oldFormData);
     if (isObject6(formData) || Array.isArray(formData)) {
-      const newState = this.getStateFromProps(this.props, formData);
+      if (!isRootPath) {
+        _set(formData, path, newValue);
+      }
+      const newState = this.getStateFromProps(this.props, formData, void 0, void 0, void 0, true);
       formData = newState.formData;
       retrievedSchema = newState.retrievedSchema;
     }
@@ -4602,38 +4828,54 @@ var Form = class extends Component5 {
         formData: newFormData
       };
     }
-    if (mustValidate) {
-      const schemaValidation = this.validate(newFormData, schema, schemaUtils, retrievedSchema);
-      let errors = schemaValidation.errors;
-      let errorSchema = schemaValidation.errorSchema;
-      const schemaValidationErrors = errors;
-      const schemaValidationErrorSchema = errorSchema;
-      if (extraErrors) {
-        const merged = validationDataMerge(schemaValidation, extraErrors);
-        errorSchema = merged.errorSchema;
-        errors = merged.errors;
-      }
-      if (newErrorSchema) {
-        const filteredErrors = this.filterErrorsBasedOnSchema(newErrorSchema, retrievedSchema, newFormData);
-        errorSchema = mergeObjects3(errorSchema, filteredErrors, "preventDuplicates");
+    if (newErrorSchema) {
+      const oldValidationError = !isRootPath ? _get(schemaValidationErrorSchema, path) : schemaValidationErrorSchema;
+      if (!_isEmpty(oldValidationError)) {
+        if (!isRootPath) {
+          _set(originalErrorSchema, path, newErrorSchema);
+        } else {
+          originalErrorSchema = newErrorSchema;
+        }
+      } else {
+        if (!customErrors) {
+          customErrors = new ErrorSchemaBuilder();
+        }
+        if (isRootPath) {
+          customErrors.setErrors(_get(newErrorSchema, ERRORS_KEY3, ""));
+        } else {
+          _set(customErrors.ErrorSchema, path, newErrorSchema);
+        }
       }
-      state = {
-        formData: newFormData,
-        errors,
-        errorSchema,
-        schemaValidationErrors,
-        schemaValidationErrorSchema
-      };
+    } else if (customErrors && _get(customErrors.ErrorSchema, [...path, ERRORS_KEY3])) {
+      customErrors.clearErrors(path);
+    }
+    if (mustValidate && this.pendingChanges.length === 1) {
+      const liveValidation = this.liveValidate(
+        schema,
+        schemaUtils,
+        originalErrorSchema,
+        newFormData,
+        extraErrors,
+        customErrors,
+        retrievedSchema
+      );
+      state = { formData: newFormData, ...liveValidation, customErrors };
     } else if (!noValidate && newErrorSchema) {
-      const errorSchema = extraErrors ? mergeObjects3(newErrorSchema, extraErrors, "preventDuplicates") : newErrorSchema;
+      const mergedErrors = this.mergeErrors({ errorSchema: originalErrorSchema, errors }, extraErrors, customErrors);
       state = {
         formData: newFormData,
-        errorSchema,
-        errors: toErrorList(errorSchema)
+        ...mergedErrors,
+        customErrors
       };
     }
-    this.setState(state, () => onChange && onChange({ ...this.state, ...state }, id));
-  };
+    this.setState(state, () => {
+      if (onChange) {
+        onChange({ ...this.state, ...state }, id);
+      }
+      this.pendingChanges.shift();
+      this.processPendingChange();
+    });
+  }
   /**
    * If the retrievedSchema has changed the new retrievedSchema is returned.
    * Otherwise, the old retrievedSchema is returned to persist reference.
@@ -4644,7 +4886,7 @@ var Form = class extends Component5 {
    * @returns The new retrieved schema if it has changed, else the old retrieved schema.
    */
   updateRetrievedSchema(retrievedSchema) {
-    const isTheSame = deepEquals3(retrievedSchema, this.state?.retrievedSchema);
+    const isTheSame = deepEquals2(retrievedSchema, this.state?.retrievedSchema);
     return isTheSame ? this.state.retrievedSchema : retrievedSchema;
   }
   /**
@@ -4662,7 +4904,9 @@ var Form = class extends Component5 {
       errorSchema: {},
       errors: [],
       schemaValidationErrors: [],
-      schemaValidationErrorSchema: {}
+      schemaValidationErrorSchema: {},
+      initialDefaultsGenerated: false,
+      customErrors: void 0
     };
     this.setState(state, () => onChange && onChange({ ...this.state, ...state }));
   };
@@ -4728,10 +4972,26 @@ var Form = class extends Component5 {
       );
     }
   };
+  /** Extracts the `GlobalFormOptions` from the given Form `props`
+   *
+   * @param props - The form props to extract the global form options from
+   * @returns - The `GlobalFormOptions` from the props
+   * @private
+   */
+  getGlobalFormOptions(props) {
+    const {
+      uiSchema = {},
+      experimental_componentUpdateStrategy,
+      idSeparator = DEFAULT_ID_SEPARATOR2,
+      idPrefix = DEFAULT_ID_PREFIX2
+    } = props;
+    const rootFieldId = uiSchema["ui:rootFieldId"];
+    return { idPrefix: rootFieldId || idPrefix, idSeparator, experimental_componentUpdateStrategy };
+  }
   /** Returns the registry for the form */
   getRegistry() {
     const { translateString: customTranslateString, uiSchema = {} } = this.props;
-    const { schemaUtils } = this.state;
+    const { schema, schemaUtils } = this.state;
     const { fields: fields2, templates: templates2, widgets: widgets2, formContext, translateString } = getDefaultRegistry();
     return {
       fields: { ...fields2, ...this.props.fields },
@@ -4744,11 +5004,12 @@ var Form = class extends Component5 {
         }
       },
       widgets: { ...widgets2, ...this.props.widgets },
-      rootSchema: this.props.schema,
+      rootSchema: schema,
       formContext: this.props.formContext || formContext,
       schemaUtils,
       translateString: customTranslateString || translateString,
-      globalUiOptions: uiSchema[UI_GLOBAL_OPTIONS_KEY]
+      globalUiOptions: uiSchema[UI_GLOBAL_OPTIONS_KEY2],
+      globalFormOptions: this.getGlobalFormOptions(this.props)
     };
   }
   /** Provides a function that can be used to programmatically submit the `Form` */
@@ -4863,8 +5124,6 @@ var Form = class extends Component5 {
     const {
       children,
       id,
-      idPrefix,
-      idSeparator,
       className = "",
       tagName,
       name,
@@ -4877,17 +5136,16 @@ var Form = class extends Component5 {
       noHtml5Validate = false,
       disabled,
       readonly,
-      formContext,
       showErrorList = "top",
       _internalFormWrapper
     } = this.props;
-    const { schema, uiSchema, formData, errorSchema, idSchema } = this.state;
+    const { schema, uiSchema, formData, errorSchema, fieldPathId } = this.state;
     const registry = this.getRegistry();
     const { SchemaField: _SchemaField } = registry.fields;
     const { SubmitButton: SubmitButton2 } = registry.templates.ButtonTemplates;
     const as = _internalFormWrapper ? tagName : void 0;
     const FormTag = _internalFormWrapper || tagName || "form";
-    let { [SUBMIT_BTN_OPTIONS_KEY]: submitOptions = {} } = getUiOptions17(uiSchema);
+    let { [SUBMIT_BTN_OPTIONS_KEY]: submitOptions = {} } = getUiOptions18(uiSchema);
     if (disabled) {
       submitOptions = { ...submitOptions, props: { ...submitOptions.props, disabled: true } };
     }
@@ -4910,17 +5168,14 @@ var Form = class extends Component5 {
         ref: this.formElement,
         children: [
           showErrorList === "top" && this.renderErrors(registry),
-          /* @__PURE__ */ jsx52(
+          /* @__PURE__ */ jsx55(
             _SchemaField,
             {
               name: "",
               schema,
               uiSchema,
               errorSchema,
-              idSchema,
-              idPrefix,
-              idSeparator,
-              formContext,
+              fieldPathId,
               formData,
               onChange: this.onChange,
               onBlur: this.onBlur,
@@ -4930,7 +5185,7 @@ var Form = class extends Component5 {
               readonly
             }
           ),
-          children ? children : /* @__PURE__ */ jsx52(SubmitButton2, { uiSchema: submitUiSchema, registry }),
+          children ? children : /* @__PURE__ */ jsx55(SubmitButton2, { uiSchema: submitUiSchema, registry }),
           showErrorList === "bottom" && this.renderErrors(registry)
         ]
       }
@@ -4940,7 +5195,7 @@ var Form = class extends Component5 {
 
 // src/withTheme.tsx
 import { forwardRef } from "react";
-import { jsx as jsx53 } from "react/jsx-runtime";
+import { jsx as jsx56 } from "react/jsx-runtime";
 function withTheme(themeProps) {
   return forwardRef(
     ({ fields: fields2, widgets: widgets2, templates: templates2, ...directProps }, ref) => {
@@ -4954,7 +5209,7 @@ function withTheme(themeProps) {
           ...templates2?.ButtonTemplates
         }
       };
-      return /* @__PURE__ */ jsx53(
+      return /* @__PURE__ */ jsx56(
         Form,
         {
           ...themeProps,
@@ -4969,12 +5224,36 @@ function withTheme(themeProps) {
   );
 }
 
+// src/getTestRegistry.tsx
+import {
+  DEFAULT_ID_PREFIX as DEFAULT_ID_PREFIX3,
+  DEFAULT_ID_SEPARATOR as DEFAULT_ID_SEPARATOR3,
+  createSchemaUtils as createSchemaUtils2,
+  englishStringTranslator as englishStringTranslator2
+} from "@rjsf/utils";
+import validator from "@rjsf/validator-ajv8";
+function getTestRegistry(rootSchema, fields2 = {}, templates2 = {}, widgets2 = {}, formContext = {}, globalFormOptions = { idPrefix: DEFAULT_ID_PREFIX3, idSeparator: DEFAULT_ID_SEPARATOR3 }) {
+  const defaults = getDefaultRegistry();
+  const schemaUtils = createSchemaUtils2(validator, rootSchema);
+  return {
+    fields: { ...defaults.fields, ...fields2 },
+    templates: { ...defaults.templates, ...templates2 },
+    widgets: { ...defaults.widgets, ...widgets2 },
+    formContext,
+    rootSchema,
+    schemaUtils,
+    translateString: englishStringTranslator2,
+    globalFormOptions
+  };
+}
+
 // src/index.ts
 var index_default = Form;
 export {
   RichDescription,
   index_default as default,
   getDefaultRegistry,
+  getTestRegistry,
   withTheme
 };
 //# sourceMappingURL=index.esm.js.map