@rjsf/primereact 6.6.0 → 6.6.2

package/src/ColorWidget/ColorWidget.tsx

@@ -1,12 +1,6 @@
-import { ChangeEvent } from 'react';
-import {
-  ariaDescribedByIds,
-  FormContextType,
-  getInputProps,
-  RJSFSchema,
-  StrictRJSFSchema,
-  WidgetProps,
-} from '@rjsf/utils';
+import type { ChangeEvent } from 'react';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps } from '@rjsf/utils';
+import { ariaDescribedByIds, getInputProps } from '@rjsf/utils';
 import { ColorPicker } from 'primereact/colorpicker';
 
 /** The `ColorWidget` component renders a color picker.
@@ -36,10 +30,10 @@ export default function ColorWidget<T = any, S extends StrictRJSFSchema = RJSFSc
   const { inline } = options;
   const primeProps = (options.prime || {}) as object;
 
-  const _onChange = ({ target: { value } }: ChangeEvent<HTMLInputElement>) =>
-    onChange(value === '' ? options.emptyValue : value);
-  const _onBlur = () => onBlur && onBlur(id, value);
-  const _onFocus = () => onFocus && onFocus(id, value);
+  const handleChange = ({ target: { value: newValue } }: ChangeEvent<HTMLInputElement>) =>
+    onChange(newValue === '' ? options.emptyValue : newValue);
+  const handleBlur = () => onBlur && onBlur(id, value);
+  const handleFocus = () => onFocus && onFocus(id, value);
 
   return (
     <ColorPicker
@@ -53,9 +47,9 @@ export default function ColorWidget<T = any, S extends StrictRJSFSchema = RJSFSc
       autoFocus={autofocus}
       disabled={disabled || readonly}
       value={value || ''}
-      onChange={onChangeOverride || _onChange}
-      onBlur={_onBlur}
-      onFocus={_onFocus}
+      onChange={onChangeOverride || handleChange}
+      onBlur={handleBlur}
+      onFocus={handleFocus}
       aria-describedby={ariaDescribedByIds(id, !!schema.examples)}
     />
   );

package/src/DescriptionField/DescriptionField.tsx

@@ -1,5 +1,5 @@
 import { RichDescription } from '@rjsf/core';
-import { DescriptionFieldProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { DescriptionFieldProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 
 /** The `DescriptionField` is the template to use to render the description of a field
  *

package/src/ErrorList/ErrorList.tsx

@@ -1,4 +1,5 @@
-import { ErrorListProps, FormContextType, RJSFSchema, StrictRJSFSchema, TranslatableString } from '@rjsf/utils';
+import type { ErrorListProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { TranslatableString } from '@rjsf/utils';
 import { TimesCircleIcon } from 'primereact/icons/timescircle';
 import { Message } from 'primereact/message';
 
@@ -19,8 +20,8 @@ export default function ErrorList<T = any, S extends StrictRJSFSchema = RJSFSche
         <div className='p-message-summary'>{translateString(TranslatableString.ErrorsLabel)}</div>
       </div>
       <ul className='p-message-list'>
-        {errors.map((error, index) => (
-          <li key={`error-${index}`}>{error.stack}</li>
+        {errors.map((error) => (
+          <li key={error.stack}>{error.stack}</li>
         ))}
       </ul>
     </div>

package/src/FieldErrorTemplate/FieldErrorTemplate.tsx

@@ -1,4 +1,5 @@
-import { errorId, FieldErrorProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { FieldErrorProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { errorId } from '@rjsf/utils';
 import { Message } from 'primereact/message';
 
 /** The `FieldErrorTemplate` component renders the errors local to the particular field
@@ -12,9 +13,8 @@ export default function FieldErrorTemplate<
 >({ errors, fieldPathId }: FieldErrorProps<T, S, F>) {
   if (errors && errors.length > 0) {
     const id = errorId(fieldPathId);
-    const content = errors.map((error, i: number) => {
-      return <div key={i}>{error}</div>;
-    });
+    // oxlint-disable-next-line react/no-array-index-key
+    const content = errors.map((error, i: number) => <div key={i}>{error}</div>);
 
     return (
       <Message

package/src/FieldHelpTemplate/FieldHelpTemplate.tsx

@@ -1,5 +1,6 @@
 import { RichHelp } from '@rjsf/core';
-import { FieldHelpProps, FormContextType, RJSFSchema, StrictRJSFSchema, helpId } from '@rjsf/utils';
+import type { FieldHelpProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { helpId } from '@rjsf/utils';
 
 /** The `FieldHelpTemplate` component renders any help desired for a field
  *

package/src/FieldTemplate/FieldTemplate.tsx

@@ -1,11 +1,5 @@
-import {
-  FieldTemplateProps,
-  FormContextType,
-  getTemplate,
-  getUiOptions,
-  RJSFSchema,
-  StrictRJSFSchema,
-} from '@rjsf/utils';
+import type { FieldTemplateProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { getTemplate, getUiOptions } from '@rjsf/utils';
 
 import { Label } from '../util';
 

package/src/GridTemplate/GridTemplate.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { GridTemplateProps } from '@rjsf/utils';
+import type { GridTemplateProps } from '@rjsf/utils';
 
 const breakpoints = {
   xs: 0,
@@ -75,7 +75,7 @@ function GridTemplateColumn(props: GridTemplateProps) {
 
   useEffect(() => {
     if (typeof window === 'undefined') {
-      return;
+      return () => {};
     }
 
     const handleResize = () => setBreakpoint(getBreakpoint(window.innerWidth));

package/src/IconButton/IconButton.tsx

@@ -1,5 +1,8 @@
-import { FormContextType, IconButtonProps, RJSFSchema, StrictRJSFSchema, TranslatableString } from '@rjsf/utils';
-import { Button, ButtonProps } from 'primereact/button';
+import { memo } from 'react';
+import type { FormContextType, IconButtonProps, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { TranslatableString } from '@rjsf/utils';
+import type { ButtonProps } from 'primereact/button';
+import { Button } from 'primereact/button';
 
 export type PrimeIconButtonProps<
   T = any,
@@ -7,14 +10,16 @@ export type PrimeIconButtonProps<
   F extends FormContextType = any,
 > = IconButtonProps<T, S, F> & Omit<ButtonProps, 'onClick'>;
 
-export default function IconButton<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
+function IconButtonFn<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
   props: PrimeIconButtonProps<T, S, F>,
 ) {
   const { icon, iconType, uiSchema, registry, ...otherProps } = props;
   return <Button icon={`pi pi-${icon}`} rounded text severity='secondary' {...otherProps} />;
 }
+const IconButton = memo(IconButtonFn) as typeof IconButtonFn;
+export default IconButton;
 
-export function CopyButton<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
+function CopyButtonFn<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
   props: PrimeIconButtonProps<T, S, F>,
 ) {
   const {
@@ -22,8 +27,9 @@ export function CopyButton<T = any, S extends StrictRJSFSchema = RJSFSchema, F e
   } = props;
   return <IconButton title={translateString(TranslatableString.CopyButton)} {...props} icon='copy' />;
 }
+export const CopyButton = memo(CopyButtonFn) as typeof CopyButtonFn;
 
-export function MoveDownButton<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
+function MoveDownButtonFn<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
   props: PrimeIconButtonProps<T, S, F>,
 ) {
   const {
@@ -31,8 +37,9 @@ export function MoveDownButton<T = any, S extends StrictRJSFSchema = RJSFSchema,
   } = props;
   return <IconButton title={translateString(TranslatableString.MoveDownButton)} {...props} icon='angle-down' />;
 }
+export const MoveDownButton = memo(MoveDownButtonFn) as typeof MoveDownButtonFn;
 
-export function MoveUpButton<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
+function MoveUpButtonFn<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
   props: PrimeIconButtonProps<T, S, F>,
 ) {
   const {
@@ -40,8 +47,9 @@ export function MoveUpButton<T = any, S extends StrictRJSFSchema = RJSFSchema, F
   } = props;
   return <IconButton title={translateString(TranslatableString.MoveUpButton)} {...props} icon='angle-up' />;
 }
+export const MoveUpButton = memo(MoveUpButtonFn) as typeof MoveUpButtonFn;
 
-export function RemoveButton<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
+function RemoveButtonFn<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
   props: PrimeIconButtonProps<T, S, F>,
 ) {
   const {
@@ -49,8 +57,9 @@ export function RemoveButton<T = any, S extends StrictRJSFSchema = RJSFSchema, F
   } = props;
   return <IconButton title={translateString(TranslatableString.RemoveButton)} {...props} icon='trash' />;
 }
+export const RemoveButton = memo(RemoveButtonFn) as typeof RemoveButtonFn;
 
-export function ClearButton<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
+function ClearButtonFn<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
   props: PrimeIconButtonProps<T, S, F>,
 ) {
   const {
@@ -58,3 +67,4 @@ export function ClearButton<T = any, S extends StrictRJSFSchema = RJSFSchema, F
   } = props;
   return <IconButton title={translateString(TranslatableString.ClearButton)} {...props} icon='times' />;
 }
+export const ClearButton = memo(ClearButtonFn) as typeof ClearButtonFn;

package/src/MultiSchemaFieldTemplate/MultiSchemaFieldTemplate.tsx

@@ -1,4 +1,4 @@
-import { FormContextType, MultiSchemaFieldTemplateProps, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { FormContextType, MultiSchemaFieldTemplateProps, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 import { Fieldset } from 'primereact/fieldset';
 
 export default function MultiSchemaFieldTemplate<

package/src/ObjectFieldTemplate/ObjectFieldTemplate.tsx

@@ -1,15 +1,5 @@
-import {
-  FormContextType,
-  ObjectFieldTemplateProps,
-  RJSFSchema,
-  StrictRJSFSchema,
-  canExpand,
-  descriptionId,
-  getTemplate,
-  getUiOptions,
-  titleId,
-  buttonId,
-} from '@rjsf/utils';
+import type { FormContextType, ObjectFieldTemplateProps, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { canExpand, descriptionId, getTemplate, getUiOptions, titleId, buttonId } from '@rjsf/utils';
 
 /** The `ObjectFieldTemplate` is the template to use to render all the inner properties of an object along with the
  * title and description if available. If the object is expandable, then an `AddButton` is also rendered after all

package/src/OptionalDataControlsTemplate/OptionalDataControlsTemplate.tsx

@@ -1,4 +1,4 @@
-import { FormContextType, OptionalDataControlsTemplateProps, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { FormContextType, OptionalDataControlsTemplateProps, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 
 import IconButton, { RemoveButton } from '../IconButton';
 
@@ -28,7 +28,8 @@ export default function OptionalDataControlsTemplate<
         style={{ height: '1.5rem', width: '1.5rem' }} // Shrink the button
       />
     );
-  } else if (onRemoveClick) {
+  }
+  if (onRemoveClick) {
     return (
       <RemoveButton
         id={id}

package/src/PasswordWidget/PasswordWidget.tsx

@@ -1,12 +1,6 @@
-import { ChangeEvent } from 'react';
-import {
-  ariaDescribedByIds,
-  FormContextType,
-  getInputProps,
-  RJSFSchema,
-  StrictRJSFSchema,
-  WidgetProps,
-} from '@rjsf/utils';
+import type { ChangeEvent } from 'react';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps } from '@rjsf/utils';
+import { ariaDescribedByIds, getInputProps } from '@rjsf/utils';
 import { Password } from 'primereact/password';
 
 /** The `PasswordWidget` renders a `Password` component
@@ -38,10 +32,10 @@ export default function PasswordWidget<
   const inputProps = getInputProps<T, S, F>(schema, type, options);
   const primeProps = (options.prime || {}) as object;
 
-  const _onChange = ({ target: { value } }: ChangeEvent<HTMLInputElement>) =>
-    onChange(value === '' ? options.emptyValue : value);
-  const _onBlur = () => onBlur && onBlur(id, value);
-  const _onFocus = () => onFocus && onFocus(id, value);
+  const handleChange = ({ target: { value: newValue } }: ChangeEvent<HTMLInputElement>) =>
+    onChange(newValue === '' ? options.emptyValue : newValue);
+  const handleBlur = () => onBlur && onBlur(id, value);
+  const handleFocus = () => onFocus && onFocus(id, value);
 
   return (
     <Password
@@ -55,9 +49,9 @@ export default function PasswordWidget<
       disabled={disabled || readonly}
       value={value || ''}
       invalid={rawErrors.length > 0}
-      onChange={onChangeOverride || _onChange}
-      onBlur={_onBlur}
-      onFocus={_onFocus}
+      onChange={onChangeOverride || handleChange}
+      onBlur={handleBlur}
+      onFocus={handleFocus}
       aria-describedby={ariaDescribedByIds(id, !!schema.examples)}
       pt={{ root: { style: { display: 'flex', flexDirection: 'column' } } }}
     />

package/src/PrimeForm/PrimeForm.ts

@@ -1,6 +1,7 @@
-import { ComponentType } from 'react';
-import { withTheme, FormProps } from '@rjsf/core';
-import { FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { ComponentType } from 'react';
+import type { FormProps } from '@rjsf/core';
+import { withTheme } from '@rjsf/core';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 
 import { generateTheme } from '../Theme';
 

package/src/RadioWidget/RadioWidget.tsx

@@ -1,3 +1,4 @@
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps } from '@rjsf/utils';
 import {
   ariaDescribedByIds,
   enumOptionValueDecoder,
@@ -5,12 +6,9 @@ import {
   enumOptionsIsSelected,
   getOptionValueFormat,
   optionId,
-  FormContextType,
-  RJSFSchema,
-  StrictRJSFSchema,
-  WidgetProps,
 } from '@rjsf/utils';
-import { RadioButton, RadioButtonChangeEvent } from 'primereact/radiobutton';
+import type { RadioButtonChangeEvent } from 'primereact/radiobutton';
+import { RadioButton } from 'primereact/radiobutton';
 
 /** The `RadioWidget` is a widget for rendering a radio group.
  *  It is typically used with a string property constrained with enum options.
@@ -25,28 +23,28 @@ export default function RadioWidget<T = any, S extends StrictRJSFSchema = RJSFSc
   const { enumOptions, enumDisabled, emptyValue } = options;
   const optionValueFormat = getOptionValueFormat(options);
 
-  const _onChange = (e: RadioButtonChangeEvent) => {
+  const handleChange = (e: RadioButtonChangeEvent) => {
     onChange(enumOptionValueDecoder<S>(e.value, enumOptions, optionValueFormat, emptyValue));
   };
 
-  const _onBlur = () => onBlur(id, value);
-  const _onFocus = () => onFocus(id, value);
+  const handleBlur = () => onBlur(id, value);
+  const handleFocus = () => onFocus(id, value);
 
   return (
     <div style={{ display: 'flex', flexDirection: 'row', gap: '1rem' }}>
       {Array.isArray(enumOptions) &&
         enumOptions.map((option, index) => {
           const checked = enumOptionsIsSelected<S>(option.value, value);
-          const itemDisabled = Array.isArray(enumDisabled) && enumDisabled.indexOf(option.value) !== -1;
+          const itemDisabled = Array.isArray(enumDisabled) && enumDisabled.includes(option.value);
           return (
-            <div key={index} style={{ display: 'flex', alignItems: 'center' }}>
+            <div key={String(option.value)} style={{ display: 'flex', alignItems: 'center' }}>
               <RadioButton
                 inputId={optionId(id, index)}
                 name={htmlName || id}
                 {...primeProps}
-                onFocus={_onFocus}
-                onBlur={_onBlur}
-                onChange={_onChange}
+                onFocus={handleFocus}
+                onBlur={handleBlur}
+                onChange={handleChange}
                 value={enumOptionValueEncoder(option.value, index, optionValueFormat)}
                 checked={checked}
                 disabled={disabled || itemDisabled || readonly}

package/src/RangeWidget/RangeWidget.tsx

@@ -1,6 +1,8 @@
-import { FocusEvent } from 'react';
-import { ariaDescribedByIds, FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps, rangeSpec } from '@rjsf/utils';
-import { Slider, SliderChangeEvent } from 'primereact/slider';
+import type { FocusEvent } from 'react';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps } from '@rjsf/utils';
+import { ariaDescribedByIds, rangeSpec } from '@rjsf/utils';
+import type { SliderChangeEvent } from 'primereact/slider';
+import { Slider } from 'primereact/slider';
 
 /** The `RangeWidget` component uses the `Slider` from PrimeReact, wrapping the result
  * in a div, with the value alongside it.
@@ -14,24 +16,22 @@ export default function RangeWidget<T = any, S extends StrictRJSFSchema = RJSFSc
   const primeProps = (options.prime || {}) as object;
   const sliderProps = { value, id, ...rangeSpec<S>(schema) };
 
-  const _onChange = (e: SliderChangeEvent) => {
+  const handleChange = (e: SliderChangeEvent) => {
     onChange(e.value ?? options.emptyValue);
   };
-  const _onBlur = ({ target }: FocusEvent<HTMLInputElement>) => onBlur(id, target && target.value);
-  const _onFocus = ({ target }: FocusEvent<HTMLInputElement>) => onFocus(id, target && target.value);
+  const handleBlur = ({ target }: FocusEvent<HTMLInputElement>) => onBlur(id, target && target.value);
+  const handleFocus = ({ target }: FocusEvent<HTMLInputElement>) => onFocus(id, target && target.value);
 
   return (
-    <>
-      <Slider
-        {...primeProps}
-        disabled={disabled || readonly}
-        onMouseDown={(e) => e.stopPropagation()}
-        onChange={_onChange}
-        onBlur={_onBlur}
-        onFocus={_onFocus}
-        {...sliderProps}
-        aria-describedby={ariaDescribedByIds(id)}
-      />
-    </>
+    <Slider
+      {...primeProps}
+      disabled={disabled || readonly}
+      onMouseDown={(e) => e.stopPropagation()}
+      onChange={handleChange}
+      onBlur={handleBlur}
+      onFocus={handleFocus}
+      {...sliderProps}
+      aria-describedby={ariaDescribedByIds(id)}
+    />
   );
 }

package/src/SelectWidget/SelectWidget.tsx

@@ -1,14 +1,11 @@
-import { FocusEvent } from 'react';
+import type { FocusEvent } from 'react';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps } from '@rjsf/utils';
 import {
   ariaDescribedByIds,
   enumOptionSelectedValue,
   enumOptionValueDecoder,
   enumOptionValueEncoder,
   getOptionValueFormat,
-  FormContextType,
-  RJSFSchema,
-  StrictRJSFSchema,
-  WidgetProps,
 } from '@rjsf/utils';
 import { Dropdown } from 'primereact/dropdown';
 import { MultiSelect } from 'primereact/multiselect';
@@ -55,15 +52,15 @@ function SingleSelectWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F
   const optionValueFormat = getOptionValueFormat(options);
   const primeProps = (options.prime || {}) as object;
 
-  multiple = typeof multiple === 'undefined' ? false : multiple;
+  const isMultiple = typeof multiple === 'undefined' ? false : multiple;
 
-  const emptyValue = multiple ? [] : '';
+  const emptyValue = isMultiple ? [] : '';
 
-  const _onChange = (e: { value: any }) =>
+  const handleChange = (e: { value: any }) =>
     onChange(enumOptionValueDecoder<S>(e.value, enumOptions, optionValueFormat, optEmptyVal));
-  const _onBlur = ({ target }: FocusEvent<HTMLInputElement>) =>
+  const handleBlur = ({ target }: FocusEvent<HTMLInputElement>) =>
     onBlur(id, enumOptionValueDecoder<S>(target && target.value, enumOptions, optionValueFormat, optEmptyVal));
-  const _onFocus = ({ target }: FocusEvent<HTMLInputElement>) =>
+  const handleFocus = ({ target }: FocusEvent<HTMLInputElement>) =>
     onFocus(id, enumOptionValueDecoder<S>(target && target.value, enumOptions, optionValueFormat, optEmptyVal));
   const { ...dropdownRemainingProps } = dropdownProps;
 
@@ -72,15 +69,15 @@ function SingleSelectWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F
       id={id}
       name={htmlName || id}
       {...primeProps}
-      value={enumOptionSelectedValue<S>(value, enumOptions, !!multiple, optionValueFormat, emptyValue)}
-      options={(enumOptions ?? []).map(({ value, label }, i: number) => ({
-        label,
-        value: enumOptionValueEncoder(value, i, optionValueFormat),
-        disabled: Array.isArray(enumDisabled) && enumDisabled.indexOf(value) !== -1,
+      value={enumOptionSelectedValue<S>(value, enumOptions, isMultiple, optionValueFormat, emptyValue)}
+      options={(enumOptions ?? []).map(({ value: enumValue, label: enumLabel }, i: number) => ({
+        label: enumLabel,
+        value: enumOptionValueEncoder(enumValue, i, optionValueFormat),
+        disabled: Array.isArray(enumDisabled) && enumDisabled.includes(enumValue),
       }))}
-      onChange={_onChange}
-      onBlur={_onBlur}
-      onFocus={_onFocus}
+      onChange={handleChange}
+      onBlur={handleBlur}
+      onFocus={handleFocus}
       placeholder={placeholder}
       disabled={disabled || readonly}
       autoFocus={autofocus}
@@ -110,11 +107,11 @@ function MultiSelectWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F e
 
   const emptyValue = multiple ? [] : '';
 
-  const _onChange = (e: { value: any }) =>
+  const handleChange = (e: { value: any }) =>
     onChange(enumOptionValueDecoder<S>(e.value, enumOptions, optionValueFormat, optEmptyVal));
-  const _onBlur = ({ target }: FocusEvent<HTMLInputElement>) =>
+  const handleBlur = ({ target }: FocusEvent<HTMLInputElement>) =>
     onBlur(id, enumOptionValueDecoder<S>(target && target.value, enumOptions, optionValueFormat, optEmptyVal));
-  const _onFocus = ({ target }: FocusEvent<HTMLInputElement>) =>
+  const handleFocus = ({ target }: FocusEvent<HTMLInputElement>) =>
     onFocus(id, enumOptionValueDecoder<S>(target && target.value, enumOptions, optionValueFormat, optEmptyVal));
 
   return (
@@ -123,14 +120,14 @@ function MultiSelectWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F e
       name={htmlName || id}
       {...primeProps}
       value={enumOptionSelectedValue<S>(value, enumOptions, multiple, optionValueFormat, emptyValue)}
-      options={(enumOptions ?? []).map(({ value, label }, i: number) => ({
-        label,
-        value: enumOptionValueEncoder(value, i, optionValueFormat),
-        disabled: Array.isArray(enumDisabled) && enumDisabled.indexOf(value) !== -1,
+      options={(enumOptions ?? []).map(({ value: enumValue, label: enumLabel }, i: number) => ({
+        label: enumLabel,
+        value: enumOptionValueEncoder(enumValue, i, optionValueFormat),
+        disabled: Array.isArray(enumDisabled) && enumDisabled.includes(enumValue),
       }))}
-      onChange={_onChange}
-      onBlur={_onBlur}
-      onFocus={_onFocus}
+      onChange={handleChange}
+      onBlur={handleBlur}
+      onFocus={handleFocus}
       placeholder={placeholder}
       disabled={disabled || readonly}
       autoFocus={autofocus}

package/src/SubmitButton/SubmitButton.tsx

@@ -1,4 +1,5 @@
-import { getSubmitButtonOptions, FormContextType, RJSFSchema, StrictRJSFSchema, SubmitButtonProps } from '@rjsf/utils';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, SubmitButtonProps } from '@rjsf/utils';
+import { getSubmitButtonOptions } from '@rjsf/utils';
 import { Button } from 'primereact/button';
 
 /** The `SubmitButton` renders a button that represents the `Submit` action on a form

package/src/Templates/Templates.ts

@@ -1,4 +1,4 @@
-import { FormContextType, RJSFSchema, StrictRJSFSchema, TemplatesType } from '@rjsf/utils';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, TemplatesType } from '@rjsf/utils';
 
 import AddButton from '../AddButton';
 import ArrayFieldItemTemplate from '../ArrayFieldItemTemplate';

package/src/TextareaWidget/TextareaWidget.tsx

@@ -1,5 +1,5 @@
-import { ChangeEvent } from 'react';
-import { FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps } from '@rjsf/utils';
+import type { ChangeEvent } from 'react';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps } from '@rjsf/utils';
 import { InputTextarea } from 'primereact/inputtextarea';
 
 /** The `TextareaWidget` is a widget for rendering input fields as textarea using PrimeReact.

package/src/Theme/Theme.ts

@@ -1,5 +1,5 @@
-import { ThemeProps } from '@rjsf/core';
-import { FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { ThemeProps } from '@rjsf/core';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 
 import { generateTemplates } from '../Templates';
 import { generateWidgets } from '../Widgets';

package/src/TitleField/TitleField.tsx

@@ -1,4 +1,5 @@
-import { FormContextType, getUiOptions, RJSFSchema, StrictRJSFSchema, TitleFieldProps, titleId } from '@rjsf/utils';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, TitleFieldProps } from '@rjsf/utils';
+import { getUiOptions, titleId } from '@rjsf/utils';
 import { Divider } from 'primereact/divider';
 
 /** The `TitleField` is the template to use to render the title of a field

package/src/UpDownWidget/UpDownWidget.tsx

@@ -1,12 +1,7 @@
-import {
-  ariaDescribedByIds,
-  FormContextType,
-  getInputProps,
-  RJSFSchema,
-  StrictRJSFSchema,
-  WidgetProps,
-} from '@rjsf/utils';
-import { InputNumber, InputNumberChangeEvent } from 'primereact/inputnumber';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps } from '@rjsf/utils';
+import { ariaDescribedByIds, getInputProps } from '@rjsf/utils';
+import type { InputNumberChangeEvent } from 'primereact/inputnumber';
+import { InputNumber } from 'primereact/inputnumber';
 
 /** The `UpDownWidget` renders an input component for a number.
  *
@@ -36,9 +31,9 @@ export default function UpDownWidget<T = any, S extends StrictRJSFSchema = RJSFS
   const { showButtons, buttonLayout, useGrouping, minFractionDigits, maxFractionDigits, locale, currency } = options;
   const primeProps = (options.prime || {}) as object;
 
-  const _onChange = (event: InputNumberChangeEvent) => onChange(event.value === null ? options.emptyValue : value);
-  const _onBlur = () => onBlur && onBlur(id, value);
-  const _onFocus = () => onFocus && onFocus(id, value);
+  const handleChange = (event: InputNumberChangeEvent) => onChange(event.value === null ? options.emptyValue : value);
+  const handleBlur = () => onBlur && onBlur(id, value);
+  const handleFocus = () => onFocus && onFocus(id, value);
 
   return (
     <InputNumber
@@ -46,24 +41,24 @@ export default function UpDownWidget<T = any, S extends StrictRJSFSchema = RJSFS
       name={id}
       {...primeProps}
       placeholder={placeholder}
-      step={isNaN(Number(inputProps.step)) ? 1 : Number(inputProps.step)}
+      step={Number.isNaN(Number(inputProps.step)) ? 1 : Number(inputProps.step)}
       required={required}
       autoFocus={autofocus}
       disabled={disabled || readonly}
       style={buttonLayout === 'vertical' ? { width: '4em' } : {}}
       showButtons={typeof showButtons === 'undefined' ? true : !!showButtons}
-      buttonLayout={(buttonLayout as any) ?? 'stacked'}
+      buttonLayout={buttonLayout ?? 'stacked'}
       useGrouping={!!useGrouping}
       minFractionDigits={minFractionDigits as number}
       maxFractionDigits={maxFractionDigits as number}
       locale={locale as string}
       mode={currency ? 'currency' : 'decimal'}
       currency={currency as string}
-      value={isNaN(Number(value)) ? null : Number(value)}
+      value={Number.isNaN(Number(value)) ? null : Number(value)}
       invalid={rawErrors.length > 0}
-      onChange={(onChangeOverride as any) || _onChange}
-      onBlur={_onBlur}
-      onFocus={_onFocus}
+      onChange={onChangeOverride || handleChange}
+      onBlur={handleBlur}
+      onFocus={handleFocus}
       aria-describedby={ariaDescribedByIds(id, !!schema.examples)}
     />
   );

package/src/Widgets/Widgets.tsx

@@ -1,4 +1,4 @@
-import { FormContextType, RegistryWidgetsType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { FormContextType, RegistryWidgetsType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 
 import AutoCompleteWidget from '../AutoCompleteWidget/AutoCompleteWidget';
 import CheckboxesWidget from '../CheckboxesWidget/CheckboxesWidget';

package/src/WrapIfAdditionalTemplate/WrapIfAdditionalTemplate.tsx

@@ -1,12 +1,5 @@
-import {
-  ADDITIONAL_PROPERTY_FLAG,
-  buttonId,
-  FormContextType,
-  RJSFSchema,
-  StrictRJSFSchema,
-  TranslatableString,
-  WrapIfAdditionalTemplateProps,
-} from '@rjsf/utils';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, WrapIfAdditionalTemplateProps } from '@rjsf/utils';
+import { ADDITIONAL_PROPERTY_FLAG, buttonId, TranslatableString } from '@rjsf/utils';
 import { InputText } from 'primereact/inputtext';
 
 /** The `WrapIfAdditional` component is used by the `FieldTemplate` to rename, or remove properties that are