support defining Static typings in asBaseComponent

Author: ethanshar

generatedTypes/commons/asBaseComponent.d.ts

@@ -6,5 +6,5 @@ export interface BaseComponentInjectedProps {
      */
     modifiers: ReturnType<typeof Modifiers.generateModifiersStyle>;
 }
-declare function asBaseComponent<PROPS>(WrappedComponent: React.ComponentType<any>): React.ComponentType<PROPS>;
+declare function asBaseComponent<PROPS, STATICS = {}>(WrappedComponent: React.ComponentType<any>): React.ComponentType<PROPS> & STATICS;
 export default asBaseComponent;

generatedTypes/components/button/index.d.ts

@@ -321,5 +321,5 @@ declare class Button extends PureComponent<Props, ButtonState> {
     render(): JSX.Element;
 }
 export { Button };
-declare const _default: React.ComponentType<ButtonPropTypes>;
+declare const _default: React.ComponentClass<ButtonPropTypes, any> | React.FunctionComponent<ButtonPropTypes>;
 export default _default;

generatedTypes/components/card/CardSection.d.ts

@@ -25,5 +25,5 @@ export declare type CardSectionProps = ViewPropTypes & {
      */
     trailingIcon?: ImageProps;
 };
-declare const _default: React.ComponentType<CardSectionProps>;
+declare const _default: React.ComponentClass<CardSectionProps, any> | React.FunctionComponent<CardSectionProps>;
 export default _default;

generatedTypes/components/card/index.d.ts

@@ -59,5 +59,11 @@ export declare type CardPropTypes = ViewPropTypes & TouchableOpacityProps & {
         hideIndicator?: boolean;
     };
 };
-declare const _default: React.ComponentType<CardPropTypes>;
+declare const _default: (React.ComponentClass<CardPropTypes, any> & {
+    Image: React.ComponentType<import("./CardImage").CardImageProps>;
+    Section: React.ComponentClass<import("./CardSection").CardSectionProps, any> | React.FunctionComponent<import("./CardSection").CardSectionProps>;
+}) | (React.FunctionComponent<CardPropTypes> & {
+    Image: React.ComponentType<import("./CardImage").CardImageProps>;
+    Section: React.ComponentClass<import("./CardSection").CardSectionProps, any> | React.FunctionComponent<import("./CardSection").CardSectionProps>;
+});
 export default _default;

generatedTypes/components/checkbox/index.d.ts

@@ -39,5 +39,5 @@ interface CheckboxProps {
     style?: StyleProp<ViewStyle>;
 }
 declare type Props = CheckboxProps & TouchableOpacityProps;
-declare const _default: React.ComponentType<Props>;
+declare const _default: React.ComponentClass<Props, any> | React.FunctionComponent<Props>;
 export default _default;

generatedTypes/components/image/index.d.ts

@@ -70,5 +70,5 @@ declare class Image extends PureComponent<Props> {
     render(): JSX.Element;
 }
 export { Image };
-declare const _default: React.ComponentType<ImageProps>;
+declare const _default: React.ComponentClass<ImageProps, any> | React.FunctionComponent<ImageProps>;
 export default _default;

generatedTypes/components/radioButton/RadioButton.d.ts

@@ -50,5 +50,5 @@ interface RadioButtonPropTypes {
      */
     iconOnRight?: boolean;
 }
-declare const _default: React.ComponentType<RadioButtonPropTypes>;
+declare const _default: React.ComponentClass<RadioButtonPropTypes, any> | React.FunctionComponent<RadioButtonPropTypes>;
 export default _default;

generatedTypes/components/radioButton/RadioGroup.d.ts

@@ -9,5 +9,5 @@ interface RadioGroupPropTypes {
      */
     onValueChange?: (value: string | number | boolean) => void;
 }
-declare const _default: React.ComponentType<RadioGroupPropTypes>;
+declare const _default: React.ComponentClass<RadioGroupPropTypes, any> | React.FunctionComponent<RadioGroupPropTypes>;
 export default _default;

generatedTypes/components/text/index.d.ts

@@ -44,5 +44,5 @@ declare class Text extends PureComponent<PropsTypes> {
     render(): JSX.Element;
 }
 export { Text };
-declare const _default: React.ComponentType<TextPropTypes>;
+declare const _default: React.ComponentClass<TextPropTypes, any> | React.FunctionComponent<TextPropTypes>;
 export default _default;

generatedTypes/components/touchableOpacity/index.d.ts

@@ -27,5 +27,5 @@ export declare type TouchableOpacityProps = RNTouchableOpacityProps & ContainerM
     useNative?: boolean;
     ref?: any;
 };
-declare const _default: React.ComponentType<TouchableOpacityProps>;
+declare const _default: React.ComponentClass<TouchableOpacityProps, any> | React.FunctionComponent<TouchableOpacityProps>;
 export default _default;

generatedTypes/components/view/index.d.ts

@@ -23,5 +23,5 @@ export interface ViewPropTypes extends ViewProps, ContainerModifiers {
      */
     height?: string | number;
 }
-declare const _default: React.ComponentType<ViewPropTypes>;
+declare const _default: React.ComponentClass<ViewPropTypes, any> | React.FunctionComponent<ViewPropTypes>;
 export default _default;

generatedTypes/incubator/TouchableOpacity.d.ts

@@ -38,5 +38,5 @@ declare type TouchableOpacityPropTypes = {
      */
     style: ViewStyle;
 };
-declare const _default: React.ComponentType<TouchableOpacityPropTypes>;
+declare const _default: React.ComponentClass<TouchableOpacityPropTypes, any> | React.FunctionComponent<TouchableOpacityPropTypes>;
 export default _default;

src/commons/asBaseComponent.tsx

@@ -14,7 +14,7 @@ export interface BaseComponentInjectedProps {
   modifiers: ReturnType<typeof Modifiers.generateModifiersStyle>;
 }
 
-function asBaseComponent<PROPS>(WrappedComponent: React.ComponentType<any>): React.ComponentType<PROPS> {
+function asBaseComponent<PROPS, STATICS = {}>(WrappedComponent: React.ComponentType<any>): React.ComponentType<PROPS> & STATICS {
   class BaseComponent extends UIComponent {
     state = Modifiers.generateModifiersStyle(undefined, BaseComponent.getThemeProps(this.props, this.context));
     static displayName: string | undefined;

src/components/card/index.tsx

@@ -369,4 +369,10 @@ function createStyles({
 Card.Image = CardImage;
 Card.Section = CardSection;
 
-export default asBaseComponent<CardPropTypes>(forwardRef(Card));
+export default asBaseComponent<
+  CardPropTypes,
+  {
+    Image: typeof CardImage;
+    Section: typeof CardSection;
+  }
+>(forwardRef(Card));