fix(select): fix type issues with onChange

react95-io · Jul 28, 2022 · 38f7cf6 · 38f7cf6
1 parent 7cef5d9
commit 38f7cf6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/Select/Select.tsx b/src/Select/Select.tsx
@@ -434,7 +434,10 @@ function SelectInner<T>(
         return;
       }
 
-      onChange?.(event, nextSelection as unknown as SelectOption<T>);
+      onChange?.(
+        event as unknown as SelectChangeEvent<T>,
+        nextSelection as unknown as SelectOption<T>
+      );
       setValueState(nextSelection.value);
       displayNode.current?.focus();
     },

diff --git a/src/Select/Select.types.ts b/src/Select/Select.types.ts
@@ -1,12 +1,19 @@
 import React from 'react';
 
+type SelectChangeEventTargetValue<T> = { value: T; name: string | undefined };
+
 export type SelectChangeEvent<T> =
-  | (React.MouseEvent & {
-      target: {
-        value: { value: T; name: string | undefined };
-      };
+  | (Omit<React.ChangeEvent<HTMLSelectElement>, 'target'> & {
+      target: Omit<
+        React.ChangeEvent<HTMLSelectElement>['target'],
+        'name' | 'value'
+      > &
+        SelectChangeEventTargetValue<T>;
     })
-  | React.ChangeEvent<HTMLSelectElement>;
+  | (Omit<React.MouseEvent, 'target'> & {
+      target: Omit<React.MouseEvent['target'], 'name' | 'value'> &
+        SelectChangeEventTargetValue<T>;
+    });
 
 export type SelectOption<T> = {
   label: string;