Merge branch 'master' into release

Author: nitzanyiz

src/components/card/index.tsx

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import React, {PureComponent} from 'react';
-import {StyleSheet, Animated, ViewStyle} from 'react-native';
+import {StyleSheet, Animated, StyleProp, ViewStyle} from 'react-native';
 import {Colors, BorderRadiuses} from '../../style';
 // import {PureBaseComponent} from '../../commons';
 import {Constants, asBaseComponent, forwardRef, BaseComponentInjectedProps, ForwardRefInjectedProps, MarginModifiers} from '../../commons/new';
@@ -78,7 +78,7 @@ export type CardProps = ViewProps &
     /**
      * Additional styles for the top container
      */
-    containerStyle?: ViewStyle;
+    containerStyle?: StyleProp<ViewStyle>;
     /**
      * Adds visual indication that the card is selected
      */

src/components/tabController/index.tsx

@@ -5,13 +5,13 @@ import {useAnimatedReaction, useSharedValue, withTiming, runOnJS} from 'react-na
 import {useOrientation, useThemeProps} from '../../hooks';
 import {Constants} from '../../commons/new';
 import TabBarContext from './TabBarContext';
-import TabBar from './TabBar';
+import TabBar, {TabControllerBarProps} from './TabBar';
 import TabBarItem, {TabControllerItemProps} from './TabBarItem';
 import TabPage from './TabPage';
 import PageCarousel from './PageCarousel';
 import useImperativeTabControllerHandle, {TabControllerImperativeMethods} from './useImperativeTabControllerHandle';
 
-export {TabControllerItemProps, TabControllerImperativeMethods};
+export {TabControllerBarProps, TabControllerItemProps, TabControllerImperativeMethods};
 
 interface TabControllerStatics {
   TabBar: typeof TabBar;

src/components/touchableOpacity/index.tsx

@@ -10,7 +10,8 @@ import {
   forwardRef,
   BaseComponentInjectedProps,
   ForwardRefInjectedProps,
-  ContainerModifiers
+  ContainerModifiers,
+  BackgroundColorModifier
 } from '../../commons/new';
 import {RecorderProps} from '../../typings/recorderTypes';
 import IncubatorTouchableOpacity from '../../incubator/TouchableOpacity';
@@ -19,6 +20,7 @@ import {ViewProps} from '../view';
 export interface TouchableOpacityProps
   extends Omit<RNTouchableOpacityProps, 'style' | 'onPress' | 'onPressIn' | 'onPressOut' | 'onLongPress'>,
     ContainerModifiers,
+    BackgroundColorModifier,
     RecorderProps {
   /**
    * background color for TouchableOpacity
@@ -59,6 +61,7 @@ export interface TouchableOpacityProps
   onLongPress?: (
     props?: (TouchableOpacityProps & {event: GestureResponderEvent}) | any
   ) => void | RNTouchableOpacityProps['onLongPress'];
+  nativeID?: string;
 }
 
 type Props = BaseComponentInjectedProps & ForwardRefInjectedProps & TouchableOpacityProps;

src/index.ts

@@ -143,6 +143,7 @@ export {default as Switch, SwitchProps} from './components/switch';
 export {
   default as TabController,
   TabControllerProps,
+  TabControllerBarProps,
   TabControllerItemProps,
   TabControllerImperativeMethods
 } from './components/tabController';