@rjsf/core 6.6.1 → 6.7.0

package/dist/index.esm.js

@@ -1,15 +1,16 @@
 // src/components/Form.tsx
-import { Component as Component3, createRef } from "react";
+import { Component, createRef } from "react";
 import {
   createSchemaUtils,
-  deepEquals as deepEquals2,
+  deepEquals as deepEquals3,
   ErrorSchemaBuilder,
   getChangedFields,
-  getTemplate as getTemplate28,
-  getUiOptions as getUiOptions21,
+  getTemplate as getTemplate29,
+  getUiOptions as getUiOptions22,
+  hashObject as hashObject6,
   isObject as isObject6,
   mergeObjects,
-  shouldRender as shouldRender2,
+  shouldRender,
   SUBMIT_BTN_OPTIONS_KEY,
   toErrorList,
   toFieldPathId as toFieldPathId6,
@@ -20,7 +21,7 @@ import {
   DEFAULT_ID_SEPARATOR as DEFAULT_ID_SEPARATOR2,
   DEFAULT_ID_PREFIX as DEFAULT_ID_PREFIX2,
   ERRORS_KEY as ERRORS_KEY3,
-  ID_KEY as ID_KEY5,
+  ID_KEY as ID_KEY6,
   getUsedFormData,
   getFieldNames,
   ANY_OF_KEY as ANY_OF_KEY6,
@@ -35,14 +36,10 @@ import _toPath from "lodash/toPath";
 import _unset from "lodash/unset";
 
 // src/getDefaultRegistry.ts
-import {
-  DEFAULT_ID_PREFIX,
-  DEFAULT_ID_SEPARATOR,
-  englishStringTranslator
-} from "@rjsf/utils";
+import { DEFAULT_ID_PREFIX, DEFAULT_ID_SEPARATOR, englishStringTranslator } from "@rjsf/utils";
 
 // src/components/fields/ArrayField.tsx
-import { useCallback, useMemo, useState } from "react";
+import { memo, useCallback, useMemo, useRef, useState } from "react";
 import {
   allowAdditionalItems,
   getTemplate,
@@ -69,12 +66,10 @@ function generateRowId() {
   return uniqueId("rjsf-array-item-");
 }
 function generateKeyedFormData(formData) {
-  return !Array.isArray(formData) ? [] : formData.map((item) => {
-    return {
-      key: generateRowId(),
-      item
-    };
-  });
+  return !Array.isArray(formData) ? [] : formData.map((item) => ({
+    key: generateRowId(),
+    item
+  }));
 }
 function keyedToPlainFormData(keyedFormData) {
   if (Array.isArray(keyedFormData)) {
@@ -275,7 +270,7 @@ function ArrayAsFiles(props) {
     }
   );
 }
-function ArrayFieldItem(props) {
+function ArrayFieldItemInner(props) {
   const {
     itemKey,
     index,
@@ -290,10 +285,10 @@ function ArrayFieldItem(props) {
     canRemove = true,
     canMoveUp,
     canMoveDown,
-    itemSchema,
+    rawItemSchema,
     itemData,
     itemUiSchema,
-    itemFieldPathId,
+    parentFieldPathId,
     itemErrorSchema,
     autofocus,
     onBlur,
@@ -310,9 +305,17 @@ function ArrayFieldItem(props) {
   const {
     schemaUtils,
     fields: { ArraySchemaField, SchemaField: SchemaField2 },
-    globalUiOptions
+    globalUiOptions,
+    globalFormOptions
   } = registry;
-  const fieldPathId = useDeepCompareMemo(itemFieldPathId);
+  const itemSchema = useMemo(
+    () => schemaUtils.retrieveSchema(rawItemSchema, itemData),
+    [schemaUtils, rawItemSchema, itemData]
+  );
+  const fieldPathId = useMemo(
+    () => toFieldPathId(index, globalFormOptions, parentFieldPathId),
+    [index, globalFormOptions, parentFieldPathId]
+  );
   const ItemSchemaField = ArraySchemaField || SchemaField2;
   const ArrayFieldItemTemplate2 = getTemplate(
     "ArrayFieldItemTemplate",
@@ -421,6 +424,7 @@ function ArrayFieldItem(props) {
   };
   return /* @__PURE__ */ jsx(ArrayFieldItemTemplate2, { ...templateProps });
 }
+var ArrayFieldItem = memo(ArrayFieldItemInner);
 function NormalArray(props) {
   const {
     schema,
@@ -447,15 +451,18 @@ function NormalArray(props) {
     handleReorderItems
   } = props;
   const fieldTitle = schema.title || title || name;
-  const { schemaUtils, fields: fields2, formContext, globalFormOptions, globalUiOptions } = registry;
+  const { schemaUtils, fields: fields2, formContext, globalUiOptions } = registry;
   const { OptionalDataControlsField: OptionalDataControlsField2 } = fields2;
-  const uiOptions = getUiOptions(uiSchema, globalUiOptions);
-  const _schemaItems = isObject(schema.items) ? schema.items : {};
-  const itemsSchema = schemaUtils.retrieveSchema(_schemaItems);
-  const formData = keyedToPlainFormData(keyedFormData);
+  const uiOptions = useMemo(() => getUiOptions(uiSchema, globalUiOptions), [uiSchema, globalUiOptions]);
+  const schemaItems = useMemo(() => isObject(schema.items) ? schema.items : {}, [schema.items]);
+  const itemsSchema = useMemo(() => schemaUtils.retrieveSchema(schemaItems), [schemaUtils, schemaItems]);
+  const formData = useMemo(() => keyedToPlainFormData(keyedFormData), [keyedFormData]);
   const renderOptionalField = shouldRenderOptionalField(registry, schema, required, uiSchema);
   const hasFormData = isFormDataAvailable(formDataFromProps);
-  const canAdd = canAddItem(registry, schema, formData, uiSchema) && (!renderOptionalField || hasFormData);
+  const canAdd = useMemo(
+    () => canAddItem(registry, schema, formData, uiSchema) && (!renderOptionalField || hasFormData),
+    [registry, schema, formData, uiSchema, renderOptionalField, hasFormData]
+  );
   const actualFormData = hasFormData ? keyedFormData : [];
   const extraClass = renderOptionalField ? " rjsf-optional-array-field" : "";
   const childFieldPathId = props.childFieldPathId ?? fieldPathId;
@@ -465,9 +472,7 @@ function NormalArray(props) {
     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 itemFieldPathId = toFieldPathId(index, globalFormOptions, childFieldPathId);
       const itemUiSchema = computeItemUiSchema(uiSchema, item, index, formContext);
       const itemProps = {
         itemKey: key,
@@ -484,8 +489,8 @@ function NormalArray(props) {
         canAdd,
         canMoveUp: index > 0,
         canMoveDown: index < formData.length - 1,
-        itemSchema,
-        itemFieldPathId,
+        rawItemSchema: schemaItems,
+        parentFieldPathId: childFieldPathId,
         itemErrorSchema,
         itemData: itemCast,
         itemUiSchema,
@@ -546,24 +551,24 @@ function FixedArray(props) {
   } = props;
   let { formData: items = [] } = props;
   const fieldTitle = schema.title || title || name;
-  const { schemaUtils, fields: fields2, formContext, globalFormOptions, globalUiOptions } = registry;
-  const uiOptions = getUiOptions(uiSchema, globalUiOptions);
+  const { fields: fields2, formContext, globalUiOptions } = registry;
+  const uiOptions = useMemo(() => getUiOptions(uiSchema, globalUiOptions), [uiSchema, globalUiOptions]);
   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, items[index])
+  const schemaItems = useMemo(
+    () => isObject(schema.items) ? schema.items : [],
+    [schema.items]
   );
-  const additionalSchema = isObject(schema.additionalItems) ? schemaUtils.retrieveSchema(schema.additionalItems, formData) : null;
+  const hasAdditionalItems = isObject(schema.additionalItems);
   const childFieldPathId = props.childFieldPathId ?? fieldPathId;
-  if (items.length < itemSchemas.length) {
-    items = items.concat(new Array(itemSchemas.length - items.length));
+  if (items.length < schemaItems.length) {
+    items = items.concat(new Array(schemaItems.length - items.length));
   }
   const actualFormData = hasFormData ? keyedFormData : [];
   const extraClass = renderOptionalField ? " rjsf-optional-array-field" : "";
   const optionalDataControl = renderOptionalField ? /* @__PURE__ */ jsx(OptionalDataControlsField2, { ...props, fieldPathId: childFieldPathId }) : void 0;
-  const canAdd = canAddItem(registry, schema, items, uiSchema) && !!additionalSchema && (!renderOptionalField || hasFormData);
+  const canAdd = canAddItem(registry, schema, items, uiSchema) && hasAdditionalItems && (!renderOptionalField || hasFormData);
   const arrayProps = {
     canAdd,
     className: `rjsf-field rjsf-field-array rjsf-field-array-fixed-items${extraClass}`,
@@ -573,18 +578,15 @@ function FixedArray(props) {
     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 itemFieldPathId = toFieldPathId(index, globalFormOptions, childFieldPathId);
+      const additional = index >= schemaItems.length;
+      const rawItemSchema = (additional && isObject(schema.additionalItems) ? schema.additionalItems : schemaItems[index]) || {};
       let itemUiSchema;
       if (additional) {
         itemUiSchema = uiSchema.additionalItems;
+      } else if (Array.isArray(uiSchema.items)) {
+        itemUiSchema = uiSchema.items[index];
       } else {
-        if (Array.isArray(uiSchema.items)) {
-          itemUiSchema = uiSchema.items[index];
-        } else {
-          itemUiSchema = computeItemUiSchema(uiSchema, item, index, formContext);
-        }
+        itemUiSchema = computeItemUiSchema(uiSchema, item, index, formContext);
       }
       const itemErrorSchema = errorSchema ? errorSchema[index] : void 0;
       const itemProps = {
@@ -601,12 +603,12 @@ function FixedArray(props) {
         title: fieldTitle ? `${fieldTitle}-${index + 1}` : void 0,
         canAdd,
         canRemove: additional,
-        canMoveUp: index >= itemSchemas.length + 1,
+        canMoveUp: index >= schemaItems.length + 1,
         canMoveDown: additional && index < items.length - 1,
-        itemSchema,
+        rawItemSchema,
         itemData: itemCast,
         itemUiSchema,
-        itemFieldPathId,
+        parentFieldPathId: childFieldPathId,
         itemErrorSchema,
         autofocus: autofocus && index === 0,
         onBlur,
@@ -654,8 +656,8 @@ function useKeyedFormData(formData = []) {
   }
   const updateKeyedFormData = useCallback((newData) => {
     const plainFormData = keyedToPlainFormData(newData);
-    const newHash2 = hashObject(plainFormData);
-    setState({ formDataHash: newHash2, keyedFormData: newData });
+    const updatedHash = hashObject(plainFormData);
+    setState({ formDataHash: updatedHash, keyedFormData: newData });
     return plainFormData;
   }, []);
   return { keyedFormData, updateKeyedFormData };
@@ -664,6 +666,10 @@ function ArrayField(props) {
   const { schema, uiSchema, errorSchema, fieldPathId, registry, formData, onChange } = props;
   const { globalFormOptions, schemaUtils, translateString } = registry;
   const { keyedFormData, updateKeyedFormData } = useKeyedFormData(formData);
+  const keyedFormDataRef = useRef(keyedFormData);
+  keyedFormDataRef.current = keyedFormData;
+  const errorSchemaRef = useRef(errorSchema);
+  errorSchemaRef.current = errorSchema;
   const childFieldPathId = props.childFieldPathId ?? fieldPathId;
   const handleAddItem = useCallback(
     (event, index) => {
@@ -671,14 +677,14 @@ function ArrayField(props) {
         event.preventDefault();
       }
       let newErrorSchema;
-      if (errorSchema) {
+      if (errorSchemaRef.current) {
         newErrorSchema = {};
-        for (const idx in errorSchema) {
-          const i = parseInt(idx);
+        for (const idx of Object.keys(errorSchemaRef.current)) {
+          const i = parseInt(idx, 10);
           if (index === void 0 || i < index) {
-            set(newErrorSchema, [i], errorSchema[idx]);
+            set(newErrorSchema, [i], errorSchemaRef.current[i]);
           } else if (i >= index) {
-            set(newErrorSchema, [i + 1], errorSchema[idx]);
+            set(newErrorSchema, [i + 1], errorSchemaRef.current[i]);
           }
         }
       }
@@ -686,7 +692,7 @@ function ArrayField(props) {
         key: generateRowId(),
         item: getNewFormDataRow(registry, schema)
       };
-      const newKeyedFormData = [...keyedFormData];
+      const newKeyedFormData = [...keyedFormDataRef.current];
       if (index !== void 0) {
         newKeyedFormData.splice(index, 0, newKeyedFormDataRow);
       } else {
@@ -694,7 +700,7 @@ function ArrayField(props) {
       }
       onChange(updateKeyedFormData(newKeyedFormData), childFieldPathId.path, newErrorSchema);
     },
-    [keyedFormData, registry, schema, onChange, updateKeyedFormData, errorSchema, childFieldPathId]
+    [registry, schema, onChange, updateKeyedFormData, childFieldPathId]
   );
   const handleCopyItem = useCallback(
     (event, index) => {
@@ -702,22 +708,22 @@ function ArrayField(props) {
         event.preventDefault();
       }
       let newErrorSchema;
-      if (errorSchema) {
+      if (errorSchemaRef.current) {
         newErrorSchema = {};
-        for (const idx in errorSchema) {
-          const i = parseInt(idx);
+        for (const idx of Object.keys(errorSchemaRef.current)) {
+          const i = parseInt(idx, 10);
           if (i <= index) {
-            set(newErrorSchema, [i], errorSchema[idx]);
+            set(newErrorSchema, [i], errorSchemaRef.current[i]);
           } else if (i > index) {
-            set(newErrorSchema, [i + 1], errorSchema[idx]);
+            set(newErrorSchema, [i + 1], errorSchemaRef.current[i]);
           }
         }
       }
       const newKeyedFormDataRow = {
         key: generateRowId(),
-        item: cloneDeep(keyedFormData[index].item)
+        item: cloneDeep(keyedFormDataRef.current[index].item)
       };
-      const newKeyedFormData = [...keyedFormData];
+      const newKeyedFormData = [...keyedFormDataRef.current];
       if (index !== void 0) {
         newKeyedFormData.splice(index + 1, 0, newKeyedFormDataRow);
       } else {
@@ -725,7 +731,7 @@ function ArrayField(props) {
       }
       onChange(updateKeyedFormData(newKeyedFormData), childFieldPathId.path, newErrorSchema);
     },
-    [keyedFormData, onChange, updateKeyedFormData, errorSchema, childFieldPathId]
+    [onChange, updateKeyedFormData, childFieldPathId]
   );
   const handleRemoveItem = useCallback(
     (event, index) => {
@@ -733,21 +739,21 @@ function ArrayField(props) {
         event.preventDefault();
       }
       let newErrorSchema;
-      if (errorSchema) {
+      if (errorSchemaRef.current) {
         newErrorSchema = {};
-        for (const idx in errorSchema) {
-          const i = parseInt(idx);
+        for (const idx of Object.keys(errorSchemaRef.current)) {
+          const i = parseInt(idx, 10);
           if (i < index) {
-            set(newErrorSchema, [i], errorSchema[idx]);
+            set(newErrorSchema, [i], errorSchemaRef.current[i]);
           } else if (i > index) {
-            set(newErrorSchema, [i - 1], errorSchema[idx]);
+            set(newErrorSchema, [i - 1], errorSchemaRef.current[i]);
           }
         }
       }
-      const newKeyedFormData = keyedFormData.filter((_, i) => i !== index);
+      const newKeyedFormData = keyedFormDataRef.current.filter((_, i) => i !== index);
       onChange(updateKeyedFormData(newKeyedFormData), childFieldPathId.path, newErrorSchema);
     },
-    [keyedFormData, onChange, updateKeyedFormData, errorSchema, childFieldPathId]
+    [onChange, updateKeyedFormData, childFieldPathId]
   );
   const handleReorderItems = useCallback(
     (event, index, newIndex) => {
@@ -756,29 +762,29 @@ function ArrayField(props) {
         event.currentTarget.blur();
       }
       let newErrorSchema;
-      if (errorSchema) {
+      if (errorSchemaRef.current) {
         newErrorSchema = {};
-        for (const idx in errorSchema) {
-          const i = parseInt(idx);
-          if (i == index) {
-            set(newErrorSchema, [newIndex], errorSchema[index]);
-          } else if (i == newIndex) {
-            set(newErrorSchema, [index], errorSchema[newIndex]);
+        for (const idx of Object.keys(errorSchemaRef.current)) {
+          const i = parseInt(idx, 10);
+          if (i === index) {
+            set(newErrorSchema, [newIndex], errorSchemaRef.current[index]);
+          } else if (i === newIndex) {
+            set(newErrorSchema, [index], errorSchemaRef.current[newIndex]);
           } else {
-            set(newErrorSchema, [idx], errorSchema[i]);
+            set(newErrorSchema, [idx], errorSchemaRef.current[i]);
           }
         }
       }
       function reOrderArray() {
-        const _newKeyedFormData = keyedFormData.slice();
-        _newKeyedFormData.splice(index, 1);
-        _newKeyedFormData.splice(newIndex, 0, keyedFormData[index]);
-        return _newKeyedFormData;
+        const newKeyedFormData2 = keyedFormDataRef.current.slice();
+        newKeyedFormData2.splice(index, 1);
+        newKeyedFormData2.splice(newIndex, 0, keyedFormDataRef.current[index]);
+        return newKeyedFormData2;
       }
       const newKeyedFormData = reOrderArray();
       onChange(updateKeyedFormData(newKeyedFormData), childFieldPathId.path, newErrorSchema);
     },
-    [keyedFormData, onChange, updateKeyedFormData, errorSchema, childFieldPathId]
+    [onChange, updateKeyedFormData, childFieldPathId]
   );
   const handleChange = useCallback(
     (value, path, newErrorSchema, id) => {
@@ -855,12 +861,7 @@ function ArrayField(props) {
 
 // src/components/fields/BooleanField.tsx
 import { useCallback as useCallback2 } from "react";
-import {
-  getWidget as getWidget2,
-  getUiOptions as getUiOptions2,
-  optionsList as optionsList2,
-  TranslatableString as TranslatableString2
-} from "@rjsf/utils";
+import { getWidget as getWidget2, getUiOptions as getUiOptions2, optionsList as optionsList2, TranslatableString as TranslatableString2 } from "@rjsf/utils";
 import isObject2 from "lodash/isObject";
 import { jsx as jsx2 } from "react/jsx-runtime";
 function BooleanField(props) {
@@ -931,9 +932,7 @@ function BooleanField(props) {
     }
   }
   const onWidgetChange = useCallback2(
-    (value, errorSchema, id) => {
-      return onChange(value, fieldPathId.path, errorSchema, id);
-    },
+    (value, errorSchema, id) => onChange(value, fieldPathId.path, errorSchema, id),
     [onChange, fieldPathId]
   );
   return /* @__PURE__ */ jsx2(
@@ -963,17 +962,49 @@ function BooleanField(props) {
 }
 var BooleanField_default = BooleanField;
 
+// src/components/fields/CyclicSchemaField.tsx
+import { useState as useState2 } from "react";
+import { getTemplate as getTemplate2, getUiOptions as getUiOptions3, RJSF_REF_CYCLE_KEY } from "@rjsf/utils";
+import { jsx as jsx3 } from "react/jsx-runtime";
+function CyclicSchemaField(props) {
+  const [expanded, setExpanded] = useState2(false);
+  const { name, registry, schema, uiSchema, fieldPathId } = props;
+  const { globalUiOptions } = registry;
+  const uiOptions = getUiOptions3(uiSchema, globalUiOptions);
+  const CyclicSchemaExpandTemplate2 = getTemplate2(
+    "CyclicSchemaExpandTemplate",
+    registry,
+    uiOptions
+  );
+  if (!expanded) {
+    return /* @__PURE__ */ jsx3(
+      CyclicSchemaExpandTemplate2,
+      {
+        registry,
+        schema,
+        uiSchema,
+        name,
+        fieldPathId,
+        onExpand: () => setExpanded(true)
+      }
+    );
+  }
+  const { fields: fields2 } = registry;
+  const { SchemaField: SchemaField2 } = fields2;
+  return /* @__PURE__ */ jsx3(SchemaField2, { ...props, schema: { ...schema, [RJSF_REF_CYCLE_KEY]: false } });
+}
+
 // src/components/fields/FallbackField.tsx
-import { useMemo as useMemo2, useState as useState2 } from "react";
+import { useMemo as useMemo2, useState as useState3 } from "react";
 import {
-  getTemplate as getTemplate2,
-  getUiOptions as getUiOptions3,
+  getTemplate as getTemplate3,
+  getUiOptions as getUiOptions4,
   hashObject as hashObject2,
   toFieldPathId as toFieldPathId2,
   TranslatableString as TranslatableString3,
   useDeepCompareMemo as useDeepCompareMemo2
 } from "@rjsf/utils";
-import { jsx as jsx3 } from "react/jsx-runtime";
+import { jsx as jsx4 } from "react/jsx-runtime";
 function getFallbackTypeSelectionSchema(title) {
   return {
     type: "string",
@@ -998,7 +1029,7 @@ function castToNewType(formData, newType) {
       return String(formData);
     case "number": {
       const castedNumber = Number(formData);
-      return isNaN(castedNumber) ? 0 : castedNumber;
+      return Number.isNaN(castedNumber) ? 0 : castedNumber;
     }
     case "boolean":
       return Boolean(formData);
@@ -1025,8 +1056,8 @@ function FallbackField(props) {
     errorSchema
   } = props;
   const { translateString, fields: fields2, globalFormOptions } = registry;
-  const [type, setType] = useState2(getTypeOfFormData(formData));
-  const uiOptions = getUiOptions3(uiSchema);
+  const [type, setType] = useState3(getTypeOfFormData(formData));
+  const uiOptions = getUiOptions4(uiSchema);
   const typeSelectorInnerFieldPathId = useDeepCompareMemo2(
     toFieldPathId2("__internal_type_selector", globalFormOptions, fieldPathId)
   );
@@ -1040,25 +1071,25 @@ function FallbackField(props) {
   };
   if (!globalFormOptions.useFallbackUiForUnsupportedType) {
     const { reason = translateString(TranslatableString3.UnknownFieldType, [String(schema.type)]) } = props;
-    const UnsupportedFieldTemplate = getTemplate2(
+    const UnsupportedFieldTemplate = getTemplate3(
       "UnsupportedFieldTemplate",
       registry,
       uiOptions
     );
-    return /* @__PURE__ */ jsx3(UnsupportedFieldTemplate, { schema, fieldPathId, reason, registry });
+    return /* @__PURE__ */ jsx4(UnsupportedFieldTemplate, { schema, fieldPathId, reason, registry });
   }
-  const FallbackFieldTemplate2 = getTemplate2(
+  const FallbackFieldTemplate2 = getTemplate3(
     "FallbackFieldTemplate",
     registry,
     uiOptions
   );
   const { SchemaField: SchemaField2 } = fields2;
-  return /* @__PURE__ */ jsx3(
+  return /* @__PURE__ */ jsx4(
     FallbackFieldTemplate2,
     {
       schema,
       registry,
-      typeSelector: /* @__PURE__ */ jsx3(
+      typeSelector: /* @__PURE__ */ jsx4(
         SchemaField2,
         {
           fieldPathId: typeSelectorInnerFieldPathId,
@@ -1076,7 +1107,7 @@ function FallbackField(props) {
         },
         formData ? hashObject2(formData) : "__empty__"
       ),
-      schemaField: /* @__PURE__ */ jsx3(
+      schemaField: /* @__PURE__ */ jsx4(
         SchemaField2,
         {
           ...props,
@@ -1095,9 +1126,9 @@ function FallbackField(props) {
 import {
   ANY_OF_KEY,
   getDiscriminatorFieldFromSchema,
-  getTemplate as getTemplate3,
+  getTemplate as getTemplate4,
   getTestIds,
-  getUiOptions as getUiOptions4,
+  getUiOptions as getUiOptions5,
   hashObject as hashObject3,
   ID_KEY as ID_KEY2,
   lookupFromFormContext,
@@ -1125,7 +1156,7 @@ import isString from "lodash/isString";
 import isUndefined from "lodash/isUndefined";
 import last from "lodash/last";
 import set2 from "lodash/set";
-import { jsx as jsx4 } from "react/jsx-runtime";
+import { jsx as jsx5 } from "react/jsx-runtime";
 import { createElement } from "react";
 var LOOKUP_REGEX = /^\$lookup=(.+)/;
 var LAYOUT_GRID_UI_OPTION = "layoutGrid";
@@ -1148,7 +1179,7 @@ function computeFieldUiSchema(field, uiProps, uiSchema, schemaReadonly, forceRea
   if (!isEmpty(globalUiOptions)) {
     set2(fieldUiSchema, [UI_GLOBAL_OPTIONS_KEY], globalUiOptions);
   }
-  let { readonly: uiReadonly } = getUiOptions4(fieldUiSchema);
+  let { readonly: uiReadonly } = getUiOptions5(fieldUiSchema);
   if (forceReadonly === true || isUndefined(uiReadonly) && schemaReadonly === true) {
     uiReadonly = true;
     if (has(localUiOptions, READONLY_KEY)) {
@@ -1194,6 +1225,7 @@ function findChildrenAndProps(layoutGridSchema, schemaKey, registry) {
 }
 function computeArraySchemasIfPresent(schema, fieldPathId, potentialIndex) {
   let rawSchema;
+  let resultPathId = fieldPathId;
   if (isNumericIndex(potentialIndex) && schema && schema?.type === "array" && has(schema, ITEMS_KEY2)) {
     const index = Number(potentialIndex);
     const items = schema[ITEMS_KEY2];
@@ -1206,12 +1238,12 @@ function computeArraySchemasIfPresent(schema, fieldPathId, potentialIndex) {
     } else {
       rawSchema = items;
     }
-    fieldPathId = {
+    resultPathId = {
       [ID_KEY2]: fieldPathId[ID_KEY2],
       path: [...fieldPathId.path.slice(0, fieldPathId.path.length - 1), index]
     };
   }
-  return { rawSchema, fieldPathId };
+  return { rawSchema, fieldPathId: resultPathId };
 }
 function getSchemaDetailsForField(registry, dottedPath, initialSchema, formData, initialFieldIdPath) {
   const { schemaUtils, globalFormOptions } = registry;
@@ -1294,15 +1326,15 @@ function computeUIComponentPropsFromGridSchema(registry, gridSchema) {
         if (isString(prop)) {
           const match = LOOKUP_REGEX.exec(prop);
           if (Array.isArray(match) && match.length > 1) {
-            const name2 = match[1];
-            uiProps[key] = lookupFromFormContext(registry, name2, name2);
+            const lookupName = match[1];
+            uiProps[key] = lookupFromFormContext(registry, lookupName, lookupName);
           }
         }
       });
     }
     UIComponent = getCustomRenderComponent(render, registry);
     if (!innerName && UIComponent) {
-      rendered = /* @__PURE__ */ jsx4(UIComponent, { ...innerProps, "data-testid": LAYOUT_GRID_FIELD_TEST_IDS.uiComponent });
+      rendered = /* @__PURE__ */ jsx5(UIComponent, { ...innerProps, "data-testid": LAYOUT_GRID_FIELD_TEST_IDS.uiComponent });
     }
   }
   return { name, UIComponent, uiProps, rendered };
@@ -1329,7 +1361,7 @@ function LayoutGridCondition(props) {
   const { operator, field = "", value } = gridProps;
   const fieldData = get(formData, field, null);
   if (conditionMatches(operator, fieldData, value)) {
-    return /* @__PURE__ */ jsx4(LayoutGridFieldChildren, { ...layoutGridFieldProps, childrenLayoutGridSchemaId: children });
+    return /* @__PURE__ */ jsx5(LayoutGridFieldChildren, { ...layoutGridFieldProps, childrenLayoutGridSchemaId: children });
   }
   return null;
 }
@@ -1337,23 +1369,23 @@ function LayoutGridCol(props) {
   const { layoutGridSchema, ...layoutGridFieldProps } = props;
   const { registry, uiSchema } = layoutGridFieldProps;
   const { children, gridProps } = findChildrenAndProps(layoutGridSchema, "ui:col" /* COLUMN */, registry);
-  const uiOptions = getUiOptions4(uiSchema);
-  const GridTemplate2 = getTemplate3("GridTemplate", registry, uiOptions);
-  return /* @__PURE__ */ jsx4(GridTemplate2, { column: true, "data-testid": LAYOUT_GRID_FIELD_TEST_IDS.col, ...gridProps, children: /* @__PURE__ */ jsx4(LayoutGridFieldChildren, { ...layoutGridFieldProps, childrenLayoutGridSchemaId: children }) });
+  const uiOptions = getUiOptions5(uiSchema);
+  const GridTemplate2 = getTemplate4("GridTemplate", registry, uiOptions);
+  return /* @__PURE__ */ jsx5(GridTemplate2, { column: true, "data-testid": LAYOUT_GRID_FIELD_TEST_IDS.col, ...gridProps, children: /* @__PURE__ */ jsx5(LayoutGridFieldChildren, { ...layoutGridFieldProps, childrenLayoutGridSchemaId: children }) });
 }
 function LayoutGridColumns(props) {
   const { layoutGridSchema, ...layoutGridFieldProps } = props;
   const { registry, uiSchema } = layoutGridFieldProps;
   const { children, gridProps } = findChildrenAndProps(layoutGridSchema, "ui:columns" /* COLUMNS */, registry);
-  const uiOptions = getUiOptions4(uiSchema);
-  const GridTemplate2 = getTemplate3("GridTemplate", registry, uiOptions);
-  return children.map((child) => /* @__PURE__ */ jsx4(
+  const uiOptions = getUiOptions5(uiSchema);
+  const GridTemplate2 = getTemplate4("GridTemplate", registry, uiOptions);
+  return children.map((child) => /* @__PURE__ */ jsx5(
     GridTemplate2,
     {
       column: true,
       "data-testid": LAYOUT_GRID_FIELD_TEST_IDS.col,
       ...gridProps,
-      children: /* @__PURE__ */ jsx4(LayoutGridFieldChildren, { ...layoutGridFieldProps, childrenLayoutGridSchemaId: [child] })
+      children: /* @__PURE__ */ jsx5(LayoutGridFieldChildren, { ...layoutGridFieldProps, childrenLayoutGridSchemaId: [child] })
     },
     `column-${hashObject3(child)}`
   ));
@@ -1362,9 +1394,9 @@ function LayoutGridRow(props) {
   const { layoutGridSchema, ...layoutGridFieldProps } = props;
   const { registry, uiSchema } = layoutGridFieldProps;
   const { children, gridProps } = findChildrenAndProps(layoutGridSchema, "ui:row" /* ROW */, registry);
-  const uiOptions = getUiOptions4(uiSchema);
-  const GridTemplate2 = getTemplate3("GridTemplate", registry, uiOptions);
-  return /* @__PURE__ */ jsx4(GridTemplate2, { ...gridProps, "data-testid": LAYOUT_GRID_FIELD_TEST_IDS.row, children: /* @__PURE__ */ jsx4(LayoutGridFieldChildren, { ...layoutGridFieldProps, childrenLayoutGridSchemaId: children }) });
+  const uiOptions = getUiOptions5(uiSchema);
+  const GridTemplate2 = getTemplate4("GridTemplate", registry, uiOptions);
+  return /* @__PURE__ */ jsx5(GridTemplate2, { ...gridProps, "data-testid": LAYOUT_GRID_FIELD_TEST_IDS.row, children: /* @__PURE__ */ jsx5(LayoutGridFieldChildren, { ...layoutGridFieldProps, childrenLayoutGridSchemaId: children }) });
 }
 function LayoutGridFieldComponent(props) {
   const {
@@ -1399,10 +1431,10 @@ function LayoutGridFieldComponent(props) {
     return uiComponentProps.rendered;
   }
   if (schema) {
-    const Field2 = optionsInfo?.hasDiscriminator ? LayoutMultiSchemaField2 : SchemaField2;
+    const Field = optionsInfo?.hasDiscriminator ? LayoutMultiSchemaField2 : SchemaField2;
     const { fieldUiSchema, uiReadonly } = computeFieldUiSchema(name, uiProps, uiSchema, isReadonly, readonly);
-    return /* @__PURE__ */ jsx4(
-      Field2,
+    return /* @__PURE__ */ jsx5(
+      Field,
       {
         "data-testid": optionsInfo?.hasDiscriminator ? LAYOUT_GRID_FIELD_TEST_IDS.layoutMultiSchemaField : LAYOUT_GRID_FIELD_TEST_IDS.field,
         ...otherProps,
@@ -1423,7 +1455,7 @@ function LayoutGridFieldComponent(props) {
     );
   }
   if (UIComponent) {
-    return /* @__PURE__ */ jsx4(
+    return /* @__PURE__ */ jsx5(
       UIComponent,
       {
         "data-testid": LAYOUT_GRID_FIELD_TEST_IDS.uiComponent,
@@ -1448,50 +1480,46 @@ function LayoutGridFieldComponent(props) {
 function LayoutGridField(props) {
   const { uiSchema } = props;
   let { layoutGridSchema } = props;
-  const uiOptions = getUiOptions4(uiSchema);
+  const uiOptions = getUiOptions5(uiSchema);
   if (!layoutGridSchema && LAYOUT_GRID_UI_OPTION in uiOptions && isObject3(uiOptions[LAYOUT_GRID_UI_OPTION])) {
     layoutGridSchema = uiOptions[LAYOUT_GRID_UI_OPTION];
   }
   if (isObject3(layoutGridSchema)) {
     if ("ui:row" /* ROW */ in layoutGridSchema) {
-      return /* @__PURE__ */ jsx4(LayoutGridRow, { ...props, layoutGridSchema });
+      return /* @__PURE__ */ jsx5(LayoutGridRow, { ...props, layoutGridSchema });
     }
     if ("ui:col" /* COLUMN */ in layoutGridSchema) {
-      return /* @__PURE__ */ jsx4(LayoutGridCol, { ...props, layoutGridSchema });
+      return /* @__PURE__ */ jsx5(LayoutGridCol, { ...props, layoutGridSchema });
     }
     if ("ui:columns" /* COLUMNS */ in layoutGridSchema) {
-      return /* @__PURE__ */ jsx4(LayoutGridColumns, { ...props, layoutGridSchema });
+      return /* @__PURE__ */ jsx5(LayoutGridColumns, { ...props, layoutGridSchema });
     }
     if ("ui:condition" /* CONDITION */ in layoutGridSchema) {
-      return /* @__PURE__ */ jsx4(LayoutGridCondition, { ...props, layoutGridSchema });
+      return /* @__PURE__ */ jsx5(LayoutGridCondition, { ...props, layoutGridSchema });
     }
   }
-  return /* @__PURE__ */ jsx4(LayoutGridFieldComponent, { ...props, gridSchema: layoutGridSchema });
+  return /* @__PURE__ */ jsx5(LayoutGridFieldComponent, { ...props, gridSchema: layoutGridSchema });
 }
 LayoutGridField.TEST_IDS = LAYOUT_GRID_FIELD_TEST_IDS;
 
 // src/components/fields/LayoutHeaderField.tsx
-import {
-  getTemplate as getTemplate4,
-  getUiOptions as getUiOptions5,
-  titleId
-} from "@rjsf/utils";
-import { jsx as jsx5 } from "react/jsx-runtime";
+import { getTemplate as getTemplate5, getUiOptions as getUiOptions6, titleId } from "@rjsf/utils";
+import { jsx as jsx6 } from "react/jsx-runtime";
 function LayoutHeaderField(props) {
   const { fieldPathId, title, schema, uiSchema, required, registry, name } = props;
-  const options = getUiOptions5(uiSchema, registry.globalUiOptions);
+  const options = getUiOptions6(uiSchema, registry.globalUiOptions);
   const { title: uiTitle } = options;
   const { title: schemaTitle } = schema;
   const fieldTitle = uiTitle || title || schemaTitle || name;
   if (!fieldTitle) {
     return null;
   }
-  const TitleFieldTemplate = getTemplate4(
+  const TitleFieldTemplate = getTemplate5(
     "TitleFieldTemplate",
     registry,
     options
   );
-  return /* @__PURE__ */ jsx5(
+  return /* @__PURE__ */ jsx6(
     TitleFieldTemplate,
     {
       id: titleId(fieldPathId),
@@ -1505,7 +1533,7 @@ function LayoutHeaderField(props) {
 }
 
 // src/components/fields/LayoutMultiSchemaField.tsx
-import { useState as useState3, useEffect } from "react";
+import { useState as useState4, useEffect } from "react";
 import {
   ANY_OF_KEY as ANY_OF_KEY2,
   CONST_KEY,
@@ -1517,8 +1545,8 @@ import {
   ONE_OF_KEY as ONE_OF_KEY2,
   optionsList as optionsList3,
   PROPERTIES_KEY as PROPERTIES_KEY2,
-  getTemplate as getTemplate5,
-  getUiOptions as getUiOptions6,
+  getTemplate as getTemplate6,
+  getUiOptions as getUiOptions7,
   getWidget as getWidget3
 } from "@rjsf/utils";
 import get2 from "lodash/get";
@@ -1527,7 +1555,7 @@ import isEmpty2 from "lodash/isEmpty";
 import noop from "lodash/noop";
 import omit from "lodash/omit";
 import set3 from "lodash/set";
-import { jsx as jsx6 } from "react/jsx-runtime";
+import { jsx as jsx7 } from "react/jsx-runtime";
 function getSelectedOption(options, selectorField, value) {
   const defaultValue = "!@#!@$@#$!@$#";
   const schemaOptions = options.map(({ schema }) => schema);
@@ -1572,11 +1600,11 @@ function LayoutMultiSchemaField(props) {
     hideError = false
   } = props;
   const { widgets: widgets2, schemaUtils, globalUiOptions } = registry;
-  const [enumOptions, setEnumOptions] = useState3(computeEnumOptions(schema, options, schemaUtils, uiSchema, formData));
+  const [enumOptions, setEnumOptions] = useState4(computeEnumOptions(schema, options, schemaUtils, uiSchema, formData));
   const id = get2(fieldPathId, ID_KEY3);
   const discriminator = getDiscriminatorFieldFromSchema2(schema);
-  const FieldErrorTemplate2 = getTemplate5("FieldErrorTemplate", registry, options);
-  const FieldTemplate2 = getTemplate5("FieldTemplate", registry, options);
+  const FieldErrorTemplate2 = getTemplate6("FieldErrorTemplate", registry, options);
+  const FieldTemplate2 = getTemplate6("FieldTemplate", registry, options);
   const schemaHash = hashObject4(schema);
   const optionsHash = hashObject4(options);
   const uiSchemaHash = uiSchema ? hashObject4(uiSchema) : "";
@@ -1591,7 +1619,7 @@ function LayoutMultiSchemaField(props) {
     optionsSchemaSelector: selectorField = discriminator,
     hideError: uiSchemaHideError,
     ...uiOptions
-  } = getUiOptions6(uiSchema);
+  } = getUiOptions7(uiSchema);
   if (!selectorField) {
     throw new Error("No selector field provided for the LayoutMultiSchemaField");
   }
@@ -1605,6 +1633,9 @@ function LayoutMultiSchemaField(props) {
   const fieldErrorSchema = omit(errorSchema, [ERRORS_KEY]);
   const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema, globalUiOptions);
   const onOptionChange = (opt) => {
+    if (disabled || readonly) {
+      return;
+    }
     const newOption = getSelectedOption(enumOptions, selectorField, opt);
     const oldOption = getSelectedOption(enumOptions, selectorField, selectedOption);
     let newFormData = schemaUtils.sanitizeDataForNewSchema(newOption, oldOption, formData);
@@ -1617,8 +1648,8 @@ function LayoutMultiSchemaField(props) {
     onChange(newFormData, fieldPathId.path, void 0, id);
   };
   const widgetOptions = { enumOptions, ...uiOptions };
-  const errors = !hideFieldError && rawErrors.length > 0 ? /* @__PURE__ */ jsx6(FieldErrorTemplate2, { fieldPathId, schema, errors: rawErrors, registry }) : void 0;
-  return /* @__PURE__ */ jsx6(
+  const errors = !hideFieldError && rawErrors.length > 0 ? /* @__PURE__ */ jsx7(FieldErrorTemplate2, { fieldPathId, schema, errors: rawErrors, registry }) : void 0;
+  return /* @__PURE__ */ jsx7(
     FieldTemplate2,
     {
       fieldPathId,
@@ -1636,7 +1667,7 @@ function LayoutMultiSchemaField(props) {
       onKeyRename: noop,
       onKeyRenameBlur: noop,
       onRemoveProperty: noop,
-      children: /* @__PURE__ */ jsx6(
+      children: /* @__PURE__ */ jsx7(
         Widget,
         {
           id,
@@ -1668,15 +1699,16 @@ function LayoutMultiSchemaField(props) {
 }
 
 // src/components/fields/MultiSchemaField.tsx
-import { Component } from "react";
+import { useCallback as useCallback3, useEffect as useEffect2, useMemo as useMemo3, useRef as useRef2, useState as useState5 } from "react";
 import {
   ANY_OF_KEY as ANY_OF_KEY3,
   deepEquals,
   ERRORS_KEY as ERRORS_KEY2,
   getDiscriminatorFieldFromSchema as getDiscriminatorFieldFromSchema3,
-  getTemplate as getTemplate6,
-  getUiOptions as getUiOptions7,
+  getTemplate as getTemplate7,
+  getUiOptions as getUiOptions8,
   getWidget as getWidget4,
+  hashObject as hashObject5,
   isFormDataAvailable as isFormDataAvailable2,
   mergeSchemas,
   ONE_OF_KEY as ONE_OF_KEY3,
@@ -1686,211 +1718,187 @@ import {
 import get3 from "lodash/get";
 import isEmpty3 from "lodash/isEmpty";
 import omit2 from "lodash/omit";
-import { jsx as jsx7 } from "react/jsx-runtime";
-var AnyOfField = class extends Component {
-  /** Constructs an `AnyOfField` with the given `props` to initialize the initially selected option in state
-   *
-   * @param props - The `FieldProps` for this template
-   */
-  constructor(props) {
-    super(props);
-    const {
-      formData,
-      options,
-      registry: { schemaUtils }
-    } = this.props;
-    const retrievedOptions = options.map((opt) => schemaUtils.retrieveSchema(opt, formData));
-    this.state = {
-      retrievedOptions,
-      selectedOption: this.getMatchingOption(0, formData, retrievedOptions)
-    };
-  }
-  /** React lifecycle method that is called when the props and/or state for this component is updated. It recomputes the
-   * currently selected option based on the overall `formData`
-   *
-   * @param prevProps - The previous `FieldProps` for this template
-   * @param prevState - The previous `AnyOfFieldState` for this template
-   */
-  componentDidUpdate(prevProps, prevState) {
-    const { formData, options, fieldPathId } = this.props;
-    const { selectedOption } = this.state;
-    let newState = this.state;
-    if (!deepEquals(prevProps.options, options)) {
-      const {
-        registry: { schemaUtils }
-      } = this.props;
-      const retrievedOptions = options.map((opt) => schemaUtils.retrieveSchema(opt, formData));
-      newState = { selectedOption, retrievedOptions };
+import { jsx as jsx8 } from "react/jsx-runtime";
+function AnyOfField(props) {
+  const {
+    name,
+    disabled = false,
+    errorSchema = {},
+    formData,
+    fieldPathId,
+    onBlur,
+    onChange,
+    onFocus,
+    options,
+    readonly,
+    registry,
+    required = false,
+    schema,
+    uiSchema
+  } = props;
+  const { schemaUtils } = registry;
+  const formDataHash = hashObject5(formData ?? null);
+  const retrievedOptions = useMemo3(
+    () => options.map((opt) => schemaUtils.retrieveSchema(opt, formData)),
+    // oxlint-disable-next-line react-hooks/exhaustive-deps -- formDataHash is the value-stable proxy for formData
+    [options, schemaUtils, formDataHash]
+  );
+  const [selectedOption, setSelectedOption] = useState5(() => {
+    const discriminator = getDiscriminatorFieldFromSchema3(schema);
+    return schemaUtils.getClosestMatchingOption(formData, retrievedOptions, 0, discriminator);
+  });
+  const skipNextOptionRecalculation = useRef2(false);
+  const prevFormDataRef = useRef2(formData);
+  const prevFieldIdRef = useRef2(fieldPathId.$id);
+  useEffect2(() => {
+    const prevFormData = prevFormDataRef.current;
+    const prevFieldId = prevFieldIdRef.current;
+    prevFormDataRef.current = formData;
+    prevFieldIdRef.current = fieldPathId.$id;
+    if (!deepEquals(formData, prevFormData) && fieldPathId.$id === prevFieldId) {
+      if (skipNextOptionRecalculation.current) {
+        skipNextOptionRecalculation.current = false;
+        return;
+      }
+      const discriminator = getDiscriminatorFieldFromSchema3(schema);
+      const matchingOption = schemaUtils.getClosestMatchingOption(
+        formData,
+        retrievedOptions,
+        selectedOption,
+        discriminator
+      );
+      if (matchingOption !== selectedOption) {
+        setSelectedOption(matchingOption);
+      }
     }
-    if (!deepEquals(formData, prevProps.formData) && fieldPathId.$id === prevProps.fieldPathId.$id) {
-      const { retrievedOptions } = newState;
-      const matchingOption = this.getMatchingOption(selectedOption, formData, retrievedOptions);
-      if (prevState && matchingOption !== selectedOption) {
-        newState = { selectedOption: matchingOption, retrievedOptions };
+  });
+  const fieldId = `${fieldPathId.$id}${schema.oneOf ? "__oneof_select" : "__anyof_select"}`;
+  const onOptionChange = useCallback3(
+    (option2) => {
+      if (disabled || readonly) {
+        return;
       }
+      const intOption = option2 !== void 0 ? parseInt(option2, 10) : -1;
+      if (intOption === selectedOption) {
+        return;
+      }
+      const newOption = intOption >= 0 ? retrievedOptions[intOption] : void 0;
+      const oldOption = selectedOption >= 0 ? retrievedOptions[selectedOption] : void 0;
+      let newFormData = schemaUtils.sanitizeDataForNewSchema(newOption, oldOption, formData);
+      if (newOption) {
+        newFormData = schemaUtils.getDefaultFormState(newOption, newFormData, "excludeObjectChildren");
+      }
+      setSelectedOption(intOption);
+      skipNextOptionRecalculation.current = true;
+      onChange(newFormData, fieldPathId.path, void 0, fieldId);
+    },
+    // setSelectedOption is stable (guaranteed by useState); skipNextOptionRecalculation is a ref
+    [selectedOption, retrievedOptions, disabled, readonly, schemaUtils, formData, fieldPathId, onChange, fieldId]
+  );
+  const { widgets: widgets2, fields: fields2, translateString, globalUiOptions } = registry;
+  const { SchemaField: SchemaFieldComponent } = fields2;
+  const MultiSchemaFieldTemplate2 = getTemplate7(
+    "MultiSchemaFieldTemplate",
+    registry,
+    globalUiOptions
+  );
+  const isOptionalRender = shouldRenderOptionalField2(registry, schema, required, uiSchema);
+  const hasFormData = isFormDataAvailable2(formData);
+  const {
+    widget = "select",
+    placeholder,
+    autofocus,
+    autocomplete,
+    title = schema.title,
+    ...uiOptions
+  } = getUiOptions8(uiSchema, globalUiOptions);
+  const Widget = getWidget4({ type: "number" }, widget, widgets2);
+  const rawErrors = get3(errorSchema, ERRORS_KEY2, []);
+  const fieldErrorSchema = omit2(errorSchema, [ERRORS_KEY2]);
+  const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema, globalUiOptions);
+  const option = selectedOption >= 0 ? retrievedOptions[selectedOption] || null : null;
+  let optionSchema;
+  if (option) {
+    const { required: schemaRequired, type: schemaType } = schema;
+    const parentProps = {};
+    if (schemaRequired) {
+      parentProps.required = schemaRequired;
     }
-    if (newState !== this.state) {
-      this.setState(newState);
+    if (schemaType !== void 0 && !("type" in option)) {
+      parentProps.type = schemaType;
     }
+    optionSchema = Object.keys(parentProps).length > 0 ? mergeSchemas(parentProps, option) : option;
   }
-  /** Determines the best matching option for the given `formData` and `options`.
-   *
-   * @param formData - The new formData
-   * @param options - The list of options to choose from
-   * @return - The index of the `option` that best matches the `formData`
-   */
-  getMatchingOption(selectedOption, formData, options) {
-    const {
-      schema,
-      registry: { schemaUtils }
-    } = this.props;
-    const discriminator = getDiscriminatorFieldFromSchema3(schema);
-    const option = schemaUtils.getClosestMatchingOption(formData, options, selectedOption, discriminator);
-    return option;
-  }
-  /** Callback handler to remember what the currently selected option is. In addition to that the `formData` is updated
-   * to remove properties that are not part of the newly selected option schema, and then the updated data is passed to
-   * the `onChange` handler.
-   *
-   * @param option - The new option value being selected
-   */
-  onOptionChange = (option) => {
-    const { selectedOption, retrievedOptions } = this.state;
-    const { formData, onChange, registry, fieldPathId } = this.props;
-    const { schemaUtils } = registry;
-    const intOption = option !== void 0 ? parseInt(option, 10) : -1;
-    if (intOption === selectedOption) {
-      return;
+  let optionsUiSchema = [];
+  if (ONE_OF_KEY3 in schema && uiSchema && ONE_OF_KEY3 in uiSchema) {
+    if (Array.isArray(uiSchema[ONE_OF_KEY3])) {
+      optionsUiSchema = uiSchema[ONE_OF_KEY3];
+    } else {
+      console.warn(`uiSchema.oneOf is not an array for "${title || name}"`);
     }
-    const newOption = intOption >= 0 ? retrievedOptions[intOption] : void 0;
-    const oldOption = selectedOption >= 0 ? retrievedOptions[selectedOption] : void 0;
-    let newFormData = schemaUtils.sanitizeDataForNewSchema(newOption, oldOption, formData);
-    if (newOption) {
-      newFormData = schemaUtils.getDefaultFormState(newOption, newFormData, "excludeObjectChildren");
+  } else if (ANY_OF_KEY3 in schema && uiSchema && ANY_OF_KEY3 in uiSchema) {
+    if (Array.isArray(uiSchema[ANY_OF_KEY3])) {
+      optionsUiSchema = uiSchema[ANY_OF_KEY3];
+    } else {
+      console.warn(`uiSchema.anyOf is not an array for "${title || name}"`);
     }
-    this.setState({ selectedOption: intOption }, () => {
-      onChange(newFormData, fieldPathId.path, void 0, this.getFieldId());
-    });
-  };
-  getFieldId() {
-    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`
-   */
-  render() {
-    const {
-      name,
-      disabled = false,
-      errorSchema = {},
-      formData,
+  let optionUiSchema = uiSchema;
+  if (selectedOption >= 0 && optionsUiSchema.length > selectedOption) {
+    optionUiSchema = optionsUiSchema[selectedOption];
+  }
+  const translateEnum = title ? TranslatableString4.TitleOptionPrefix : TranslatableString4.OptionPrefix;
+  const translateParams = title ? [title] : [];
+  const enumOptions = retrievedOptions.map((opt, index) => {
+    const { title: uiTitle = opt.title } = getUiOptions8(optionsUiSchema[index]);
+    return {
+      label: uiTitle || translateString(translateEnum, translateParams.concat(String(index + 1))),
+      value: index
+    };
+  });
+  const selector = !isOptionalRender || hasFormData ? /* @__PURE__ */ jsx8(
+    Widget,
+    {
+      id: fieldId,
+      name: `${name}${schema.oneOf ? "__oneof_select" : "__anyof_select"}`,
+      schema: { type: "number", default: 0 },
+      onChange: onOptionChange,
       onBlur,
       onFocus,
-      readonly,
-      required = false,
-      registry,
-      schema,
-      uiSchema
-    } = this.props;
-    const { widgets: widgets2, fields: fields2, translateString, globalUiOptions, schemaUtils } = registry;
-    const { SchemaField: _SchemaField } = fields2;
-    const MultiSchemaFieldTemplate2 = getTemplate6(
-      "MultiSchemaFieldTemplate",
+      disabled: disabled || isEmpty3(enumOptions),
+      multiple: false,
+      rawErrors,
+      errorSchema: fieldErrorSchema,
+      value: selectedOption >= 0 ? selectedOption : void 0,
+      options: { enumOptions, ...uiOptions },
       registry,
-      globalUiOptions
-    );
-    const isOptionalRender = shouldRenderOptionalField2(registry, schema, required, uiSchema);
-    const hasFormData = isFormDataAvailable2(formData);
-    const { selectedOption, retrievedOptions } = this.state;
-    const {
-      widget = "select",
       placeholder,
-      autofocus,
       autocomplete,
-      title = schema.title,
-      ...uiOptions
-    } = getUiOptions7(uiSchema, globalUiOptions);
-    const Widget = getWidget4({ type: "number" }, widget, widgets2);
-    const rawErrors = get3(errorSchema, ERRORS_KEY2, []);
-    const fieldErrorSchema = omit2(errorSchema, [ERRORS_KEY2]);
-    const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema, globalUiOptions);
-    const option = selectedOption >= 0 ? retrievedOptions[selectedOption] || null : null;
-    let optionSchema;
-    if (option) {
-      const { required: required2 } = schema;
-      optionSchema = required2 ? mergeSchemas({ required: required2 }, option) : option;
-    }
-    let optionsUiSchema = [];
-    if (ONE_OF_KEY3 in schema && uiSchema && ONE_OF_KEY3 in uiSchema) {
-      if (Array.isArray(uiSchema[ONE_OF_KEY3])) {
-        optionsUiSchema = uiSchema[ONE_OF_KEY3];
-      } else {
-        console.warn(`uiSchema.oneOf is not an array for "${title || name}"`);
-      }
-    } else if (ANY_OF_KEY3 in schema && uiSchema && ANY_OF_KEY3 in uiSchema) {
-      if (Array.isArray(uiSchema[ANY_OF_KEY3])) {
-        optionsUiSchema = uiSchema[ANY_OF_KEY3];
-      } else {
-        console.warn(`uiSchema.anyOf is not an array for "${title || name}"`);
-      }
+      autofocus,
+      label: title ?? name,
+      hideLabel: !displayLabel,
+      readonly
     }
-    let optionUiSchema = uiSchema;
-    if (selectedOption >= 0 && optionsUiSchema.length > selectedOption) {
-      optionUiSchema = optionsUiSchema[selectedOption];
+  ) : void 0;
+  const optionsSchemaField = optionSchema && optionSchema.type !== "null" && /* @__PURE__ */ jsx8(SchemaFieldComponent, { ...props, schema: optionSchema, uiSchema: optionUiSchema }) || null;
+  return /* @__PURE__ */ jsx8(
+    MultiSchemaFieldTemplate2,
+    {
+      schema,
+      registry,
+      uiSchema,
+      selector,
+      optionSchemaField: optionsSchemaField
     }
-    const translateEnum = title ? TranslatableString4.TitleOptionPrefix : TranslatableString4.OptionPrefix;
-    const translateParams = title ? [title] : [];
-    const enumOptions = retrievedOptions.map((opt, index) => {
-      const { title: uiTitle = opt.title } = getUiOptions7(optionsUiSchema[index]);
-      return {
-        label: uiTitle || translateString(translateEnum, translateParams.concat(String(index + 1))),
-        value: index
-      };
-    });
-    const selector = !isOptionalRender || hasFormData ? /* @__PURE__ */ jsx7(
-      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,
-        placeholder,
-        autocomplete,
-        autofocus,
-        label: title ?? name,
-        hideLabel: !displayLabel,
-        readonly
-      }
-    ) : void 0;
-    const optionsSchemaField = optionSchema && optionSchema.type !== "null" && /* @__PURE__ */ jsx7(_SchemaField, { ...this.props, schema: optionSchema, uiSchema: optionUiSchema }) || null;
-    return /* @__PURE__ */ jsx7(
-      MultiSchemaFieldTemplate2,
-      {
-        schema,
-        registry,
-        uiSchema,
-        selector,
-        optionSchemaField: optionsSchemaField
-      }
-    );
-  }
-};
+  );
+}
 var MultiSchemaField_default = AnyOfField;
 
 // src/components/fields/NullField.tsx
-import { useEffect as useEffect2 } from "react";
+import { useEffect as useEffect3 } from "react";
 function NullField(props) {
   const { formData, onChange, fieldPathId } = props;
-  useEffect2(() => {
+  useEffect3(() => {
     if (formData === void 0) {
       onChange(null, fieldPathId.path);
     }
@@ -1900,25 +1908,21 @@ function NullField(props) {
 var NullField_default = NullField;
 
 // src/components/fields/NumberField.tsx
-import { useState as useState4, useCallback as useCallback3 } from "react";
-import {
-  asNumber
-} from "@rjsf/utils";
-import { jsx as jsx8 } from "react/jsx-runtime";
+import { useState as useState6, useCallback as useCallback4 } from "react";
+import { asNumber } from "@rjsf/utils";
+import { jsx as jsx9 } from "react/jsx-runtime";
 var trailingCharMatcherWithPrefix = /\.([0-9]*0)*$/;
 var trailingCharMatcher = /[0.]0*$/;
 function NumberField(props) {
   const { registry, onChange, formData, value: initialValue } = props;
-  const [lastValue, setLastValue] = useState4(initialValue);
+  const [lastValue, setLastValue] = useState6(initialValue);
   const { StringField: StringField2 } = registry.fields;
   let value = formData;
-  const handleChange = useCallback3(
-    (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);
+  const handleChange = useCallback4(
+    (newValue, path, errorSchema, id) => {
+      setLastValue(newValue);
+      const normalizedValue = `${newValue}`.startsWith(".") ? `0${newValue}` : newValue;
+      const processed = typeof normalizedValue === "string" && trailingCharMatcherWithPrefix.exec(normalizedValue) ? asNumber(normalizedValue.replace(trailingCharMatcher, "")) : asNumber(normalizedValue);
       onChange(processed, path, errorSchema, id);
     },
     [onChange]
@@ -1929,17 +1933,17 @@ function NumberField(props) {
       value = lastValue;
     }
   }
-  return /* @__PURE__ */ jsx8(StringField2, { ...props, formData: value, onChange: handleChange });
+  return /* @__PURE__ */ jsx9(StringField2, { ...props, formData: value, onChange: handleChange });
 }
 var NumberField_default = NumberField;
 
 // src/components/fields/ObjectField.tsx
-import { useCallback as useCallback4, useRef, useState as useState5 } from "react";
+import { memo as memo2, useCallback as useCallback5, useMemo as useMemo4, useRef as useRef3, useState as useState7 } from "react";
 import {
   ADDITIONAL_PROPERTY_FLAG,
   ANY_OF_KEY as ANY_OF_KEY4,
-  getTemplate as getTemplate7,
-  getUiOptions as getUiOptions8,
+  getTemplate as getTemplate8,
+  getUiOptions as getUiOptions9,
   isFormDataAvailable as isFormDataAvailable3,
   orderProperties,
   shouldRenderOptionalField as shouldRenderOptionalField3,
@@ -1954,16 +1958,16 @@ import get4 from "lodash/get";
 import has3 from "lodash/has";
 import isObject4 from "lodash/isObject";
 import set4 from "lodash/set";
-import { Markdown } from "markdown-to-jsx";
+import { Markdown } from "markdown-to-jsx/react";
 
 // src/components/constants.ts
 var ADDITIONAL_PROPERTY_KEY_REMOVE = /* @__PURE__ */ Symbol("remove-this-key");
 var IS_RESET = /* @__PURE__ */ Symbol("reset");
 
 // src/components/fields/ObjectField.tsx
-import { jsx as jsx9, jsxs } from "react/jsx-runtime";
+import { jsx as jsx10, jsxs } from "react/jsx-runtime";
 function isRequired(schema, name) {
-  return Array.isArray(schema.required) && schema.required.indexOf(name) !== -1;
+  return Array.isArray(schema.required) && schema.required.includes(name);
 }
 function getDefaultValue(translateString, type) {
   switch (type) {
@@ -1982,7 +1986,7 @@ function getDefaultValue(translateString, type) {
       return translateString(TranslatableString5.NewStringDefault);
   }
 }
-function ObjectFieldProperty(props) {
+function ObjectFieldPropertyFn(props) {
   const {
     fieldPathId,
     schema,
@@ -2002,22 +2006,23 @@ function ObjectFieldProperty(props) {
     handleRemoveProperty,
     addedByAdditionalProperties
   } = props;
-  const [wasPropertyKeyModified, setWasPropertyKeyModified] = useState5(false);
+  const [wasPropertyKeyModified, setWasPropertyKeyModified] = useState7(false);
   const { globalFormOptions, fields: fields2 } = registry;
   const { SchemaField: SchemaField2 } = fields2;
   const innerFieldIdPathId = useDeepCompareMemo4(
     toFieldPathId4(propertyName, globalFormOptions, fieldPathId.path)
   );
-  const onPropertyChange = useCallback4(
+  const onPropertyChange = useCallback5(
     (value, path, newErrorSchema, id) => {
+      let normalizedValue = value;
       if (value === void 0 && addedByAdditionalProperties) {
-        value = "";
+        normalizedValue = "";
       }
-      onChange(value, path, newErrorSchema, id);
+      onChange(normalizedValue, path, newErrorSchema, id);
     },
     [onChange, addedByAdditionalProperties]
   );
-  const onKeyRename = useCallback4(
+  const onKeyRename = useCallback5(
     (value) => {
       if (propertyName !== value) {
         setWasPropertyKeyModified(true);
@@ -2026,7 +2031,7 @@ function ObjectFieldProperty(props) {
     },
     [propertyName, handleKeyRename]
   );
-  const onKeyRenameBlur = useCallback4(
+  const onKeyRenameBlur = useCallback5(
     (event) => {
       const {
         target: { value }
@@ -2035,10 +2040,10 @@ function ObjectFieldProperty(props) {
     },
     [onKeyRename]
   );
-  const onRemoveProperty = useCallback4(() => {
+  const onRemoveProperty = useCallback5(() => {
     handleRemoveProperty(propertyName);
   }, [propertyName, handleRemoveProperty]);
-  return /* @__PURE__ */ jsx9(
+  return /* @__PURE__ */ jsx10(
     SchemaField2,
     {
       name: propertyName,
@@ -2062,6 +2067,7 @@ function ObjectFieldProperty(props) {
     }
   );
 }
+var ObjectFieldProperty = memo2(ObjectFieldPropertyFn);
 function ObjectField(props) {
   const {
     schema: rawSchema,
@@ -2082,35 +2088,38 @@ function ObjectField(props) {
   } = props;
   const { fields: fields2, schemaUtils, translateString, globalUiOptions } = registry;
   const { OptionalDataControlsField: OptionalDataControlsField2 } = fields2;
-  const formDataRef = useRef(formData);
+  const formDataRef = useRef3(formData);
   formDataRef.current = formData;
-  const schema = schemaUtils.retrieveSchema(rawSchema, formData, true);
-  const uiOptions = getUiOptions8(uiSchema, globalUiOptions);
+  const schema = useMemo4(
+    () => schemaUtils.retrieveSchema(rawSchema, formData, true),
+    [schemaUtils, rawSchema, formData]
+  );
+  const uiOptions = useMemo4(() => getUiOptions9(uiSchema, globalUiOptions), [uiSchema, globalUiOptions]);
   const { properties: schemaProperties = {} } = schema;
   const childFieldPathId = props.childFieldPathId ?? fieldPathId;
-  const lastRenamedProperty = useRef({ previousKey: "", currentKey: void 0 });
+  const lastRenamedProperty = useRef3({ previousKey: "", currentKey: void 0 });
   const templateTitle = uiOptions.title ?? schema.title ?? title ?? name;
   const description = uiOptions.description ?? schema.description;
   const renderOptionalField = shouldRenderOptionalField3(registry, schema, required, uiSchema);
   const hasFormData = isFormDataAvailable3(formData);
   let orderedProperties = [];
-  const getAvailableKey = useCallback4(
-    (preferredKey, formData2) => {
-      const { duplicateKeySuffixSeparator = "-" } = getUiOptions8(uiSchema, globalUiOptions);
+  const getAvailableKey = useCallback5(
+    (preferredKey, existingFormData) => {
+      const { duplicateKeySuffixSeparator = "-" } = getUiOptions9(uiSchema, globalUiOptions);
       let index = 0;
       let newKey = preferredKey;
-      while (has3(formData2, newKey)) {
-        newKey = `${preferredKey}${duplicateKeySuffixSeparator}${++index}`;
+      while (has3(existingFormData, newKey)) {
+        index += 1;
+        newKey = `${preferredKey}${duplicateKeySuffixSeparator}${index}`;
       }
       return newKey;
     },
     [uiSchema, globalUiOptions]
   );
-  const onAddProperty = useCallback4(() => {
+  const onAddProperty = useCallback5(() => {
     if (!(schema.additionalProperties || schema.patternProperties)) {
       return;
     }
-    const { translateString: translateString2 } = registry;
     const newFormData = { ...formData };
     const newKey = getAvailableKey("newKey", newFormData);
     if (schema.patternProperties) {
@@ -2125,17 +2134,16 @@ function ObjectField(props) {
         defaultValue = schema.additionalProperties.default;
         let apSchema = schema.additionalProperties;
         if (REF_KEY in apSchema) {
-          const { schemaUtils: schemaUtils2 } = registry;
-          apSchema = schemaUtils2.retrieveSchema({ [REF_KEY]: apSchema[REF_KEY] }, formData);
+          apSchema = schemaUtils.retrieveSchema({ [REF_KEY]: apSchema[REF_KEY] }, formData);
           type = apSchema.type;
           constValue = apSchema.const;
-          defaultValue = apSchema.default;
+          defaultValue = schemaUtils.getDefaultFormState(apSchema, defaultValue);
         }
         if (!type && (ANY_OF_KEY4 in apSchema || ONE_OF_KEY4 in apSchema)) {
           type = "object";
         }
       }
-      const newValue = constValue ?? defaultValue ?? getDefaultValue(translateString2, type);
+      const newValue = constValue ?? defaultValue ?? getDefaultValue(translateString, type);
       set4(newFormData, newKey, newValue);
     }
     if (lastRenamedProperty.current.previousKey === newKey) {
@@ -2143,8 +2151,8 @@ function ObjectField(props) {
       lastRenamedProperty.current.previousKey = getAvailableKey(newKey, newFormData);
     }
     onChange(newFormData, childFieldPathId.path);
-  }, [formData, onChange, registry, childFieldPathId, getAvailableKey, schema]);
-  const handleKeyRename = useCallback4(
+  }, [formData, onChange, translateString, schemaUtils, childFieldPathId, getAvailableKey, schema]);
+  const handleKeyRename = useCallback5(
     (oldKey, newKey) => {
       if (oldKey !== newKey) {
         const currentFormData = formDataRef.current;
@@ -2154,8 +2162,8 @@ function ObjectField(props) {
         };
         const newKeys = { [oldKey]: actualNewKey };
         const keyValues = Object.keys(newFormData).map((key) => {
-          const newKey2 = newKeys[key] || key;
-          return { [newKey2]: newFormData[key] };
+          const mappedKey = Object.hasOwn(newKeys, key) ? newKeys[key] : key;
+          return { [mappedKey]: newFormData[key] };
         });
         const renamedObj = Object.assign({}, ...keyValues);
         formDataRef.current = renamedObj;
@@ -2168,13 +2176,13 @@ function ObjectField(props) {
     },
     [onChange, childFieldPathId, getAvailableKey]
   );
-  const handleRemoveProperty = useCallback4(
+  const handleRemoveProperty = useCallback5(
     (key) => {
       onChange(ADDITIONAL_PROPERTY_KEY_REMOVE, [...childFieldPathId.path, key]);
     },
     [onChange, childFieldPathId]
   );
-  const getStableKey = useCallback4((property) => {
+  const getStableKey = useCallback5((property) => {
     if (lastRenamedProperty.current.currentKey === property) {
       return lastRenamedProperty.current.previousKey;
     }
@@ -2186,31 +2194,33 @@ function ObjectField(props) {
       orderedProperties = orderProperties(properties, uiOptions.order);
     } catch (err) {
       return /* @__PURE__ */ jsxs("div", { children: [
-        /* @__PURE__ */ jsx9("p", { className: "rjsf-config-error", style: { color: "red" }, children: /* @__PURE__ */ jsx9(Markdown, { options: { disableParsingRawHTML: true }, children: translateString(TranslatableString5.InvalidObjectField, [name || "root", err.message]) }) }),
-        /* @__PURE__ */ jsx9("pre", { children: JSON.stringify(schema) })
+        /* @__PURE__ */ jsx10("p", { className: "rjsf-config-error", style: { color: "red" }, children: /* @__PURE__ */ jsx10(Markdown, { options: { disableParsingRawHTML: true }, children: translateString(TranslatableString5.InvalidObjectField, [name || "root", err.message]) }) }),
+        /* @__PURE__ */ jsx10("pre", { children: JSON.stringify(schema) })
       ] });
     }
   }
-  const Template = getTemplate7("ObjectFieldTemplate", registry, uiOptions);
-  const optionalDataControl = renderOptionalField ? /* @__PURE__ */ jsx9(OptionalDataControlsField2, { ...props, fieldPathId: childFieldPathId, schema }) : void 0;
+  const Template = getTemplate8("ObjectFieldTemplate", registry, uiOptions);
+  const optionalDataControl = renderOptionalField ? /* @__PURE__ */ jsx10(OptionalDataControlsField2, { ...props, fieldPathId: childFieldPathId, schema }) : void 0;
   const templateProps = {
     // getDisplayLabel() always returns false for object types, so just check the `uiOptions.label`
     title: uiOptions.label === false ? "" : templateTitle,
     description: uiOptions.label === false ? void 0 : description,
-    properties: orderedProperties.map((name2) => {
-      const addedByAdditionalProperties = has3(schema, [PROPERTIES_KEY3, name2, ADDITIONAL_PROPERTY_FLAG]);
-      const fieldUiSchema = addedByAdditionalProperties ? uiSchema.additionalProperties : uiSchema[name2];
-      const hidden = getUiOptions8(fieldUiSchema).widget === "hidden";
-      const content = /* @__PURE__ */ jsx9(
+    properties: orderedProperties.map((propertyName) => {
+      const addedByAdditionalProperties = Boolean(
+        schema.properties?.[propertyName]?.[ADDITIONAL_PROPERTY_FLAG]
+      );
+      const fieldUiSchema = addedByAdditionalProperties ? uiSchema.additionalProperties : uiSchema[propertyName];
+      const hidden = getUiOptions9(fieldUiSchema).widget === "hidden";
+      const content = /* @__PURE__ */ jsx10(
         ObjectFieldProperty,
         {
-          propertyName: name2,
-          required: isRequired(schema, name2),
-          schema: get4(schema, [PROPERTIES_KEY3, name2], {}),
+          propertyName,
+          required: isRequired(schema, propertyName),
+          schema: get4(schema, [PROPERTIES_KEY3, propertyName], {}),
           uiSchema: fieldUiSchema,
-          errorSchema: get4(errorSchema, [name2]),
+          errorSchema: get4(errorSchema, [propertyName]),
           fieldPathId: childFieldPathId,
-          formData: get4(formData, [name2]),
+          formData: get4(formData, [propertyName]),
           handleKeyRename,
           handleRemoveProperty,
           addedByAdditionalProperties,
@@ -2222,11 +2232,11 @@ function ObjectField(props) {
           readonly,
           hideError
         },
-        getStableKey(name2)
+        getStableKey(propertyName)
       );
       return {
         content,
-        name: name2,
+        name: propertyName,
         readonly,
         disabled,
         required,
@@ -2245,19 +2255,19 @@ function ObjectField(props) {
     optionalDataControl,
     className: renderOptionalField ? "rjsf-optional-object-field" : void 0
   };
-  return /* @__PURE__ */ jsx9(Template, { ...templateProps, onAddProperty });
+  return /* @__PURE__ */ jsx10(Template, { ...templateProps, onAddProperty });
 }
 
 // src/components/fields/OptionalDataControlsField.tsx
 import {
   getSchemaType,
-  getTemplate as getTemplate8,
-  getUiOptions as getUiOptions9,
+  getTemplate as getTemplate9,
+  getUiOptions as getUiOptions10,
   isFormDataAvailable as isFormDataAvailable4,
   optionalControlsId,
   TranslatableString as TranslatableString6
 } from "@rjsf/utils";
-import { jsx as jsx10 } from "react/jsx-runtime";
+import { jsx as jsx11 } from "react/jsx-runtime";
 function OptionalDataControlsField(props) {
   const {
     schema,
@@ -2271,8 +2281,8 @@ function OptionalDataControlsField(props) {
     registry
   } = props;
   const { globalUiOptions = {}, schemaUtils, translateString } = registry;
-  const uiOptions = getUiOptions9(uiSchema, globalUiOptions);
-  const OptionalDataControlsTemplate2 = getTemplate8(
+  const uiOptions = getUiOptions10(uiSchema, globalUiOptions);
+  const OptionalDataControlsTemplate2 = getTemplate9(
     "OptionalDataControlsTemplate",
     registry,
     uiOptions
@@ -2302,7 +2312,7 @@ function OptionalDataControlsField(props) {
       };
     }
   }
-  return label && /* @__PURE__ */ jsx10(
+  return label && /* @__PURE__ */ jsx11(
     OptionalDataControlsTemplate2,
     {
       id,
@@ -2317,19 +2327,21 @@ function OptionalDataControlsField(props) {
 }
 
 // src/components/fields/SchemaField.tsx
-import { useCallback as useCallback5, Component as Component2 } from "react";
+import { useCallback as useCallback6, memo as memo3 } from "react";
 import {
   ADDITIONAL_PROPERTY_FLAG as ADDITIONAL_PROPERTY_FLAG2,
   ANY_OF_KEY as ANY_OF_KEY5,
+  deepEquals as deepEquals2,
   descriptionId,
   getSchemaType as getSchemaType2,
-  getTemplate as getTemplate9,
-  getUiOptions as getUiOptions10,
+  getTemplate as getTemplate10,
+  getUiOptions as getUiOptions11,
   ID_KEY as ID_KEY4,
   isFormDataAvailable as isFormDataAvailable5,
   ONE_OF_KEY as ONE_OF_KEY5,
   resolveUiSchema,
-  shouldRender,
+  RJSF_REF_CYCLE_KEY as RJSF_REF_CYCLE_KEY2,
+  shallowEquals,
   shouldRenderOptionalField as shouldRenderOptionalField4,
   toFieldPathId as toFieldPathId5,
   TranslatableString as TranslatableString7,
@@ -2337,7 +2349,7 @@ import {
 } from "@rjsf/utils";
 import isObject5 from "lodash/isObject";
 import omit3 from "lodash/omit";
-import { Fragment, jsx as jsx11, jsxs as jsxs2 } from "react/jsx-runtime";
+import { Fragment, jsx as jsx12, jsxs as jsxs2 } from "react/jsx-runtime";
 var COMPONENT_TYPES = {
   array: "ArrayField",
   boolean: "BooleanField",
@@ -2348,8 +2360,8 @@ var COMPONENT_TYPES = {
   null: "NullField"
 };
 function getFieldComponent(schema, uiOptions, registry) {
-  const field = uiOptions.field;
-  const { fields: fields2 } = registry;
+  const { field } = uiOptions;
+  const { fields: fields2, schemaUtils } = registry;
   if (typeof field === "function") {
     return field;
   }
@@ -2363,10 +2375,10 @@ function getFieldComponent(schema, uiOptions, registry) {
   if (schemaId && schemaId in fields2) {
     componentName = schemaId;
   }
-  if (!componentName && (schema.anyOf || schema.oneOf)) {
+  if ((schema.anyOf || schema.oneOf) && !schemaUtils.isSelect(schema) && componentName !== "ObjectField") {
     return () => null;
   }
-  return componentName in fields2 ? fields2[componentName] : fields2["FallbackField"];
+  return componentName in fields2 ? fields2[componentName] : fields2.FallbackField;
 }
 function SchemaFieldRender(props) {
   const {
@@ -2385,26 +2397,29 @@ function SchemaFieldRender(props) {
     wasPropertyKeyModified = false
   } = props;
   const { schemaUtils, globalFormOptions, globalUiOptions, fields: fields2 } = registry;
-  const { AnyOfField: _AnyOfField, OneOfField: _OneOfField } = fields2;
+  const { AnyOfField: _AnyOfField, OneOfField: _OneOfField, CyclicSchemaField: CyclicSchemaField2 } = fields2;
+  const fieldId = fieldPathId[ID_KEY4];
+  const handleFieldComponentChange = useCallback6(
+    (newFormData, path, newErrorSchema, id2) => {
+      const theId = id2 || fieldId;
+      return onChange(newFormData, path, newErrorSchema, theId);
+    },
+    [fieldId, onChange]
+  );
+  if (_schema[RJSF_REF_CYCLE_KEY2]) {
+    return /* @__PURE__ */ jsx12(CyclicSchemaField2, { ...props });
+  }
   const uiSchema = resolveUiSchema(_schema, _uiSchema, registry);
-  const uiOptions = getUiOptions10(uiSchema, globalUiOptions);
-  const FieldTemplate2 = getTemplate9("FieldTemplate", registry, uiOptions);
-  const DescriptionFieldTemplate = getTemplate9(
+  const uiOptions = getUiOptions11(uiSchema, globalUiOptions);
+  const FieldTemplate2 = getTemplate10("FieldTemplate", registry, uiOptions);
+  const DescriptionFieldTemplate = getTemplate10(
     "DescriptionFieldTemplate",
     registry,
     uiOptions
   );
-  const FieldHelpTemplate2 = getTemplate9("FieldHelpTemplate", registry, uiOptions);
-  const FieldErrorTemplate2 = getTemplate9("FieldErrorTemplate", registry, uiOptions);
+  const FieldHelpTemplate2 = getTemplate10("FieldHelpTemplate", registry, uiOptions);
+  const FieldErrorTemplate2 = getTemplate10("FieldErrorTemplate", registry, uiOptions);
   const schema = schemaUtils.retrieveSchema(_schema, formData);
-  const fieldId = fieldPathId[ID_KEY4];
-  const handleFieldComponentChange = useCallback5(
-    (formData2, path, newErrorSchema, id2) => {
-      const theId = id2 || fieldId;
-      return onChange(formData2, path, newErrorSchema, theId);
-    },
-    [fieldId, onChange]
-  );
   const FieldComponent = getFieldComponent(schema, uiOptions, registry);
   const isDeprecated = Boolean(schema.deprecated);
   const deprecatedHandling = isDeprecated ? uiOptions.deprecatedHandling ?? "label" : void 0;
@@ -2425,12 +2440,12 @@ function SchemaFieldRender(props) {
     if (schema[ANY_OF_KEY5]) {
       XxxOfField = _AnyOfField;
       XxxOfOptions = schema[ANY_OF_KEY5].map(
-        (_schema2) => schemaUtils.retrieveSchema(isObject5(_schema2) ? _schema2 : {}, formData)
+        (xxxOfSchema) => schemaUtils.retrieveSchema(isObject5(xxxOfSchema) ? xxxOfSchema : {}, formData)
       );
     } else if (schema[ONE_OF_KEY5]) {
       XxxOfField = _OneOfField;
       XxxOfOptions = schema[ONE_OF_KEY5].map(
-        (_schema2) => schemaUtils.retrieveSchema(isObject5(_schema2) ? _schema2 : {}, formData)
+        (xxxOfSchema) => schemaUtils.retrieveSchema(isObject5(xxxOfSchema) ? xxxOfSchema : {}, formData)
       );
     }
     const isOptionalRender = shouldRenderOptionalField4(registry, schema, required, uiSchema);
@@ -2448,7 +2463,7 @@ function SchemaFieldRender(props) {
   if (UI_OPTIONS_KEY2 in fieldUiSchema) {
     fieldUiSchema[UI_OPTIONS_KEY2] = omit3(fieldUiSchema[UI_OPTIONS_KEY2], ["classNames", "style"]);
   }
-  const field = /* @__PURE__ */ jsx11(
+  const field = /* @__PURE__ */ jsx12(
     FieldComponent,
     {
       ...props,
@@ -2475,7 +2490,7 @@ function SchemaFieldRender(props) {
     label = registry.translateString(TranslatableString7.DeprecatedLabel, [label]);
   }
   const description = uiOptions.description || props.schema.description || schema.description || "";
-  const help = uiOptions.help;
+  const { help } = uiOptions;
   const hidden = uiOptions.widget === "hidden" || deprecatedHandling === "hide";
   const classNames = ["rjsf-field", `rjsf-field-${getSchemaType2(schema)}`];
   if (!hideError && __errors && __errors.length > 0) {
@@ -2484,7 +2499,7 @@ function SchemaFieldRender(props) {
   if (uiOptions.classNames) {
     classNames.push(uiOptions.classNames);
   }
-  const helpComponent = /* @__PURE__ */ jsx11(
+  const helpComponent = /* @__PURE__ */ jsx12(
     FieldHelpTemplate2,
     {
       help,
@@ -2495,7 +2510,7 @@ function SchemaFieldRender(props) {
       registry
     }
   );
-  const errorsComponent = hideError || XxxOfField && !schemaUtils.isSelect(schema) ? void 0 : /* @__PURE__ */ jsx11(
+  const errorsComponent = hideError || XxxOfField && !schemaUtils.isSelect(schema) ? void 0 : /* @__PURE__ */ jsx12(
     FieldErrorTemplate2,
     {
       errors: __errors,
@@ -2507,7 +2522,7 @@ function SchemaFieldRender(props) {
     }
   );
   const fieldProps = {
-    description: /* @__PURE__ */ jsx11(
+    description: /* @__PURE__ */ jsx12(
       DescriptionFieldTemplate,
       {
         id: descriptionId(id),
@@ -2542,9 +2557,9 @@ function SchemaFieldRender(props) {
     uiSchema,
     registry
   };
-  return /* @__PURE__ */ jsx11(FieldTemplate2, { ...fieldProps, children: /* @__PURE__ */ jsxs2(Fragment, { children: [
+  return /* @__PURE__ */ jsx12(FieldTemplate2, { ...fieldProps, children: /* @__PURE__ */ jsxs2(Fragment, { children: [
     field,
-    XxxOfField && /* @__PURE__ */ jsx11(
+    XxxOfField && /* @__PURE__ */ jsx12(
       XxxOfField,
       {
         name,
@@ -2566,29 +2581,22 @@ function SchemaFieldRender(props) {
     )
   ] }) });
 }
-var SchemaField = class extends Component2 {
-  shouldComponentUpdate(nextProps) {
-    const {
-      registry: { globalFormOptions }
-    } = this.props;
-    const { experimental_componentUpdateStrategy = "customDeep" } = globalFormOptions;
-    return shouldRender(this, nextProps, this.state, experimental_componentUpdateStrategy);
+var SchemaField = memo3(SchemaFieldRender, (prevProps, nextProps) => {
+  const { experimental_componentUpdateStrategy = "customDeep" } = nextProps.registry.globalFormOptions;
+  if (experimental_componentUpdateStrategy === "always") {
+    return false;
   }
-  render() {
-    return /* @__PURE__ */ jsx11(SchemaFieldRender, { ...this.props });
+  if (experimental_componentUpdateStrategy === "shallow") {
+    return shallowEquals(prevProps, nextProps);
   }
-};
+  return deepEquals2(prevProps, nextProps);
+});
 var SchemaField_default = SchemaField;
 
 // src/components/fields/StringField.tsx
-import { useCallback as useCallback6 } from "react";
-import {
-  getWidget as getWidget5,
-  getUiOptions as getUiOptions11,
-  optionsList as optionsList4,
-  hasWidget
-} from "@rjsf/utils";
-import { jsx as jsx12 } from "react/jsx-runtime";
+import { useCallback as useCallback7 } from "react";
+import { getWidget as getWidget5, getUiOptions as getUiOptions12, optionsList as optionsList4, hasWidget } from "@rjsf/utils";
+import { jsx as jsx13 } from "react/jsx-runtime";
 function StringField(props) {
   const {
     schema,
@@ -2615,17 +2623,15 @@ function StringField(props) {
   if (format && hasWidget(schema, format, widgets2)) {
     defaultWidget = format;
   }
-  const { widget = defaultWidget, placeholder = "", title: uiTitle, ...options } = getUiOptions11(uiSchema);
+  const { widget = defaultWidget, placeholder = "", title: uiTitle, ...options } = getUiOptions12(uiSchema);
   const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema, globalUiOptions);
   const label = uiTitle ?? title ?? schemaTitle ?? name;
   const Widget = getWidget5(schema, widget, widgets2);
-  const onWidgetChange = useCallback6(
-    (value, errorSchema, id) => {
-      return onChange(value, fieldPathId.path, errorSchema, id);
-    },
+  const onWidgetChange = useCallback7(
+    (value, errorSchema, id) => onChange(value, fieldPathId.path, errorSchema, id),
     [onChange, fieldPathId]
   );
-  return /* @__PURE__ */ jsx12(
+  return /* @__PURE__ */ jsx13(
     Widget,
     {
       options: { ...options, enumOptions },
@@ -2660,6 +2666,7 @@ function fields() {
     ArrayField,
     // ArrayField falls back to SchemaField if ArraySchemaField is not defined, which it isn't by default
     BooleanField: BooleanField_default,
+    CyclicSchemaField,
     FallbackField,
     LayoutGridField,
     LayoutHeaderField,
@@ -2676,25 +2683,21 @@ function fields() {
 var fields_default = fields;
 
 // src/components/templates/ArrayFieldDescriptionTemplate.tsx
-import {
-  descriptionId as descriptionId2,
-  getTemplate as getTemplate10,
-  getUiOptions as getUiOptions12
-} from "@rjsf/utils";
-import { jsx as jsx13 } from "react/jsx-runtime";
+import { descriptionId as descriptionId2, getTemplate as getTemplate11, getUiOptions as getUiOptions13 } from "@rjsf/utils";
+import { jsx as jsx14 } from "react/jsx-runtime";
 function ArrayFieldDescriptionTemplate(props) {
   const { fieldPathId, description, registry, schema, uiSchema } = props;
-  const options = getUiOptions12(uiSchema, registry.globalUiOptions);
+  const options = getUiOptions13(uiSchema, registry.globalUiOptions);
   const { label: displayLabel = true } = options;
   if (!description || !displayLabel) {
     return null;
   }
-  const DescriptionFieldTemplate = getTemplate10(
+  const DescriptionFieldTemplate = getTemplate11(
     "DescriptionFieldTemplate",
     registry,
     options
   );
-  return /* @__PURE__ */ jsx13(
+  return /* @__PURE__ */ jsx14(
     DescriptionFieldTemplate,
     {
       id: descriptionId2(fieldPathId),
@@ -2707,10 +2710,8 @@ function ArrayFieldDescriptionTemplate(props) {
 }
 
 // src/components/templates/ArrayFieldItemButtonsTemplate.tsx
-import {
-  buttonId
-} from "@rjsf/utils";
-import { Fragment as Fragment2, jsx as jsx14, jsxs as jsxs3 } from "react/jsx-runtime";
+import { buttonId } from "@rjsf/utils";
+import { Fragment as Fragment2, jsx as jsx15, jsxs as jsxs3 } from "react/jsx-runtime";
 function ArrayFieldItemButtonsTemplate(props) {
   const {
     disabled,
@@ -2729,7 +2730,7 @@ function ArrayFieldItemButtonsTemplate(props) {
   } = props;
   const { CopyButton: CopyButton2, MoveDownButton: MoveDownButton2, MoveUpButton: MoveUpButton2, RemoveButton: RemoveButton2 } = registry.templates.ButtonTemplates;
   return /* @__PURE__ */ jsxs3(Fragment2, { children: [
-    (hasMoveUp || hasMoveDown) && /* @__PURE__ */ jsx14(
+    (hasMoveUp || hasMoveDown) && /* @__PURE__ */ jsx15(
       MoveUpButton2,
       {
         id: buttonId(fieldPathId, "moveUp"),
@@ -2740,7 +2741,7 @@ function ArrayFieldItemButtonsTemplate(props) {
         registry
       }
     ),
-    (hasMoveUp || hasMoveDown) && /* @__PURE__ */ jsx14(
+    (hasMoveUp || hasMoveDown) && /* @__PURE__ */ jsx15(
       MoveDownButton2,
       {
         id: buttonId(fieldPathId, "moveDown"),
@@ -2751,7 +2752,7 @@ function ArrayFieldItemButtonsTemplate(props) {
         registry
       }
     ),
-    hasCopy && /* @__PURE__ */ jsx14(
+    hasCopy && /* @__PURE__ */ jsx15(
       CopyButton2,
       {
         id: buttonId(fieldPathId, "copy"),
@@ -2762,7 +2763,7 @@ function ArrayFieldItemButtonsTemplate(props) {
         registry
       }
     ),
-    hasRemove && /* @__PURE__ */ jsx14(
+    hasRemove && /* @__PURE__ */ jsx15(
       RemoveButton2,
       {
         id: buttonId(fieldPathId, "remove"),
@@ -2777,15 +2778,12 @@ function ArrayFieldItemButtonsTemplate(props) {
 }
 
 // src/components/templates/ArrayFieldItemTemplate.tsx
-import {
-  getTemplate as getTemplate11,
-  getUiOptions as getUiOptions13
-} from "@rjsf/utils";
-import { jsx as jsx15, jsxs as jsxs4 } from "react/jsx-runtime";
+import { getTemplate as getTemplate12, getUiOptions as getUiOptions14 } from "@rjsf/utils";
+import { jsx as jsx16, jsxs as jsxs4 } from "react/jsx-runtime";
 function ArrayFieldItemTemplate(props) {
   const { children, className, buttonsProps, displayLabel, hasDescription, hasToolbar, registry, uiSchema } = props;
-  const uiOptions = getUiOptions13(uiSchema);
-  const ArrayFieldItemButtonsTemplate2 = getTemplate11(
+  const uiOptions = getUiOptions14(uiSchema);
+  const ArrayFieldItemButtonsTemplate2 = getTemplate12(
     "ArrayFieldItemButtonsTemplate",
     registry,
     uiOptions
@@ -2800,18 +2798,14 @@ function ArrayFieldItemTemplate(props) {
   const containerStyle = { display: "flex", alignItems: displayLabel ? "center" : "baseline" };
   const toolbarStyle = { display: "flex", justifyContent: "flex-end", marginTop: displayLabel ? `${margin}px` : 0 };
   return /* @__PURE__ */ jsxs4("div", { className, style: containerStyle, children: [
-    /* @__PURE__ */ jsx15("div", { className: hasToolbar ? "col-xs-9 col-md-10 col-xl-11" : "col-xs-12", children }),
-    hasToolbar && /* @__PURE__ */ jsx15("div", { className: "col-xs-3 col-md-2 col-xl-1 array-item-toolbox", children: /* @__PURE__ */ jsx15("div", { className: "btn-group", style: toolbarStyle, children: /* @__PURE__ */ jsx15(ArrayFieldItemButtonsTemplate2, { ...buttonsProps, style: btnStyle }) }) })
+    /* @__PURE__ */ jsx16("div", { className: hasToolbar ? "col-xs-9 col-md-10 col-xl-11" : "col-xs-12", children }),
+    hasToolbar && /* @__PURE__ */ jsx16("div", { className: "col-xs-3 col-md-2 col-xl-1 array-item-toolbox", children: /* @__PURE__ */ jsx16("div", { className: "btn-group", style: toolbarStyle, children: /* @__PURE__ */ jsx16(ArrayFieldItemButtonsTemplate2, { ...buttonsProps, style: btnStyle }) }) })
   ] });
 }
 
 // src/components/templates/ArrayFieldTemplate.tsx
-import {
-  getTemplate as getTemplate12,
-  getUiOptions as getUiOptions14,
-  buttonId as buttonId2
-} from "@rjsf/utils";
-import { jsx as jsx16, jsxs as jsxs5 } from "react/jsx-runtime";
+import { getTemplate as getTemplate13, getUiOptions as getUiOptions15, buttonId as buttonId2 } from "@rjsf/utils";
+import { jsx as jsx17, jsxs as jsxs5 } from "react/jsx-runtime";
 function ArrayFieldTemplate(props) {
   const {
     canAdd,
@@ -2828,13 +2822,13 @@ function ArrayFieldTemplate(props) {
     schema,
     title
   } = props;
-  const uiOptions = getUiOptions14(uiSchema);
-  const ArrayFieldDescriptionTemplate2 = getTemplate12(
+  const uiOptions = getUiOptions15(uiSchema);
+  const ArrayFieldDescriptionTemplate2 = getTemplate13(
     "ArrayFieldDescriptionTemplate",
     registry,
     uiOptions
   );
-  const ArrayFieldTitleTemplate2 = getTemplate12(
+  const ArrayFieldTitleTemplate2 = getTemplate13(
     "ArrayFieldTitleTemplate",
     registry,
     uiOptions
@@ -2844,7 +2838,7 @@ function ArrayFieldTemplate(props) {
     ButtonTemplates: { AddButton: AddButton2 }
   } = registry.templates;
   return /* @__PURE__ */ jsxs5("fieldset", { className, id: fieldPathId.$id, children: [
-    /* @__PURE__ */ jsx16(
+    /* @__PURE__ */ jsx17(
       ArrayFieldTitleTemplate2,
       {
         fieldPathId,
@@ -2856,7 +2850,7 @@ function ArrayFieldTemplate(props) {
         optionalDataControl: showOptionalDataControlInTitle ? optionalDataControl : void 0
       }
     ),
-    /* @__PURE__ */ jsx16(
+    /* @__PURE__ */ jsx17(
       ArrayFieldDescriptionTemplate2,
       {
         fieldPathId,
@@ -2867,8 +2861,8 @@ function ArrayFieldTemplate(props) {
       }
     ),
     !showOptionalDataControlInTitle ? optionalDataControl : void 0,
-    /* @__PURE__ */ jsx16("div", { className: "row array-item-list", children: items }),
-    canAdd && /* @__PURE__ */ jsx16(
+    /* @__PURE__ */ jsx17("div", { className: "row array-item-list", children: items }),
+    canAdd && /* @__PURE__ */ jsx17(
       AddButton2,
       {
         id: buttonId2(fieldPathId, "add"),
@@ -2883,25 +2877,21 @@ function ArrayFieldTemplate(props) {
 }
 
 // src/components/templates/ArrayFieldTitleTemplate.tsx
-import {
-  getTemplate as getTemplate13,
-  getUiOptions as getUiOptions15,
-  titleId as titleId2
-} from "@rjsf/utils";
-import { jsx as jsx17 } from "react/jsx-runtime";
+import { getTemplate as getTemplate14, getUiOptions as getUiOptions16, titleId as titleId2 } from "@rjsf/utils";
+import { jsx as jsx18 } from "react/jsx-runtime";
 function ArrayFieldTitleTemplate(props) {
   const { fieldPathId, title, schema, uiSchema, required, registry, optionalDataControl } = props;
-  const options = getUiOptions15(uiSchema, registry.globalUiOptions);
+  const options = getUiOptions16(uiSchema, registry.globalUiOptions);
   const { label: displayLabel = true } = options;
   if (!title || !displayLabel) {
     return null;
   }
-  const TitleFieldTemplate = getTemplate13(
+  const TitleFieldTemplate = getTemplate14(
     "TitleFieldTemplate",
     registry,
     options
   );
-  return /* @__PURE__ */ jsx17(
+  return /* @__PURE__ */ jsx18(
     TitleFieldTemplate,
     {
       id: titleId2(fieldPathId),
@@ -2916,31 +2906,28 @@ function ArrayFieldTitleTemplate(props) {
 }
 
 // src/components/templates/BaseInputTemplate.tsx
-import { useCallback as useCallback7 } from "react";
-import {
-  ariaDescribedByIds,
-  examplesId as examplesId2,
-  getInputProps
-} from "@rjsf/utils";
+import { useCallback as useCallback8 } from "react";
+import { ariaDescribedByIds, examplesId as examplesId2, getInputProps } from "@rjsf/utils";
 
 // src/components/SchemaExamples.tsx
 import { examplesId } from "@rjsf/utils";
-import { jsx as jsx18 } from "react/jsx-runtime";
+import { jsx as jsx19 } from "react/jsx-runtime";
 function SchemaExamples(props) {
   const { id, schema } = props;
   const { examples, default: schemaDefault } = schema;
   if (!Array.isArray(examples)) {
     return null;
   }
-  return /* @__PURE__ */ jsx18("datalist", { id: examplesId(id), children: examples.concat(
+  return /* @__PURE__ */ jsx19("datalist", { id: examplesId(id), children: examples.concat(
     schemaDefault !== void 0 && !examples.map(String).includes(String(schemaDefault)) ? [schemaDefault] : []
-  ).map((example) => {
-    return /* @__PURE__ */ jsx18("option", { value: example }, String(example));
-  }) }, `datalist_${id}`);
+  ).map((example) => (
+    // oxlint-disable-next-line jsx-a11y/control-has-associated-label
+    /* @__PURE__ */ jsx19("option", { value: example }, String(example))
+  )) }, `datalist_${id}`);
 }
 
 // src/components/templates/BaseInputTemplate.tsx
-import { Fragment as Fragment3, jsx as jsx19, jsxs as jsxs6 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx20, jsxs as jsxs6 } from "react/jsx-runtime";
 function BaseInputTemplate(props) {
   const {
     id,
@@ -2982,19 +2969,16 @@ function BaseInputTemplate(props) {
   } else {
     inputValue = value == null ? "" : value;
   }
-  const _onChange = useCallback7(
-    ({ target: { value: value2 } }) => onChange(value2 === "" ? options.emptyValue : value2),
+  const handleChange = useCallback8(
+    ({ target: { value: newValue } }) => onChange(newValue === "" ? options.emptyValue : newValue),
     [onChange, options]
   );
-  const _onBlur = useCallback7(
-    ({ target }) => onBlur(id, target && target.value),
-    [onBlur, id]
-  );
-  const _onFocus = useCallback7(
-    ({ target }) => onFocus(id, target && target.value),
+  const handleBlur = useCallback8(({ target }) => onBlur(id, target?.value), [onBlur, id]);
+  const handleFocus = useCallback8(
+    ({ target }) => onFocus(id, target?.value),
     [onFocus, id]
   );
-  const _onClear = useCallback7(
+  const handleClear = useCallback8(
     (e) => {
       e.preventDefault();
       e.stopPropagation();
@@ -3003,7 +2987,7 @@ function BaseInputTemplate(props) {
     [onChange, options.emptyValue]
   );
   return /* @__PURE__ */ jsxs6(Fragment3, { children: [
-    /* @__PURE__ */ jsx19(
+    /* @__PURE__ */ jsx20(
       "input",
       {
         id,
@@ -3015,14 +2999,14 @@ function BaseInputTemplate(props) {
         value: inputValue,
         ...inputProps,
         list: schema.examples ? examplesId2(id) : void 0,
-        onChange: onChangeOverride || _onChange,
-        onBlur: _onBlur,
-        onFocus: _onFocus,
+        onChange: onChangeOverride || handleChange,
+        onBlur: handleBlur,
+        onFocus: handleFocus,
         "aria-describedby": ariaDescribedByIds(id, !!schema.examples)
       }
     ),
-    options.allowClearTextInputs && !readonly && !disabled && inputValue && /* @__PURE__ */ jsx19(ClearButton2, { registry, onClick: _onClear }),
-    /* @__PURE__ */ jsx19(SchemaExamples, { id, schema })
+    options.allowClearTextInputs && !readonly && !disabled && inputValue && /* @__PURE__ */ jsx20(ClearButton2, { registry, onClick: handleClear }),
+    /* @__PURE__ */ jsx20(SchemaExamples, { id, schema })
   ] });
 }
 
@@ -3030,37 +3014,44 @@ function BaseInputTemplate(props) {
 import { TranslatableString as TranslatableString9 } from "@rjsf/utils";
 
 // src/components/templates/ButtonTemplates/IconButton.tsx
+import { memo as memo4 } from "react";
 import { TranslatableString as TranslatableString8 } from "@rjsf/utils";
-import { jsx as jsx20 } from "react/jsx-runtime";
-function IconButton(props) {
+import { jsx as jsx21 } from "react/jsx-runtime";
+function IconButtonFn(props) {
   const { iconType = "default", icon, className, uiSchema, registry, ...otherProps } = props;
-  return /* @__PURE__ */ jsx20("button", { type: "button", className: `btn btn-${iconType} ${className}`, ...otherProps, children: /* @__PURE__ */ jsx20("i", { className: `glyphicon glyphicon-${icon}` }) });
+  return /* @__PURE__ */ jsx21("button", { type: "button", className: `btn btn-${iconType} ${className}`, ...otherProps, children: /* @__PURE__ */ jsx21("i", { className: `glyphicon glyphicon-${icon}` }) });
 }
-function CopyButton(props) {
+var IconButton = memo4(IconButtonFn);
+var IconButton_default = IconButton;
+function CopyButtonFn(props) {
   const {
     registry: { translateString }
   } = props;
-  return /* @__PURE__ */ jsx20(IconButton, { title: translateString(TranslatableString8.CopyButton), ...props, icon: "copy" });
+  return /* @__PURE__ */ jsx21(IconButton, { title: translateString(TranslatableString8.CopyButton), ...props, icon: "copy" });
 }
-function MoveDownButton(props) {
+var CopyButton = memo4(CopyButtonFn);
+function MoveDownButtonFn(props) {
   const {
     registry: { translateString }
   } = props;
-  return /* @__PURE__ */ jsx20(IconButton, { title: translateString(TranslatableString8.MoveDownButton), ...props, icon: "arrow-down" });
+  return /* @__PURE__ */ jsx21(IconButton, { title: translateString(TranslatableString8.MoveDownButton), ...props, icon: "arrow-down" });
 }
-function MoveUpButton(props) {
+var MoveDownButton = memo4(MoveDownButtonFn);
+function MoveUpButtonFn(props) {
   const {
     registry: { translateString }
   } = props;
-  return /* @__PURE__ */ jsx20(IconButton, { title: translateString(TranslatableString8.MoveUpButton), ...props, icon: "arrow-up" });
+  return /* @__PURE__ */ jsx21(IconButton, { title: translateString(TranslatableString8.MoveUpButton), ...props, icon: "arrow-up" });
 }
-function RemoveButton(props) {
+var MoveUpButton = memo4(MoveUpButtonFn);
+function RemoveButtonFn(props) {
   const {
     registry: { translateString }
   } = props;
-  return /* @__PURE__ */ jsx20(IconButton, { title: translateString(TranslatableString8.RemoveButton), ...props, iconType: "danger", icon: "remove" });
+  return /* @__PURE__ */ jsx21(IconButton, { title: translateString(TranslatableString8.RemoveButton), ...props, iconType: "danger", icon: "remove" });
 }
-function ClearButton({
+var RemoveButton = memo4(RemoveButtonFn);
+function ClearButtonFn({
   id,
   className,
   onClick,
@@ -3069,7 +3060,7 @@ function ClearButton({
   ...props
 }) {
   const { translateString } = registry;
-  return /* @__PURE__ */ jsx20(
+  return /* @__PURE__ */ jsx21(
     IconButton,
     {
       id,
@@ -3084,9 +3075,10 @@ function ClearButton({
     }
   );
 }
+var ClearButton = memo4(ClearButtonFn);
 
 // src/components/templates/ButtonTemplates/AddButton.tsx
-import { jsx as jsx21 } from "react/jsx-runtime";
+import { jsx as jsx22 } from "react/jsx-runtime";
 function AddButton({
   id,
   className,
@@ -3095,12 +3087,12 @@ function AddButton({
   registry
 }) {
   const { translateString } = registry;
-  return /* @__PURE__ */ jsx21("div", { className: "row", children: /* @__PURE__ */ jsx21(
+  return /* @__PURE__ */ jsx22("div", { className: "row", children: /* @__PURE__ */ jsx22(
     "p",
     {
       className: `col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right ${className}`,
-      children: /* @__PURE__ */ jsx21(
-        IconButton,
+      children: /* @__PURE__ */ jsx22(
+        IconButton_default,
         {
           id,
           iconType: "info",
@@ -3118,13 +3110,13 @@ function AddButton({
 
 // src/components/templates/ButtonTemplates/SubmitButton.tsx
 import { getSubmitButtonOptions } from "@rjsf/utils";
-import { jsx as jsx22 } from "react/jsx-runtime";
+import { jsx as jsx23 } from "react/jsx-runtime";
 function SubmitButton({ uiSchema }) {
   const { submitText, norender, props: submitButtonProps = {} } = getSubmitButtonOptions(uiSchema);
   if (norender) {
     return null;
   }
-  return /* @__PURE__ */ jsx22("div", { children: /* @__PURE__ */ jsx22("button", { type: "submit", ...submitButtonProps, className: `btn btn-info ${submitButtonProps.className || ""}`, children: submitText }) });
+  return /* @__PURE__ */ jsx23("div", { children: /* @__PURE__ */ jsx23("button", { type: "submit", ...submitButtonProps, className: `btn btn-info ${submitButtonProps.className || ""}`, children: submitText }) });
 }
 
 // src/components/templates/ButtonTemplates/index.ts
@@ -3141,62 +3133,83 @@ function buttonTemplates() {
 }
 var ButtonTemplates_default = buttonTemplates;
 
+// src/components/templates/CyclicSchemaExpandTemplate.tsx
+import { ID_KEY as ID_KEY5, TranslatableString as TranslatableString10 } from "@rjsf/utils";
+import { jsx as jsx24, jsxs as jsxs7 } from "react/jsx-runtime";
+function CyclicSchemaExpandTemplate(props) {
+  const { name, fieldPathId, registry, onExpand } = props;
+  const { translateString } = registry;
+  const buttonId5 = `${fieldPathId[ID_KEY5]}-button`;
+  return /* @__PURE__ */ jsxs7("div", { style: { marginTop: "1rem" }, children: [
+    /* @__PURE__ */ jsx24("div", { className: "text-danger", children: translateString(TranslatableString10.CycleDetected, [name]) }),
+    /* @__PURE__ */ jsxs7("div", { children: [
+      /* @__PURE__ */ jsx24(
+        "button",
+        {
+          id: buttonId5,
+          type: "button",
+          className: "btn btn-sm btn-warning",
+          onClick: () => onExpand(fieldPathId[ID_KEY5]),
+          children: translateString(TranslatableString10.ExpandButton)
+        }
+      ),
+      " "
+    ] })
+  ] });
+}
+
 // src/components/RichDescription.tsx
-import {
-  getTestIds as getTestIds2,
-  getUiOptions as getUiOptions16
-} from "@rjsf/utils";
+import { getTestIds as getTestIds2, getUiOptions as getUiOptions17 } from "@rjsf/utils";
 import { Markdown as Markdown2 } from "markdown-to-jsx/react";
-import { jsx as jsx23 } from "react/jsx-runtime";
+import { jsx as jsx25 } from "react/jsx-runtime";
 var TEST_IDS = getTestIds2();
 function RichDescription({ description, registry, uiSchema = {} }) {
   const { globalUiOptions } = registry;
-  const uiOptions = getUiOptions16(uiSchema, globalUiOptions);
+  const uiOptions = getUiOptions17(uiSchema, globalUiOptions);
   if (uiOptions.enableMarkdownInDescription && typeof description === "string") {
-    return /* @__PURE__ */ jsx23(Markdown2, { options: { disableParsingRawHTML: true }, "data-testid": TEST_IDS.markdown, children: description });
+    return /* @__PURE__ */ jsx25(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 jsx24 } from "react/jsx-runtime";
+import { jsx as jsx26 } from "react/jsx-runtime";
 function DescriptionField(props) {
   const { id, description, registry, uiSchema } = props;
   if (!description) {
     return null;
   }
-  return /* @__PURE__ */ jsx24("div", { id, className: "field-description", children: /* @__PURE__ */ jsx24(RichDescription, { description, registry, uiSchema }) });
+  return /* @__PURE__ */ jsx26("div", { id, className: "field-description", children: /* @__PURE__ */ jsx26(RichDescription, { description, registry, uiSchema }) });
 }
 
 // src/components/templates/ErrorList.tsx
-import {
-  TranslatableString as TranslatableString10
-} from "@rjsf/utils";
-import { jsx as jsx25, jsxs as jsxs7 } from "react/jsx-runtime";
+import { TranslatableString as TranslatableString11 } from "@rjsf/utils";
+import { jsx as jsx27, jsxs as jsxs8 } from "react/jsx-runtime";
 function ErrorList({
   errors,
   registry
 }) {
   const { translateString } = registry;
-  return /* @__PURE__ */ jsxs7("div", { className: "panel panel-danger errors", children: [
-    /* @__PURE__ */ jsx25("div", { className: "panel-heading", children: /* @__PURE__ */ jsx25("h3", { className: "panel-title", children: translateString(TranslatableString10.ErrorsLabel) }) }),
-    /* @__PURE__ */ jsx25("ul", { className: "list-group", children: errors.map((error, i) => {
-      return /* @__PURE__ */ jsx25("li", { className: "list-group-item text-danger", children: error.stack }, i);
-    }) })
+  return /* @__PURE__ */ jsxs8("div", { className: "panel panel-danger errors", children: [
+    /* @__PURE__ */ jsx27("div", { className: "panel-heading", children: /* @__PURE__ */ jsx27("h3", { className: "panel-title", children: translateString(TranslatableString11.ErrorsLabel) }) }),
+    /* @__PURE__ */ jsx27("ul", { className: "list-group", children: errors.map((error, i) => (
+      // oxlint-disable-next-line react/no-array-index-key
+      /* @__PURE__ */ jsx27("li", { className: "list-group-item text-danger", children: error.stack }, i)
+    )) })
   ] });
 }
 
 // src/components/templates/FallbackFieldTemplate.tsx
-import { getTemplate as getTemplate14 } from "@rjsf/utils";
-import { jsx as jsx26 } from "react/jsx-runtime";
+import { getTemplate as getTemplate15 } from "@rjsf/utils";
+import { jsx as jsx28 } from "react/jsx-runtime";
 function FallbackFieldTemplate(props) {
   const { schema, registry, typeSelector, schemaField } = props;
-  const MultiSchemaFieldTemplate2 = getTemplate14(
+  const MultiSchemaFieldTemplate2 = getTemplate15(
     "MultiSchemaFieldTemplate",
     registry
   );
-  return /* @__PURE__ */ jsx26(
+  return /* @__PURE__ */ jsx28(
     MultiSchemaFieldTemplate2,
     {
       selector: typeSelector,
@@ -3209,28 +3222,26 @@ function FallbackFieldTemplate(props) {
 
 // src/components/templates/FieldErrorTemplate.tsx
 import { errorId } from "@rjsf/utils";
-import { jsx as jsx27 } from "react/jsx-runtime";
+import { jsx as jsx29 } from "react/jsx-runtime";
 function FieldErrorTemplate(props) {
   const { errors = [], fieldPathId } = props;
   if (errors.length === 0) {
     return null;
   }
   const id = errorId(fieldPathId);
-  return /* @__PURE__ */ jsx27("div", { children: /* @__PURE__ */ jsx27("ul", { id, className: "error-detail bs-callout bs-callout-info", children: errors.filter((elem) => !!elem).map((error, index) => {
-    return /* @__PURE__ */ jsx27("li", { className: "text-danger", children: error }, index);
-  }) }) });
+  return /* @__PURE__ */ jsx29("div", { children: /* @__PURE__ */ jsx29("ul", { id, className: "error-detail bs-callout bs-callout-info", children: errors.filter((elem) => !!elem).map((error, index) => (
+    // oxlint-disable-next-line react/no-array-index-key
+    /* @__PURE__ */ jsx29("li", { className: "text-danger", children: error }, index)
+  )) }) });
 }
 
 // src/components/templates/FieldHelpTemplate.tsx
 import { helpId } from "@rjsf/utils";
 
 // src/components/RichHelp.tsx
-import {
-  getTestIds as getTestIds3,
-  getUiOptions as getUiOptions17
-} from "@rjsf/utils";
+import { getTestIds as getTestIds3, getUiOptions as getUiOptions18 } from "@rjsf/utils";
 import { Markdown as Markdown3 } from "markdown-to-jsx/react";
-import { jsx as jsx28 } from "react/jsx-runtime";
+import { jsx as jsx30 } from "react/jsx-runtime";
 var TEST_IDS2 = getTestIds3();
 function RichHelp({
   help,
@@ -3238,60 +3249,57 @@ function RichHelp({
   uiSchema = {}
 }) {
   const { globalUiOptions } = registry;
-  const uiOptions = getUiOptions17(uiSchema, globalUiOptions);
+  const uiOptions = getUiOptions18(uiSchema, globalUiOptions);
   if (uiOptions.enableMarkdownInHelp && typeof help === "string") {
-    return /* @__PURE__ */ jsx28(Markdown3, { options: { disableParsingRawHTML: true }, "data-testid": TEST_IDS2.markdown, children: help });
+    return /* @__PURE__ */ jsx30(Markdown3, { options: { disableParsingRawHTML: true }, "data-testid": TEST_IDS2.markdown, children: help });
   }
   return help;
 }
 RichHelp.TEST_IDS = TEST_IDS2;
 
 // src/components/templates/FieldHelpTemplate.tsx
-import { jsx as jsx29 } from "react/jsx-runtime";
+import { jsx as jsx31 } from "react/jsx-runtime";
 function FieldHelpTemplate(props) {
   const { fieldPathId, help, uiSchema, registry } = props;
   if (!help) {
     return null;
   }
-  return /* @__PURE__ */ jsx29("div", { id: helpId(fieldPathId), className: "help-block", children: /* @__PURE__ */ jsx29(RichHelp, { help, registry, uiSchema }) });
+  return /* @__PURE__ */ jsx31("div", { id: helpId(fieldPathId), className: "help-block", children: /* @__PURE__ */ jsx31(RichHelp, { help, registry, uiSchema }) });
 }
 
 // src/components/templates/FieldTemplate/FieldTemplate.tsx
-import {
-  getTemplate as getTemplate15,
-  getUiOptions as getUiOptions18
-} from "@rjsf/utils";
+import { getTemplate as getTemplate16, getUiOptions as getUiOptions19 } from "@rjsf/utils";
 
 // src/components/templates/FieldTemplate/Label.tsx
-import { jsx as jsx30, jsxs as jsxs8 } from "react/jsx-runtime";
+import { jsx as jsx32, jsxs as jsxs9 } from "react/jsx-runtime";
 var REQUIRED_FIELD_SYMBOL = "*";
 function Label(props) {
   const { label, required, id } = props;
   if (!label) {
     return null;
   }
-  return /* @__PURE__ */ jsxs8("label", { className: "control-label", htmlFor: id, children: [
+  return /* @__PURE__ */ jsxs9("label", { className: "control-label", htmlFor: id, children: [
     label,
-    required && /* @__PURE__ */ jsx30("span", { className: "required", children: REQUIRED_FIELD_SYMBOL })
+    required && /* @__PURE__ */ jsx32("span", { className: "required", children: REQUIRED_FIELD_SYMBOL })
   ] });
 }
 
 // src/components/templates/FieldTemplate/FieldTemplate.tsx
-import { jsx as jsx31, jsxs as jsxs9 } from "react/jsx-runtime";
+import { jsx as jsx33, jsxs as jsxs10 } from "react/jsx-runtime";
 function FieldTemplate(props) {
   const { id, label, children, errors, help, description, hidden, required, displayLabel, registry, uiSchema } = props;
-  const uiOptions = getUiOptions18(uiSchema);
-  const WrapIfAdditionalTemplate2 = getTemplate15(
+  const uiOptions = getUiOptions19(uiSchema);
+  const WrapIfAdditionalTemplate2 = getTemplate16(
     "WrapIfAdditionalTemplate",
     registry,
     uiOptions
   );
   if (hidden) {
-    return /* @__PURE__ */ jsx31("div", { className: "hidden", children });
+    return /* @__PURE__ */ jsx33("div", { className: "hidden", children });
   }
   const isCheckbox = uiOptions.widget === "checkbox";
-  return /* @__PURE__ */ jsxs9(WrapIfAdditionalTemplate2, { ...props, children: [
-    displayLabel && !isCheckbox && /* @__PURE__ */ jsx31(Label, { label, required, id }),
+  return /* @__PURE__ */ jsxs10(WrapIfAdditionalTemplate2, { ...props, children: [
+    displayLabel && !isCheckbox && /* @__PURE__ */ jsx33(Label, { label, required, id }),
     displayLabel && description ? description : null,
     children,
     errors,
@@ -3303,32 +3311,25 @@ function FieldTemplate(props) {
 var FieldTemplate_default = FieldTemplate;
 
 // src/components/templates/GridTemplate.tsx
-import { jsx as jsx32 } from "react/jsx-runtime";
+import { jsx as jsx34 } from "react/jsx-runtime";
 function GridTemplate(props) {
   const { children, column, className, ...rest } = props;
-  return /* @__PURE__ */ jsx32("div", { className, ...rest, children });
+  return /* @__PURE__ */ jsx34("div", { className, ...rest, children });
 }
 
 // src/components/templates/MultiSchemaFieldTemplate.tsx
-import { jsx as jsx33, jsxs as jsxs10 } from "react/jsx-runtime";
+import { jsx as jsx35, jsxs as jsxs11 } from "react/jsx-runtime";
 function MultiSchemaFieldTemplate(props) {
   const { selector, optionSchemaField } = props;
-  return /* @__PURE__ */ jsxs10("div", { className: "panel panel-default panel-body", children: [
-    /* @__PURE__ */ jsx33("div", { className: "form-group", children: selector }),
+  return /* @__PURE__ */ jsxs11("div", { className: "panel panel-default panel-body", children: [
+    /* @__PURE__ */ jsx35("div", { className: "form-group", children: selector }),
     optionSchemaField
   ] });
 }
 
 // src/components/templates/ObjectFieldTemplate.tsx
-import {
-  canExpand,
-  descriptionId as descriptionId3,
-  getTemplate as getTemplate16,
-  getUiOptions as getUiOptions19,
-  titleId as titleId3,
-  buttonId as buttonId3
-} from "@rjsf/utils";
-import { jsx as jsx34, jsxs as jsxs11 } from "react/jsx-runtime";
+import { canExpand, descriptionId as descriptionId3, getTemplate as getTemplate17, getUiOptions as getUiOptions20, titleId as titleId3, buttonId as buttonId3 } from "@rjsf/utils";
+import { jsx as jsx36, jsxs as jsxs12 } from "react/jsx-runtime";
 function ObjectFieldTemplate(props) {
   const {
     className,
@@ -3346,9 +3347,9 @@ function ObjectFieldTemplate(props) {
     title,
     uiSchema
   } = props;
-  const options = getUiOptions19(uiSchema);
-  const TitleFieldTemplate = getTemplate16("TitleFieldTemplate", registry, options);
-  const DescriptionFieldTemplate = getTemplate16(
+  const options = getUiOptions20(uiSchema);
+  const TitleFieldTemplate = getTemplate17("TitleFieldTemplate", registry, options);
+  const DescriptionFieldTemplate = getTemplate17(
     "DescriptionFieldTemplate",
     registry,
     options
@@ -3361,8 +3362,8 @@ function ObjectFieldTemplate(props) {
   const {
     ButtonTemplates: { AddButton: AddButton2 }
   } = registry.templates;
-  return /* @__PURE__ */ jsxs11("fieldset", { className, id: fieldPathId.$id, children: [
-    title && /* @__PURE__ */ jsx34(
+  return /* @__PURE__ */ jsxs12("fieldset", { className, id: fieldPathId.$id, children: [
+    title && /* @__PURE__ */ jsx36(
       TitleFieldTemplate,
       {
         id: titleId3(fieldPathId),
@@ -3374,7 +3375,7 @@ function ObjectFieldTemplate(props) {
         optionalDataControl: showOptionalDataControlInTitle ? optionalDataControl : void 0
       }
     ),
-    description && /* @__PURE__ */ jsx34(
+    description && /* @__PURE__ */ jsx36(
       DescriptionFieldTemplate,
       {
         id: descriptionId3(fieldPathId),
@@ -3386,7 +3387,7 @@ function ObjectFieldTemplate(props) {
     ),
     !showOptionalDataControlInTitle ? optionalDataControl : void 0,
     properties.map((prop) => prop.content),
-    canExpand(schema, uiSchema, formData) && /* @__PURE__ */ jsx34(
+    canExpand(schema, uiSchema, formData) && /* @__PURE__ */ jsx36(
       AddButton2,
       {
         id: buttonId3(fieldPathId, "add"),
@@ -3401,12 +3402,12 @@ function ObjectFieldTemplate(props) {
 }
 
 // src/components/templates/OptionalDataControlsTemplate.tsx
-import { jsx as jsx35 } from "react/jsx-runtime";
+import { jsx as jsx37 } from "react/jsx-runtime";
 function OptionalDataControlsTemplate(props) {
   const { id, registry, label, onAddClick, onRemoveClick } = props;
   if (onAddClick) {
-    return /* @__PURE__ */ jsx35(
-      IconButton,
+    return /* @__PURE__ */ jsx37(
+      IconButton_default,
       {
         id,
         registry,
@@ -3416,9 +3417,10 @@ function OptionalDataControlsTemplate(props) {
         title: label
       }
     );
-  } else if (onRemoveClick) {
-    return /* @__PURE__ */ jsx35(
-      IconButton,
+  }
+  if (onRemoveClick) {
+    return /* @__PURE__ */ jsx37(
+      IconButton_default,
       {
         id,
         registry,
@@ -3429,52 +3431,48 @@ function OptionalDataControlsTemplate(props) {
       }
     );
   }
-  return /* @__PURE__ */ jsx35("em", { id, children: label });
+  return /* @__PURE__ */ jsx37("em", { id, children: label });
 }
 
 // src/components/templates/TitleField.tsx
-import { jsx as jsx36, jsxs as jsxs12 } from "react/jsx-runtime";
+import { jsx as jsx38, jsxs as jsxs13 } from "react/jsx-runtime";
 var REQUIRED_FIELD_SYMBOL2 = "*";
 function TitleField(props) {
   const { id, title, required, optionalDataControl } = props;
-  return /* @__PURE__ */ jsxs12("legend", { id, children: [
+  return /* @__PURE__ */ jsxs13("legend", { id, children: [
     title,
-    required && /* @__PURE__ */ jsx36("span", { className: "required", children: REQUIRED_FIELD_SYMBOL2 }),
-    optionalDataControl && /* @__PURE__ */ jsx36("span", { className: "pull-right", style: { marginBottom: "2px" }, children: optionalDataControl })
+    required && /* @__PURE__ */ jsx38("span", { className: "required", children: REQUIRED_FIELD_SYMBOL2 }),
+    optionalDataControl && /* @__PURE__ */ jsx38("span", { className: "pull-right", style: { marginBottom: "2px" }, children: optionalDataControl })
   ] });
 }
 
 // src/components/templates/UnsupportedField.tsx
-import { TranslatableString as TranslatableString11 } from "@rjsf/utils";
-import { Markdown as Markdown4 } from "markdown-to-jsx";
-import { jsx as jsx37, jsxs as jsxs13 } from "react/jsx-runtime";
+import { TranslatableString as TranslatableString12 } from "@rjsf/utils";
+import { Markdown as Markdown4 } from "markdown-to-jsx/react";
+import { jsx as jsx39, jsxs as jsxs14 } from "react/jsx-runtime";
 function UnsupportedField(props) {
   const { schema, fieldPathId, reason, registry } = props;
   const { translateString } = registry;
-  let translateEnum = TranslatableString11.UnsupportedField;
+  let translateEnum = TranslatableString12.UnsupportedField;
   const translateParams = [];
-  if (fieldPathId && fieldPathId.$id) {
-    translateEnum = TranslatableString11.UnsupportedFieldWithId;
+  if (fieldPathId?.$id) {
+    translateEnum = TranslatableString12.UnsupportedFieldWithId;
     translateParams.push(fieldPathId.$id);
   }
   if (reason) {
-    translateEnum = translateEnum === TranslatableString11.UnsupportedField ? TranslatableString11.UnsupportedFieldWithReason : TranslatableString11.UnsupportedFieldWithIdAndReason;
+    translateEnum = translateEnum === TranslatableString12.UnsupportedField ? TranslatableString12.UnsupportedFieldWithReason : TranslatableString12.UnsupportedFieldWithIdAndReason;
     translateParams.push(reason);
   }
-  return /* @__PURE__ */ jsxs13("div", { className: "unsupported-field", children: [
-    /* @__PURE__ */ jsx37("p", { children: /* @__PURE__ */ jsx37(Markdown4, { options: { disableParsingRawHTML: true }, children: translateString(translateEnum, translateParams) }) }),
-    schema && /* @__PURE__ */ jsx37("pre", { children: JSON.stringify(schema, null, 2) })
+  return /* @__PURE__ */ jsxs14("div", { className: "unsupported-field", children: [
+    /* @__PURE__ */ jsx39("p", { children: /* @__PURE__ */ jsx39(Markdown4, { options: { disableParsingRawHTML: true }, children: translateString(translateEnum, translateParams) }) }),
+    schema && /* @__PURE__ */ jsx39("pre", { children: JSON.stringify(schema, null, 2) })
   ] });
 }
 var UnsupportedField_default = UnsupportedField;
 
 // src/components/templates/WrapIfAdditionalTemplate.tsx
-import {
-  ADDITIONAL_PROPERTY_FLAG as ADDITIONAL_PROPERTY_FLAG3,
-  buttonId as buttonId4,
-  TranslatableString as TranslatableString12
-} from "@rjsf/utils";
-import { jsx as jsx38, jsxs as jsxs14 } from "react/jsx-runtime";
+import { ADDITIONAL_PROPERTY_FLAG as ADDITIONAL_PROPERTY_FLAG3, buttonId as buttonId4, TranslatableString as TranslatableString13 } from "@rjsf/utils";
+import { jsx as jsx40, jsxs as jsxs15 } from "react/jsx-runtime";
 function WrapIfAdditionalTemplate(props) {
   const {
     id,
@@ -3497,7 +3495,7 @@ function WrapIfAdditionalTemplate(props) {
   } = props;
   const { templates: templates2, translateString } = registry;
   const { RemoveButton: RemoveButton2 } = templates2.ButtonTemplates;
-  const keyLabel = translateString(TranslatableString12.KeyLabel, [label]);
+  const keyLabel = translateString(TranslatableString13.KeyLabel, [label]);
   const additional = ADDITIONAL_PROPERTY_FLAG3 in schema;
   const hasDescription = !!rawDescription;
   const classNamesList = ["form-group", classNames];
@@ -3506,14 +3504,14 @@ function WrapIfAdditionalTemplate(props) {
   }
   const uiClassNames = classNamesList.join(" ").trim();
   if (!additional) {
-    return /* @__PURE__ */ jsx38("div", { className: uiClassNames, style, children });
+    return /* @__PURE__ */ jsx40("div", { className: uiClassNames, style, children });
   }
   const margin = hasDescription ? 46 : 26;
-  return /* @__PURE__ */ jsx38("div", { className: uiClassNames, style, children: /* @__PURE__ */ jsxs14("div", { className: "row", children: [
-    /* @__PURE__ */ jsx38("div", { className: "col-xs-5 form-additional", children: /* @__PURE__ */ jsxs14("div", { className: "form-group", children: [
-      displayLabel && /* @__PURE__ */ jsx38(Label, { label: keyLabel, required, id: `${id}-key` }),
-      displayLabel && rawDescription && /* @__PURE__ */ jsx38("div", { children: "\xA0" }),
-      /* @__PURE__ */ jsx38(
+  return /* @__PURE__ */ jsx40("div", { className: uiClassNames, style, children: /* @__PURE__ */ jsxs15("div", { className: "row", children: [
+    /* @__PURE__ */ jsx40("div", { className: "col-xs-5 form-additional", children: /* @__PURE__ */ jsxs15("div", { className: "form-group", children: [
+      displayLabel && /* @__PURE__ */ jsx40(Label, { label: keyLabel, required, id: `${id}-key` }),
+      displayLabel && rawDescription && /* @__PURE__ */ jsx40("div", { children: "\xA0" }),
+      /* @__PURE__ */ jsx40(
         "input",
         {
           className: "form-control",
@@ -3525,8 +3523,8 @@ function WrapIfAdditionalTemplate(props) {
         label
       )
     ] }) }),
-    /* @__PURE__ */ jsx38("div", { className: "form-additional form-group col-xs-5", children }),
-    /* @__PURE__ */ jsx38("div", { className: "col-xs-2", style: { marginTop: displayLabel ? `${margin}px` : void 0 }, children: /* @__PURE__ */ jsx38(
+    /* @__PURE__ */ jsx40("div", { className: "form-additional form-group col-xs-5", children }),
+    /* @__PURE__ */ jsx40("div", { className: "col-xs-2", style: { marginTop: displayLabel ? `${margin}px` : void 0 }, children: /* @__PURE__ */ jsx40(
       RemoveButton2,
       {
         id: buttonId4(id, "remove"),
@@ -3551,6 +3549,7 @@ function templates() {
     ArrayFieldTitleTemplate,
     ButtonTemplates: ButtonTemplates_default(),
     BaseInputTemplate,
+    CyclicSchemaExpandTemplate,
     DescriptionFieldTemplate: DescriptionField,
     ErrorListTemplate: ErrorList,
     FallbackFieldTemplate,
@@ -3569,51 +3568,50 @@ function templates() {
 var templates_default = templates;
 
 // src/components/widgets/AltDateTimeWidget.tsx
-import { jsx as jsx39 } from "react/jsx-runtime";
+import { jsx as jsx41 } from "react/jsx-runtime";
 function AltDateTimeWidget({
   time = true,
   ...props
 }) {
   const { AltDateWidget: AltDateWidget2 } = props.registry.widgets;
-  return /* @__PURE__ */ jsx39(AltDateWidget2, { time, ...props });
+  return /* @__PURE__ */ jsx41(AltDateWidget2, { time, ...props });
 }
 var AltDateTimeWidget_default = AltDateTimeWidget;
 
 // src/components/widgets/AltDateWidget.tsx
-import {
-  DateElement,
-  TranslatableString as TranslatableString13,
-  useAltDateWidgetProps
-} from "@rjsf/utils";
-import { jsx as jsx40, jsxs as jsxs15 } from "react/jsx-runtime";
+import { DateElement, TranslatableString as TranslatableString14, useAltDateWidgetProps } from "@rjsf/utils";
+import { jsx as jsx42, jsxs as jsxs16 } from "react/jsx-runtime";
 function AltDateWidget(props) {
   const { disabled = false, readonly = false, autofocus = false, options, id, name, registry, onBlur, onFocus } = props;
   const { translateString } = registry;
   const { elements, handleChange, handleClear, handleSetNow } = useAltDateWidgetProps(props);
-  return /* @__PURE__ */ jsxs15("ul", { className: "list-inline", children: [
-    elements.map((elemProps, i) => /* @__PURE__ */ jsx40("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx40(
-      DateElement,
-      {
-        rootId: id,
-        name,
-        select: handleChange,
-        ...elemProps,
-        disabled,
-        readonly,
-        registry,
-        onBlur,
-        onFocus,
-        autofocus: autofocus && i === 0
-      }
-    ) }, i)),
-    (options.hideNowButton !== "undefined" ? !options.hideNowButton : true) && /* @__PURE__ */ jsx40("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx40("a", { href: "#", className: "btn btn-info btn-now", onClick: handleSetNow, children: translateString(TranslatableString13.NowLabel) }) }),
-    (options.hideClearButton !== "undefined" ? !options.hideClearButton : true) && /* @__PURE__ */ jsx40("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx40("a", { href: "#", className: "btn btn-warning btn-clear", onClick: handleClear, children: translateString(TranslatableString13.ClearLabel) }) })
+  return /* @__PURE__ */ jsxs16("ul", { className: "list-inline", children: [
+    elements.map((elemProps, i) => (
+      // oxlint-disable-next-line react/no-array-index-key
+      /* @__PURE__ */ jsx42("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx42(
+        DateElement,
+        {
+          rootId: id,
+          name,
+          select: handleChange,
+          ...elemProps,
+          disabled,
+          readonly,
+          registry,
+          onBlur,
+          onFocus,
+          autofocus: autofocus && i === 0
+        }
+      ) }, i)
+    )),
+    (options.hideNowButton !== "undefined" ? !options.hideNowButton : true) && /* @__PURE__ */ jsx42("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx42("button", { type: "button", className: "btn btn-info btn-now", onClick: handleSetNow, children: translateString(TranslatableString14.NowLabel) }) }),
+    (options.hideClearButton !== "undefined" ? !options.hideClearButton : true) && /* @__PURE__ */ jsx42("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx42("button", { type: "button", className: "btn btn-warning btn-clear", onClick: handleClear, children: translateString(TranslatableString14.ClearLabel) }) })
   ] });
 }
 var AltDateWidget_default = AltDateWidget;
 
 // src/components/widgets/CheckboxesWidget.tsx
-import { useCallback as useCallback8 } from "react";
+import { useCallback as useCallback9 } from "react";
 import {
   ariaDescribedByIds as ariaDescribedByIds2,
   enumOptionValueDecoder,
@@ -3624,7 +3622,7 @@ import {
   getOptionValueFormat,
   optionId
 } from "@rjsf/utils";
-import { jsx as jsx41, jsxs as jsxs16 } from "react/jsx-runtime";
+import { jsx as jsx43, jsxs as jsxs17 } from "react/jsx-runtime";
 function CheckboxesWidget({
   id,
   disabled,
@@ -3640,17 +3638,17 @@ function CheckboxesWidget({
   const { inline = false, enumOptions, enumDisabled, emptyValue } = options;
   const optionValueFormat = getOptionValueFormat(options);
   const checkboxesValues = Array.isArray(value) ? value : [value];
-  const handleBlur = useCallback8(
-    ({ target }) => onBlur(id, enumOptionValueDecoder(target && target.value, enumOptions, optionValueFormat, emptyValue)),
+  const handleBlur = useCallback9(
+    ({ target }) => onBlur(id, enumOptionValueDecoder(target?.value, enumOptions, optionValueFormat, emptyValue)),
     [onBlur, id, enumOptions, emptyValue, optionValueFormat]
   );
-  const handleFocus = useCallback8(
-    ({ target }) => onFocus(id, enumOptionValueDecoder(target && target.value, enumOptions, optionValueFormat, emptyValue)),
+  const handleFocus = useCallback9(
+    ({ target }) => onFocus(id, enumOptionValueDecoder(target?.value, enumOptions, optionValueFormat, emptyValue)),
     [onFocus, id, enumOptions, emptyValue, optionValueFormat]
   );
-  return /* @__PURE__ */ jsx41("div", { className: "checkboxes", id, children: Array.isArray(enumOptions) && enumOptions.map((option, index) => {
+  return /* @__PURE__ */ jsx43("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 itemDisabled = Array.isArray(enumDisabled) && enumDisabled.includes(option.value);
     const disabledCls = disabled || itemDisabled || readonly ? "disabled" : "";
     const handleChange = (event) => {
       if (event.target.checked) {
@@ -3659,8 +3657,8 @@ function CheckboxesWidget({
         onChange(enumOptionsDeselectValue(index, checkboxesValues, enumOptions));
       }
     };
-    const checkbox = /* @__PURE__ */ jsxs16("span", { children: [
-      /* @__PURE__ */ jsx41(
+    const checkbox = /* @__PURE__ */ jsxs17("span", { children: [
+      /* @__PURE__ */ jsx43(
         "input",
         {
           type: "checkbox",
@@ -3676,24 +3674,24 @@ function CheckboxesWidget({
           "aria-describedby": ariaDescribedByIds2(id)
         }
       ),
-      /* @__PURE__ */ jsx41("span", { children: option.label })
+      /* @__PURE__ */ jsx43("span", { children: option.label })
     ] });
-    return inline ? /* @__PURE__ */ jsx41("label", { className: `checkbox-inline ${disabledCls}`, children: checkbox }, index) : /* @__PURE__ */ jsx41("div", { className: `checkbox ${disabledCls}`, children: /* @__PURE__ */ jsx41("label", { children: checkbox }) }, index);
+    return inline ? /* @__PURE__ */ jsx43("label", { className: `checkbox-inline ${disabledCls}`, children: checkbox }, String(option.value)) : /* @__PURE__ */ jsx43("div", { className: `checkbox ${disabledCls}`, children: /* @__PURE__ */ jsx43("label", { children: checkbox }) }, String(option.value));
   }) });
 }
 var CheckboxesWidget_default = CheckboxesWidget;
 
 // src/components/widgets/CheckboxWidget.tsx
-import { useCallback as useCallback9 } from "react";
+import { useCallback as useCallback10 } from "react";
 import {
   ariaDescribedByIds as ariaDescribedByIds3,
   descriptionId as descriptionId4,
-  getTemplate as getTemplate17,
+  getTemplate as getTemplate18,
   labelValue,
   schemaRequiresTrueValue,
-  getUiOptions as getUiOptions20
+  getUiOptions as getUiOptions21
 } from "@rjsf/utils";
-import { jsx as jsx42, jsxs as jsxs17 } from "react/jsx-runtime";
+import { jsx as jsx44, jsxs as jsxs18 } from "react/jsx-runtime";
 function CheckboxWidget({
   schema,
   uiSchema,
@@ -3711,29 +3709,29 @@ function CheckboxWidget({
   registry,
   htmlName
 }) {
-  const DescriptionFieldTemplate = getTemplate17(
+  const DescriptionFieldTemplate = getTemplate18(
     "DescriptionFieldTemplate",
     registry,
     options
   );
   const required = schemaRequiresTrueValue(schema);
-  const handleChange = useCallback9(
+  const handleChange = useCallback10(
     (event) => onChange(event.target.checked),
     [onChange]
   );
-  const handleBlur = useCallback9(
+  const handleBlur = useCallback10(
     (event) => onBlur(id, event.target.checked),
     [onBlur, id]
   );
-  const handleFocus = useCallback9(
+  const handleFocus = useCallback10(
     (event) => onFocus(id, event.target.checked),
     [onFocus, id]
   );
-  const uiOptions = getUiOptions20(uiSchema);
+  const uiOptions = getUiOptions21(uiSchema);
   const isCheckboxWidget = uiOptions.widget === "checkbox";
   const description = isCheckboxWidget ? void 0 : options.description ?? schema.description;
-  return /* @__PURE__ */ jsxs17("div", { className: `checkbox ${disabled || readonly ? "disabled" : ""}`, children: [
-    !hideLabel && description && /* @__PURE__ */ jsx42(
+  return /* @__PURE__ */ jsxs18("div", { className: `checkbox ${disabled || readonly ? "disabled" : ""}`, children: [
+    !hideLabel && description && /* @__PURE__ */ jsx44(
       DescriptionFieldTemplate,
       {
         id: descriptionId4(id),
@@ -3743,8 +3741,8 @@ function CheckboxWidget({
         registry
       }
     ),
-    /* @__PURE__ */ jsxs17("label", { children: [
-      /* @__PURE__ */ jsx42(
+    /* @__PURE__ */ jsxs18("label", { children: [
+      /* @__PURE__ */ jsx44(
         "input",
         {
           type: "checkbox",
@@ -3760,70 +3758,62 @@ function CheckboxWidget({
           "aria-describedby": ariaDescribedByIds3(id)
         }
       ),
-      labelValue(/* @__PURE__ */ jsx42("span", { children: label }), hideLabel)
+      labelValue(/* @__PURE__ */ jsx44("span", { children: label }), hideLabel)
     ] })
   ] });
 }
 var CheckboxWidget_default = CheckboxWidget;
 
 // src/components/widgets/ColorWidget.tsx
-import { getTemplate as getTemplate18 } from "@rjsf/utils";
-import { jsx as jsx43 } from "react/jsx-runtime";
+import { getTemplate as getTemplate19 } from "@rjsf/utils";
+import { jsx as jsx45 } from "react/jsx-runtime";
 function ColorWidget(props) {
   const { disabled, readonly, options, registry } = props;
-  const BaseInputTemplate2 = getTemplate18("BaseInputTemplate", registry, options);
-  return /* @__PURE__ */ jsx43(BaseInputTemplate2, { type: "color", ...props, disabled: disabled || readonly });
+  const BaseInputTemplate2 = getTemplate19("BaseInputTemplate", registry, options);
+  return /* @__PURE__ */ jsx45(BaseInputTemplate2, { type: "color", ...props, disabled: disabled || readonly });
 }
 
 // src/components/widgets/DateTimeWidget.tsx
-import {
-  getTemplate as getTemplate19,
-  localToUTC,
-  utcToLocal
-} from "@rjsf/utils";
-import { jsx as jsx44 } from "react/jsx-runtime";
+import { getTemplate as getTemplate20, localToUTC, utcToLocal } from "@rjsf/utils";
+import { jsx as jsx46 } from "react/jsx-runtime";
 function DateTimeWidget(props) {
   const { onChange, value, options, registry } = props;
-  const BaseInputTemplate2 = getTemplate19("BaseInputTemplate", registry, options);
-  return /* @__PURE__ */ jsx44(
+  const BaseInputTemplate2 = getTemplate20("BaseInputTemplate", registry, options);
+  return /* @__PURE__ */ jsx46(
     BaseInputTemplate2,
     {
       type: "datetime-local",
       ...props,
       value: utcToLocal(value),
-      onChange: (value2) => onChange(localToUTC(value2))
+      onChange: (newValue) => onChange(localToUTC(newValue))
     }
   );
 }
 
 // src/components/widgets/DateWidget.tsx
-import { useCallback as useCallback10 } from "react";
-import { getTemplate as getTemplate20 } from "@rjsf/utils";
-import { jsx as jsx45 } from "react/jsx-runtime";
+import { useCallback as useCallback11 } from "react";
+import { getTemplate as getTemplate21 } from "@rjsf/utils";
+import { jsx as jsx47 } from "react/jsx-runtime";
 function DateWidget(props) {
   const { onChange, options, registry } = props;
-  const BaseInputTemplate2 = getTemplate20("BaseInputTemplate", registry, options);
-  const handleChange = useCallback10((value) => onChange(value || void 0), [onChange]);
-  return /* @__PURE__ */ jsx45(BaseInputTemplate2, { type: "date", ...props, onChange: handleChange });
+  const BaseInputTemplate2 = getTemplate21("BaseInputTemplate", registry, options);
+  const handleChange = useCallback11((value) => onChange(value || void 0), [onChange]);
+  return /* @__PURE__ */ jsx47(BaseInputTemplate2, { type: "date", ...props, onChange: handleChange });
 }
 
 // src/components/widgets/EmailWidget.tsx
-import { getTemplate as getTemplate21 } from "@rjsf/utils";
-import { jsx as jsx46 } from "react/jsx-runtime";
+import { getTemplate as getTemplate22 } from "@rjsf/utils";
+import { jsx as jsx48 } from "react/jsx-runtime";
 function EmailWidget(props) {
   const { options, registry } = props;
-  const BaseInputTemplate2 = getTemplate21("BaseInputTemplate", registry, options);
-  return /* @__PURE__ */ jsx46(BaseInputTemplate2, { type: "email", ...props });
+  const BaseInputTemplate2 = getTemplate22("BaseInputTemplate", registry, options);
+  return /* @__PURE__ */ jsx48(BaseInputTemplate2, { type: "email", ...props });
 }
 
 // src/components/widgets/FileWidget.tsx
-import {
-  getTemplate as getTemplate22,
-  TranslatableString as TranslatableString14,
-  useFileWidgetProps
-} from "@rjsf/utils";
-import { Markdown as Markdown5 } from "markdown-to-jsx";
-import { Fragment as Fragment4, jsx as jsx47, jsxs as jsxs18 } from "react/jsx-runtime";
+import { getTemplate as getTemplate23, TranslatableString as TranslatableString15, useFileWidgetProps } from "@rjsf/utils";
+import { Markdown as Markdown5 } from "markdown-to-jsx/react";
+import { Fragment as Fragment4, jsx as jsx49, jsxs as jsxs19 } from "react/jsx-runtime";
 function FileInfoPreview({
   fileInfo,
   registry
@@ -3833,12 +3823,13 @@ function FileInfoPreview({
   if (!dataURL) {
     return null;
   }
+  const previewLabel = translateString(TranslatableString15.PreviewLabel);
   if (["image/jpeg", "image/png"].includes(type)) {
-    return /* @__PURE__ */ jsx47("img", { src: dataURL, style: { maxWidth: "100%" }, className: "file-preview" });
+    return /* @__PURE__ */ jsx49("img", { src: dataURL, alt: previewLabel, style: { maxWidth: "100%" }, className: "file-preview" });
   }
-  return /* @__PURE__ */ jsxs18(Fragment4, { children: [
+  return /* @__PURE__ */ jsxs19(Fragment4, { children: [
     " ",
-    /* @__PURE__ */ jsx47("a", { download: `preview-${name}`, href: dataURL, className: "file-download", children: translateString(TranslatableString14.PreviewLabel) })
+    /* @__PURE__ */ jsx49("a", { download: `preview-${name}`, href: dataURL, className: "file-download", children: previewLabel })
   ] });
 }
 function FilesInfo({
@@ -3852,28 +3843,31 @@ function FilesInfo({
     return null;
   }
   const { translateString } = registry;
-  const { RemoveButton: RemoveButton2 } = getTemplate22("ButtonTemplates", registry, options);
-  return /* @__PURE__ */ jsx47("ul", { className: "file-info", children: filesInfo.map((fileInfo, key) => {
+  const { RemoveButton: RemoveButton2 } = getTemplate23("ButtonTemplates", registry, options);
+  return /* @__PURE__ */ jsx49("ul", { className: "file-info", children: filesInfo.map((fileInfo, key) => {
     const { name, size, type } = fileInfo;
     const handleRemove = () => onRemove(key);
-    return /* @__PURE__ */ jsxs18("li", { children: [
-      /* @__PURE__ */ jsx47(Markdown5, { children: translateString(TranslatableString14.FilesInfo, [name, type, String(size)]) }),
-      preview && /* @__PURE__ */ jsx47(FileInfoPreview, { fileInfo, registry }),
-      /* @__PURE__ */ jsx47(RemoveButton2, { onClick: handleRemove, registry })
-    ] }, key);
+    return (
+      // oxlint-disable-next-line react/no-array-index-key
+      /* @__PURE__ */ jsxs19("li", { children: [
+        /* @__PURE__ */ jsx49(Markdown5, { children: translateString(TranslatableString15.FilesInfo, [name, type, String(size)]) }),
+        preview && /* @__PURE__ */ jsx49(FileInfoPreview, { fileInfo, registry }),
+        /* @__PURE__ */ jsx49(RemoveButton2, { onClick: handleRemove, registry })
+      ] }, key)
+    );
   }) });
 }
 function FileWidget(props) {
   const { disabled, readonly, required, multiple, onChange, value, options, registry } = props;
   const { filesInfo, handleChange, handleRemove } = useFileWidgetProps(value, onChange, multiple);
-  const BaseInputTemplate2 = getTemplate22("BaseInputTemplate", registry, options);
+  const BaseInputTemplate2 = getTemplate23("BaseInputTemplate", registry, options);
   const handleOnChangeEvent = (event) => {
     if (event.target.files) {
       void handleChange(event.target.files);
     }
   };
-  return /* @__PURE__ */ jsxs18("div", { children: [
-    /* @__PURE__ */ jsx47(
+  return /* @__PURE__ */ jsxs19("div", { children: [
+    /* @__PURE__ */ jsx49(
       BaseInputTemplate2,
       {
         ...props,
@@ -3885,7 +3879,7 @@ function FileWidget(props) {
         accept: options.accept ? String(options.accept) : void 0
       }
     ),
-    /* @__PURE__ */ jsx47(
+    /* @__PURE__ */ jsx49(
       FilesInfo,
       {
         filesInfo,
@@ -3900,27 +3894,27 @@ function FileWidget(props) {
 var FileWidget_default = FileWidget;
 
 // src/components/widgets/HiddenWidget.tsx
-import { jsx as jsx48 } from "react/jsx-runtime";
+import { jsx as jsx50 } from "react/jsx-runtime";
 function HiddenWidget({
   id,
   value,
   htmlName
 }) {
-  return /* @__PURE__ */ jsx48("input", { type: "hidden", id, name: htmlName || id, value: typeof value === "undefined" ? "" : value });
+  return /* @__PURE__ */ jsx50("input", { type: "hidden", id, name: htmlName || id, value: typeof value === "undefined" ? "" : value });
 }
 var HiddenWidget_default = HiddenWidget;
 
 // src/components/widgets/PasswordWidget.tsx
-import { getTemplate as getTemplate23 } from "@rjsf/utils";
-import { jsx as jsx49 } from "react/jsx-runtime";
+import { getTemplate as getTemplate24 } from "@rjsf/utils";
+import { jsx as jsx51 } from "react/jsx-runtime";
 function PasswordWidget(props) {
   const { options, registry } = props;
-  const BaseInputTemplate2 = getTemplate23("BaseInputTemplate", registry, options);
-  return /* @__PURE__ */ jsx49(BaseInputTemplate2, { type: "password", ...props });
+  const BaseInputTemplate2 = getTemplate24("BaseInputTemplate", registry, options);
+  return /* @__PURE__ */ jsx51(BaseInputTemplate2, { type: "password", ...props });
 }
 
 // src/components/widgets/RadioWidget.tsx
-import { useCallback as useCallback11 } from "react";
+import { useCallback as useCallback12 } from "react";
 import {
   ariaDescribedByIds as ariaDescribedByIds4,
   enumOptionValueDecoder as enumOptionValueDecoder2,
@@ -3929,7 +3923,7 @@ import {
   getOptionValueFormat as getOptionValueFormat2,
   optionId as optionId2
 } from "@rjsf/utils";
-import { jsx as jsx50, jsxs as jsxs19 } from "react/jsx-runtime";
+import { jsx as jsx52, jsxs as jsxs20 } from "react/jsx-runtime";
 function RadioWidget({
   options,
   value,
@@ -3945,21 +3939,21 @@ function RadioWidget({
 }) {
   const { enumOptions, enumDisabled, inline, emptyValue } = options;
   const optionValueFormat = getOptionValueFormat2(options);
-  const handleBlur = useCallback11(
-    ({ target }) => onBlur(id, enumOptionValueDecoder2(target && target.value, enumOptions, optionValueFormat, emptyValue)),
+  const handleBlur = useCallback12(
+    ({ target }) => onBlur(id, enumOptionValueDecoder2(target?.value, enumOptions, optionValueFormat, emptyValue)),
     [onBlur, enumOptions, emptyValue, id, optionValueFormat]
   );
-  const handleFocus = useCallback11(
-    ({ target }) => onFocus(id, enumOptionValueDecoder2(target && target.value, enumOptions, optionValueFormat, emptyValue)),
+  const handleFocus = useCallback12(
+    ({ target }) => onFocus(id, enumOptionValueDecoder2(target?.value, enumOptions, optionValueFormat, emptyValue)),
     [onFocus, enumOptions, emptyValue, id, optionValueFormat]
   );
-  return /* @__PURE__ */ jsx50("div", { className: "field-radio-group", id, role: "radiogroup", children: Array.isArray(enumOptions) && enumOptions.map((option, i) => {
+  return /* @__PURE__ */ jsx52("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 itemDisabled = Array.isArray(enumDisabled) && enumDisabled.includes(option.value);
     const disabledCls = disabled || itemDisabled || readonly ? "disabled" : "";
     const handleChange = () => onChange(option.value);
-    const radio = /* @__PURE__ */ jsxs19("span", { children: [
-      /* @__PURE__ */ jsx50(
+    const radio = /* @__PURE__ */ jsxs20("span", { children: [
+      /* @__PURE__ */ jsx52(
         "input",
         {
           type: "radio",
@@ -3976,15 +3970,15 @@ function RadioWidget({
           "aria-describedby": ariaDescribedByIds4(id)
         }
       ),
-      /* @__PURE__ */ jsx50("span", { children: option.label })
+      /* @__PURE__ */ jsx52("span", { children: option.label })
     ] });
-    return inline ? /* @__PURE__ */ jsx50("label", { className: `radio-inline ${disabledCls}`, children: radio }, i) : /* @__PURE__ */ jsx50("div", { className: `radio ${disabledCls}`, children: /* @__PURE__ */ jsx50("label", { children: radio }) }, i);
+    return inline ? /* @__PURE__ */ jsx52("label", { className: `radio-inline ${disabledCls}`, children: radio }, String(option.value)) : /* @__PURE__ */ jsx52("div", { className: `radio ${disabledCls}`, children: /* @__PURE__ */ jsx52("label", { children: radio }) }, String(option.value));
   }) });
 }
 var RadioWidget_default = RadioWidget;
 
 // src/components/widgets/RangeWidget.tsx
-import { jsx as jsx51, jsxs as jsxs20 } from "react/jsx-runtime";
+import { jsx as jsx53, jsxs as jsxs21 } from "react/jsx-runtime";
 function RangeWidget(props) {
   const {
     value,
@@ -3992,15 +3986,15 @@ function RangeWidget(props) {
       templates: { BaseInputTemplate: BaseInputTemplate2 }
     }
   } = props;
-  return /* @__PURE__ */ jsxs20("div", { className: "field-range-wrapper", children: [
-    /* @__PURE__ */ jsx51(BaseInputTemplate2, { type: "range", ...props }),
-    /* @__PURE__ */ jsx51("span", { className: "range-view", children: value })
+  return /* @__PURE__ */ jsxs21("div", { className: "field-range-wrapper", children: [
+    /* @__PURE__ */ jsx53(BaseInputTemplate2, { type: "range", ...props }),
+    /* @__PURE__ */ jsx53("span", { className: "range-view", children: value })
   ] });
 }
 
 // src/components/widgets/RatingWidget.tsx
-import { useCallback as useCallback12 } from "react";
-import { Fragment as Fragment5, jsx as jsx52, jsxs as jsxs21 } from "react/jsx-runtime";
+import { useCallback as useCallback13 } from "react";
+import { jsx as jsx54, jsxs as jsxs22 } from "react/jsx-runtime";
 function RatingWidget({
   id,
   value,
@@ -4018,7 +4012,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 = useCallback12(
+  const handleStarClick = useCallback13(
     (starValue) => {
       if (!disabled && !readonly) {
         onChange(starValue);
@@ -4026,7 +4020,7 @@ function RatingWidget({
     },
     [onChange, disabled, readonly]
   );
-  const handleFocus = useCallback12(
+  const handleFocus = useCallback13(
     (event) => {
       if (onFocus) {
         const starValue = Number(event.target.dataset.value);
@@ -4035,7 +4029,7 @@ function RatingWidget({
     },
     [onFocus, id]
   );
-  const handleBlur = useCallback12(
+  const handleBlur = useCallback13(
     (event) => {
       if (onBlur) {
         const starValue = Number(event.target.dataset.value);
@@ -4050,7 +4044,7 @@ function RatingWidget({
     }
     return isFilled ? "\u2605" : "\u2606";
   };
-  return /* @__PURE__ */ jsx52(Fragment5, { children: /* @__PURE__ */ jsxs21(
+  return /* @__PURE__ */ jsxs22(
     "div",
     {
       className: "rating-widget",
@@ -4063,10 +4057,11 @@ function RatingWidget({
         [...Array(numStars)].map((_, index) => {
           const starValue = min + index;
           const isFilled = starValue <= value;
-          return /* @__PURE__ */ jsx52(
+          return /* @__PURE__ */ jsx54(
             "span",
             {
               onClick: () => handleStarClick(starValue),
+              onKeyDown: (e) => (e.key === "Enter" || e.key === " ") && handleStarClick(starValue),
               onFocus: handleFocus,
               onBlur: handleBlur,
               "data-value": starValue,
@@ -4085,7 +4080,7 @@ function RatingWidget({
             index
           );
         }),
-        /* @__PURE__ */ jsx52(
+        /* @__PURE__ */ jsx54(
           "input",
           {
             type: "hidden",
@@ -4099,19 +4094,21 @@ function RatingWidget({
         )
       ]
     }
-  ) });
+  );
 }
 
 // src/components/widgets/SelectWidget.tsx
-import { useCallback as useCallback13 } from "react";
+import { useCallback as useCallback14 } from "react";
 import {
   ariaDescribedByIds as ariaDescribedByIds5,
   enumOptionSelectedValue,
   enumOptionValueDecoder as enumOptionValueDecoder3,
   enumOptionValueEncoder as enumOptionValueEncoder3,
-  getOptionValueFormat as getOptionValueFormat3
+  getOptionValueFormat as getOptionValueFormat3,
+  logUnsupportedDefaultForEnum,
+  SelectedOptionDescription
 } from "@rjsf/utils";
-import { jsx as jsx53, jsxs as jsxs22 } from "react/jsx-runtime";
+import { Fragment as Fragment5, jsx as jsx55, jsxs as jsxs23 } 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);
@@ -4132,26 +4129,28 @@ function SelectWidget({
   onBlur,
   onFocus,
   placeholder,
-  htmlName
+  htmlName,
+  registry,
+  uiSchema
 }) {
   const { enumOptions, enumDisabled, emptyValue: optEmptyVal } = options;
   const emptyValue = multiple ? [] : "";
   const optionValueFormat = getOptionValueFormat3(options);
-  const handleFocus = useCallback13(
+  const handleFocus = useCallback14(
     (event) => {
       const newValue = getValue(event, multiple);
       return onFocus(id, enumOptionValueDecoder3(newValue, enumOptions, optionValueFormat, optEmptyVal));
     },
     [onFocus, id, multiple, enumOptions, optEmptyVal, optionValueFormat]
   );
-  const handleBlur = useCallback13(
+  const handleBlur = useCallback14(
     (event) => {
       const newValue = getValue(event, multiple);
       return onBlur(id, enumOptionValueDecoder3(newValue, enumOptions, optionValueFormat, optEmptyVal));
     },
     [onBlur, id, multiple, enumOptions, optEmptyVal, optionValueFormat]
   );
-  const handleChange = useCallback13(
+  const handleChange = useCallback14(
     (event) => {
       const newValue = getValue(event, multiple);
       return onChange(enumOptionValueDecoder3(newValue, enumOptions, optionValueFormat, optEmptyVal));
@@ -4160,41 +4159,62 @@ function SelectWidget({
   );
   const selectValue = enumOptionSelectedValue(value, enumOptions, multiple, optionValueFormat, emptyValue);
   const showPlaceholderOption = !multiple && schema.default === void 0;
-  return /* @__PURE__ */ jsxs22(
-    "select",
-    {
-      id,
-      name: htmlName || id,
-      multiple,
-      role: "combobox",
-      className: "form-control",
-      value: selectValue,
-      required,
-      disabled: disabled || readonly,
-      autoFocus: autofocus,
-      onBlur: handleBlur,
-      onFocus: handleFocus,
-      onChange: handleChange,
-      "aria-describedby": ariaDescribedByIds5(id),
-      children: [
-        showPlaceholderOption && /* @__PURE__ */ jsx53("option", { value: "", children: placeholder }),
-        Array.isArray(enumOptions) && enumOptions.map(({ value: value2, label }, i) => {
-          const disabled2 = enumDisabled && enumDisabled.indexOf(value2) !== -1;
-          return /* @__PURE__ */ jsx53("option", { value: enumOptionValueEncoder3(value2, i, optionValueFormat), disabled: disabled2, children: label }, i);
-        })
-      ]
-    }
-  );
+  logUnsupportedDefaultForEnum(id, schema, enumOptions, multiple);
+  return /* @__PURE__ */ jsxs23(Fragment5, { children: [
+    /* @__PURE__ */ jsx55(
+      SelectedOptionDescription,
+      {
+        id,
+        multiple,
+        options,
+        registry,
+        uiSchema,
+        value
+      }
+    ),
+    /* @__PURE__ */ jsxs23(
+      "select",
+      {
+        id,
+        name: htmlName || id,
+        multiple,
+        className: "form-control",
+        value: selectValue,
+        required,
+        disabled: disabled || readonly,
+        autoFocus: autofocus,
+        onBlur: handleBlur,
+        onFocus: handleFocus,
+        onChange: handleChange,
+        "aria-describedby": ariaDescribedByIds5(id),
+        children: [
+          showPlaceholderOption && /* @__PURE__ */ jsx55("option", { value: "", children: placeholder }),
+          Array.isArray(enumOptions) && enumOptions.map(({ value: enumValue, label: enumLabel }, i) => {
+            const isDisabled = enumDisabled && enumDisabled.includes(enumValue);
+            return /* @__PURE__ */ jsx55(
+              "option",
+              {
+                value: enumOptionValueEncoder3(enumValue, i, optionValueFormat),
+                disabled: isDisabled,
+                children: enumLabel
+              },
+              String(enumValue)
+            );
+          })
+        ]
+      }
+    )
+  ] });
 }
 var SelectWidget_default = SelectWidget;
 
 // src/components/widgets/TextareaWidget.tsx
-import { useCallback as useCallback14 } from "react";
+import { useCallback as useCallback15 } from "react";
 import { ariaDescribedByIds as ariaDescribedByIds6 } from "@rjsf/utils";
-import { jsx as jsx54 } from "react/jsx-runtime";
+import { jsx as jsx56 } from "react/jsx-runtime";
 function TextareaWidget({
   id,
-  options = {},
+  options,
   placeholder,
   value,
   required,
@@ -4206,25 +4226,25 @@ function TextareaWidget({
   onFocus,
   htmlName
 }) {
-  const handleChange = useCallback14(
-    ({ target: { value: value2 } }) => onChange(value2 === "" ? options.emptyValue : value2),
+  const handleChange = useCallback15(
+    ({ target: { value: newValue } }) => onChange(newValue === "" ? options.emptyValue : newValue),
     [onChange, options.emptyValue]
   );
-  const handleBlur = useCallback14(
-    ({ target }) => onBlur(id, target && target.value),
+  const handleBlur = useCallback15(
+    ({ target }) => onBlur(id, target?.value),
     [onBlur, id]
   );
-  const handleFocus = useCallback14(
-    ({ target }) => onFocus(id, target && target.value),
+  const handleFocus = useCallback15(
+    ({ target }) => onFocus(id, target?.value),
     [id, onFocus]
   );
-  return /* @__PURE__ */ jsx54(
+  return /* @__PURE__ */ jsx56(
     "textarea",
     {
       id,
       name: htmlName || id,
       className: "form-control",
-      value: value ? value : "",
+      value: value || "",
       placeholder,
       required,
       disabled,
@@ -4241,41 +4261,41 @@ function TextareaWidget({
 var TextareaWidget_default = TextareaWidget;
 
 // src/components/widgets/TextWidget.tsx
-import { getTemplate as getTemplate24 } from "@rjsf/utils";
-import { jsx as jsx55 } from "react/jsx-runtime";
+import { getTemplate as getTemplate25 } from "@rjsf/utils";
+import { jsx as jsx57 } from "react/jsx-runtime";
 function TextWidget(props) {
   const { options, registry } = props;
-  const BaseInputTemplate2 = getTemplate24("BaseInputTemplate", registry, options);
-  return /* @__PURE__ */ jsx55(BaseInputTemplate2, { ...props });
+  const BaseInputTemplate2 = getTemplate25("BaseInputTemplate", registry, options);
+  return /* @__PURE__ */ jsx57(BaseInputTemplate2, { ...props });
 }
 
 // src/components/widgets/TimeWidget.tsx
-import { useCallback as useCallback15 } from "react";
-import { getTemplate as getTemplate25 } from "@rjsf/utils";
-import { jsx as jsx56 } from "react/jsx-runtime";
+import { useCallback as useCallback16 } from "react";
+import { getTemplate as getTemplate26 } from "@rjsf/utils";
+import { jsx as jsx58 } from "react/jsx-runtime";
 function TimeWidget(props) {
   const { onChange, options, registry } = props;
-  const BaseInputTemplate2 = getTemplate25("BaseInputTemplate", registry, options);
-  const handleChange = useCallback15((value) => onChange(value ? `${value}:00` : void 0), [onChange]);
-  return /* @__PURE__ */ jsx56(BaseInputTemplate2, { type: "time", ...props, onChange: handleChange });
+  const BaseInputTemplate2 = getTemplate26("BaseInputTemplate", registry, options);
+  const handleChange = useCallback16((value) => onChange(value ? `${value}:00` : void 0), [onChange]);
+  return /* @__PURE__ */ jsx58(BaseInputTemplate2, { type: "time", ...props, onChange: handleChange });
 }
 
 // src/components/widgets/UpDownWidget.tsx
-import { getTemplate as getTemplate26 } from "@rjsf/utils";
-import { jsx as jsx57 } from "react/jsx-runtime";
+import { getTemplate as getTemplate27 } from "@rjsf/utils";
+import { jsx as jsx59 } from "react/jsx-runtime";
 function UpDownWidget(props) {
   const { options, registry } = props;
-  const BaseInputTemplate2 = getTemplate26("BaseInputTemplate", registry, options);
-  return /* @__PURE__ */ jsx57(BaseInputTemplate2, { type: "number", ...props });
+  const BaseInputTemplate2 = getTemplate27("BaseInputTemplate", registry, options);
+  return /* @__PURE__ */ jsx59(BaseInputTemplate2, { type: "number", ...props });
 }
 
 // src/components/widgets/URLWidget.tsx
-import { getTemplate as getTemplate27 } from "@rjsf/utils";
-import { jsx as jsx58 } from "react/jsx-runtime";
+import { getTemplate as getTemplate28 } from "@rjsf/utils";
+import { jsx as jsx60 } from "react/jsx-runtime";
 function URLWidget(props) {
   const { options, registry } = props;
-  const BaseInputTemplate2 = getTemplate27("BaseInputTemplate", registry, options);
-  return /* @__PURE__ */ jsx58(BaseInputTemplate2, { type: "url", ...props });
+  const BaseInputTemplate2 = getTemplate28("BaseInputTemplate", registry, options);
+  return /* @__PURE__ */ jsx60(BaseInputTemplate2, { type: "url", ...props });
 }
 
 // src/components/widgets/index.ts
@@ -4323,14 +4343,14 @@ function getDefaultRegistry() {
 }
 
 // src/components/Form.tsx
-import { jsx as jsx59, jsxs as jsxs23 } from "react/jsx-runtime";
+import { jsx as jsx61, jsxs as jsxs24 } from "react/jsx-runtime";
 function toIChangeEvent(state, status) {
   return {
     ..._pick(state, ["schema", "uiSchema", "fieldPathId", "schemaUtils", "formData", "edit", "errors", "errorSchema"]),
     ...status !== void 0 && { status }
   };
 }
-var Form = class extends Component3 {
+var Form = class _Form extends Component {
   /** The ref used to hold the `form` element, this needs to be `any` because `tagName` or `_internalFormWrapper` can
    * provide any possible type here
    */
@@ -4341,7 +4361,7 @@ var Form = class extends Component3 {
   /** Flag to track when we're processing a user-initiated field change.
    * This prevents componentDidUpdate from reverting oneOf/anyOf option switches.
    */
-  _isProcessingUserChange = false;
+  isProcessingUserChange = false;
   /** When the `extraErrors` prop changes, re-merges `schemaValidationErrors` + `extraErrors` + `customErrors` into
    * state before render, ensuring the updated errors are visible immediately in a single render cycle.
    *
@@ -4350,7 +4370,7 @@ var Form = class extends Component3 {
    * @returns Partial state with re-merged errors if `extraErrors` changed, or `null` if no update is needed
    */
   static getDerivedStateFromProps(props, state) {
-    if (props.extraErrors !== state._prevExtraErrors) {
+    if (props.extraErrors !== state.prevExtraErrors) {
       const baseErrors = {
         errors: state.schemaValidationErrors || [],
         errorSchema: state.schemaValidationErrorSchema || {}
@@ -4366,7 +4386,7 @@ var Form = class extends Component3 {
           true
         ));
       }
-      return { _prevExtraErrors: props.extraErrors, errors, errorSchema };
+      return { prevExtraErrors: props.extraErrors, errors, errorSchema };
     }
     return null;
   }
@@ -4385,9 +4405,9 @@ var Form = class extends Component3 {
     const formData = propsFormData ?? initialFormData;
     this.state = {
       ...this.getStateFromProps(props, formData, void 0, void 0, void 0, true),
-      _prevExtraErrors: props.extraErrors
+      prevExtraErrors: props.extraErrors
     };
-    if (onChange && !deepEquals2(this.state.formData, formData)) {
+    if (onChange && !deepEquals3(this.state.formData, formData)) {
       onChange(toIChangeEvent(this.state));
     }
     this.formElement = createRef();
@@ -4411,12 +4431,12 @@ var Form = class extends Component3 {
    *        with a flag indicating that an update is not necessary.
    */
   getSnapshotBeforeUpdate(prevProps, prevState) {
-    if (!deepEquals2(this.props, prevProps)) {
+    if (!deepEquals3(this.props, prevProps)) {
       const formDataChangedFields = getChangedFields(this.props.formData, prevProps.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 isSchemaChanged = !deepEquals3(prevProps.schema, this.props.schema);
+      const isFormDataChanged = formDataChangedFields.length > 0 || !deepEquals3(prevProps.formData, this.props.formData);
+      const isStateDataChanged = stateDataChangedFields.length > 0 || !deepEquals3(this.state.formData, this.props.formData);
       const nextState = this.getStateFromProps(
         this.props,
         this.props.formData,
@@ -4429,7 +4449,7 @@ var Form = class extends Component3 {
         // Skip live validation for this request if no form data has changed from the last state
         !isStateDataChanged
       );
-      const shouldUpdate = !deepEquals2(nextState, prevState);
+      const shouldUpdate = !deepEquals3(nextState, prevState);
       return { nextState, shouldUpdate };
     }
     return { shouldUpdate: false };
@@ -4449,13 +4469,13 @@ var Form = class extends Component3 {
   componentDidUpdate(_, prevState, snapshot) {
     if (snapshot.shouldUpdate) {
       const { nextState } = snapshot;
-      const nextStateDiffersFromProps = !deepEquals2(nextState.formData, this.props.formData);
-      const wasProcessingUserChange = this._isProcessingUserChange;
-      this._isProcessingUserChange = false;
+      const nextStateDiffersFromProps = !deepEquals3(nextState.formData, this.props.formData);
+      const wasProcessingUserChange = this.isProcessingUserChange;
+      this.isProcessingUserChange = false;
       if (wasProcessingUserChange && nextStateDiffersFromProps) {
         return;
       }
-      if (nextStateDiffersFromProps && !deepEquals2(nextState.formData, prevState.formData) && this.props.onChange) {
+      if (nextStateDiffersFromProps && !deepEquals3(nextState.formData, prevState.formData) && this.props.onChange) {
         this.props.onChange(toIChangeEvent(nextState));
       }
       this.setState(nextState);
@@ -4468,12 +4488,13 @@ var Form = class extends Component3 {
    * @param props - The props passed to the `Form`
    * @param inputFormData - The new or current data for the `Form`
    * @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
+   * @param [isSchemaChanged=false] - A flag indicating whether the schema has changed.
+   * @param [formDataChangedFields=[]] - The changed fields of `formData`
+   * @param [skipLiveValidate=false] - Optional flag, if true, means that we are not running live validation
+   * @param [shouldSanitize=false] - Optional flag, if true, means that we should attempt to sanitize formData
    * @returns - The new state for the `Form`
    */
-  getStateFromProps(props, inputFormData, retrievedSchema, isSchemaChanged = false, formDataChangedFields = [], skipLiveValidate = false) {
+  getStateFromProps(props, inputFormData, retrievedSchema, isSchemaChanged = false, formDataChangedFields = [], skipLiveValidate = false, shouldSanitize = 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;
@@ -4484,7 +4505,7 @@ var Form = class extends Component3 {
     const mustValidate = edit && !props.noValidate && liveValidate;
     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;
+    let { schemaUtils } = state;
     if (!schemaUtils || schemaUtils.doesSchemaUtilsDiffer(
       validator2,
       schema,
@@ -4505,19 +4526,45 @@ var Form = class extends Component3 {
     } else if (inputFormData === void 0 && isUncontrolled) {
       defaultsFormData = state.formData;
     }
-    const formData = schemaUtils.getDefaultFormState(
-      rootSchema,
-      defaultsFormData,
-      false,
-      state.initialDefaultsGenerated
-    );
-    const _retrievedSchema = this.updateRetrievedSchema(
-      retrievedSchema ?? schemaUtils.retrieveSchema(rootSchema, formData)
-    );
+    let formData;
+    let computedRetrievedSchema;
+    let wasSanitized = false;
+    const preventInfiniteSanitize = [];
+    do {
+      formData = schemaUtils.getDefaultFormState(
+        rootSchema,
+        defaultsFormData,
+        false,
+        state.initialDefaultsGenerated
+      );
+      const formHash = shouldSanitize ? hashObject6({ formData }) : "";
+      computedRetrievedSchema = this.updateRetrievedSchema(
+        retrievedSchema ?? schemaUtils.retrieveSchema(rootSchema, formData)
+      );
+      if (shouldSanitize && !preventInfiniteSanitize.includes(formHash) && !deepEquals3(computedRetrievedSchema, state.retrievedSchema)) {
+        const sanitizedFormData = schemaUtils.sanitizeDataForNewSchema(
+          computedRetrievedSchema,
+          state.retrievedSchema,
+          formData
+        );
+        wasSanitized = !deepEquals3(sanitizedFormData, formData);
+        if (wasSanitized) {
+          formData = sanitizedFormData;
+          defaultsFormData = sanitizedFormData;
+          const sanitizedFormHash = hashObject6({ formData: sanitizedFormData });
+          wasSanitized = !preventInfiniteSanitize.includes(sanitizedFormHash);
+          preventInfiniteSanitize.push(sanitizedFormHash);
+        }
+        preventInfiniteSanitize.push(formHash);
+      } else {
+        wasSanitized = false;
+      }
+    } while (wasSanitized);
     const getCurrentErrors = () => {
       if (props.noValidate || isSchemaChanged) {
         return { errors: [], errorSchema: {} };
-      } else if (!props.liveValidate) {
+      }
+      if (!props.liveValidate) {
         return {
           errors: state.schemaValidationErrors || [],
           errorSchema: state.schemaValidationErrorSchema || {}
@@ -4530,8 +4577,7 @@ var Form = class extends Component3 {
     };
     let errors;
     let errorSchema;
-    let schemaValidationErrors = state.schemaValidationErrors;
-    let schemaValidationErrorSchema = state.schemaValidationErrorSchema;
+    let { schemaValidationErrors, schemaValidationErrorSchema } = state;
     if (mustValidate && !skipLiveValidate) {
       const liveValidation = this.liveValidate(
         rootSchema,
@@ -4554,26 +4600,24 @@ var Form = class extends Component3 {
       errors = currentErrors.errors;
       errorSchema = currentErrors.errorSchema;
       if (formDataChangedFields.length > 0 && !mustValidate) {
-        const newErrorSchema = formDataChangedFields.reduce(
-          (acc, key) => {
-            acc[key] = void 0;
-            return acc;
-          },
-          {}
-        );
-        errorSchema = schemaValidationErrorSchema = mergeObjects(
+        const newErrorSchema = formDataChangedFields.reduce((acc, key) => {
+          acc[key] = void 0;
+          return acc;
+        }, {});
+        schemaValidationErrorSchema = mergeObjects(
           currentErrors.errorSchema,
           newErrorSchema,
           "preventDuplicates"
         );
+        errorSchema = schemaValidationErrorSchema;
       }
-      const mergedErrors = this.mergeErrors({ errorSchema, errors }, props.extraErrors, state.customErrors);
+      const mergedErrors = _Form.mergeErrors({ errorSchema, errors }, props.extraErrors, state.customErrors);
       errors = mergedErrors.errors;
       errorSchema = mergedErrors.errorSchema;
     }
-    const newRegistry = this.getRegistry(props, rootSchema, schemaUtils);
-    const registry = deepEquals2(state.registry, newRegistry) ? state.registry : newRegistry;
-    const fieldPathId = state.fieldPathId && state.fieldPathId?.[ID_KEY5] === registry.globalFormOptions.idPrefix ? state.fieldPathId : toFieldPathId6("", registry.globalFormOptions);
+    const newRegistry = _Form.getRegistry(props, rootSchema, schemaUtils);
+    const registry = deepEquals3(state.registry, newRegistry) ? state.registry : newRegistry;
+    const fieldPathId = state.fieldPathId && state.fieldPathId?.[ID_KEY6] === registry.globalFormOptions.idPrefix ? state.fieldPathId : toFieldPathId6("", registry.globalFormOptions);
     const nextState = {
       schemaUtils,
       schema: rootSchema,
@@ -4585,7 +4629,7 @@ var Form = class extends Component3 {
       errorSchema,
       schemaValidationErrors,
       schemaValidationErrorSchema,
-      retrievedSchema: _retrievedSchema,
+      retrievedSchema: computedRetrievedSchema,
       initialDefaultsGenerated: true,
       registry
     };
@@ -4599,7 +4643,7 @@ var Form = class extends Component3 {
    */
   shouldComponentUpdate(nextProps, nextState) {
     const { experimental_componentUpdateStrategy = "customDeep" } = this.props;
-    return shouldRender2(this, nextProps, nextState, experimental_componentUpdateStrategy);
+    return shouldRender(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.
@@ -4610,18 +4654,19 @@ var Form = class extends Component3 {
    * @param [retrievedSchema] - An optionally retrieved schema for per
    */
   validate(formData, schema = this.state.schema, altSchemaUtils, retrievedSchema) {
-    const schemaUtils = altSchemaUtils ? altSchemaUtils : this.state.schemaUtils;
+    const schemaUtils = altSchemaUtils || this.state.schemaUtils;
     const { customValidate, transformErrors, uiSchema } = this.props;
-    const resolvedSchema = retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData);
-    return schemaUtils.getValidator().validateFormData(formData, resolvedSchema, customValidate, transformErrors, uiSchema);
+    const validationSchema = retrievedSchema ?? schema;
+    const validationFormData = formData ? JSON.parse(JSON.stringify(formData)) : void 0;
+    return schemaUtils.getValidator().validateFormData(validationFormData, validationSchema, customValidate, transformErrors, uiSchema);
   }
   /** 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 options = getUiOptions21(uiSchema);
-    const ErrorListTemplate = getTemplate28("ErrorListTemplate", registry, options);
-    if (errors && errors.length) {
-      return /* @__PURE__ */ jsx59(
+    const options = getUiOptions22(uiSchema);
+    const ErrorListTemplate = getTemplate29("ErrorListTemplate", registry, options);
+    if (errors?.length) {
+      return /* @__PURE__ */ jsx61(
         ErrorListTemplate,
         {
           errors,
@@ -4642,9 +4687,8 @@ var Form = class extends Component3 {
    * @return - The `extraErrors` and `customErrors` merged into the `schemaValidation`
    * @private
    */
-  mergeErrors(schemaValidation, extraErrors, customErrors) {
-    let errorSchema = schemaValidation.errorSchema;
-    let errors = schemaValidation.errors;
+  static mergeErrors(schemaValidation, extraErrors, customErrors) {
+    let { errorSchema, errors } = schemaValidation;
     if (extraErrors) {
       const merged = validationDataMerge(schemaValidation, extraErrors);
       errorSchema = merged.errorSchema;
@@ -4673,8 +4717,8 @@ var Form = class extends Component3 {
    */
   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;
+    const { errors } = schemaValidation;
+    let { errorSchema } = schemaValidation;
     if (mergeIntoOriginalErrorSchema) {
       errorSchema = mergeObjects(
         originalErrorSchema,
@@ -4684,7 +4728,7 @@ var Form = class extends Component3 {
     }
     const schemaValidationErrors = errors;
     const schemaValidationErrorSchema = errorSchema;
-    const mergedErrors = this.mergeErrors({ errorSchema, errors }, extraErrors, customErrors);
+    const mergedErrors = _Form.mergeErrors({ errorSchema, errors }, extraErrors, customErrors);
     return { ...mergedErrors, schemaValidationErrors, schemaValidationErrorSchema };
   }
   /** Returns the `formData` with only the elements specified in the `fields` list
@@ -4693,18 +4737,16 @@ var Form = class extends Component3 {
    * @param fields - The fields to keep while filtering
    * @deprecated - To be removed as an exported `Form` function in a future release; there isn't a planned replacement
    */
-  getUsedFormData = (formData, fields2) => {
-    return getUsedFormData(formData, fields2);
-  };
+  // oxlint-disable-next-line class-methods-use-this, typescript/no-deprecated
+  getUsedFormData = (formData, fields2) => getUsedFormData(formData, fields2);
   /** Returns the list of field names from inspecting the `pathSchema` as well as using the `formData`
    *
    * @param pathSchema - The `PathSchema` object for the form
    * @param [formData] - The form data to use while checking for empty objects/arrays
    * @deprecated - To be removed as an exported `Form` function in a future release; there isn't a planned replacement
    */
-  getFieldNames = (pathSchema, formData) => {
-    return getFieldNames(pathSchema, formData);
-  };
+  // oxlint-disable-next-line class-methods-use-this, typescript/no-deprecated
+  getFieldNames = (pathSchema, formData) => getFieldNames(pathSchema, formData);
   /** Returns the `formData` after filtering to remove any extra data not in a form field
    *
    * @param formData - The data for the `Form`
@@ -4727,7 +4769,7 @@ var Form = class extends Component3 {
     const { registry } = this.state;
     const path = Array.isArray(fieldPath) ? fieldPath : fieldPath.split(".");
     const fieldPathId = toFieldPathId6("", registry.globalFormOptions, path);
-    this.onChange(newValue, path, void 0, fieldPathId[ID_KEY5]);
+    this.onChange(newValue, path, void 0, fieldPathId[ID_KEY6]);
   };
   /** Pushes the given change information into the `pendingChanges` array and then calls `processPendingChanges()` if
    * the array only contains a single pending change.
@@ -4756,25 +4798,24 @@ var Form = class extends Component3 {
     if (this.pendingChanges.length === 0) {
       return;
     }
-    this._isProcessingUserChange = true;
+    this.isProcessingUserChange = true;
     const { newValue, path, id } = this.pendingChanges[0];
     const { newErrorSchema } = this.pendingChanges[0];
-    const { extraErrors, omitExtraData, liveOmit, noValidate, liveValidate, onChange } = this.props;
+    const { extraErrors, omitExtraData, liveOmit, noValidate, liveValidate, onChange, disabled, readonly } = this.props;
     const { formData: oldFormData, schemaUtils, schema, fieldPathId, schemaValidationErrorSchema, errors } = this.state;
-    let { customErrors } = this.state;
+    let { customErrors, retrievedSchema } = this.state;
     let mergeBaseErrorSchema = schemaValidationErrorSchema;
     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);
     const hasOnlyUndefinedValues = isObject6(formData) && Object.keys(formData).length > 0 && Object.values(formData).every((v) => v === void 0);
     const wasPreviouslyNull = oldFormData === null || oldFormData === void 0;
     const inputForDefaults = hasOnlyUndefinedValues && wasPreviouslyNull ? void 0 : formData;
     if (isObject6(formData) || Array.isArray(formData)) {
+      let plainLeafWasCleared = false;
       if (newValue === ADDITIONAL_PROPERTY_KEY_REMOVE) {
         _unset(formData, path);
       } else if (!isRootPath) {
-        let unsetPath = false;
         let valueForPath = newValue;
         if (newValue === void 0) {
           const lastSegment = path[path.length - 1];
@@ -4785,28 +4826,38 @@ var Form = class extends Component3 {
             const leaf = field;
             const isOneOfOrAnyOfLeaf = leaf && (ONE_OF_KEY6 in leaf || ANY_OF_KEY6 in leaf);
             if (!isOneOfOrAnyOfLeaf && leaf !== void 0) {
-              unsetPath = true;
+              plainLeafWasCleared = true;
             }
           }
         }
-        if (unsetPath) {
-          _unset(formData, path);
+        if (plainLeafWasCleared) {
+          _set(formData, path, void 0);
         } else {
           _set(formData, path, valueForPath);
         }
       }
-      const newState = this.getStateFromProps(this.props, inputForDefaults, void 0, void 0, void 0, true);
+      const shouldSanitize = retrievedSchema && !isRootPath && !isObject6(newValue) && !Array.isArray(newValue) && !disabled && !readonly;
+      const newState = this.getStateFromProps(
+        this.props,
+        inputForDefaults,
+        void 0,
+        void 0,
+        void 0,
+        true,
+        shouldSanitize
+      );
       formData = newState.formData;
       retrievedSchema = newState.retrievedSchema;
+      if (plainLeafWasCleared && formData) {
+        _set(formData, path, void 0);
+      }
     }
     const mustValidate = !noValidate && (liveValidate === true || liveValidate === "onChange");
-    let state = { formData, schema };
+    let state = { formData, retrievedSchema };
     let newFormData = formData;
     if (omitExtraData === true && (liveOmit === true || liveOmit === "onChange")) {
       newFormData = this.omitExtraData(formData);
-      state = {
-        formData: newFormData
-      };
+      state = { ...state, formData: newFormData };
     }
     if (newErrorSchema) {
       const oldValidationError = !isRootPath ? _get(schemaValidationErrorSchema, path) : schemaValidationErrorSchema;
@@ -4822,9 +4873,9 @@ var Form = class extends Component3 {
           customErrors = new ErrorSchemaBuilder();
         }
         if (isRootPath) {
-          const errors2 = _get(newErrorSchema, ERRORS_KEY3);
-          if (errors2) {
-            customErrors.setErrors(errors2);
+          const pathErrors = _get(newErrorSchema, ERRORS_KEY3);
+          if (pathErrors) {
+            customErrors.setErrors(pathErrors);
           }
         } else {
           _set(customErrors.ErrorSchema, path, newErrorSchema);
@@ -4843,14 +4894,14 @@ var Form = class extends Component3 {
         customErrors,
         retrievedSchema
       );
-      state = { formData: newFormData, ...liveValidation, customErrors };
+      state = { ...state, formData: newFormData, ...liveValidation, customErrors };
     } else if (!noValidate && newErrorSchema) {
-      const mergedErrors = this.mergeErrors({ errorSchema: mergeBaseErrorSchema, errors }, extraErrors, customErrors);
-      state = {
-        formData: newFormData,
-        ...mergedErrors,
+      const mergedErrors = _Form.mergeErrors(
+        { errorSchema: mergeBaseErrorSchema, errors },
+        extraErrors,
         customErrors
-      };
+      );
+      state = { ...state, formData: newFormData, ...mergedErrors, customErrors };
     }
     this.setState(state, () => {
       if (onChange) {
@@ -4870,7 +4921,7 @@ var Form = class extends Component3 {
    * @returns The new retrieved schema if it has changed, else the old retrieved schema.
    */
   updateRetrievedSchema(retrievedSchema) {
-    const isTheSame = deepEquals2(retrievedSchema, this.state?.retrievedSchema);
+    const isTheSame = deepEquals3(retrievedSchema, this.state?.retrievedSchema);
     return isTheSame ? this.state.retrievedSchema : retrievedSchema;
   }
   /**
@@ -4899,7 +4950,7 @@ var Form = class extends Component3 {
       initialDefaultsGenerated: false,
       customErrors: void 0
     };
-    this.setState(state, () => onChange && onChange(toIChangeEvent({ ...this.state, ...state })));
+    this.setState(state, () => onChange?.(toIChangeEvent({ ...this.state, ...state })));
   };
   /** Callback function to handle when a field on the form is blurred. Calls the `onBlur` callback for the `Form` if it
    * was provided. Also runs any live validation and/or live omit operations if the flags indicate they should happen
@@ -4938,7 +4989,7 @@ var Form = class extends Component3 {
       const hasChanges = Object.keys(state).filter((key) => !key.startsWith("schemaValidation")).some((key) => {
         const oldData = _get(this.state, key);
         const newData = _get(state, key);
-        return !deepEquals2(oldData, newData);
+        return !deepEquals3(oldData, newData);
       });
       this.setState(state, () => {
         if (onChange && hasChanges) {
@@ -5003,7 +5054,7 @@ var Form = class extends Component3 {
    * @returns - The `GlobalFormOptions` from the props
    * @private
    */
-  getGlobalFormOptions(props) {
+  static getGlobalFormOptions(props) {
     const {
       uiSchema = {},
       experimental_componentUpdateStrategy,
@@ -5022,7 +5073,7 @@ var Form = class extends Component3 {
     };
   }
   /** Computed the registry for the form using the given `props`, `schema` and `schemaUtils` */
-  getRegistry(props, schema, schemaUtils) {
+  static getRegistry(props, schema, schemaUtils) {
     const { translateString: customTranslateString, uiSchema = {} } = props;
     const { fields: fields2, templates: templates2, widgets: widgets2, formContext, translateString } = getDefaultRegistry();
     return {
@@ -5041,7 +5092,7 @@ var Form = class extends Component3 {
       schemaUtils,
       translateString: customTranslateString || translateString,
       globalUiOptions: uiSchema[UI_GLOBAL_OPTIONS_KEY2],
-      globalFormOptions: this.getGlobalFormOptions(props),
+      globalFormOptions: _Form.getGlobalFormOptions(props),
       uiSchemaDefinitions: uiSchema[UI_DEFINITIONS_KEY] ?? {}
     };
   }
@@ -5076,7 +5127,7 @@ var Form = class extends Component3 {
     if (!field) {
       field = this.formElement.current.querySelector(`input[id^="${elementId}"], button[id^="${elementId}"]`);
     }
-    if (field && field.length) {
+    if (field?.length) {
       field = field[0];
     }
     if (field) {
@@ -5093,7 +5144,7 @@ var Form = class extends Component3 {
     const { extraErrors, extraErrorsBlockSubmit, focusOnFirstError, onError } = this.props;
     const { errors: prevErrors } = this.state;
     const schemaValidation = this.validate(formData);
-    const { errors, errorSchema } = extraErrors ? this.mergeErrors(schemaValidation, extraErrors) : schemaValidation;
+    const { errors, errorSchema } = extraErrors ? _Form.mergeErrors(schemaValidation, extraErrors) : schemaValidation;
     const hasError = schemaValidation.errors.length > 0 || extraErrors && extraErrorsBlockSubmit;
     if (hasError) {
       if (focusOnFirstError) {
@@ -5172,19 +5223,19 @@ var Form = class extends Component3 {
       _internalFormWrapper
     } = this.props;
     const { schema, uiSchema, formData, errorSchema, fieldPathId, registry } = this.state;
-    const { SchemaField: _SchemaField } = registry.fields;
+    const { SchemaField: SchemaFieldComponent } = 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 = {} } = getUiOptions21(uiSchema);
+    let { [SUBMIT_BTN_OPTIONS_KEY]: submitOptions = {} } = getUiOptions22(uiSchema);
     if (disabled) {
       submitOptions = { ...submitOptions, props: { ...submitOptions.props, disabled: true } };
     }
     const submitUiSchema = { [UI_OPTIONS_KEY3]: { [SUBMIT_BTN_OPTIONS_KEY]: submitOptions } };
-    return /* @__PURE__ */ jsxs23(
+    return /* @__PURE__ */ jsxs24(
       FormTag,
       {
-        className: className ? className : "rjsf",
+        className: className || "rjsf",
         id,
         name,
         method,
@@ -5199,8 +5250,8 @@ var Form = class extends Component3 {
         ref: this.formElement,
         children: [
           showErrorList === "top" && this.renderErrors(registry),
-          /* @__PURE__ */ jsx59(
-            _SchemaField,
+          /* @__PURE__ */ jsx61(
+            SchemaFieldComponent,
             {
               name: "",
               schema,
@@ -5216,7 +5267,7 @@ var Form = class extends Component3 {
               readonly
             }
           ),
-          children ? children : /* @__PURE__ */ jsx59(SubmitButton2, { uiSchema: submitUiSchema, registry }),
+          children || /* @__PURE__ */ jsx61(SubmitButton2, { uiSchema: submitUiSchema, registry }),
           showErrorList === "bottom" && this.renderErrors(registry)
         ]
       }
@@ -5225,12 +5276,7 @@ var Form = class extends Component3 {
 };
 
 // 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 { 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,
@@ -5253,21 +5299,21 @@ function getTestRegistry(rootSchema, fields2 = {}, templates2 = {}, widgets2 = {
 
 // src/withTheme.tsx
 import { forwardRef } from "react";
-import { jsx as jsx60 } from "react/jsx-runtime";
+import { jsx as jsx62 } from "react/jsx-runtime";
 function withTheme(themeProps) {
   return forwardRef(
-    ({ fields: fields2, widgets: widgets2, templates: templates2, ...directProps }, ref) => {
-      fields2 = { ...themeProps?.fields, ...fields2 };
-      widgets2 = { ...themeProps?.widgets, ...widgets2 };
-      templates2 = {
+    ({ fields: propFields, widgets: propWidgets, templates: propTemplates, ...directProps }, ref) => {
+      const fields2 = { ...themeProps?.fields, ...propFields };
+      const widgets2 = { ...themeProps?.widgets, ...propWidgets };
+      const templates2 = {
         ...themeProps?.templates,
-        ...templates2,
+        ...propTemplates,
         ButtonTemplates: {
           ...themeProps?.templates?.ButtonTemplates,
-          ...templates2?.ButtonTemplates
+          ...propTemplates?.ButtonTemplates
         }
       };
-      return /* @__PURE__ */ jsx60(
+      return /* @__PURE__ */ jsx62(
         Form,
         {
           ...themeProps,