Skip to content

Fix textStyle propType and add tabStyle in DefaultTabBar #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 26, 2016
Merged

Fix textStyle propType and add tabStyle in DefaultTabBar #282

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb05ed4
Fix textStyle propType and add tabStyle in DefaultTabBar
kilihorse May 25, 2016
ef82516
add tabStyle prop in DefaultTabBar
kilihorse May 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DefaultTabBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const DefaultTabBar = React.createClass({
backgroundColor: React.PropTypes.string,
activeTextColor: React.PropTypes.string,
inactiveTextColor: React.PropTypes.string,
textStyle: View.propTypes.style,
textStyle: Text.propTypes.style,
},

getDefaultProps() {
Expand All @@ -43,7 +43,7 @@ const DefaultTabBar = React.createClass({
accessibilityTraits='button'
onPress={() => this.props.goToPage(page)}
>
<View style={styles.tab}>
<View style={[styles.tab, this.props.tabStyle]}>
Copy link
Collaborator

@skv-headless skv-headless May 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add to propTypes

<Text style={[{color: textColor, fontWeight, }, textStyle, ]}>
{name}
</Text>
Expand Down
2 changes: 1 addition & 1 deletion ScrollableTabBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const ScrollableTabBar = React.createClass({
style: View.propTypes.style,
tabStyle: View.propTypes.style,
tabsContainerStyle: View.propTypes.style,
textStyle: View.propTypes.style,
textStyle: Text.propTypes.style,
},

getDefaultProps() {
Expand Down