Merge pull request GeekyAnts#2144 from GeekyAnts/fix/tabFontSize/allowOverride

SupriyaKalghatgi · web-flow · commit 2a1e13939f5f · 2018-07-19T15:40:37.000+05:30
Allow overriding of theme variable with explicit styles prop on Tab c…
diff --git a/src/basic/Tabs/DefaultTabBar.js b/src/basic/Tabs/DefaultTabBar.js
@@ -71,8 +71,8 @@ const DefaultTabBar = createReactClass({
           >
             <Text
               style={[
-                isTabActive ? activeTextStyle : textStyle,
-                { fontSize: tabFontSize }
+                { fontSize: tabFontSize },
+                isTabActive ? activeTextStyle : textStyle
               ]}
             >
               {name}

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ const DefaultTabBar = createReactClass({`
`71`	`71`	`>`
`72`	`72`	`<Text`
`73`	`73`	`style={[`
`74`		`- isTabActive ? activeTextStyle : textStyle,`
`75`		`- { fontSize: tabFontSize }`
	`74`	`+ { fontSize: tabFontSize },`
	`75`	`+ isTabActive ? activeTextStyle : textStyle`
`76`	`76`	`]}`
`77`	`77`	`>`
`78`	`78`	`{name}`