Merge branch 'master' of https://github.com/wix/react-native-ui-lib

Author: ethanshar

src/components/tabController/TabBarItem.js

@@ -106,9 +106,19 @@ export default class TabBarItem extends PureComponent {
     onPress: _.noop
   };
 
-  state = {};
-  itemWidth = this.props.width;
-  itemRef = React.createRef();
+  constructor(props) {
+    super(props);
+
+    this.itemWidth = this.props.width;
+    this.state = {};
+    this.itemRef = React.createRef();
+
+    if (this.itemWidth) {
+      const {index, onLayout} = this.props;
+      onLayout({width: this.itemWidth}, index);
+    }
+  }
+
 
   onStateChange = event([
     {
@@ -148,11 +158,11 @@ export default class TabBarItem extends PureComponent {
       opacity
     };
 
-    // if (this.itemWidth) {
-    //   style.flex = undefined;
-    //   style.width = this.itemWidth;
-    //   style.paddingHorizontal = undefined;
-    // }
+    if (this.props.width) {
+      style.flex = undefined;
+      style.width = this.itemWidth;
+      style.paddingHorizontal = undefined;
+    }
 
     return style;
   }
@@ -234,7 +244,7 @@ export default class TabBarItem extends PureComponent {
         onPress={this.onPress}
         testID={testID}
       >
-        {icon && <Reanimated.Image source={icon} style={[styles.tabItemIcon, this.getIconStyle()]}/>}
+        {icon && <Reanimated.Image source={icon} style={[label && styles.tabItemIconWithLabel, this.getIconStyle()]}/>}
         {!_.isEmpty(label) && (
           <Reanimated.Text style={[styles.tabItemLabel, this.getLabelStyle()]}>
             {uppercase ? _.toUpper(label) : label}
@@ -257,7 +267,7 @@ const styles = StyleSheet.create({
   tabItemLabel: {
     ...Typography.text80
   },
-  tabItemIcon: {
+  tabItemIconWithLabel: {
     marginRight: 10
   },
   badge: {