Revert "fix for tabbar types for scrollbar"

This reverts commit 5405420.

Author: ethanshar

generatedTypes/components/scrollBar/index.d.ts

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { Animated, FlatListProps, ImageSourcePropType, NativeSyntheticEvent, NativeScrollEvent, LayoutChangeEvent } from 'react-native';
 import { ForwardRefInjectedProps } from '../../commons/new';
-export interface ScrollBarProps extends FlatListProps<any> {
+interface Props extends FlatListProps<any>, ForwardRefInjectedProps {
     /**
        * Whether to use a FlatList. NOTE: you must pass 'data' and 'renderItem' props as well
        */
@@ -44,7 +44,7 @@ export interface ScrollBarProps extends FlatListProps<any> {
      */
     focusIndex?: number;
 }
-declare type Props = ScrollBarProps & ForwardRefInjectedProps;
+export declare type ScrollBarProps = Props;
 export declare type State = {
     gradientOpacity: Animated.Value;
     gradientOpacityLeft: Animated.Value;
@@ -83,7 +83,9 @@ declare const Item: {
     ({ children, index, onLayout }: any): JSX.Element;
     displayName: string;
 };
-declare const _default: React.ComponentClass<ScrollBarProps & {
-    useCustomTheme?: boolean | undefined;
+declare const _default: React.ComponentClass<Props & {
+    useCustomTheme?: boolean | undefined; /**
+       * Whether to use a FlatList. NOTE: you must pass 'data' and 'renderItem' props as well
+       */
 }, any> & typeof ScrollBar;
 export default _default;

generatedTypes/components/tabBar/index.d.ts

@@ -1,14 +1,15 @@
 import React from 'react';
-import { StyleProp, ViewStyle } from 'react-native';
-import { ScrollBarProps } from '../scrollBar';
-import TabBarItem, { TabBarItemProps } from './TabBarItem';
-interface Props extends ScrollBarProps, TabBarItemProps {
+import { Animated, ViewStyle } from 'react-native';
+import { BaseComponentInjectedProps } from '../../commons/new';
+import { ViewProps } from '../view';
+import TabBarItem from './TabBarItem';
+export declare type TabBarProps = BaseComponentInjectedProps & ViewProps & {
     /**
      * Show Tab Bar bottom shadow
      */
     enableShadow?: boolean;
     /**
-     * The minimum number of tabs to render in scroll mode
+     * The minimum number of tabs to render
      */
     minTabsForScroll?: number;
     /**
@@ -18,37 +19,69 @@ interface Props extends ScrollBarProps, TabBarItemProps {
     /**
      * callback for when index has change (will not be called on ignored items)
      */
-    onChangeIndex?: (index: number) => void;
+    onChangeIndex?: (props: any) => void;
     /**
      * callback for when tab selected
      */
-    onTabSelected?: (index: number) => void;
+    onTabSelected?: (props: any) => void;
     /**
      * custom style for the selected indicator
      */
-    indicatorStyle?: StyleProp<ViewStyle>;
+    indicatorStyle?: ViewStyle;
+    /**
+     * The background color
+     */
+    backgroundColor: string;
     /**
      * Tab Bar height
      */
     height?: number;
+    children: React.ReactNode;
+    style?: ViewStyle;
+    testID?: string;
+};
+export declare type State = {
+    gradientOpacity: Animated.Value;
+    scrollEnabled?: boolean;
+    currentIndex?: number;
+};
+declare const _default: React.ComponentClass<BaseComponentInjectedProps & ViewProps & {
     /**
-     * Pass when container width is different than the screen width
+     * Show Tab Bar bottom shadow
+     */
+    enableShadow?: boolean | undefined;
+    /**
+     * The minimum number of tabs to render
+     */
+    minTabsForScroll?: number | undefined;
+    /**
+     * current selected tab index
      */
-    containerWidth?: number;
+    selectedIndex?: number | undefined;
+    /**
+     * callback for when index has change (will not be called on ignored items)
+     */
+    onChangeIndex?: ((props: any) => void) | undefined;
+    /**
+     * callback for when tab selected
+     */
+    onTabSelected?: ((props: any) => void) | undefined;
+    /**
+     * custom style for the selected indicator
+     */
+    indicatorStyle?: ViewStyle | undefined;
     /**
      * The background color
      */
-    backgroundColor?: string;
+    backgroundColor: string;
     /**
-     * set darkTheme style
+     * Tab Bar height
      */
-    darkTheme?: boolean;
-    children?: React.ReactNode;
-    style?: ViewStyle;
-    testID?: string;
-}
-export declare type TabBarProps = Props;
-declare const _default: React.ComponentClass<Props & {
+    height?: number | undefined;
+    children: React.ReactNode;
+    style?: ViewStyle | undefined;
+    testID?: string | undefined;
+} & {
     useCustomTheme?: boolean | undefined;
 }, any> & {
     Item: typeof TabBarItem;

generatedTypes/components/tabController/TabBarItem.d.ts

@@ -43,12 +43,6 @@ export interface TabControllerItemProps {
      * Badge component props to display next the item label
      */
     badge?: BadgeProps;
-    /**
-     * maximun number of lines the label can break
-     */
-    /**
-     * whether the tab will have a divider on its right
-     */
     /**
      * A fixed width for the item
      */

src/components/tabBar/index.tsx

@@ -5,14 +5,16 @@ import {Constants} from '../../helpers';
 import {Colors} from '../../style';
 import {asBaseComponent} from '../../commons/new';
 import View from '../view';
-import ScrollBar , {ScrollBarProps} from '../scrollBar';
+import ScrollBar/* , {ScrollBarProps} */ from '../scrollBar';
 import TabBarItem, {TabBarItemProps} from './TabBarItem';
 
 
 const MIN_TABS_FOR_SCROLL = 1;
 const DEFAULT_BACKGROUND_COLOR = Colors.white;
 const DEFAULT_HEIGHT = 48;
 
+const ScrollBarProps = ScrollBar.propTypes; //TODO: remove after TS migration
+
 interface Props extends ScrollBarProps, TabBarItemProps {
   /**
    * Show Tab Bar bottom shadow