@rjsf/core 6.6.1 → 6.6.2

package/src/components/SchemaExamples.tsx

@@ -1,4 +1,5 @@
-import { examplesId, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { examplesId } from '@rjsf/utils';
 
 export interface SchemaExamplesProps<S extends StrictRJSFSchema = RJSFSchema> {
   /** The id of the input element this datalist is for */
@@ -28,9 +29,10 @@ export default function SchemaExamples<S extends StrictRJSFSchema = RJSFSchema>(
             ? ([schemaDefault] as string[])
             : [],
         )
-        .map((example: any) => {
-          return <option key={String(example)} value={example} />;
-        })}
+        .map((example: any) => (
+          // oxlint-disable-next-line jsx-a11y/control-has-associated-label
+          <option key={String(example)} value={example} />
+        ))}
     </datalist>
   );
 }

package/src/components/fields/ArrayField.tsx

@@ -1,4 +1,18 @@
-import { MouseEvent, useCallback, useMemo, useState } from 'react';
+import type { MouseEvent } from 'react';
+import { memo, useCallback, useMemo, useRef, useState } from 'react';
+import type {
+  ArrayFieldTemplateProps,
+  ErrorSchema,
+  FieldPathId,
+  FieldPathList,
+  FieldProps,
+  FormContextType,
+  Registry,
+  RJSFSchema,
+  StrictRJSFSchema,
+  UiSchema,
+  UIOptionsType,
+} from '@rjsf/utils';
 import {
   allowAdditionalItems,
   getTemplate,
@@ -14,18 +28,7 @@ import {
   useDeepCompareMemo,
   ITEMS_KEY,
   ID_KEY,
-  ArrayFieldTemplateProps,
-  ErrorSchema,
-  FieldPathId,
-  FieldPathList,
-  FieldProps,
-  FormContextType,
-  Registry,
-  RJSFSchema,
-  StrictRJSFSchema,
   TranslatableString,
-  UiSchema,
-  UIOptionsType,
 } from '@rjsf/utils';
 import cloneDeep from 'lodash/cloneDeep';
 import isObject from 'lodash/isObject';
@@ -33,7 +36,10 @@ import set from 'lodash/set';
 import uniqueId from 'lodash/uniqueId';
 
 /** Type used to represent the keyed form data used in the state */
-type KeyedFormDataType<T> = { key: string; item: T };
+interface KeyedFormDataType<T> {
+  key: string;
+  item: T;
+}
 
 /** Used to generate a unique ID for an element in a row */
 function generateRowId() {
@@ -48,12 +54,10 @@ function generateRowId() {
 function generateKeyedFormData<T>(formData?: T[]): KeyedFormDataType<T>[] {
   return !Array.isArray(formData)
     ? []
-    : formData.map((item) => {
-        return {
-          key: generateRowId(),
-          item,
-        };
-      });
+    : formData.map((item) => ({
+        key: generateRowId(),
+        item,
+      }));
 }
 
 /** Converts `KeyedFormDataType` data into the inner `formData`
@@ -136,6 +140,7 @@ function computeItemUiSchema<T = any, S extends StrictRJSFSchema = RJSFSchema, F
       // Only use the result if it's truthy
       return result as UiSchema<T[], S, F>;
     } catch (e) {
+      // oxlint-disable-next-line no-console
       console.error(`Error executing dynamic uiSchema.items function for item at index ${index}:`, e);
       // Fall back to undefined to allow the field to still render
       return undefined;
@@ -348,7 +353,7 @@ function ArrayAsFiles<T = any, S extends StrictRJSFSchema = RJSFSchema, F extend
 /** Renders the individual array item using a `SchemaField` along with the additional properties that are needed to
  * render the whole of the `ArrayFieldItemTemplate`.
  */
-function ArrayFieldItem<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(props: {
+function ArrayFieldItemInner<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(props: {
   itemKey: string;
   index: number;
   name: string;
@@ -364,10 +369,10 @@ function ArrayFieldItem<T = any, S extends StrictRJSFSchema = RJSFSchema, F exte
   canRemove?: boolean;
   canMoveUp: boolean;
   canMoveDown: boolean;
-  itemSchema: S;
+  rawItemSchema: S;
   itemData: T[];
   itemUiSchema: UiSchema<T[], S, F> | undefined;
-  itemFieldPathId: FieldPathId;
+  parentFieldPathId: FieldPathId;
   itemErrorSchema?: ErrorSchema<T[]>;
   autofocus?: boolean;
   onBlur: FieldProps<T[], S, F>['onBlur'];
@@ -394,10 +399,10 @@ function ArrayFieldItem<T = any, S extends StrictRJSFSchema = RJSFSchema, F exte
     canRemove = true,
     canMoveUp,
     canMoveDown,
-    itemSchema,
+    rawItemSchema,
     itemData,
     itemUiSchema,
-    itemFieldPathId,
+    parentFieldPathId,
     itemErrorSchema,
     autofocus,
     onBlur,
@@ -415,8 +420,18 @@ function ArrayFieldItem<T = any, S extends StrictRJSFSchema = RJSFSchema, F exte
     schemaUtils,
     fields: { ArraySchemaField, SchemaField },
     globalUiOptions,
+    globalFormOptions,
   } = registry;
-  const fieldPathId = useDeepCompareMemo<FieldPathId>(itemFieldPathId);
+  const itemSchema = useMemo(
+    () => schemaUtils.retrieveSchema(rawItemSchema, itemData),
+    [schemaUtils, rawItemSchema, itemData],
+  );
+  // parentFieldPathId is the same stable reference for all items; index is a stable number.
+  // useMemo avoids creating a new FieldPathId object on every render, letting React.memo bail out.
+  const fieldPathId = useMemo(
+    () => toFieldPathId(index, globalFormOptions, parentFieldPathId),
+    [index, globalFormOptions, parentFieldPathId],
+  );
   const ItemSchemaField = ArraySchemaField || SchemaField;
   const ArrayFieldItemTemplate = getTemplate<'ArrayFieldItemTemplate', T[], S, F>(
     'ArrayFieldItemTemplate',
@@ -427,7 +442,7 @@ function ArrayFieldItem<T = any, S extends StrictRJSFSchema = RJSFSchema, F exte
   const { description } = getUiOptions(itemUiSchema);
   const hasDescription = !!description || !!itemSchema.description;
   const { orderable = true, removable = true, copyable = false } = uiOptions;
-  const has: { [key: string]: boolean } = {
+  const has: Record<string, boolean> = {
     moveUp: orderable && canMoveUp,
     moveDown: orderable && canMoveDown,
     copy: copyable && canAdd,
@@ -499,7 +514,7 @@ function ArrayFieldItem<T = any, S extends StrictRJSFSchema = RJSFSchema, F exte
       hasMoveUp: has.moveUp,
       hasMoveDown: has.moveDown,
       hasRemove: has.remove,
-      index: index,
+      index,
       totalItems,
       onAddItem,
       onCopyItem,
@@ -526,6 +541,7 @@ function ArrayFieldItem<T = any, S extends StrictRJSFSchema = RJSFSchema, F exte
   };
   return <ArrayFieldItemTemplate {...templateProps} />;
 }
+const ArrayFieldItem = memo(ArrayFieldItemInner) as typeof ArrayFieldItemInner;
 
 /** The properties required by the stateless components that render the items using the `ArrayFieldItem` */
 interface InternalArrayFieldProps<
@@ -575,15 +591,19 @@ function NormalArray<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends
     handleReorderItems,
   } = props;
   const fieldTitle = schema.title || title || name;
-  const { schemaUtils, fields, formContext, globalFormOptions, globalUiOptions } = registry;
+  const { schemaUtils, fields, formContext, globalUiOptions } = registry;
   const { OptionalDataControlsField } = fields;
-  const uiOptions = getUiOptions<T[], S, F>(uiSchema, globalUiOptions);
-  const _schemaItems: S = isObject(schema.items) ? (schema.items as S) : ({} as S);
-  const itemsSchema: S = schemaUtils.retrieveSchema(_schemaItems);
-  const formData = keyedToPlainFormData<T>(keyedFormData);
+  const uiOptions = useMemo(() => getUiOptions<T[], S, F>(uiSchema, globalUiOptions), [uiSchema, globalUiOptions]);
+  // Memoize schemaItems to avoid a new `{}` object identity on every render (which would bust retrieveSchema cache)
+  const schemaItems: S = useMemo(() => (isObject(schema.items) ? (schema.items as S) : ({} as S)), [schema.items]);
+  const itemsSchema: S = useMemo(() => schemaUtils.retrieveSchema(schemaItems), [schemaUtils, schemaItems]);
+  const formData = useMemo(() => keyedToPlainFormData<T>(keyedFormData), [keyedFormData]);
   const renderOptionalField = shouldRenderOptionalField<T[], S, F>(registry, schema, required, uiSchema);
   const hasFormData = isFormDataAvailable<T[]>(formDataFromProps);
-  const canAdd = canAddItem<T, S, F>(registry, schema, formData, uiSchema) && (!renderOptionalField || hasFormData);
+  const canAdd = useMemo(
+    () => canAddItem<T, S, F>(registry, schema, formData, uiSchema) && (!renderOptionalField || hasFormData),
+    [registry, schema, formData, uiSchema, renderOptionalField, hasFormData],
+  );
   const actualFormData = hasFormData ? keyedFormData : [];
   const extraClass = renderOptionalField ? ' rjsf-optional-array-field' : '';
   // All the children will use childFieldPathId if present in the props, falling back to the fieldPathId
@@ -597,9 +617,7 @@ function NormalArray<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends
       const { key, item } = keyedItem;
       // While we are actually dealing with a single item of type T, the types require a T[], so cast
       const itemCast = item as unknown as T[];
-      const itemSchema = schemaUtils.retrieveSchema(_schemaItems, itemCast);
       const itemErrorSchema = errorSchema ? (errorSchema[index] as ErrorSchema<T[]>) : undefined;
-      const itemFieldPathId = toFieldPathId(index, globalFormOptions, childFieldPathId);
 
       // Compute the item UI schema using the helper method
       const itemUiSchema = computeItemUiSchema<T, S, F>(uiSchema, item, index, formContext);
@@ -619,8 +637,8 @@ function NormalArray<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends
         canAdd,
         canMoveUp: index > 0,
         canMoveDown: index < formData.length - 1,
-        itemSchema,
-        itemFieldPathId,
+        rawItemSchema: schemaItems,
+        parentFieldPathId: childFieldPathId,
         itemErrorSchema,
         itemData: itemCast,
         itemUiSchema,
@@ -687,24 +705,22 @@ function FixedArray<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends
   } = props;
   let { formData: items = [] } = props;
   const fieldTitle = schema.title || title || name;
-  const { schemaUtils, fields, formContext, globalFormOptions, globalUiOptions } = registry;
-  const uiOptions = getUiOptions<T[], S, F>(uiSchema, globalUiOptions);
+  const { fields, formContext, globalUiOptions } = registry;
+  const uiOptions = useMemo(() => getUiOptions<T[], S, F>(uiSchema, globalUiOptions), [uiSchema, globalUiOptions]);
   const { OptionalDataControlsField } = fields;
   const renderOptionalField = shouldRenderOptionalField<T[], S, F>(registry, schema, required, uiSchema);
   const hasFormData = isFormDataAvailable<T[]>(formData);
-  const _schemaItems: S[] = isObject(schema.items) ? (schema.items as S[]) : ([] as S[]);
-  const itemSchemas = _schemaItems.map((item: S, index: number) =>
-    schemaUtils.retrieveSchema(item, items[index] as unknown as T[]),
+  const schemaItems: S[] = useMemo(
+    () => (isObject(schema.items) ? (schema.items as S[]) : ([] as S[])),
+    [schema.items],
   );
-  const additionalSchema = isObject(schema.additionalItems)
-    ? schemaUtils.retrieveSchema(schema.additionalItems as S, formData)
-    : null;
+  const hasAdditionalItems = isObject(schema.additionalItems);
   // All the children will use childFieldPathId if present in the props, falling back to the fieldPathId
   const childFieldPathId = props.childFieldPathId ?? fieldPathId;
 
-  if (items.length < itemSchemas.length) {
+  if (items.length < schemaItems.length) {
     // to make sure at least all fixed items are generated
-    items = items.concat(new Array(itemSchemas.length - items.length));
+    items = items.concat(new Array(schemaItems.length - items.length));
   }
   const actualFormData = hasFormData ? keyedFormData : [];
   const extraClass = renderOptionalField ? ' rjsf-optional-array-field' : '';
@@ -715,7 +731,7 @@ function FixedArray<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends
   // These are the props passed into the render function
   const canAdd =
     canAddItem<T, S, F>(registry, schema, items, uiSchema) &&
-    !!additionalSchema &&
+    hasAdditionalItems &&
     (!renderOptionalField || hasFormData);
   const arrayProps: ArrayFieldTemplateProps<T[], S, F> = {
     canAdd,
@@ -727,25 +743,21 @@ function FixedArray<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends
       const { key, item } = keyedItem;
       // While we are actually dealing with a single item of type T, the types require a T[], so cast
       const itemCast = item as unknown as T[];
-      const additional = index >= itemSchemas.length;
-      const itemSchema =
-        (additional && isObject(schema.additionalItems)
-          ? schemaUtils.retrieveSchema(schema.additionalItems as S, itemCast)
-          : itemSchemas[index]) || {};
-      const itemFieldPathId = toFieldPathId(index, globalFormOptions, childFieldPathId);
+      const additional = index >= schemaItems.length;
+      const rawItemSchema =
+        (additional && isObject(schema.additionalItems) ? (schema.additionalItems as S) : schemaItems[index]) ||
+        ({} as S);
       // Compute the item UI schema - handle both static and dynamic cases
       let itemUiSchema: UiSchema<T[], S, F> | undefined;
       if (additional) {
         // For additional items, use additionalItems uiSchema
         itemUiSchema = uiSchema.additionalItems as UiSchema<T[], S, F>;
-      } else {
+      } else if (Array.isArray(uiSchema.items)) {
         // For fixed items, uiSchema.items can be an array, a function, or a single object
-        if (Array.isArray(uiSchema.items)) {
-          itemUiSchema = uiSchema.items[index] as UiSchema<T[], S, F>;
-        } else {
-          // Use the helper method for function or static object cases
-          itemUiSchema = computeItemUiSchema<T, S, F>(uiSchema, item, index, formContext);
-        }
+        itemUiSchema = uiSchema.items[index] as UiSchema<T[], S, F>;
+      } else {
+        // Use the helper method for function or static object cases
+        itemUiSchema = computeItemUiSchema<T, S, F>(uiSchema, item, index, formContext);
       }
       const itemErrorSchema = errorSchema ? (errorSchema[index] as ErrorSchema<T[]>) : undefined;
 
@@ -763,12 +775,12 @@ function FixedArray<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends
         title: fieldTitle ? `${fieldTitle}-${index + 1}` : undefined,
         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,
@@ -807,12 +819,12 @@ interface KeyedFormDataState<T = any> {
 }
 
 /** Type used for the state of the `ArrayField` component */
-type ArrayFieldState<T> = {
+interface ArrayFieldState<T> {
   /** The hash of the last formData passed in */
   formDataHash: string;
   /** The keyed form data elements */
   keyedFormData: KeyedFormDataType<T>[];
-};
+}
 
 /** A custom hook that handles the updating of the keyedFormData from an external `formData` change as well as
  * internally by the `ArrayField`. If there was an external `formData` change, then the `keyedFormData` is recomputed
@@ -846,8 +858,8 @@ function useKeyedFormData<T = any>(formData: T[] = []): KeyedFormDataState<T> {
 
   const updateKeyedFormData = useCallback((newData: KeyedFormDataType<T>[]) => {
     const plainFormData = keyedToPlainFormData(newData);
-    const newHash = hashObject(plainFormData);
-    setState({ formDataHash: newHash, keyedFormData: newData });
+    const updatedHash = hashObject(plainFormData);
+    setState({ formDataHash: updatedHash, keyedFormData: newData });
     return plainFormData;
   }, []);
 
@@ -863,6 +875,12 @@ export default function ArrayField<T = any, S extends StrictRJSFSchema = RJSFSch
   const { schema, uiSchema, errorSchema, fieldPathId, registry, formData, onChange } = props;
   const { globalFormOptions, schemaUtils, translateString } = registry;
   const { keyedFormData, updateKeyedFormData } = useKeyedFormData<T>(formData);
+  // Refs keep the latest values accessible inside stable useCallback closures without being in the dep array,
+  // so the four mutation handlers don't get new references on every keyedFormData / errorSchema change.
+  const keyedFormDataRef = useRef(keyedFormData);
+  keyedFormDataRef.current = keyedFormData;
+  const errorSchemaRef = useRef(errorSchema);
+  errorSchemaRef.current = errorSchema;
   // All the children will use childFieldPathId if present in the props, falling back to the fieldPathId
   const childFieldPathId = props.childFieldPathId ?? fieldPathId;
 
@@ -880,14 +898,14 @@ export default function ArrayField<T = any, S extends StrictRJSFSchema = RJSFSch
       }
 
       let newErrorSchema: ErrorSchema<T> | undefined;
-      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 === undefined || 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]);
           }
         }
       }
@@ -896,7 +914,7 @@ export default function ArrayField<T = any, S extends StrictRJSFSchema = RJSFSch
         key: generateRowId(),
         item: getNewFormDataRow<T, S, F>(registry, schema),
       };
-      const newKeyedFormData = [...keyedFormData];
+      const newKeyedFormData = [...keyedFormDataRef.current];
       if (index !== undefined) {
         newKeyedFormData.splice(index, 0, newKeyedFormDataRow);
       } else {
@@ -904,7 +922,7 @@ export default function ArrayField<T = any, S extends StrictRJSFSchema = RJSFSch
       }
       onChange(updateKeyedFormData(newKeyedFormData), childFieldPathId.path, newErrorSchema as ErrorSchema<T[]>);
     },
-    [keyedFormData, registry, schema, onChange, updateKeyedFormData, errorSchema, childFieldPathId],
+    [registry, schema, onChange, updateKeyedFormData, childFieldPathId],
   );
 
   /** Callback handler for when the user clicks on the copy button on an existing array element. Clones the row of
@@ -920,23 +938,23 @@ export default function ArrayField<T = any, S extends StrictRJSFSchema = RJSFSch
       }
 
       let newErrorSchema: ErrorSchema<T> | undefined;
-      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: KeyedFormDataType<T> = {
         key: generateRowId(),
-        item: cloneDeep(keyedFormData[index].item),
+        item: cloneDeep(keyedFormDataRef.current[index].item),
       };
-      const newKeyedFormData = [...keyedFormData];
+      const newKeyedFormData = [...keyedFormDataRef.current];
       if (index !== undefined) {
         newKeyedFormData.splice(index + 1, 0, newKeyedFormDataRow);
       } else {
@@ -944,7 +962,7 @@ export default function ArrayField<T = any, S extends StrictRJSFSchema = RJSFSch
       }
       onChange(updateKeyedFormData(newKeyedFormData), childFieldPathId.path, newErrorSchema as ErrorSchema<T[]>);
     },
-    [keyedFormData, onChange, updateKeyedFormData, errorSchema, childFieldPathId],
+    [onChange, updateKeyedFormData, childFieldPathId],
   );
 
   /** Callback handler for when the user clicks on the remove button on an existing array element. Removes the row of
@@ -960,21 +978,21 @@ export default function ArrayField<T = any, S extends StrictRJSFSchema = RJSFSch
       }
       // refs #195: revalidate to ensure properly reindexing errors
       let newErrorSchema: ErrorSchema<T> | undefined;
-      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 as ErrorSchema<T[]>);
     },
-    [keyedFormData, onChange, updateKeyedFormData, errorSchema, childFieldPathId],
+    [onChange, updateKeyedFormData, childFieldPathId],
   );
 
   /** Callback handler for when the user clicks on one of the move item buttons on an existing array element. Moves the
@@ -991,34 +1009,30 @@ export default function ArrayField<T = any, S extends StrictRJSFSchema = RJSFSch
         event.currentTarget.blur();
       }
       let newErrorSchema: ErrorSchema<T> | undefined;
-      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() {
-        // Copy item
-        const _newKeyedFormData = keyedFormData.slice();
-
-        // Moves item from index to newIndex
-        _newKeyedFormData.splice(index, 1);
-        _newKeyedFormData.splice(newIndex, 0, keyedFormData[index]);
-
-        return _newKeyedFormData;
+        const newKeyedFormData = keyedFormDataRef.current.slice();
+        newKeyedFormData.splice(index, 1);
+        newKeyedFormData.splice(newIndex, 0, keyedFormDataRef.current[index]);
+        return newKeyedFormData;
       }
       const newKeyedFormData = reOrderArray();
       onChange(updateKeyedFormData(newKeyedFormData), childFieldPathId.path, newErrorSchema as ErrorSchema<T[]>);
     },
-    [keyedFormData, onChange, updateKeyedFormData, errorSchema, childFieldPathId],
+    [onChange, updateKeyedFormData, childFieldPathId],
   );
 
   /** Callback handler used to deal with changing the value of the data in the array at the `index`. Calls the
@@ -1054,7 +1068,7 @@ export default function ArrayField<T = any, S extends StrictRJSFSchema = RJSFSch
     ...props,
     formData,
     fieldPathId: childFieldPathId,
-    onSelectChange: onSelectChange,
+    onSelectChange,
   };
   const arrayProps: InternalArrayFieldProps<T, S, F> = {
     ...props,

package/src/components/fields/BooleanField.tsx

@@ -1,16 +1,13 @@
 import { useCallback } from 'react';
-import {
-  getWidget,
-  getUiOptions,
-  optionsList,
+import type {
   FieldProps,
   FormContextType,
   EnumOptionsType,
   ErrorSchema,
   RJSFSchema,
   StrictRJSFSchema,
-  TranslatableString,
 } from '@rjsf/utils';
+import { getWidget, getUiOptions, optionsList, TranslatableString } from '@rjsf/utils';
 import isObject from 'lodash/isObject';
 
 /** The `BooleanField` component is used to render a field in the schema is boolean. It constructs `enumOptions` for the
@@ -89,10 +86,8 @@ function BooleanField<T = any, S extends StrictRJSFSchema = RJSFSchema, F extend
     }
   }
   const onWidgetChange = useCallback(
-    (value: T | undefined, errorSchema?: ErrorSchema, id?: string) => {
-      // Boolean field change passes an empty path array to the parent field which adds the appropriate path
-      return onChange(value, fieldPathId.path, errorSchema, id);
-    },
+    (value: T | undefined, errorSchema?: ErrorSchema, id?: string) =>
+      onChange(value, fieldPathId.path, errorSchema, id),
     [onChange, fieldPathId],
   );
 

package/src/components/fields/FallbackField.tsx

@@ -1,18 +1,14 @@
 import { useMemo, useState } from 'react';
+import type { FallbackFieldProps, FieldPathId, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 import {
-  FallbackFieldProps,
-  FieldPathId,
-  FormContextType,
   getTemplate,
   getUiOptions,
   hashObject,
-  RJSFSchema,
-  StrictRJSFSchema,
   toFieldPathId,
   TranslatableString,
   useDeepCompareMemo,
 } from '@rjsf/utils';
-import { JSONSchema7TypeName } from 'json-schema';
+import type { JSONSchema7TypeName } from 'json-schema';
 
 /**
  * Get the schema for the type selection component.
@@ -23,7 +19,7 @@ function getFallbackTypeSelectionSchema(title: string): RJSFSchema {
     type: 'string',
     enum: ['string', 'number', 'boolean', 'object', 'array'],
     default: 'string',
-    title: title,
+    title,
   };
 }
 
@@ -54,7 +50,7 @@ function castToNewType<T = any>(formData: T, newType: JSONSchema7TypeName): T {
       return String(formData) as T;
     case 'number': {
       const castedNumber = Number(formData);
-      return (isNaN(castedNumber) ? 0 : castedNumber) as T;
+      return (Number.isNaN(castedNumber) ? 0 : castedNumber) as T;
     }
     case 'boolean':
       return Boolean(formData) as T;