Skip to content

Commit 73f99c2

Browse files
committed
Merge pull request ptomasroos#282 from kiliwalk/fix_textStyle_propType
Fix textStyle propType and add tabStyle in DefaultTabBar
2 parents d459f9d + ef82516 commit 73f99c2

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

DefaultTabBar.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ const DefaultTabBar = React.createClass({
1717
backgroundColor: React.PropTypes.string,
1818
activeTextColor: React.PropTypes.string,
1919
inactiveTextColor: React.PropTypes.string,
20-
textStyle: View.propTypes.style,
20+
textStyle: Text.propTypes.style,
21+
tabStyle: View.propTypes.style,
2122
},
2223

2324
getDefaultProps() {
@@ -44,7 +45,7 @@ const DefaultTabBar = React.createClass({
4445
accessibilityTraits='button'
4546
onPress={() => this.props.goToPage(page)}
4647
>
47-
<View style={styles.tab}>
48+
<View style={[styles.tab, this.props.tabStyle]}>
4849
<Text style={[{color: textColor, fontWeight, }, textStyle, ]}>
4950
{name}
5051
</Text>

ScrollableTabBar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const ScrollableTabBar = React.createClass({
2828
style: View.propTypes.style,
2929
tabStyle: View.propTypes.style,
3030
tabsContainerStyle: View.propTypes.style,
31-
textStyle: View.propTypes.style,
31+
textStyle: Text.propTypes.style,
3232
},
3333

3434
getDefaultProps() {

0 commit comments

Comments
 (0)