chore: Move class out to support ts define export

Author: zombieJ

src/Select.tsx

@@ -29,6 +29,7 @@
  * - `combobox` mode not support `optionLabelProp`
  */
 
+import React from 'react';
 import { OptionsType as SelectOptionsType } from './interface';
 import SelectOptionList from './OptionList';
 import Option from './Option';
@@ -42,24 +43,15 @@ import {
   flattenOptions,
   fillOptionsWithMissingValue,
 } from './utils/valueUtil';
-import generateSelector, { SelectProps } from './generate';
+import generateSelector, { SelectProps, RefSelectProps } from './generate';
 import { DefaultValueType } from './interface/generator';
 import warningProps from './utils/warningPropsUtil';
 
-interface SelectStaticProps {
-  Option: typeof Option;
-  OptGroup: typeof OptGroup;
-}
-
-const Select = generateSelector<SelectOptionsType, SelectStaticProps>({
+const RefSelect = generateSelector<SelectOptionsType>({
   prefixCls: 'rc-select',
   components: {
     optionList: SelectOptionList,
   },
-  staticProps: {
-    Option,
-    OptGroup,
-  },
   convertChildrenToData: convertSelectChildrenToData,
   flattenOptions,
   getLabeledValue: getSelectLabeledValue,
@@ -75,6 +67,28 @@ export type SelectProps<ValueType extends DefaultValueType = DefaultValueType> =
   ValueType
 >;
 
-(Select as any).displayName = 'Select';
+/**
+ * Typescript not support generic with function component,
+ * we have to wrap an class component to handle this.
+ */
+class Select<VT> extends React.Component<SelectProps<SelectOptionsType, VT>> {
+  static Option: typeof Option;
+
+  static OptGroup: typeof OptGroup;
+
+  selectRef = React.createRef<RefSelectProps>();
+
+  focus = () => {
+    this.selectRef.current.focus();
+  };
+
+  blur = () => {
+    this.selectRef.current.blur();
+  };
+
+  render() {
+    return <RefSelect ref={this.selectRef} {...this.props} />;
+  }
+}
 
 export default Select;

src/generate.tsx

@@ -128,7 +128,7 @@ export interface SelectProps<OptionsType extends object[], ValueType> extends Re
   choiceTransitionName?: string;
 }
 
-export interface GenerateConfig<OptionsType extends object[], StaticProps> {
+export interface GenerateConfig<OptionsType extends object[]> {
   prefixCls: string;
   components: {
     optionList: React.ForwardRefExoticComponent<
@@ -138,7 +138,6 @@ export interface GenerateConfig<OptionsType extends object[], StaticProps> {
         React.RefAttributes<RefOptionListProps>
     >;
   };
-  staticProps?: StaticProps;
   /** Convert jsx tree into `OptionsType` */
   convertChildrenToData: (children: React.ReactNode) => OptionsType;
   /** Flatten nest options into raw option list */
@@ -171,13 +170,11 @@ export default function generateSelector<
     label?: React.ReactNode;
     key?: Key;
     disabled?: boolean;
-  }[],
-  StaticProps
->(config: GenerateConfig<OptionsType, StaticProps>) {
+  }[]
+>(config: GenerateConfig<OptionsType>) {
   const {
     prefixCls: defaultPrefixCls,
     components: { optionList: OptionList },
-    staticProps,
     convertChildrenToData,
     flattenOptions,
     getLabeledValue,
@@ -852,32 +849,5 @@ export default function generateSelector<
   type RefSelectFuncType = typeof RefSelectFunc;
   const RefSelect = ((React.forwardRef as unknown) as RefSelectFuncType)(Select);
 
-  /**
-   * Typescript not support generic with function component,
-   * we have to wrap an class component to handle this.
-   */
-  class ClassSelect<VT> extends React.Component<SelectProps<OptionsType, VT>> {
-    selectRef = React.createRef<RefSelectProps>();
-
-    focus = () => {
-      this.selectRef.current.focus();
-    };
-
-    blur = () => {
-      this.selectRef.current.blur();
-    };
-
-    render() {
-      return <RefSelect ref={this.selectRef} {...this.props} />;
-    }
-  }
-
-  // Inject static props
-  if (staticProps) {
-    Object.keys(staticProps).forEach(prop => {
-      ClassSelect[prop] = staticProps[prop];
-    });
-  }
-
-  return ClassSelect as (typeof ClassSelect & StaticProps);
+  return RefSelect;
 }