Skip to content
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

Jump to bottom

[Tab] Allow overriding button style on tabs #5844

Merged
merged 2 commits into from
Dec 28, 2016
Merged

[Tab] Allow overriding button style on tabs #5844

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b00c4f6
Allow setting button style on tabs
rhagigi Dec 28, 2016
49d6db0
Fixing review comments
rhagigi Dec 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Tabs/Tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ class Tab extends Component {
static muiName = 'Tab';

static propTypes = {
/**
Copy link
Member

Choose a reason for hiding this comment

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

Wrong spacing.

* Override the inline-styles of the button element
Copy link
Member

Choose a reason for hiding this comment

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

Missing dot at the end of the sentence.

*/
buttonStyle: PropTypes.object,
/**
* The css class name of the root element.
*/
Expand Down Expand Up @@ -95,6 +99,7 @@ class Tab extends Component {
onTouchTap, // eslint-disable-line no-unused-vars
selected, // eslint-disable-line no-unused-vars
label,
buttonStyle,
style,
value, // eslint-disable-line no-unused-vars
width, // eslint-disable-line no-unused-vars
Expand Down Expand Up @@ -132,7 +137,7 @@ class Tab extends Component {
touchRippleOpacity={rippleOpacity}
onTouchTap={this.handleTouchTap}
>
<div style={styles.button} >
<div style={Object.assign(styles.button, buttonStyle)} >
{iconElement}
{label}
</div>
Expand Down