@rjsf/semantic-ui 6.6.0 → 6.6.2

package/src/SelectWidget/SelectWidget.tsx

@@ -1,11 +1,5 @@
-import { FocusEvent, SyntheticEvent } from 'react';
-import {
-  ariaDescribedByIds,
-  enumOptionSelectedValue,
-  enumOptionValueDecoder,
-  enumOptionValueEncoder,
-  getOptionValueFormat,
-  labelValue,
+import type { FocusEvent, SyntheticEvent } from 'react';
+import type {
   EnumOptionsType,
   FormContextType,
   OptionValueFormat,
@@ -14,8 +8,17 @@ import {
   WidgetProps,
   UIOptionsType,
 } from '@rjsf/utils';
+import {
+  ariaDescribedByIds,
+  enumOptionSelectedValue,
+  enumOptionValueDecoder,
+  enumOptionValueEncoder,
+  getOptionValueFormat,
+  labelValue,
+} from '@rjsf/utils';
 import map from 'lodash/map';
-import { Form, DropdownProps, DropdownItemProps } from 'semantic-ui-react';
+import type { DropdownProps, DropdownItemProps } from 'semantic-ui-react';
+import { Form } from 'semantic-ui-react';
 
 import { getSemanticProps } from '../util';
 
@@ -36,7 +39,7 @@ function createDefaultValueOptionsForDropDown<S extends StrictRJSFSchema = RJSFS
 ) {
   const disabledOptions = enumDisabled || [];
   const options: DropdownItemProps[] = map(enumOptions, ({ label, value }, index) => ({
-    disabled: disabledOptions.indexOf(value) !== -1,
+    disabled: disabledOptions.includes(value),
     key: label,
     text: label,
     value: enumOptionValueEncoder(value, index, format),
@@ -99,12 +102,11 @@ export default function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFS
     placeholder,
     optionValueFormat,
   );
-  const _onChange = (_: SyntheticEvent<HTMLElement>, { value }: DropdownProps) =>
-    onChange(enumOptionValueDecoder<S>(value as string[], enumOptions, optionValueFormat, optEmptyVal));
-  // eslint-disable-next-line no-shadow
-  const _onBlur = (_: FocusEvent<HTMLElement>, { target }: DropdownProps) =>
+  const handleChange = (_: SyntheticEvent<HTMLElement>, { value: enumValue }: DropdownProps) =>
+    onChange(enumOptionValueDecoder<S>(enumValue as string[], enumOptions, optionValueFormat, optEmptyVal));
+  const handleBlur = (_: FocusEvent<HTMLElement>, { target }: DropdownProps) =>
     onBlur(id, enumOptionValueDecoder<S>(target && target.value, enumOptions, optionValueFormat, optEmptyVal));
-  const _onFocus = (_: FocusEvent<HTMLElement>, { target }: DropdownProps) =>
+  const handleFocus = (_: FocusEvent<HTMLElement>, { target }: DropdownProps) =>
     onFocus(id, enumOptionValueDecoder<S>(target && target.value, enumOptions, optionValueFormat, optEmptyVal));
   return (
     <Form.Dropdown
@@ -122,9 +124,9 @@ export default function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFS
       autoFocus={autofocus}
       readOnly={readonly}
       options={dropdownOptions}
-      onChange={_onChange}
-      onBlur={_onBlur}
-      onFocus={_onFocus}
+      onChange={handleChange}
+      onBlur={handleBlur}
+      onFocus={handleFocus}
       aria-describedby={ariaDescribedByIds(id)}
     />
   );

package/src/SemanticUIForm/SemanticUIForm.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/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 'semantic-ui-react';
 
 /** The `SubmitButton` renders a button that represent 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,12 +1,6 @@
-import { ChangeEvent } from 'react';
-import {
-  ariaDescribedByIds,
-  labelValue,
-  FormContextType,
-  RJSFSchema,
-  StrictRJSFSchema,
-  WidgetProps,
-} from '@rjsf/utils';
+import type { ChangeEvent } from 'react';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps } from '@rjsf/utils';
+import { ariaDescribedByIds, labelValue } from '@rjsf/utils';
 import { Form } from 'semantic-ui-react';
 
 import { getSemanticProps } from '../util';
@@ -43,11 +37,11 @@ export default function TextareaWidget<
     options,
     defaultSchemaProps: { inverted: 'false' },
   });
-  // eslint-disable-next-line no-shadow
-  const _onChange = ({ target: { value } }: ChangeEvent<HTMLTextAreaElement>) =>
+  // oxlint-disable-next-line no-shadow
+  const handleChange = ({ target: { value } }: ChangeEvent<HTMLTextAreaElement>) =>
     onChange && onChange(value === '' ? options.emptyValue : value);
-  const _onBlur = () => onBlur && onBlur(id, value);
-  const _onFocus = () => onFocus && onFocus(id, value);
+  const handleBlur = () => onBlur && onBlur(id, value);
+  const handleFocus = () => onFocus && onFocus(id, value);
   return (
     <Form.TextArea
       id={id}
@@ -62,9 +56,9 @@ export default function TextareaWidget<
       value={value || ''}
       error={rawErrors.length > 0}
       rows={options.rows || 5}
-      onChange={_onChange}
-      onBlur={_onBlur}
-      onFocus={_onFocus}
+      onChange={handleChange}
+      onBlur={handleBlur}
+      onFocus={handleFocus}
       aria-describedby={ariaDescribedByIds(id)}
     />
   );

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 { Form as SuiForm } from 'semantic-ui-react';
 
 import { generateTemplates } from '../Templates';

package/src/TitleField/TitleField.tsx

@@ -1,4 +1,4 @@
-import { FormContextType, TitleFieldProps, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { FormContextType, TitleFieldProps, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 import { Grid, Header } from 'semantic-ui-react';
 
 import { getSemanticProps } from '../util';

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 CheckboxesWidget from '../CheckboxesWidget/CheckboxesWidget';
 import CheckboxWidget from '../CheckboxWidget/CheckboxWidget';

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 { Form, Grid } from 'semantic-ui-react';
 
 /** The `WrapIfAdditional` component is used by the `FieldTemplate` to rename, or remove properties that are
@@ -64,17 +57,17 @@ export default function WrapIfAdditionalTemplate<
                 className='form-group'
                 hasFeedback
                 fluid
-                htmlFor={`${id}`}
+                htmlFor={id}
                 label={displayLabel ? keyLabel : undefined}
                 required={required}
                 defaultValue={label}
                 disabled={disabled || (readonlyAsDisabled && readonly)}
-                id={`${id}`}
-                name={`${id}`}
+                id={id}
+                name={id}
                 onBlur={!readonly ? onKeyRenameBlur : undefined}
                 style={wrapperStyle}
                 type='text'
-              ></Form.Input>
+              />
             </Form.Group>
           </Grid.Column>
           <Grid.Column width={7} className='form-additional' verticalAlign='middle'>

package/src/util.tsx

@@ -1,32 +1,32 @@
-import { ElementType } from 'react';
-import {
+import type { ElementType } from 'react';
+import type {
   UiSchema,
   GenericObjectType,
-  getUiOptions,
   FormContextType,
   RJSFSchema,
   StrictRJSFSchema,
   UIOptionsType,
 } from '@rjsf/utils';
+import { getUiOptions } from '@rjsf/utils';
 
-export type SemanticPropsTypes<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = {
+export interface SemanticPropsTypes<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> {
   formContext?: F;
   uiSchema?: UiSchema<T, S, F>;
   options?: UIOptionsType<T, S, F>;
   defaultSchemaProps?: GenericObjectType;
   defaultContextProps?: GenericObjectType;
-};
+}
 
-export type SemanticErrorPropsType<
+export interface SemanticErrorPropsType<
   T = any,
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
-> = {
+> {
   formContext?: F;
   uiSchema?: UiSchema<T, S, F>;
   options?: UIOptionsType<T, S, F>;
   defaultProps?: GenericObjectType;
-};
+}
 
 export type WrapProps = GenericObjectType & {
   wrap: boolean;
@@ -55,14 +55,13 @@ export function getSemanticProps<T = any, S extends StrictRJSFSchema = RJSFSchem
   const schemaProps = getUiOptions<T, S, F>(uiSchema).semantic;
   const optionProps = options.semantic;
   // formContext props should overide other props
-  return Object.assign(
-    {},
-    { ...defaultSchemaProps },
-    { ...defaultContextProps },
-    schemaProps,
-    optionProps,
-    formContextProps,
-  );
+  return {
+    ...defaultSchemaProps,
+    ...defaultContextProps,
+    ...schemaProps,
+    ...optionProps,
+    ...formContextProps,
+  };
 }
 
 /**
@@ -89,7 +88,7 @@ export function getSemanticErrorProps<
   const schemaProps = semanticOptions && semanticOptions.errorOptions;
   const optionProps = options.semantic && (options.semantic as GenericObjectType).errorOptions;
 
-  return Object.assign({}, { ...defaultProps }, schemaProps, optionProps, formContextProps);
+  return { ...defaultProps, ...schemaProps, ...optionProps, ...formContextProps };
 }
 
 /**
@@ -101,7 +100,7 @@ export function getSemanticErrorProps<
  * @param {Array} omit
  * @returns {string}
  */
-export function cleanClassNames(classNameArr: Array<string | undefined>, omit: string[] = []) {
+export function cleanClassNames(classNameArr: (string | undefined)[], omit: string[] = []) {
   // Split each arg on whitespace, and add it to an array. Skip false-y args
   // like "" and undefined.
   const classList = classNameArr