@rjsf/core 6.6.1 → 6.6.2

package/dist/index.esm.js

@@ -7,6 +7,7 @@ import {
   getChangedFields,
   getTemplate as getTemplate28,
   getUiOptions as getUiOptions21,
+  hashObject as hashObject5,
   isObject as isObject6,
   mergeObjects,
   shouldRender as shouldRender2,
@@ -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(
@@ -998,7 +997,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);
@@ -1194,6 +1193,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 +1206,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,8 +1294,8 @@ 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);
           }
         }
       });
@@ -1399,10 +1399,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,
+      Field,
       {
         "data-testid": optionsInfo?.hasDiscriminator ? LAYOUT_GRID_FIELD_TEST_IDS.layoutMultiSchemaField : LAYOUT_GRID_FIELD_TEST_IDS.field,
         ...otherProps,
@@ -1471,11 +1471,7 @@ function LayoutGridField(props) {
 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 { getTemplate as getTemplate4, getUiOptions as getUiOptions5, titleId } from "@rjsf/utils";
 import { jsx as jsx5 } from "react/jsx-runtime";
 function LayoutHeaderField(props) {
   const { fieldPathId, title, schema, uiSchema, required, registry, name } = props;
@@ -1605,6 +1601,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);
@@ -1688,6 +1687,12 @@ import isEmpty3 from "lodash/isEmpty";
 import omit2 from "lodash/omit";
 import { jsx as jsx7 } from "react/jsx-runtime";
 var AnyOfField = class extends Component {
+  /** Flag to skip the formData-change-driven option recalculation when the user just selected an option.
+   * Set to true in the setState callback of onOptionChange (after onChange is called), consumed and reset in
+   * componentDidUpdate. This prevents the matching-option recalculation from overriding a user's explicit choice
+   * when getDefaultFormState populates undefined properties that make deepEquals see a false formData change.
+   */
+  skipNextOptionRecalculation = false;
   /** Constructs an `AnyOfField` with the given `props` to initialize the initially selected option in state
    *
    * @param props - The `FieldProps` for this template
@@ -1723,10 +1728,14 @@ var AnyOfField = class extends Component {
       newState = { selectedOption, retrievedOptions };
     }
     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 };
+      if (this.skipNextOptionRecalculation) {
+        this.skipNextOptionRecalculation = false;
+      } else {
+        const { retrievedOptions } = newState;
+        const matchingOption = this.getMatchingOption(selectedOption, formData, retrievedOptions);
+        if (prevState && matchingOption !== selectedOption) {
+          newState = { selectedOption: matchingOption, retrievedOptions };
+        }
       }
     }
     if (newState !== this.state) {
@@ -1756,7 +1765,10 @@ var AnyOfField = class extends Component {
    */
   onOptionChange = (option) => {
     const { selectedOption, retrievedOptions } = this.state;
-    const { formData, onChange, registry, fieldPathId } = this.props;
+    const { disabled = false, formData, onChange, readonly = false, registry, fieldPathId } = this.props;
+    if (disabled || readonly) {
+      return;
+    }
     const { schemaUtils } = registry;
     const intOption = option !== void 0 ? parseInt(option, 10) : -1;
     if (intOption === selectedOption) {
@@ -1769,6 +1781,7 @@ var AnyOfField = class extends Component {
       newFormData = schemaUtils.getDefaultFormState(newOption, newFormData, "excludeObjectChildren");
     }
     this.setState({ selectedOption: intOption }, () => {
+      this.skipNextOptionRecalculation = true;
       onChange(newFormData, fieldPathId.path, void 0, this.getFieldId());
     });
   };
@@ -1793,7 +1806,7 @@ var AnyOfField = class extends Component {
       uiSchema
     } = this.props;
     const { widgets: widgets2, fields: fields2, translateString, globalUiOptions, schemaUtils } = registry;
-    const { SchemaField: _SchemaField } = fields2;
+    const { SchemaField: SchemaFieldComponent } = fields2;
     const MultiSchemaFieldTemplate2 = getTemplate6(
       "MultiSchemaFieldTemplate",
       registry,
@@ -1817,8 +1830,8 @@ var AnyOfField = class extends Component {
     const option = selectedOption >= 0 ? retrievedOptions[selectedOption] || null : null;
     let optionSchema;
     if (option) {
-      const { required: required2 } = schema;
-      optionSchema = required2 ? mergeSchemas({ required: required2 }, option) : option;
+      const { required: schemaRequired } = schema;
+      optionSchema = schemaRequired ? mergeSchemas({ required: schemaRequired }, option) : option;
     }
     let optionsUiSchema = [];
     if (ONE_OF_KEY3 in schema && uiSchema && ONE_OF_KEY3 in uiSchema) {
@@ -1871,7 +1884,7 @@ var AnyOfField = class extends Component {
         readonly
       }
     ) : void 0;
-    const optionsSchemaField = optionSchema && optionSchema.type !== "null" && /* @__PURE__ */ jsx7(_SchemaField, { ...this.props, schema: optionSchema, uiSchema: optionUiSchema }) || null;
+    const optionsSchemaField = optionSchema && optionSchema.type !== "null" && /* @__PURE__ */ jsx7(SchemaFieldComponent, { ...this.props, schema: optionSchema, uiSchema: optionUiSchema }) || null;
     return /* @__PURE__ */ jsx7(
       MultiSchemaFieldTemplate2,
       {
@@ -1901,9 +1914,7 @@ var NullField_default = NullField;
 
 // src/components/fields/NumberField.tsx
 import { useState as useState4, useCallback as useCallback3 } from "react";
-import {
-  asNumber
-} from "@rjsf/utils";
+import { asNumber } from "@rjsf/utils";
 import { jsx as jsx8 } from "react/jsx-runtime";
 var trailingCharMatcherWithPrefix = /\.([0-9]*0)*$/;
 var trailingCharMatcher = /[0.]0*$/;
@@ -1913,12 +1924,10 @@ function NumberField(props) {
   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);
+    (newValue, path, errorSchema, id) => {
+      setLastValue(newValue);
+      const normalizedValue = `${newValue}`.startsWith(".") ? `0${newValue}` : newValue;
+      const processed = typeof normalizedValue === "string" && normalizedValue.match(trailingCharMatcherWithPrefix) ? asNumber(normalizedValue.replace(trailingCharMatcher, "")) : asNumber(normalizedValue);
       onChange(processed, path, errorSchema, id);
     },
     [onChange]
@@ -1934,7 +1943,7 @@ function NumberField(props) {
 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 useCallback4, useMemo as useMemo3, useRef as useRef2, useState as useState5 } from "react";
 import {
   ADDITIONAL_PROPERTY_FLAG,
   ANY_OF_KEY as ANY_OF_KEY4,
@@ -1954,7 +1963,7 @@ 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");
@@ -1963,7 +1972,7 @@ var IS_RESET = /* @__PURE__ */ Symbol("reset");
 // src/components/fields/ObjectField.tsx
 import { jsx as jsx9, 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 +1991,7 @@ function getDefaultValue(translateString, type) {
       return translateString(TranslatableString5.NewStringDefault);
   }
 }
-function ObjectFieldProperty(props) {
+function ObjectFieldPropertyFn(props) {
   const {
     fieldPathId,
     schema,
@@ -2010,10 +2019,11 @@ function ObjectFieldProperty(props) {
   );
   const onPropertyChange = useCallback4(
     (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]
   );
@@ -2062,6 +2072,7 @@ function ObjectFieldProperty(props) {
     }
   );
 }
+var ObjectFieldProperty = memo2(ObjectFieldPropertyFn);
 function ObjectField(props) {
   const {
     schema: rawSchema,
@@ -2082,25 +2093,29 @@ function ObjectField(props) {
   } = props;
   const { fields: fields2, schemaUtils, translateString, globalUiOptions } = registry;
   const { OptionalDataControlsField: OptionalDataControlsField2 } = fields2;
-  const formDataRef = useRef(formData);
+  const formDataRef = useRef2(formData);
   formDataRef.current = formData;
-  const schema = schemaUtils.retrieveSchema(rawSchema, formData, true);
-  const uiOptions = getUiOptions8(uiSchema, globalUiOptions);
+  const schema = useMemo3(
+    () => schemaUtils.retrieveSchema(rawSchema, formData, true),
+    [schemaUtils, rawSchema, formData]
+  );
+  const uiOptions = useMemo3(() => getUiOptions8(uiSchema, globalUiOptions), [uiSchema, globalUiOptions]);
   const { properties: schemaProperties = {} } = schema;
   const childFieldPathId = props.childFieldPathId ?? fieldPathId;
-  const lastRenamedProperty = useRef({ previousKey: "", currentKey: void 0 });
+  const lastRenamedProperty = useRef2({ 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) => {
+    (preferredKey, existingFormData) => {
       const { duplicateKeySuffixSeparator = "-" } = getUiOptions8(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;
     },
@@ -2110,7 +2125,6 @@ function ObjectField(props) {
     if (!(schema.additionalProperties || schema.patternProperties)) {
       return;
     }
-    const { translateString: translateString2 } = registry;
     const newFormData = { ...formData };
     const newKey = getAvailableKey("newKey", newFormData);
     if (schema.patternProperties) {
@@ -2125,8 +2139,7 @@ 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;
@@ -2135,7 +2148,7 @@ function ObjectField(props) {
           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,7 +2156,7 @@ function ObjectField(props) {
       lastRenamedProperty.current.previousKey = getAvailableKey(newKey, newFormData);
     }
     onChange(newFormData, childFieldPathId.path);
-  }, [formData, onChange, registry, childFieldPathId, getAvailableKey, schema]);
+  }, [formData, onChange, translateString, schemaUtils, childFieldPathId, getAvailableKey, schema]);
   const handleKeyRename = useCallback4(
     (oldKey, newKey) => {
       if (oldKey !== newKey) {
@@ -2154,8 +2167,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;
@@ -2197,20 +2210,20 @@ function ObjectField(props) {
     // 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];
+    properties: orderedProperties.map((propertyName) => {
+      const addedByAdditionalProperties = has3(schema, [PROPERTIES_KEY3, propertyName, ADDITIONAL_PROPERTY_FLAG]);
+      const fieldUiSchema = addedByAdditionalProperties ? uiSchema.additionalProperties : uiSchema[propertyName];
       const hidden = getUiOptions8(fieldUiSchema).widget === "hidden";
       const content = /* @__PURE__ */ jsx9(
         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 +2235,11 @@ function ObjectField(props) {
           readonly,
           hideError
         },
-        getStableKey(name2)
+        getStableKey(propertyName)
       );
       return {
         content,
-        name: name2,
+        name: propertyName,
         readonly,
         disabled,
         required,
@@ -2348,7 +2361,7 @@ var COMPONENT_TYPES = {
   null: "NullField"
 };
 function getFieldComponent(schema, uiOptions, registry) {
-  const field = uiOptions.field;
+  const { field } = uiOptions;
   const { fields: fields2 } = registry;
   if (typeof field === "function") {
     return field;
@@ -2366,7 +2379,7 @@ function getFieldComponent(schema, uiOptions, registry) {
   if (!componentName && (schema.anyOf || schema.oneOf)) {
     return () => null;
   }
-  return componentName in fields2 ? fields2[componentName] : fields2["FallbackField"];
+  return componentName in fields2 ? fields2[componentName] : fields2.FallbackField;
 }
 function SchemaFieldRender(props) {
   const {
@@ -2399,9 +2412,9 @@ function SchemaFieldRender(props) {
   const schema = schemaUtils.retrieveSchema(_schema, formData);
   const fieldId = fieldPathId[ID_KEY4];
   const handleFieldComponentChange = useCallback5(
-    (formData2, path, newErrorSchema, id2) => {
+    (newFormData, path, newErrorSchema, id2) => {
       const theId = id2 || fieldId;
-      return onChange(formData2, path, newErrorSchema, theId);
+      return onChange(newFormData, path, newErrorSchema, theId);
     },
     [fieldId, onChange]
   );
@@ -2425,12 +2438,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);
@@ -2475,7 +2488,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) {
@@ -2582,12 +2595,7 @@ 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 { getWidget as getWidget5, getUiOptions as getUiOptions11, optionsList as optionsList4, hasWidget } from "@rjsf/utils";
 import { jsx as jsx12 } from "react/jsx-runtime";
 function StringField(props) {
   const {
@@ -2620,9 +2628,7 @@ function StringField(props) {
   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);
-    },
+    (value, errorSchema, id) => onChange(value, fieldPathId.path, errorSchema, id),
     [onChange, fieldPathId]
   );
   return /* @__PURE__ */ jsx12(
@@ -2676,11 +2682,7 @@ 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 { descriptionId as descriptionId2, getTemplate as getTemplate10, getUiOptions as getUiOptions12 } from "@rjsf/utils";
 import { jsx as jsx13 } from "react/jsx-runtime";
 function ArrayFieldDescriptionTemplate(props) {
   const { fieldPathId, description, registry, schema, uiSchema } = props;
@@ -2707,9 +2709,7 @@ function ArrayFieldDescriptionTemplate(props) {
 }
 
 // src/components/templates/ArrayFieldItemButtonsTemplate.tsx
-import {
-  buttonId
-} from "@rjsf/utils";
+import { buttonId } from "@rjsf/utils";
 import { Fragment as Fragment2, jsx as jsx14, jsxs as jsxs3 } from "react/jsx-runtime";
 function ArrayFieldItemButtonsTemplate(props) {
   const {
@@ -2777,10 +2777,7 @@ function ArrayFieldItemButtonsTemplate(props) {
 }
 
 // src/components/templates/ArrayFieldItemTemplate.tsx
-import {
-  getTemplate as getTemplate11,
-  getUiOptions as getUiOptions13
-} from "@rjsf/utils";
+import { getTemplate as getTemplate11, getUiOptions as getUiOptions13 } from "@rjsf/utils";
 import { jsx as jsx15, jsxs as jsxs4 } from "react/jsx-runtime";
 function ArrayFieldItemTemplate(props) {
   const { children, className, buttonsProps, displayLabel, hasDescription, hasToolbar, registry, uiSchema } = props;
@@ -2806,11 +2803,7 @@ function ArrayFieldItemTemplate(props) {
 }
 
 // src/components/templates/ArrayFieldTemplate.tsx
-import {
-  getTemplate as getTemplate12,
-  getUiOptions as getUiOptions14,
-  buttonId as buttonId2
-} from "@rjsf/utils";
+import { getTemplate as getTemplate12, getUiOptions as getUiOptions14, buttonId as buttonId2 } from "@rjsf/utils";
 import { jsx as jsx16, jsxs as jsxs5 } from "react/jsx-runtime";
 function ArrayFieldTemplate(props) {
   const {
@@ -2883,11 +2876,7 @@ function ArrayFieldTemplate(props) {
 }
 
 // src/components/templates/ArrayFieldTitleTemplate.tsx
-import {
-  getTemplate as getTemplate13,
-  getUiOptions as getUiOptions15,
-  titleId as titleId2
-} from "@rjsf/utils";
+import { getTemplate as getTemplate13, getUiOptions as getUiOptions15, titleId as titleId2 } from "@rjsf/utils";
 import { jsx as jsx17 } from "react/jsx-runtime";
 function ArrayFieldTitleTemplate(props) {
   const { fieldPathId, title, schema, uiSchema, required, registry, optionalDataControl } = props;
@@ -2917,11 +2906,7 @@ function ArrayFieldTitleTemplate(props) {
 
 // src/components/templates/BaseInputTemplate.tsx
 import { useCallback as useCallback7 } from "react";
-import {
-  ariaDescribedByIds,
-  examplesId as examplesId2,
-  getInputProps
-} from "@rjsf/utils";
+import { ariaDescribedByIds, examplesId as examplesId2, getInputProps } from "@rjsf/utils";
 
 // src/components/SchemaExamples.tsx
 import { examplesId } from "@rjsf/utils";
@@ -2934,9 +2919,10 @@ function SchemaExamples(props) {
   }
   return /* @__PURE__ */ jsx18("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__ */ jsx18("option", { value: example }, String(example))
+  )) }, `datalist_${id}`);
 }
 
 // src/components/templates/BaseInputTemplate.tsx
@@ -2982,19 +2968,19 @@ function BaseInputTemplate(props) {
   } else {
     inputValue = value == null ? "" : value;
   }
-  const _onChange = useCallback7(
-    ({ target: { value: value2 } }) => onChange(value2 === "" ? options.emptyValue : value2),
+  const handleChange = useCallback7(
+    ({ target: { value: newValue } }) => onChange(newValue === "" ? options.emptyValue : newValue),
     [onChange, options]
   );
-  const _onBlur = useCallback7(
+  const handleBlur = useCallback7(
     ({ target }) => onBlur(id, target && target.value),
     [onBlur, id]
   );
-  const _onFocus = useCallback7(
+  const handleFocus = useCallback7(
     ({ target }) => onFocus(id, target && target.value),
     [onFocus, id]
   );
-  const _onClear = useCallback7(
+  const handleClear = useCallback7(
     (e) => {
       e.preventDefault();
       e.stopPropagation();
@@ -3015,13 +3001,13 @@ 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 }),
+    options.allowClearTextInputs && !readonly && !disabled && inputValue && /* @__PURE__ */ jsx19(ClearButton2, { registry, onClick: handleClear }),
     /* @__PURE__ */ jsx19(SchemaExamples, { id, schema })
   ] });
 }
@@ -3030,37 +3016,44 @@ function BaseInputTemplate(props) {
 import { TranslatableString as TranslatableString9 } from "@rjsf/utils";
 
 // src/components/templates/ButtonTemplates/IconButton.tsx
+import { memo as memo3 } from "react";
 import { TranslatableString as TranslatableString8 } from "@rjsf/utils";
 import { jsx as jsx20 } from "react/jsx-runtime";
-function IconButton(props) {
+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}` }) });
 }
-function CopyButton(props) {
+var IconButton = memo3(IconButtonFn);
+var IconButton_default = IconButton;
+function CopyButtonFn(props) {
   const {
     registry: { translateString }
   } = props;
   return /* @__PURE__ */ jsx20(IconButton, { title: translateString(TranslatableString8.CopyButton), ...props, icon: "copy" });
 }
-function MoveDownButton(props) {
+var CopyButton = memo3(CopyButtonFn);
+function MoveDownButtonFn(props) {
   const {
     registry: { translateString }
   } = props;
   return /* @__PURE__ */ jsx20(IconButton, { title: translateString(TranslatableString8.MoveDownButton), ...props, icon: "arrow-down" });
 }
-function MoveUpButton(props) {
+var MoveDownButton = memo3(MoveDownButtonFn);
+function MoveUpButtonFn(props) {
   const {
     registry: { translateString }
   } = props;
   return /* @__PURE__ */ jsx20(IconButton, { title: translateString(TranslatableString8.MoveUpButton), ...props, icon: "arrow-up" });
 }
-function RemoveButton(props) {
+var MoveUpButton = memo3(MoveUpButtonFn);
+function RemoveButtonFn(props) {
   const {
     registry: { translateString }
   } = props;
   return /* @__PURE__ */ jsx20(IconButton, { title: translateString(TranslatableString8.RemoveButton), ...props, iconType: "danger", icon: "remove" });
 }
-function ClearButton({
+var RemoveButton = memo3(RemoveButtonFn);
+function ClearButtonFn({
   id,
   className,
   onClick,
@@ -3084,6 +3077,7 @@ function ClearButton({
     }
   );
 }
+var ClearButton = memo3(ClearButtonFn);
 
 // src/components/templates/ButtonTemplates/AddButton.tsx
 import { jsx as jsx21 } from "react/jsx-runtime";
@@ -3100,7 +3094,7 @@ function AddButton({
     {
       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,
+        IconButton_default,
         {
           id,
           iconType: "info",
@@ -3142,10 +3136,7 @@ function buttonTemplates() {
 var ButtonTemplates_default = buttonTemplates;
 
 // src/components/RichDescription.tsx
-import {
-  getTestIds as getTestIds2,
-  getUiOptions as getUiOptions16
-} from "@rjsf/utils";
+import { getTestIds as getTestIds2, getUiOptions as getUiOptions16 } from "@rjsf/utils";
 import { Markdown as Markdown2 } from "markdown-to-jsx/react";
 import { jsx as jsx23 } from "react/jsx-runtime";
 var TEST_IDS = getTestIds2();
@@ -3170,9 +3161,7 @@ function DescriptionField(props) {
 }
 
 // src/components/templates/ErrorList.tsx
-import {
-  TranslatableString as TranslatableString10
-} from "@rjsf/utils";
+import { TranslatableString as TranslatableString10 } from "@rjsf/utils";
 import { jsx as jsx25, jsxs as jsxs7 } from "react/jsx-runtime";
 function ErrorList({
   errors,
@@ -3181,9 +3170,10 @@ function ErrorList({
   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);
-    }) })
+    /* @__PURE__ */ jsx25("ul", { className: "list-group", children: errors.map((error, i) => (
+      // oxlint-disable-next-line react/no-array-index-key
+      /* @__PURE__ */ jsx25("li", { className: "list-group-item text-danger", children: error.stack }, i)
+    )) })
   ] });
 }
 
@@ -3216,19 +3206,17 @@ function FieldErrorTemplate(props) {
     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__ */ jsx27("div", { children: /* @__PURE__ */ jsx27("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__ */ jsx27("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 getUiOptions17 } from "@rjsf/utils";
 import { Markdown as Markdown3 } from "markdown-to-jsx/react";
 import { jsx as jsx28 } from "react/jsx-runtime";
 var TEST_IDS2 = getTestIds3();
@@ -3257,10 +3245,7 @@ function FieldHelpTemplate(props) {
 }
 
 // src/components/templates/FieldTemplate/FieldTemplate.tsx
-import {
-  getTemplate as getTemplate15,
-  getUiOptions as getUiOptions18
-} from "@rjsf/utils";
+import { getTemplate as getTemplate15, getUiOptions as getUiOptions18 } from "@rjsf/utils";
 
 // src/components/templates/FieldTemplate/Label.tsx
 import { jsx as jsx30, jsxs as jsxs8 } from "react/jsx-runtime";
@@ -3320,14 +3305,7 @@ function MultiSchemaFieldTemplate(props) {
 }
 
 // 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 { 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";
 function ObjectFieldTemplate(props) {
   const {
@@ -3406,7 +3384,7 @@ function OptionalDataControlsTemplate(props) {
   const { id, registry, label, onAddClick, onRemoveClick } = props;
   if (onAddClick) {
     return /* @__PURE__ */ jsx35(
-      IconButton,
+      IconButton_default,
       {
         id,
         registry,
@@ -3416,9 +3394,10 @@ function OptionalDataControlsTemplate(props) {
         title: label
       }
     );
-  } else if (onRemoveClick) {
+  }
+  if (onRemoveClick) {
     return /* @__PURE__ */ jsx35(
-      IconButton,
+      IconButton_default,
       {
         id,
         registry,
@@ -3446,7 +3425,7 @@ function TitleField(props) {
 
 // src/components/templates/UnsupportedField.tsx
 import { TranslatableString as TranslatableString11 } from "@rjsf/utils";
-import { Markdown as Markdown4 } from "markdown-to-jsx";
+import { Markdown as Markdown4 } from "markdown-to-jsx/react";
 import { jsx as jsx37, jsxs as jsxs13 } from "react/jsx-runtime";
 function UnsupportedField(props) {
   const { schema, fieldPathId, reason, registry } = props;
@@ -3469,11 +3448,7 @@ function UnsupportedField(props) {
 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 { 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";
 function WrapIfAdditionalTemplate(props) {
   const {
@@ -3580,34 +3555,33 @@ function AltDateTimeWidget({
 var AltDateTimeWidget_default = AltDateTimeWidget;
 
 // src/components/widgets/AltDateWidget.tsx
-import {
-  DateElement,
-  TranslatableString as TranslatableString13,
-  useAltDateWidgetProps
-} from "@rjsf/utils";
+import { DateElement, TranslatableString as TranslatableString13, useAltDateWidgetProps } from "@rjsf/utils";
 import { jsx as jsx40, jsxs as jsxs15 } 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) }) })
+    elements.map((elemProps, i) => (
+      // oxlint-disable-next-line react/no-array-index-key
+      /* @__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("button", { type: "button", 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("button", { type: "button", className: "btn btn-warning btn-clear", onClick: handleClear, children: translateString(TranslatableString13.ClearLabel) }) })
   ] });
 }
 var AltDateWidget_default = AltDateWidget;
@@ -3650,7 +3624,7 @@ function CheckboxesWidget({
   );
   return /* @__PURE__ */ jsx41("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) {
@@ -3678,7 +3652,7 @@ function CheckboxesWidget({
       ),
       /* @__PURE__ */ jsx41("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__ */ jsx41("label", { className: `checkbox-inline ${disabledCls}`, children: checkbox }, String(option.value)) : /* @__PURE__ */ jsx41("div", { className: `checkbox ${disabledCls}`, children: /* @__PURE__ */ jsx41("label", { children: checkbox }) }, String(option.value));
   }) });
 }
 var CheckboxesWidget_default = CheckboxesWidget;
@@ -3776,11 +3750,7 @@ function ColorWidget(props) {
 }
 
 // src/components/widgets/DateTimeWidget.tsx
-import {
-  getTemplate as getTemplate19,
-  localToUTC,
-  utcToLocal
-} from "@rjsf/utils";
+import { getTemplate as getTemplate19, localToUTC, utcToLocal } from "@rjsf/utils";
 import { jsx as jsx44 } from "react/jsx-runtime";
 function DateTimeWidget(props) {
   const { onChange, value, options, registry } = props;
@@ -3791,7 +3761,7 @@ function DateTimeWidget(props) {
       type: "datetime-local",
       ...props,
       value: utcToLocal(value),
-      onChange: (value2) => onChange(localToUTC(value2))
+      onChange: (newValue) => onChange(localToUTC(newValue))
     }
   );
 }
@@ -3817,12 +3787,8 @@ function EmailWidget(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 { getTemplate as getTemplate22, TranslatableString as TranslatableString14, useFileWidgetProps } from "@rjsf/utils";
+import { Markdown as Markdown5 } from "markdown-to-jsx/react";
 import { Fragment as Fragment4, jsx as jsx47, jsxs as jsxs18 } from "react/jsx-runtime";
 function FileInfoPreview({
   fileInfo,
@@ -3833,12 +3799,13 @@ function FileInfoPreview({
   if (!dataURL) {
     return null;
   }
+  const previewLabel = translateString(TranslatableString14.PreviewLabel);
   if (["image/jpeg", "image/png"].includes(type)) {
-    return /* @__PURE__ */ jsx47("img", { src: dataURL, style: { maxWidth: "100%" }, className: "file-preview" });
+    return /* @__PURE__ */ jsx47("img", { src: dataURL, alt: previewLabel, style: { maxWidth: "100%" }, className: "file-preview" });
   }
   return /* @__PURE__ */ jsxs18(Fragment4, { children: [
     " ",
-    /* @__PURE__ */ jsx47("a", { download: `preview-${name}`, href: dataURL, className: "file-download", children: translateString(TranslatableString14.PreviewLabel) })
+    /* @__PURE__ */ jsx47("a", { download: `preview-${name}`, href: dataURL, className: "file-download", children: previewLabel })
   ] });
 }
 function FilesInfo({
@@ -3856,11 +3823,14 @@ function FilesInfo({
   return /* @__PURE__ */ jsx47("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__ */ 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)
+    );
   }) });
 }
 function FileWidget(props) {
@@ -3955,7 +3925,7 @@ function RadioWidget({
   );
   return /* @__PURE__ */ jsx50("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: [
@@ -3978,7 +3948,7 @@ function RadioWidget({
       ),
       /* @__PURE__ */ jsx50("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__ */ jsx50("label", { className: `radio-inline ${disabledCls}`, children: radio }, String(option.value)) : /* @__PURE__ */ jsx50("div", { className: `radio ${disabledCls}`, children: /* @__PURE__ */ jsx50("label", { children: radio }) }, String(option.value));
   }) });
 }
 var RadioWidget_default = RadioWidget;
@@ -4000,7 +3970,7 @@ function RangeWidget(props) {
 
 // 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 { jsx as jsx52, jsxs as jsxs21 } from "react/jsx-runtime";
 function RatingWidget({
   id,
   value,
@@ -4050,7 +4020,7 @@ function RatingWidget({
     }
     return isFilled ? "\u2605" : "\u2606";
   };
-  return /* @__PURE__ */ jsx52(Fragment5, { children: /* @__PURE__ */ jsxs21(
+  return /* @__PURE__ */ jsxs21(
     "div",
     {
       className: "rating-widget",
@@ -4067,6 +4037,7 @@ function RatingWidget({
             "span",
             {
               onClick: () => handleStarClick(starValue),
+              onKeyDown: (e) => (e.key === "Enter" || e.key === " ") && handleStarClick(starValue),
               onFocus: handleFocus,
               onBlur: handleBlur,
               "data-value": starValue,
@@ -4099,7 +4070,7 @@ function RatingWidget({
         )
       ]
     }
-  ) });
+  );
 }
 
 // src/components/widgets/SelectWidget.tsx
@@ -4160,30 +4131,40 @@ 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);
-        })
-      ]
-    }
+  return (
+    // oxlint-disable-next-line jsx-a11y/no-autofocus
+    /* @__PURE__ */ jsxs22(
+      "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__ */ jsx53("option", { value: "", children: placeholder }),
+          Array.isArray(enumOptions) && enumOptions.map(({ value: enumValue, label: enumLabel }, i) => {
+            const isDisabled = enumDisabled && enumDisabled.includes(enumValue);
+            return /* @__PURE__ */ jsx53(
+              "option",
+              {
+                value: enumOptionValueEncoder3(enumValue, i, optionValueFormat),
+                disabled: isDisabled,
+                children: enumLabel
+              },
+              String(enumValue)
+            );
+          })
+        ]
+      }
+    )
   );
 }
 var SelectWidget_default = SelectWidget;
@@ -4207,7 +4188,7 @@ function TextareaWidget({
   htmlName
 }) {
   const handleChange = useCallback14(
-    ({ target: { value: value2 } }) => onChange(value2 === "" ? options.emptyValue : value2),
+    ({ target: { value: newValue } }) => onChange(newValue === "" ? options.emptyValue : newValue),
     [onChange, options.emptyValue]
   );
   const handleBlur = useCallback14(
@@ -4224,7 +4205,7 @@ function TextareaWidget({
       id,
       name: htmlName || id,
       className: "form-control",
-      value: value ? value : "",
+      value: value || "",
       placeholder,
       required,
       disabled,
@@ -4330,7 +4311,7 @@ function toIChangeEvent(state, status) {
     ...status !== void 0 && { status }
   };
 }
-var Form = class extends Component3 {
+var Form = class _Form extends Component3 {
   /** 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 +4322,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 +4331,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 +4347,7 @@ var Form = class extends Component3 {
           true
         ));
       }
-      return { _prevExtraErrors: props.extraErrors, errors, errorSchema };
+      return { prevExtraErrors: props.extraErrors, errors, errorSchema };
     }
     return null;
   }
@@ -4385,7 +4366,7 @@ 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)) {
       onChange(toIChangeEvent(this.state));
@@ -4450,8 +4431,8 @@ var Form = class extends Component3 {
     if (snapshot.shouldUpdate) {
       const { nextState } = snapshot;
       const nextStateDiffersFromProps = !deepEquals2(nextState.formData, this.props.formData);
-      const wasProcessingUserChange = this._isProcessingUserChange;
-      this._isProcessingUserChange = false;
+      const wasProcessingUserChange = this.isProcessingUserChange;
+      this.isProcessingUserChange = false;
       if (wasProcessingUserChange && nextStateDiffersFromProps) {
         return;
       }
@@ -4468,12 +4449,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 +4466,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 +4487,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 ? hashObject5({ formData }) : "";
+      computedRetrievedSchema = this.updateRetrievedSchema(
+        retrievedSchema ?? schemaUtils.retrieveSchema(rootSchema, formData)
+      );
+      if (shouldSanitize && !preventInfiniteSanitize.includes(formHash) && !deepEquals2(computedRetrievedSchema, state.retrievedSchema)) {
+        const sanitizedFormData = schemaUtils.sanitizeDataForNewSchema(
+          computedRetrievedSchema,
+          state.retrievedSchema,
+          formData
+        );
+        wasSanitized = !deepEquals2(sanitizedFormData, formData);
+        if (wasSanitized) {
+          formData = sanitizedFormData;
+          defaultsFormData = sanitizedFormData;
+          const sanitizedFormHash = hashObject5({ 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 +4538,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,24 +4561,22 @@ 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 newRegistry = _Form.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 nextState = {
@@ -4585,7 +4590,7 @@ var Form = class extends Component3 {
       errorSchema,
       schemaValidationErrors,
       schemaValidationErrorSchema,
-      retrievedSchema: _retrievedSchema,
+      retrievedSchema: computedRetrievedSchema,
       initialDefaultsGenerated: true,
       registry
     };
@@ -4610,10 +4615,10 @@ 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;
+    return schemaUtils.getValidator().validateFormData(formData, validationSchema, customValidate, transformErrors, uiSchema);
   }
   /** Renders any errors contained in the `state` in using the `ErrorList`, if not disabled by `showErrorList`. */
   renderErrors(registry) {
@@ -4642,9 +4647,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 +4677,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 +4688,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 +4697,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`
@@ -4756,16 +4758,15 @@ 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;
@@ -4795,18 +4796,25 @@ var Form = class extends Component3 {
           _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;
     }
     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 +4830,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 +4851,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) {
@@ -5003,7 +5011,7 @@ var Form = class extends Component3 {
    * @returns - The `GlobalFormOptions` from the props
    * @private
    */
-  getGlobalFormOptions(props) {
+  static getGlobalFormOptions(props) {
     const {
       uiSchema = {},
       experimental_componentUpdateStrategy,
@@ -5022,7 +5030,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 +5049,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] ?? {}
     };
   }
@@ -5093,7 +5101,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,7 +5180,7 @@ 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";
@@ -5184,7 +5192,7 @@ var Form = class extends Component3 {
     return /* @__PURE__ */ jsxs23(
       FormTag,
       {
-        className: className ? className : "rjsf",
+        className: className || "rjsf",
         id,
         name,
         method,
@@ -5200,7 +5208,7 @@ var Form = class extends Component3 {
         children: [
           showErrorList === "top" && this.renderErrors(registry),
           /* @__PURE__ */ jsx59(
-            _SchemaField,
+            SchemaFieldComponent,
             {
               name: "",
               schema,
@@ -5216,7 +5224,7 @@ var Form = class extends Component3 {
               readonly
             }
           ),
-          children ? children : /* @__PURE__ */ jsx59(SubmitButton2, { uiSchema: submitUiSchema, registry }),
+          children || /* @__PURE__ */ jsx59(SubmitButton2, { uiSchema: submitUiSchema, registry }),
           showErrorList === "bottom" && this.renderErrors(registry)
         ]
       }
@@ -5225,12 +5233,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,
@@ -5256,15 +5259,15 @@ import { forwardRef } from "react";
 import { jsx as jsx60 } 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(