Fixes textStyle for Tab(heading) (#2801)

GeekyAnts · Jul 23, 2019 · 78e03c3 · 78e03c3
1 parent 994525d
commit 78e03c3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/basic/Tabs/DefaultTabBar.js b/src/basic/Tabs/DefaultTabBar.js
@@ -67,7 +67,7 @@ const DefaultTabBar = createReactClass({
       ? activeTextColor
       : inactiveTextColor;
     const fontWeight = isTabActive ? 'bold' : 'normal';
-    const isDisabled = disabled == undefined ? false : true;
+    const isDisabled = disabled != undefined;
 
     if (typeof name === 'string') {
       return (
@@ -84,8 +84,8 @@ const DefaultTabBar = createReactClass({
             <Text
               style={[
                 { fontSize: tabFontSize },
-                isTabActive ? activeTextStyle : textStyle,
-                { color: textColor }
+                { color: textColor },
+                isTabActive ? activeTextStyle : textStyle
               ]}
             >
               {name}