fix types

mll-lab · Jul 10, 2024 · 5d04231 · 5d04231
1 parent 994169e
commit 5d04231
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 42 deletions.
diff --git a/src/Fields/SelectField.tsx b/src/Fields/SelectField.tsx
@@ -51,7 +51,6 @@ export function SelectField<
         // Makes the allowClear method able to actually affect the form value
         // See https://react-hook-form.com/api/usecontroller/controller
         // > Calling onChange with undefined is not valid. You should use null or the empty string as your default/cleared value instead.
-        // @ts-expect-error error make no sense to me and i spent to much time on it
         onChange={(value) => onChange(value ?? null)}
         {...component}
       />

diff --git a/src/Select/index.tsx b/src/Select/index.tsx
@@ -4,8 +4,8 @@ import { BaseSelectRef } from 'rc-select';
 import React, {
   ForwardedRef,
   forwardRef,
-  ForwardRefExoticComponent,
   ReactElement,
+  ReactNode,
   RefAttributes,
   useCallback,
 } from 'react';
@@ -46,49 +46,49 @@ const StyledDropdown = styled.div`
   }
 `;
 
-type SelectType = ForwardRefExoticComponent<
-  SelectProps<unknown, BaseOptionType | DefaultOptionType> &
-    RefAttributes<BaseSelectRef>
-> & { Option: typeof AntdSelect.Option; OptGroup: typeof AntdSelect.OptGroup };
+function SelectInner<
+  ValueType = unknown,
+  OptionType extends BaseOptionType | DefaultOptionType = DefaultOptionType,
+>(
+  {
+    children,
+    dropdownRender,
+    onChange,
+    ...props
+  }: SelectProps<ValueType, OptionType>,
+  ref: ForwardedRef<BaseSelectRef>,
+) {
+  const styledDropdownRender = useCallback(
+    (menu: ReactElement) => (
+      <StyledDropdown>
+        {dropdownRender ? dropdownRender(menu) : menu}
+      </StyledDropdown>
+    ),
+    [dropdownRender],
+  );
 
-const InternalSelect = forwardRef<
+  return (
+    <StyledSelect<ValueType, OptionType>
+      ref={ref}
+      {...props}
+      dropdownRender={styledDropdownRender}
+    >
+      {children}
+    </StyledSelect>
+  );
+}
+
+export const Select = forwardRef<
   BaseSelectRef,
   SelectProps<unknown, BaseOptionType | DefaultOptionType>
+>(SelectInner) as unknown as (<
+  TValue = unknown,
+  TOption extends BaseOptionType | DefaultOptionType = DefaultOptionType,
 >(
-  <
-    ValueType = unknown,
-    OptionType extends BaseOptionType | DefaultOptionType = DefaultOptionType,
-  >(
-    {
-      children,
-      dropdownRender,
-      onChange,
-      ...props
-    }: SelectProps<ValueType, OptionType>,
-    ref: ForwardedRef<BaseSelectRef>,
-  ) => {
-    const styledDropdownRender = useCallback(
-      (menu: ReactElement) => (
-        <StyledDropdown>
-          {dropdownRender ? dropdownRender(menu) : menu}
-        </StyledDropdown>
-      ),
-      [dropdownRender],
-    );
-
-    return (
-      <StyledSelect<ValueType, OptionType>
-        ref={ref}
-        {...props}
-        dropdownRender={styledDropdownRender}
-      >
-        {children}
-      </StyledSelect>
-    );
-  },
-);
-InternalSelect.displayName = 'Select';
-
-export const Select = InternalSelect as SelectType;
+  props: SelectProps<TValue, TOption> & RefAttributes<BaseSelectRef>,
+) => ReactNode) & {
+  Option: typeof AntdSelect.Option;
+  OptGroup: typeof AntdSelect.OptGroup;
+};
 Select.Option = AntdSelect.Option;
 Select.OptGroup = AntdSelect.OptGroup;