feat(Button): add advanced handling of disabled prop #1781
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
layershifter
commented
Jun 19, 2017
| it('adds className icon when true', () => { | ||
| shallow(<Button icon />) | ||
| .should.have.className('icon') | ||
| }) |
layershifter
commented
Jun 19, 2017
|
|
||
| if (labelElement) { | ||
| const classes = cx('ui', baseClasses, 'button', className) | ||
| if (!_.isNil(label)) { |
There was a problem hiding this comment.
If you take attention to these conditions you can see, that in fact there are two conditions: when the Button has a container and has not.
layershifter
commented
Jun 19, 2017
| pointing: labelPosition === 'left' ? 'right' : 'left', | ||
| } }) | ||
|
|
||
| if (labelElement) { |
There was a problem hiding this comment.
Also, this condition doesn't makes sence, we should use there check for the label prop.
layershifter
commented
Jun 19, 2017
|
|
||
| return ( | ||
| <ElementType {...rest} className={containerClasses} onClick={this.handleClick}> | ||
| {labelPosition === 'left' && labelElement} | ||
| <button className={classes} ref={this.handleRef} tabIndex={tabIndex}> | ||
| <button className={buttonClasses} disabled={disabled} ref={this.handleRef} tabIndex={tabIndex}> |
There was a problem hiding this comment.
HTML's button tag can have a disabled attr.
Codecov Report
@@ Coverage Diff @@
## master #1781 +/- ##
==========================================
- Coverage 99.75% 99.75% -0.01%
==========================================
Files 142 142
Lines 2459 2452 -7
==========================================
- Hits 2453 2446 -7
Misses 6 6
Continue to review full report at Codecov.
|
|
Perfect, thank you. |
|
Released in |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR:
render()method