Merge pull request #1 from tiberiumihai/fix-initial-page-for-tabs

Fix initialPage for Tabs
tiberiumihai · Nov 17, 2017 · ca07659 · ca07659
2 parents cfcf28e + 8dda85e
commit ca07659
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 22 deletions.
diff --git a/dist/src/Utils/index.js b/dist/src/Utils/index.js
diff --git a/dist/src/Utils/index.js.map b/dist/src/Utils/index.js.map
diff --git a/dist/src/Utils/interactionManager.js b/dist/src/Utils/interactionManager.js
diff --git a/dist/src/Utils/interactionManager.js.map b/dist/src/Utils/interactionManager.js.map
diff --git a/dist/src/basic/Tabs/index.js b/dist/src/basic/Tabs/index.js
diff --git a/dist/src/basic/Tabs/index.js.map b/dist/src/basic/Tabs/index.js.map
diff --git a/src/Utils/index.js b/src/Utils/index.js
@@ -1,3 +1,4 @@
 import ViewPropTypes from './viewPropTypes'
+import InteractionManager from './interactionManager'
 
-export { ViewPropTypes }
+export { InteractionManager, ViewPropTypes }
diff --git a/src/Utils/interactionManager.js b/src/Utils/interactionManager.js
@@ -0,0 +1,15 @@
+import { InteractionManager } from "react-native";
+export default {
+  ...InteractionManager,
+  runAfterInteractions:  f => {
+    // ensure f get called, timeout at 10ms
+    // @gre workaround https://github.com/facebook/react-native/issues/8624
+    let called = false;
+    const timeout = setTimeout(() => { called = true; f() }, 10);
+    InteractionManager.runAfterInteractions(() => {
+      if (called) return;
+      clearTimeout(timeout);
+      f();
+    });
+  }
+};
diff --git a/src/basic/Tabs/index.js b/src/basic/Tabs/index.js
@@ -9,10 +9,9 @@ const {
   Animated,
   ScrollView,
   StyleSheet,
-  InteractionManager,
   Platform,
 } = ReactNative;
-import { ViewPropTypes } from "../../Utils";
+import { InteractionManager, ViewPropTypes } from "../../Utils";
 const TimerMixin = require("react-timer-mixin");
 import _ from "lodash";
 
@@ -66,14 +65,12 @@ const ScrollableTabView = createReactClass({
 
   componentDidMount() {
     const scrollFn = () => {
-      if (this.scrollView && Platform.OS === "android") {
+      if (this.scrollView) {
         const x = this.props.initialPage * this.state.containerWidth;
         this.scrollView.scrollTo({ x, animated: false });
       }
     };
-    this.setTimeout(() => {
-      InteractionManager.runAfterInteractions(scrollFn);
-    }, 0);
+    InteractionManager.runAfterInteractions(scrollFn);
   },
 
   componentWillReceiveProps(props) {