improve tab controller transition performance when moving to a "heavy…

…" tab page
wix · Dec 22, 2019 · b9135b1 · b9135b1
1 parent 090fa21
commit b9135b1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/demo/src/screens/incubatorScreens/TabControllerScreen/index.js b/demo/src/screens/incubatorScreens/TabControllerScreen/index.js
@@ -79,10 +79,10 @@ class TabControllerScreen extends Component {
         <Incubator.TabController.TabPage index={0}>
           <Tab1/>
         </Incubator.TabController.TabPage>
-        <Incubator.TabController.TabPage index={1} lazy={!USE_CAROUSEL}>
+        <Incubator.TabController.TabPage index={1}>
           <Tab2/>
         </Incubator.TabController.TabPage>
-        <Incubator.TabController.TabPage index={2}>
+        <Incubator.TabController.TabPage index={2} lazy>
           <Tab3/>
         </Incubator.TabController.TabPage>
         {/* <Incubator.TabController.TabPage index={3}>

diff --git a/src/incubator/TabController/TabPage.js b/src/incubator/TabController/TabPage.js
@@ -35,6 +35,7 @@ export default class TabPage extends PureComponent {
     loaded: !this.props.lazy
   };
 
+  _loaded = new Value(Number(!this.props.lazy));
   _opacity = new Value(0);
   _zIndex = new Value(0);
   _pageStyle = [
@@ -44,9 +45,11 @@ export default class TabPage extends PureComponent {
   ];
 
   lazyLoad = () => {
-    this.setState({
-      loaded: true
-    });
+    setTimeout(() => {
+      this.setState({
+        loaded: true
+      });
+    }, 300); // tab bar indicator transition time
   };
 
   render() {
@@ -60,7 +63,10 @@ export default class TabPage extends PureComponent {
         <Code>
           {() => {
             return block([
-              cond(and(eq(currentPage, index), lazy, !loaded), call([], this.lazyLoad)),
+              cond(and(eq(currentPage, index), lazy, eq(this._loaded, 0)), [
+                set(this._loaded, 1),
+                call([], this.lazyLoad)
+              ]),
               cond(eq(currentPage, index),
                 [set(this._opacity, 1), set(this._zIndex, 1)],
                 [set(this._opacity, 0), set(this._zIndex, 0)])