Merge branch 'master' into release

ethanshar · ethanshar · commit 2f43158e2708 · 2019-08-07T16:11:25.000+03:00
diff --git a/demo/src/screens/incubatorScreens/TabControllerScreen/index.js b/demo/src/screens/incubatorScreens/TabControllerScreen/index.js
@@ -35,7 +35,7 @@ class TabControllerScreen extends Component {
     }
   };
 
-  getTabs() {
+  renderTabItems() {
     const {tabsCount} = this.state;
     const tabs = [
       <Incubator.TabController.TabBarItem key="tab1" label="tab1" onPress={() => console.warn('press tab1')} />,
@@ -52,6 +52,31 @@ class TabControllerScreen extends Component {
     ];
   }
 
+  renderTabPages() {
+    return (
+      <View flex>
+        <Incubator.TabController.TabPage index={0}>
+          <Tab1 />
+        </Incubator.TabController.TabPage>
+        <Incubator.TabController.TabPage index={1} lazy>
+          <Tab2 />
+        </Incubator.TabController.TabPage>
+        <Incubator.TabController.TabPage index={2}>
+          <Tab3 />
+        </Incubator.TabController.TabPage>
+        <Incubator.TabController.TabPage index={3}>
+          <Text text40>ACCOUNT</Text>
+        </Incubator.TabController.TabPage>
+        <Incubator.TabController.TabPage index={4}>
+          <Text text40>GROUPS</Text>
+        </Incubator.TabController.TabPage>
+        <Incubator.TabController.TabPage index={5}>
+          <Text text40>BLOG</Text>
+        </Incubator.TabController.TabPage>
+      </View>
+    );
+  }
+
   render() {
     const {key, selectedIndex} = this.state;
     return (
@@ -73,28 +98,9 @@ class TabControllerScreen extends Component {
               // selectedIconColor={'blue'}
               activeBackgroundColor={Colors.blue60}
             >
-              {this.getTabs()}
+              {this.renderTabItems()}
             </Incubator.TabController.TabBar>
-            <View flex>
-              <Incubator.TabController.TabPage index={0}>
-                <Tab1 />
-              </Incubator.TabController.TabPage>
-              <Incubator.TabController.TabPage index={1} lazy>
-                <Tab2 />
-              </Incubator.TabController.TabPage>
-              <Incubator.TabController.TabPage index={2}>
-                <Tab3 />
-              </Incubator.TabController.TabPage>
-              <Incubator.TabController.TabPage index={3}>
-                <Text text40>ACCOUNT</Text>
-              </Incubator.TabController.TabPage>
-              <Incubator.TabController.TabPage index={4}>
-                <Text text40>GROUPS</Text>
-              </Incubator.TabController.TabPage>
-              <Incubator.TabController.TabPage index={5}>
-                <Text text40>BLOG</Text>
-              </Incubator.TabController.TabPage>
-            </View>
+            {this.renderTabPages()}
           </Incubator.TabController>
         </View>
       </View>
diff --git a/demo/src/screens/incubatorScreens/TabControllerScreen/tab3.js b/demo/src/screens/incubatorScreens/TabControllerScreen/tab3.js
@@ -1,7 +1,7 @@
 import React, {Component} from 'react';
 import {ScrollView} from 'react-native';
 import _ from 'lodash';
-import {Card, Incubator, Colors, View, Text, Image, Assets, Button} from 'react-native-ui-lib'; //eslint-disable-line
+import {Card, Avatar, View, Text, Image, Assets, Button} from 'react-native-ui-lib'; //eslint-disable-line
 
 class Tab2 extends Component {
   state = {
@@ -12,6 +12,22 @@ class Tab2 extends Component {
     setTimeout(() => {
       this.setState({loading: false});
     }, 1200);
+
+    // this.slow();
+  }
+
+  slow(iterations = 10) {
+    if (iterations === 0) {
+      return;
+    }
+
+    setTimeout(() => {
+      _.times(5000, () => {
+        console.log('slow log');
+      });
+
+      this.slow(iterations - 1);
+    }, 10);
   }
 
   render() {
@@ -29,10 +45,16 @@ class Tab2 extends Component {
           )}
 
           {!loading &&
-            _.times(20, index => {
+            _.times(100, index => {
               return (
-                <Card margin-20 padding-20 key={index} onPress={_.noop}>
-                  <Text text40>{index}</Text>
+                <Card row centerV margin-20 padding-20 key={index} onPress={_.noop}>
+                  <Avatar
+                    size={50}
+                    imageSource={{
+                      uri: 'https://static.pexels.com/photos/60628/flower-garden-blue-sky-hokkaido-japan-60628.jpeg',
+                    }}
+                  />
+                  <Text text40 marginL-20>{index}</Text>
                 </Card>
               );
             })}
diff --git a/src/incubator/TabController/ReanimatedObject.js b/src/incubator/TabController/ReanimatedObject.js
@@ -0,0 +1,48 @@
+import Reanimated, {Easing} from 'react-native-reanimated';
+
+const {Clock, Value, cond, stopClock, startClock, clockRunning, timing, block, set} = Reanimated;
+
+export default class ReanimatedObject {
+  constructor(config) {
+    this.clock = new Clock();
+    this.state = {
+      finished: new Value(0),
+      position: new Value(0),
+      time: new Value(0),
+      frameTime: new Value(0),
+    };
+    (this.config = {
+      duration: 300,
+      toValue: new Value(0),
+      easing: Easing.bezier(0.23, 1, 0.32, 1),
+      ...config,
+    }),
+      (this.prevValue = new Value(0));
+    this.value = new Value(0);
+    this.nextValue = new Value(0);
+  }
+
+  getTransitionBlock() {
+    return block([
+      cond(
+        clockRunning(this.clock),
+        [
+          set(this.config.toValue, this.nextValue),
+          set(this.value, this.state.position),
+        ],
+        [
+          set(this.state.finished, 0),
+          set(this.state.time, 0),
+          set(this.state.frameTime, 0),
+          set(this.config.toValue, this.nextValue),
+          startClock(this.clock),
+        ],
+      ),
+      timing(this.clock, this.state, this.config),
+      cond(this.state.finished, [
+        stopClock(this.clock),
+        set(this.prevValue, this.state.position),
+      ]),
+    ]);
+  }
+}
diff --git a/src/incubator/TabController/TabBar.js b/src/incubator/TabController/TabBar.js
@@ -5,34 +5,22 @@ import {StyleSheet, ScrollView, ViewPropTypes, Platform} from 'react-native';
 import Reanimated, {Easing} from 'react-native-reanimated';
 import PropTypes from 'prop-types';
 import _ from 'lodash';
+
 import TabBarContext from './TabBarContext';
+import ReanimatedObject from './ReanimatedObject';
 import {asBaseComponent, forwardRef} from '../../commons';
 import View from '../../components/view';
 import Text from '../../components/text';
 import {Colors, Spacings} from '../../style';
 import {Constants} from '../../helpers';
 
 const DEFAULT_HEIGHT = 48;
-const {
-  Code,
-  Clock,
-  Value,
-  add,
-  sub,
-  cond,
-  eq,
-  stopClock,
-  startClock,
-  clockRunning,
-  timing,
-  block,
-  set,
-} = Reanimated;
+const {Code, Clock, Value, add, sub, cond, eq, stopClock, startClock, clockRunning, timing, block, set} = Reanimated;
 
 /**
-* @description: TabController's TabBar component
-* @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/incubatorScreens/TabControllerScreen/index.js
-*/
+ * @description: TabController's TabBar component
+ * @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/incubatorScreens/TabControllerScreen/index.js
+ */
 class TabBar extends PureComponent {
   static displayName = 'TabController.TabBar';
   static contextType = TabBarContext;
@@ -93,23 +81,26 @@ class TabBar extends PureComponent {
     containerWidth: Constants.screenWidth,
   };
 
-  state = {
-    itemsWidths: undefined,
-  };
-
-  tabBar = React.createRef();
-  _clock = new Clock();
-  _itemsWidths = _.times(React.Children.count(this.props.children), () => null);
-  _indicatorWidth = new Value(0);
-  _prevIndicatorWidth = new Value(0);
-  _prevOffset = new Value(0);
-  _offset = new Value(0);
-
   constructor(props, context) {
     super(props, context);
     const {registerTabItems} = this.context;
     const itemsCount = React.Children.count(this.props.children);
     const ignoredItems = [];
+
+    this.tabBar = React.createRef();
+
+    this._itemsWidths = _.times(React.Children.count(this.props.children), () => null);
+    this._indicatorOffset = new ReanimatedObject({duration: 300, easing: Easing.bezier(0.23, 1, 0.32, 1)});
+    this._indicatorWidth = new ReanimatedObject({duration: 300, easing: Easing.bezier(0.23, 1, 0.32, 1)});
+    this._indicatorTransitionStyle = {
+      width: this._indicatorWidth.value,
+      left: this._indicatorOffset.value,
+    };
+
+    this.state = {
+      itemsWidths: undefined,
+    };
+
     React.Children.toArray(this.props.children).forEach((child, index) => {
       if (child.props.ignore) {
         ignoredItems.push(index);
@@ -158,14 +149,19 @@ class TabBar extends PureComponent {
   }
 
   renderSelectedIndicator() {
+    // return null;
     const {itemsWidths} = this.state;
     const {indicatorStyle} = this.props;
     if (itemsWidths) {
-      const transitionStyle = {
-        width: this.runTiming(this._indicatorWidth, this._prevIndicatorWidth, 300),
-        left: this.runTiming(this._offset, this._prevOffset, 400),
-      };
-      return <Reanimated.View style={[styles.selectedIndicator, indicatorStyle, transitionStyle]} />;
+      // const transitionStyle = {
+      //   width: this.runTiming(this._indicatorWidth, this._prevIndicatorWidth, 300),
+      //   left: this.runTiming(this._offset, this._prevOffset, 400),
+      // };
+      return (
+        <Reanimated.View
+          style={[styles.selectedIndicator, indicatorStyle /* , transitionStyle */, this._indicatorTransitionStyle]}
+        />
+      );
     }
   }
 
@@ -181,7 +177,12 @@ class TabBar extends PureComponent {
       activeBackgroundColor,
     } = this.props;
     if (!_.isEmpty(itemStates)) {
-      return React.Children.map(this.props.children, (child, index) => {
+
+      if (this.tabBarItems) {
+        return this.tabBarItems;
+      }
+
+      this.tabBarItems = React.Children.map(this.props.children, (child, index) => {
         return React.cloneElement(child, {
           labelColor,
           selectedLabelColor,
@@ -197,6 +198,7 @@ class TabBar extends PureComponent {
           onLayout: this.onItemLayout,
         });
       });
+      return this.tabBarItems;
     }
   }
 
@@ -210,8 +212,8 @@ class TabBar extends PureComponent {
           ref={this.tabBar}
           horizontal
           showsHorizontalScrollIndicator={false}
-          style={{backgroundColor: Colors.white}}
-          contentContainerStyle={{minWidth: containerWidth}}
+          style={styles.tabBarScroll}
+          contentContainerStyle={styles.tabBarScrollContent}
         >
           <View style={[styles.tabBar, height && {height}]}>{this.renderTabBarItems()}</View>
           {this.renderSelectedIndicator()}
@@ -222,14 +224,23 @@ class TabBar extends PureComponent {
               const indicatorInset = Spacings.s4;
 
               return block([
+                // calc indicator current width
                 ..._.map(itemsWidths, (width, index) => {
                   return cond(eq(currentPage, index), [
-                    set(this._indicatorWidth, sub(itemsWidths[index], indicatorInset * 2)),
+                    set(this._indicatorWidth.nextValue, sub(itemsWidths[index], indicatorInset * 2)),
                   ]);
                 }),
+                // calc indicator current position
                 ..._.map(itemsOffsets, (offset, index) => {
-                  return cond(eq(currentPage, index), [set(this._offset, add(itemsOffsets[index], indicatorInset))]);
+                  return cond(eq(currentPage, index), [
+                    set(this._indicatorOffset.nextValue, add(itemsOffsets[index], indicatorInset)),
+                  ]);
                 }),
+
+                // Offset transition
+                this._indicatorOffset.getTransitionBlock(),
+                // Width transition
+                this._indicatorWidth.getTransitionBlock(),
               ]);
             }}
           </Code>
@@ -247,6 +258,12 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     justifyContent: 'space-between',
   },
+  tabBarScroll: {
+    backgroundColor: Colors.white,
+  },
+  tabBarScrollContent: {
+    minWidth: Constants.screenWidth,
+  },
   tab: {
     flex: 1,
     alignItems: 'center',
@@ -266,13 +283,13 @@ const styles = StyleSheet.create({
         shadowColor: Colors.dark10,
         shadowOpacity: 0.05,
         shadowRadius: 2,
-        shadowOffset: {height: 6, width: 0}
+        shadowOffset: {height: 6, width: 0},
       },
       android: {
         elevation: 5,
-        backgroundColor: Colors.white
-      }
-    })
+        backgroundColor: Colors.white,
+      },
+    }),
   },
 });
 
