Merge pull request #519 from Yoctol/fix/select-generic-type

fix(select): generic types
Yoctol · Mar 16, 2021 · 239e13a · 239e13a
2 parents 82ff65a + ca9831e
commit 239e13a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/lab/Select/MultipleSelect.tsx b/src/lab/Select/MultipleSelect.tsx
@@ -1,5 +1,6 @@
 import React, {
   PropsWithoutRef,
+  ReactElement,
   ReactNode,
   Ref,
   forwardRef,
@@ -28,7 +29,7 @@ import {
   useSelectOptions,
 } from './utils';
 
-interface MultipleSelectProps<T extends SelectOption = SelectOption> {
+interface MultipleSelectProps<T extends SelectOption> {
   id?: string;
   loading?: boolean;
   searchable?: boolean;
@@ -241,6 +242,8 @@ const MultipleSelect = forwardRef(function MultipleSelect<
       />
     </div>
   );
-});
+}) as <T extends SelectOption>(
+  p: PropsWithoutRef<MultipleSelectProps<T>> & { ref?: Ref<HTMLDivElement> }
+) => ReactElement;
 
 export { MultipleSelect };
diff --git a/src/lab/Select/Select.tsx b/src/lab/Select/Select.tsx
@@ -1,5 +1,6 @@
 import React, {
   PropsWithoutRef,
+  ReactElement,
   ReactNode,
   Ref,
   forwardRef,
@@ -23,7 +24,7 @@ import {
 import { SelectOption, SelectValue } from './types';
 import { StyledSelect } from './styles';
 
-interface SelectProps<T extends SelectOption = SelectOption, V = T | null> {
+interface SelectProps<T extends SelectOption, V = T | null> {
   id?: string;
   loading?: boolean;
   searchable?: boolean;
@@ -197,6 +198,8 @@ const Select = forwardRef(function Select<T extends SelectOption>(
       />
     </div>
   );
-});
+}) as <T extends SelectOption>(
+  p: PropsWithoutRef<SelectProps<T>> & { ref?: Ref<HTMLDivElement> }
+) => ReactElement;
 
 export { Select };