Set initialLayout in defaultProps on Android (react-navigation#2843)

Minishlink · vonovak · commit 701337024e1c · 2017-10-30T11:17:55.000+01:00
* Revert "Workaround nested TabNavigation swipe issue (react-navigation#2733)" This reverts commit 7b88a47. * Set initialLayout in defaultProps on Android This reverts the previous PR (react-navigation#2733) and takes into account react-navigation#2385 In order to fix satya164/react-native-tab-view#312 * Don't use window's dimensions
diff --git a/src/views/TabView/TabView.js b/src/views/TabView/TabView.js
@@ -20,7 +20,6 @@ export type TabViewConfig = {
   tabBarComponent?: ReactClass<*>,
   tabBarPosition?: 'top' | 'bottom',
   tabBarOptions?: {},
-  initialLayout?: { width: number, height: number },
   swipeEnabled?: boolean,
   animationEnabled?: boolean,
   lazy?: boolean,
@@ -38,7 +37,6 @@ type Props = {
   tabBarComponent?: ReactClass<*>,
   tabBarPosition?: 'top' | 'bottom',
   tabBarOptions?: {},
-  initialLayout?: { width: number, height: number },
   swipeEnabled?: boolean,
   animationEnabled?: boolean,
   lazy?: boolean,
@@ -56,7 +54,14 @@ type Props = {
   },
 };
 
-class TabView extends PureComponent<void, Props, void> {
+class TabView extends PureComponent<$Shape<Props>, Props, void> {
+  static defaultProps = {
+    // fix for https://github.com/react-native-community/react-native-tab-view/issues/312
+    initialLayout: Platform.select({
+      android: { width: 1, height: 0 },
+    }),
+  };
+
   props: Props;
 
   _handlePageChanged = (index: number) => {
@@ -208,9 +213,6 @@ class TabView extends PureComponent<void, Props, void> {
       screenProps: this.props.screenProps,
       style: styles.container,
     };
-    if (Platform.OS === 'android') {
-      props.initialLayout = { width: 1, height: 0 };
-    }
 
     return <TabViewAnimated {...props} />;
   }
