Merge pull request #828 from vrk-kpa/hotfix/typing-overlap

[Hotfix] Typing in callback function props
vrk-kpa · Feb 16, 2024 · bc3a9fa · bc3a9fa
2 parents 4ca7b72 + 33b86ca
commit bc3a9fa
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 102 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "suomifi-ui-components",
-  "version": "13.0.0",
+  "version": "13.0.1",
   "description": "Suomi.fi UI component library",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

diff --git a/src/core/Form/DateInput/DateInput.tsx b/src/core/Form/DateInput/DateInput.tsx
@@ -158,7 +158,7 @@ export interface DateInputProps
   extends DatePickerProps,
     MarginProps,
     StatusTextCommonProps,
-    Omit<HtmlInputProps, 'type' | 'onChange'> {
+    Omit<HtmlInputProps, 'type' | 'onChange' | 'onClick' | 'onBlur'> {
   /** DateInput container div class name for custom styling. */
   className?: string;
   /** Disable input usage */

diff --git a/src/core/Form/RadioButton/RadioButton.tsx b/src/core/Form/RadioButton/RadioButton.tsx
@@ -35,7 +35,9 @@ const radioButtonClassNames = {
   checked: `${baseClassName}--checked`,
 };
 
-export interface RadioButtonProps extends MarginProps, HtmlInputProps {
+export interface RadioButtonProps
+  extends MarginProps,
+    Omit<HtmlInputProps, 'onChange'> {
   /** CSS class for custom styles */
   className?: string;
   /** RadioButton text content (label) */

diff --git a/src/core/Form/SearchInput/SearchInput.tsx b/src/core/Form/SearchInput/SearchInput.tsx
@@ -45,6 +45,8 @@ export interface SearchInputProps
       | 'type'
       | 'disabled'
       | 'onChange'
+      | 'onBlur'
+      | 'onSearch'
       | 'children'
       | 'onClick'
       | 'value'

diff --git a/src/core/Form/Select/MultiSelect/MultiSelect/MultiSelect.tsx b/src/core/Form/Select/MultiSelect/MultiSelect/MultiSelect.tsx
@@ -218,7 +218,7 @@ export type MultiSelectProps<T> = InternalMultiSelectProps<
   AriaOptionChipRemovedProps &
   AriaSelectedAmountProps &
   MarginProps &
-  HtmlDivProps &
+  Omit<HtmlDivProps, 'onChange' | 'onBlur'> &
   LoadingProps;
 
 interface MultiSelectState<T extends MultiSelectData> {

diff --git a/src/core/Form/Select/SingleSelect/SingleSelect.tsx b/src/core/Form/Select/SingleSelect/SingleSelect.tsx
@@ -161,7 +161,7 @@ type AllowItemAdditionProps =
 export type SingleSelectProps<T> = InternalSingleSelectProps<
   T & SingleSelectData
 > &
-  HtmlDivProps &
+  Omit<HtmlDivProps, 'onChange' | 'onBlur'> &
   AllowItemAdditionProps &
   AriaOptionsAvailableProps &
   MarginProps &

diff --git a/src/core/Form/TextInput/TextInput.tsx b/src/core/Form/TextInput/TextInput.tsx
@@ -55,7 +55,7 @@ type TextInputValue = string | number | undefined;
 interface BaseTextInputProps
   extends StatusTextCommonProps,
     MarginProps,
-    Omit<HtmlInputProps, 'type' | 'onChange'> {
+    Omit<HtmlInputProps, 'type' | 'onChange' | 'onClick' | 'onBlur'> {
   /** CSS class for custom styles */
   className?: string;
   /** Disables the input */

diff --git a/src/core/Form/Textarea/Textarea.tsx b/src/core/Form/Textarea/Textarea.tsx
@@ -52,7 +52,10 @@ type TextareaStatus = Exclude<InputStatus, 'success'>;
 interface BaseTextareaProps
   extends StatusTextCommonProps,
     MarginProps,
-    Omit<HtmlTextareaProps, 'placeholder' | 'forwardedRef'> {
+    Omit<
+      HtmlTextareaProps,
+      'placeholder' | 'forwardedRef' | 'onChange' | 'onBlur'
+    > {
   /** CSS class for custom styles */
   className?: string;
   /** Disables the input */

diff --git a/src/core/Form/TimeInput/TimeInput.tsx b/src/core/Form/TimeInput/TimeInput.tsx
@@ -41,7 +41,10 @@ export const timeInputClassNames = {
 export interface TimeInputProps
   extends StatusTextCommonProps,
     MarginProps,
-    Omit<HtmlInputProps, 'type' | 'onChange' | 'onBlur' | 'defaultValue'> {
+    Omit<
+      HtmlInputProps,
+      'type' | 'onChange' | 'onBlur' | 'defaultValue' | 'onClick'
+    > {
   /** CSS class for custom styles */
   className?: string;
   /** Disables the input */

diff --git a/src/core/LanguageMenu/LanguageMenu.tsx b/src/core/LanguageMenu/LanguageMenu.tsx
@@ -41,7 +41,9 @@ export type MenuContent =
   | Array<ReactElement<LanguageMenuItemProps>>
   | ReactElement<LanguageMenuItemProps>;
 
-export interface LanguageMenuProps extends MarginProps, HtmlButtonProps {
+export interface LanguageMenuProps
+  extends MarginProps,
+    Omit<HtmlButtonProps, 'onBlur'> {
   /** Content for the menu button. Should indicate the currently selected language */
   buttonText: ReactNode;
   /**

diff --git a/src/core/Pagination/Pagination.tsx b/src/core/Pagination/Pagination.tsx
@@ -87,7 +87,7 @@ interface InternalPaginationProps {
 
 export type PaginationProps = ShowInputProps &
   InternalPaginationProps &
-  HtmlNavProps &
+  Omit<HtmlNavProps, 'onChange'> &
   MarginProps;
 
 const baseClassName = 'fi-pagination';