Fix various typing issues (#1291)

* Fix various typing issues

* Omit RNText style for our own style prop

Author: ethanshar

generatedTypes/components/button/ButtonTypes.d.ts

@@ -2,6 +2,7 @@ import { ImageStyle, TextStyle, StyleProp } from 'react-native';
 import { BaseComponentInjectedProps, ForwardRefInjectedProps, TypographyModifiers, ColorsModifiers, BackgroundColorModifier, MarginModifiers } from '../../commons/new';
 import { TouchableOpacityProps } from '../touchableOpacity';
 import { TextProps } from '../text';
+import { ImageProps } from '../image';
 export declare enum ButtonSize {
     xSmall = "xSmall",
     small = "small",
@@ -25,7 +26,7 @@ export declare type ButtonProps = TouchableOpacityProps & TypographyModifiers &
     /**
      * Icon image source or a callback function that returns a source
      */
-    iconSource?: object | number | Function;
+    iconSource?: ImageProps['source'] | Function;
     /**
      * Icon image style
      */

generatedTypes/components/button/index.d.ts

@@ -40,7 +40,7 @@ export declare type CardSectionProps = ViewProps & {
     /**
      * Other image props that will be passed to the image
      */
-    imageProps?: ImageProps;
+    imageProps?: Partial<ImageProps>;
 };
 declare const _default: React.ComponentClass<ViewProps & {
     /**
@@ -76,7 +76,7 @@ declare const _default: React.ComponentClass<ViewProps & {
     /**
      * Other image props that will be passed to the image
      */
-    imageProps?: ImageProps | undefined;
+    imageProps?: Partial<ImageProps> | undefined;
 } & {
     useCustomTheme?: boolean | undefined;
 }, any>;

generatedTypes/components/card/CardSection.d.ts

@@ -10,6 +10,7 @@ import {
 } from '../../commons/new';
 import {TouchableOpacityProps} from '../touchableOpacity';
 import {TextProps} from '../text';
+import {ImageProps} from '../image';
 
 export enum ButtonSize {
   xSmall = 'xSmall',
@@ -40,7 +41,7 @@ export type ButtonProps = TouchableOpacityProps &
     /**
      * Icon image source or a callback function that returns a source
      */
-    iconSource?: object | number | Function;
+    iconSource?: ImageProps['source'] | Function;
     /**
      * Icon image style
      */

generatedTypes/components/text/index.d.ts

@@ -44,7 +44,7 @@ export type CardSectionProps = ViewProps & {
   /**
    * Other image props that will be passed to the image
    */
-  imageProps?: ImageProps;
+  imageProps?: Partial<ImageProps>;
 };
 
 type Props = CardSectionProps & asCardChildProps;

generatedTypes/incubator/TextField/usePreset.d.ts

@@ -1,5 +1,5 @@
 import React, {PureComponent} from 'react';
-import {Text as RNText, StyleSheet, TextProps as RNTextProps, TextStyle, Animated} from 'react-native';
+import {Text as RNText, StyleSheet, TextProps as RNTextProps, TextStyle, Animated, StyleProp} from 'react-native';
 import _ from 'lodash';
 import {
   asBaseComponent,
@@ -12,7 +12,7 @@ import {
 } from '../../commons/new';
 import {Colors} from 'style';
 
-export type TextProps = RNTextProps & TypographyModifiers & ColorsModifiers & MarginModifiers & {
+export type TextProps = Omit<RNTextProps, 'style'> & TypographyModifiers & ColorsModifiers & MarginModifiers & {
   /**
    * color of the text
    */
@@ -38,6 +38,7 @@ export type TextProps = RNTextProps & TypographyModifiers & ColorsModifiers & Ma
    */
   animated?: boolean;
   textAlign?: string;
+  style?: StyleProp<TextStyle | Animated.AnimatedProps<TextStyle>>;
 }
 export type TextPropTypes = TextProps; //TODO: remove after ComponentPropTypes deprecation;