@rjsf/core 6.6.1 → 6.6.2

package/src/components/fields/SchemaField.tsx

@@ -1,8 +1,6 @@
-import { useCallback, Component, ComponentType } from 'react';
-import {
-  ADDITIONAL_PROPERTY_FLAG,
-  ANY_OF_KEY,
-  descriptionId,
+import type { ComponentType } from 'react';
+import { useCallback, Component } from 'react';
+import type {
   ErrorSchema,
   Field,
   FieldPathId,
@@ -10,28 +8,33 @@ import {
   FieldProps,
   FieldTemplateProps,
   FormContextType,
+  Registry,
+  RJSFSchema,
+  StrictRJSFSchema,
+  UIOptionsType,
+} from '@rjsf/utils';
+import {
+  ADDITIONAL_PROPERTY_FLAG,
+  ANY_OF_KEY,
+  descriptionId,
   getSchemaType,
   getTemplate,
   getUiOptions,
   ID_KEY,
   isFormDataAvailable,
   ONE_OF_KEY,
-  Registry,
   resolveUiSchema,
-  RJSFSchema,
   shouldRender,
   shouldRenderOptionalField,
-  StrictRJSFSchema,
   toFieldPathId,
   TranslatableString,
   UI_OPTIONS_KEY,
-  UIOptionsType,
 } from '@rjsf/utils';
 import isObject from 'lodash/isObject';
 import omit from 'lodash/omit';
 
 /** The map of component type to FieldName */
-const COMPONENT_TYPES: { [key: string]: string } = {
+const COMPONENT_TYPES: Record<string, string> = {
   array: 'ArrayField',
   boolean: 'BooleanField',
   integer: 'NumberField',
@@ -55,7 +58,7 @@ function getFieldComponent<T = any, S extends StrictRJSFSchema = RJSFSchema, F e
   uiOptions: UIOptionsType<T, S, F>,
   registry: Registry<T, S, F>,
 ): ComponentType<FieldProps<T, S, F>> {
-  const field = uiOptions.field;
+  const { field } = uiOptions;
   const { fields } = registry;
   if (typeof field === 'function') {
     return field;
@@ -80,7 +83,7 @@ function getFieldComponent<T = any, S extends StrictRJSFSchema = RJSFSchema, F e
     return () => null;
   }
 
-  return componentName in fields ? fields[componentName] : fields['FallbackField'];
+  return componentName in fields ? fields[componentName] : fields.FallbackField;
 }
 
 /** The `SchemaFieldRender` component is the work-horse of react-jsonschema-form, determining what kind of real field to
@@ -126,9 +129,9 @@ function SchemaFieldRender<T = any, S extends StrictRJSFSchema = RJSFSchema, F e
    * `onChange` chain if it is not already being provided from a deeper level in the hierarchy
    */
   const handleFieldComponentChange = useCallback(
-    (formData: T | undefined, path: FieldPathList, newErrorSchema?: ErrorSchema<T>, id?: string) => {
+    (newFormData: T | undefined, path: FieldPathList, newErrorSchema?: ErrorSchema<T>, id?: string) => {
       const theId = id || fieldId;
-      return onChange(formData, path, newErrorSchema, theId);
+      return onChange(newFormData, path, newErrorSchema, theId);
     },
     [fieldId, onChange],
   );
@@ -162,13 +165,13 @@ function SchemaFieldRender<T = any, S extends StrictRJSFSchema = RJSFSchema, F e
   if ((ANY_OF_KEY in schema || ONE_OF_KEY in schema) && !isReplacingAnyOrOneOf && !schemaUtils.isSelect(schema)) {
     if (schema[ANY_OF_KEY]) {
       XxxOfField = _AnyOfField;
-      XxxOfOptions = schema[ANY_OF_KEY].map((_schema) =>
-        schemaUtils.retrieveSchema(isObject(_schema) ? (_schema as S) : ({} as S), formData),
+      XxxOfOptions = schema[ANY_OF_KEY].map((xxxOfSchema) =>
+        schemaUtils.retrieveSchema(isObject(xxxOfSchema) ? (xxxOfSchema as S) : ({} as S), formData),
       );
     } else if (schema[ONE_OF_KEY]) {
       XxxOfField = _OneOfField;
-      XxxOfOptions = schema[ONE_OF_KEY].map((_schema) =>
-        schemaUtils.retrieveSchema(isObject(_schema) ? (_schema as S) : ({} as S), formData),
+      XxxOfOptions = schema[ONE_OF_KEY].map((xxxOfSchema) =>
+        schemaUtils.retrieveSchema(isObject(xxxOfSchema) ? (xxxOfSchema as S) : ({} as S), formData),
       );
     }
     // When the anyOf/oneOf is an optional data control render AND it does not have form data, hide the label
@@ -224,7 +227,7 @@ function SchemaFieldRender<T = any, S extends StrictRJSFSchema = RJSFSchema, F e
   }
 
   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-${getSchemaType(schema)}`];

package/src/components/fields/StringField.tsx

@@ -1,15 +1,6 @@
 import { useCallback } from 'react';
-import {
-  getWidget,
-  getUiOptions,
-  optionsList,
-  hasWidget,
-  FieldProps,
-  FormContextType,
-  RJSFSchema,
-  StrictRJSFSchema,
-  ErrorSchema,
-} from '@rjsf/utils';
+import type { FieldProps, FormContextType, RJSFSchema, StrictRJSFSchema, ErrorSchema } from '@rjsf/utils';
+import { getWidget, getUiOptions, optionsList, hasWidget } from '@rjsf/utils';
 
 /** The `StringField` component is used to render a schema field that represents a string type
  *
@@ -48,10 +39,8 @@ function StringField<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends
   const label = uiTitle ?? title ?? schemaTitle ?? name;
   const Widget = getWidget<T, S, F>(schema, widget, widgets);
   const onWidgetChange = useCallback(
-    (value: T | undefined, errorSchema?: ErrorSchema, id?: string) => {
-      // String 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],
   );
   return (

package/src/components/fields/index.ts

@@ -1,4 +1,4 @@
-import { Field, FormContextType, RegistryFieldsType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { Field, FormContextType, RegistryFieldsType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 
 import ArrayField from './ArrayField';
 import BooleanField from './BooleanField';

package/src/components/templates/ArrayFieldDescriptionTemplate.tsx

@@ -1,12 +1,5 @@
-import {
-  descriptionId,
-  getTemplate,
-  getUiOptions,
-  ArrayFieldDescriptionProps,
-  FormContextType,
-  RJSFSchema,
-  StrictRJSFSchema,
-} from '@rjsf/utils';
+import type { ArrayFieldDescriptionProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { descriptionId, getTemplate, getUiOptions } from '@rjsf/utils';
 
 /** The `ArrayFieldDescriptionTemplate` component renders a `DescriptionFieldTemplate` with an `id` derived from
  * the `fieldPathId`.

package/src/components/templates/ArrayFieldItemButtonsTemplate.tsx

@@ -1,10 +1,5 @@
-import {
-  ArrayFieldItemButtonsTemplateProps,
-  buttonId,
-  FormContextType,
-  RJSFSchema,
-  StrictRJSFSchema,
-} from '@rjsf/utils';
+import type { ArrayFieldItemButtonsTemplateProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { buttonId } from '@rjsf/utils';
 
 /** The `ArrayFieldTemplateItemButtons` component is the template used to render the buttons associate3d with items of
  * an array.

package/src/components/templates/ArrayFieldItemTemplate.tsx

@@ -1,12 +1,6 @@
-import { CSSProperties } from 'react';
-import {
-  ArrayFieldItemTemplateProps,
-  FormContextType,
-  getTemplate,
-  getUiOptions,
-  RJSFSchema,
-  StrictRJSFSchema,
-} from '@rjsf/utils';
+import type { CSSProperties } from 'react';
+import type { ArrayFieldItemTemplateProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { getTemplate, getUiOptions } from '@rjsf/utils';
 
 /** The `ArrayFieldItemTemplate` component is the template used to render an items of an array.
  *

package/src/components/templates/ArrayFieldTemplate.tsx

@@ -1,12 +1,5 @@
-import {
-  getTemplate,
-  getUiOptions,
-  ArrayFieldTemplateProps,
-  FormContextType,
-  RJSFSchema,
-  StrictRJSFSchema,
-  buttonId,
-} from '@rjsf/utils';
+import type { ArrayFieldTemplateProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { getTemplate, getUiOptions, buttonId } from '@rjsf/utils';
 
 /** The `ArrayFieldTemplate` component is the template used to render all items in an array.
  *

package/src/components/templates/ArrayFieldTitleTemplate.tsx

@@ -1,13 +1,5 @@
-import {
-  getTemplate,
-  getUiOptions,
-  titleId,
-  ArrayFieldTitleProps,
-  FormContextType,
-  RJSFSchema,
-  StrictRJSFSchema,
-  TemplatesType,
-} from '@rjsf/utils';
+import type { ArrayFieldTitleProps, FormContextType, RJSFSchema, StrictRJSFSchema, TemplatesType } from '@rjsf/utils';
+import { getTemplate, getUiOptions, titleId } from '@rjsf/utils';
 
 /** The `ArrayFieldTitleTemplate` component renders a `TitleFieldTemplate` with an `id` derived from
  * the `fieldPathId`.

package/src/components/templates/BaseInputTemplate.tsx

@@ -1,13 +1,7 @@
-import { ChangeEvent, FocusEvent, MouseEvent, useCallback } from 'react';
-import {
-  ariaDescribedByIds,
-  BaseInputTemplateProps,
-  examplesId,
-  getInputProps,
-  FormContextType,
-  RJSFSchema,
-  StrictRJSFSchema,
-} from '@rjsf/utils';
+import type { ChangeEvent, FocusEvent, MouseEvent } from 'react';
+import { useCallback } from 'react';
+import type { BaseInputTemplateProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { ariaDescribedByIds, examplesId, getInputProps } from '@rjsf/utils';
 
 import SchemaExamples from '../SchemaExamples';
 
@@ -49,6 +43,7 @@ export default function BaseInputTemplate<
   // Note: since React 15.2.0 we can't forward unknown element attributes, so we
   // exclude the "options" and "schema" ones here.
   if (!id) {
+    // oxlint-disable-next-line no-console
     console.log('No id for', props);
     throw new Error(`no id for props ${JSON.stringify(props)}`);
   }
@@ -64,19 +59,20 @@ export default function BaseInputTemplate<
     inputValue = value == null ? '' : value;
   }
 
-  const _onChange = useCallback(
-    ({ target: { value } }: ChangeEvent<HTMLInputElement>) => onChange(value === '' ? options.emptyValue : value),
+  const handleChange = useCallback(
+    ({ target: { value: newValue } }: ChangeEvent<HTMLInputElement>) =>
+      onChange(newValue === '' ? options.emptyValue : newValue),
     [onChange, options],
   );
-  const _onBlur = useCallback(
+  const handleBlur = useCallback(
     ({ target }: FocusEvent<HTMLInputElement>) => onBlur(id, target && target.value),
     [onBlur, id],
   );
-  const _onFocus = useCallback(
+  const handleFocus = useCallback(
     ({ target }: FocusEvent<HTMLInputElement>) => onFocus(id, target && target.value),
     [onFocus, id],
   );
-  const _onClear = useCallback(
+  const handleClear = useCallback(
     (e: MouseEvent) => {
       e.preventDefault();
       e.stopPropagation();
@@ -97,13 +93,13 @@ export default function BaseInputTemplate<
         value={inputValue}
         {...inputProps}
         list={schema.examples ? examplesId(id) : undefined}
-        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 && (
-        <ClearButton registry={registry} onClick={_onClear} />
+        <ClearButton registry={registry} onClick={handleClear} />
       )}
       <SchemaExamples id={id} schema={schema} />
     </>

package/src/components/templates/ButtonTemplates/AddButton.tsx

@@ -1,4 +1,5 @@
-import { FormContextType, IconButtonProps, RJSFSchema, StrictRJSFSchema, TranslatableString } from '@rjsf/utils';
+import type { FormContextType, IconButtonProps, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { TranslatableString } from '@rjsf/utils';
 
 import IconButton from './IconButton';
 

package/src/components/templates/ButtonTemplates/IconButton.tsx

@@ -1,6 +1,8 @@
-import { FormContextType, IconButtonProps, RJSFSchema, StrictRJSFSchema, TranslatableString } from '@rjsf/utils';
+import { memo } from 'react';
+import type { FormContextType, IconButtonProps, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { TranslatableString } from '@rjsf/utils';
 
-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: IconButtonProps<T, S, F>,
 ) {
   const { iconType = 'default', icon, className, uiSchema, registry, ...otherProps } = props;
@@ -10,8 +12,10 @@ export default function IconButton<T = any, S extends StrictRJSFSchema = RJSFSch
     </button>
   );
 }
+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: IconButtonProps<T, S, F>,
 ) {
   const {
@@ -19,8 +23,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: IconButtonProps<T, S, F>,
 ) {
   const {
@@ -28,8 +33,9 @@ export function MoveDownButton<T = any, S extends StrictRJSFSchema = RJSFSchema,
   } = props;
   return <IconButton title={translateString(TranslatableString.MoveDownButton)} {...props} icon='arrow-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: IconButtonProps<T, S, F>,
 ) {
   const {
@@ -37,8 +43,9 @@ export function MoveUpButton<T = any, S extends StrictRJSFSchema = RJSFSchema, F
   } = props;
   return <IconButton title={translateString(TranslatableString.MoveUpButton)} {...props} icon='arrow-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: IconButtonProps<T, S, F>,
 ) {
   const {
@@ -48,8 +55,9 @@ export function RemoveButton<T = any, S extends StrictRJSFSchema = RJSFSchema, F
     <IconButton title={translateString(TranslatableString.RemoveButton)} {...props} iconType='danger' icon='remove' />
   );
 }
+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>({
   id,
   className,
   onClick,
@@ -72,3 +80,4 @@ export function ClearButton<T = any, S extends StrictRJSFSchema = RJSFSchema, F
     />
   );
 }
+export const ClearButton = memo(ClearButtonFn) as typeof ClearButtonFn;

package/src/components/templates/ButtonTemplates/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';
 
 /** The `SubmitButton` renders a button that represent the `Submit` action on a form
  */

package/src/components/templates/ButtonTemplates/index.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 { CopyButton, MoveDownButton, MoveUpButton, RemoveButton, ClearButton } from './IconButton';

package/src/components/templates/DescriptionField.tsx

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

package/src/components/templates/ErrorList.tsx

@@ -1,11 +1,5 @@
-import {
-  ErrorListProps,
-  FormContextType,
-  RJSFValidationError,
-  RJSFSchema,
-  StrictRJSFSchema,
-  TranslatableString,
-} from '@rjsf/utils';
+import type { ErrorListProps, FormContextType, RJSFValidationError, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { TranslatableString } from '@rjsf/utils';
 
 /** The `ErrorList` component is the template that renders the all the errors associated with the fields in the `Form`
  *
@@ -22,13 +16,12 @@ export default function ErrorList<T = any, S extends StrictRJSFSchema = RJSFSche
         <h3 className='panel-title'>{translateString(TranslatableString.ErrorsLabel)}</h3>
       </div>
       <ul className='list-group'>
-        {errors.map((error: RJSFValidationError, i: number) => {
-          return (
-            <li key={i} className='list-group-item text-danger'>
-              {error.stack}
-            </li>
-          );
-        })}
+        {errors.map((error: RJSFValidationError, i: number) => (
+          // oxlint-disable-next-line react/no-array-index-key
+          <li key={i} className='list-group-item text-danger'>
+            {error.stack}
+          </li>
+        ))}
       </ul>
     </div>
   );

package/src/components/templates/FallbackFieldTemplate.tsx

@@ -1,4 +1,5 @@
-import { FallbackFieldTemplateProps, FormContextType, getTemplate, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { FallbackFieldTemplateProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { getTemplate } from '@rjsf/utils';
 
 /**
  * The `FallbackFieldTemplate` is used to render a field when no field matches. The field renders a type selector and

package/src/components/templates/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';
 
 /** The `FieldErrorTemplate` component renders the errors local to the particular field
  *
@@ -20,13 +21,12 @@ export default function FieldErrorTemplate<
       <ul id={id} className='error-detail bs-callout bs-callout-info'>
         {errors
           .filter((elem) => !!elem)
-          .map((error, index: number) => {
-            return (
-              <li className='text-danger' key={index}>
-                {error}
-              </li>
-            );
-          })}
+          .map((error, index: number) => (
+            // oxlint-disable-next-line react/no-array-index-key
+            <li className='text-danger' key={index}>
+              {error}
+            </li>
+          ))}
       </ul>
     </div>
   );

package/src/components/templates/FieldHelpTemplate.tsx

@@ -1,4 +1,5 @@
-import { helpId, FieldHelpProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { FieldHelpProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { helpId } from '@rjsf/utils';
 
 import RichHelp from '../RichHelp';
 

package/src/components/templates/FieldTemplate/FieldTemplate.tsx

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

package/src/components/templates/FieldTemplate/Label.tsx

@@ -1,13 +1,13 @@
 const REQUIRED_FIELD_SYMBOL = '*';
 
-export type LabelProps = {
+export interface LabelProps {
   /** The label for the field */
   label?: string;
   /** A boolean value stating if the field is required */
   required?: boolean;
   /** The id of the input field being labeled */
   id?: string;
-};
+}
 
 /** Renders a label for a field
  *

package/src/components/templates/GridTemplate.tsx

@@ -1,4 +1,4 @@
-import { GridTemplateProps } from '@rjsf/utils';
+import type { GridTemplateProps } from '@rjsf/utils';
 
 /** Renders a `GridTemplate` for bootstrap 3, which is expecting the column information coming in via the `className`
  * prop. Also spreads all the other props provided by the user directly on the div.

package/src/components/templates/MultiSchemaFieldTemplate.tsx

@@ -1,4 +1,4 @@
-import { FormContextType, MultiSchemaFieldTemplateProps, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { FormContextType, MultiSchemaFieldTemplateProps, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 
 /** The `MultiSchemaFieldTemplate` component renders the layout for the MultiSchemaField, which supports choosing
  * a schema from a list of schemas defined using `anyOf` or `oneOf`.

package/src/components/templates/ObjectFieldTemplate.tsx

@@ -1,16 +1,11 @@
-import {
+import type {
   FormContextType,
   ObjectFieldTemplatePropertyType,
   ObjectFieldTemplateProps,
   RJSFSchema,
   StrictRJSFSchema,
-  canExpand,
-  descriptionId,
-  getTemplate,
-  getUiOptions,
-  titleId,
-  buttonId,
 } 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/components/templates/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 from './ButtonTemplates/IconButton';
 
@@ -27,7 +27,8 @@ export default function OptionalDataControlsTemplate<
         title={label}
       />
     );
-  } else if (onRemoveClick) {
+  }
+  if (onRemoveClick) {
     return (
       <IconButton
         id={id}

package/src/components/templates/TitleField.tsx

@@ -1,4 +1,4 @@
-import { FormContextType, TitleFieldProps, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { FormContextType, TitleFieldProps, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 
 const REQUIRED_FIELD_SYMBOL = '*';
 

package/src/components/templates/UnsupportedField.tsx

@@ -1,5 +1,6 @@
-import { FormContextType, RJSFSchema, StrictRJSFSchema, TranslatableString, UnsupportedFieldProps } from '@rjsf/utils';
-import { Markdown } from 'markdown-to-jsx';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, UnsupportedFieldProps } from '@rjsf/utils';
+import { TranslatableString } from '@rjsf/utils';
+import { Markdown } from 'markdown-to-jsx/react';
 
 /** The `UnsupportedField` component is used to render a field in the schema is one that is not supported by
  * react-jsonschema-form.

package/src/components/templates/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 Label from './FieldTemplate/Label';
 

package/src/components/templates/index.ts

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

package/src/components/widgets/AltDateTimeWidget.tsx

@@ -1,4 +1,4 @@
-import { FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps } from '@rjsf/utils';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps } from '@rjsf/utils';
 
 /** The `AltDateTimeWidget` is an alternative widget for rendering datetime properties.
  *  It uses the AltDateWidget for rendering, with the `time` prop set to true by default.

package/src/components/widgets/AltDateWidget.tsx

@@ -1,12 +1,5 @@
-import {
-  DateElement,
-  FormContextType,
-  RJSFSchema,
-  StrictRJSFSchema,
-  TranslatableString,
-  WidgetProps,
-  useAltDateWidgetProps,
-} from '@rjsf/utils';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps } from '@rjsf/utils';
+import { DateElement, TranslatableString, useAltDateWidgetProps } from '@rjsf/utils';
 
 /** The `AltDateWidget` is an alternative widget for rendering date properties.
  * @param props - The `WidgetProps` for this component
@@ -21,6 +14,7 @@ function AltDateWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F exten
   return (
     <ul className='list-inline'>
       {elements.map((elemProps, i) => (
+        // oxlint-disable-next-line react/no-array-index-key
         <li className='list-inline-item' key={i}>
           <DateElement
             rootId={id}
@@ -38,16 +32,16 @@ function AltDateWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F exten
       ))}
       {(options.hideNowButton !== 'undefined' ? !options.hideNowButton : true) && (
         <li className='list-inline-item'>
-          <a href='#' className='btn btn-info btn-now' onClick={handleSetNow}>
+          <button type='button' className='btn btn-info btn-now' onClick={handleSetNow}>
             {translateString(TranslatableString.NowLabel)}
-          </a>
+          </button>
         </li>
       )}
       {(options.hideClearButton !== 'undefined' ? !options.hideClearButton : true) && (
         <li className='list-inline-item'>
-          <a href='#' className='btn btn-warning btn-clear' onClick={handleClear}>
+          <button type='button' className='btn btn-warning btn-clear' onClick={handleClear}>
             {translateString(TranslatableString.ClearLabel)}
-          </a>
+          </button>
         </li>
       )}
     </ul>