Support passing custom style to TabController.TabBarItem (#947)

ethanshar · web-flow · commit 9fe4fbc80daa · 2020-09-21T15:55:43.000+03:00
diff --git a/src/components/tabController/TabBarItem.js b/src/components/tabController/TabBarItem.js
@@ -148,7 +148,7 @@ export default class TabBarItem extends PureComponent {
   };
 
   getItemStyle() {
-    const {state} = this.props;
+    const {state, style: propsStyle} = this.props;
     const opacity = block([
       cond(eq(state, State.END), call([], this.onPress)),
       cond(eq(state, State.BEGAN), this.props.activeOpacity, 1)
@@ -164,7 +164,7 @@ export default class TabBarItem extends PureComponent {
       style.paddingHorizontal = undefined;
     }
 
-    return style;
+    return [style, propsStyle];
   }
 
   getLabelStyle() {

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ export default class TabBarItem extends PureComponent {`
`148`	`148`	`};`
`149`	`149`
`150`	`150`	`getItemStyle() {`
`151`		`- const {state} = this.props;`
	`151`	`+ const {state, style: propsStyle} = this.props;`
`152`	`152`	`const opacity = block([`
`153`	`153`	`cond(eq(state, State.END), call([], this.onPress)),`
`154`	`154`	`cond(eq(state, State.BEGAN), this.props.activeOpacity, 1)`
`@@ -164,7 +164,7 @@ export default class TabBarItem extends PureComponent {`
`164`	`164`	`style.paddingHorizontal = undefined;`
`165`	`165`	`}`
`166`	`166`
`167`		`- return style;`
	`167`	`+ return [style, propsStyle];`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`getLabelStyle() {`