Skip to content

Commit bb05ed4

Browse files
committed
Fix textStyle propType and add tabStyle in DefaultTabBar
1 parent 0757ed3 commit bb05ed4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

DefaultTabBar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ 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,
2121
},
2222

2323
getDefaultProps() {
@@ -43,7 +43,7 @@ const DefaultTabBar = React.createClass({
4343
accessibilityTraits='button'
4444
onPress={() => this.props.goToPage(page)}
4545
>
46-
<View style={styles.tab}>
46+
<View style={[styles.tab, this.props.tabStyle]}>
4747
<Text style={[{color: textColor, fontWeight, }, textStyle, ]}>
4848
{name}
4949
</Text>

ScrollableTabBar.js

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

3535
getDefaultProps() {

0 commit comments

Comments
 (0)