Badge: Add ReacNode support for count prop #12140
Closed
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
|
Deploy preview for ant-design ready! Built with commit df191ad |
|
@afc163 Is the CI broken? |
supra28
changed the title
1 task
|
rebased after snapshot updates |
|
It's better to add a demo about it : ) |
afc163
reviewed
Sep 12, 2018
| const state = this.state; | ||
| if (!state.count || isNaN(state.count as number)) { | ||
| if(props.displayComponent){ |
There was a problem hiding this comment.
What exactly should I change here? It was already written this way.
This is my first time, pls give a few pointers.
There was a problem hiding this comment.
- if(props.displayComponent){
+ if (props.displayComponent) {
afc163
reviewed
Sep 12, 2018
| @@ -105,7 +111,8 @@ export default class Badge extends React.Component<BadgeProps, any> { | |||
| data-show={!hidden} | |||
| className={scrollNumberCls} | |||
| count={displayCount} | |||
| title={title || count} | |||
| displayComponent = {displayComponent} | |||
There was a problem hiding this comment.
- displayComponent = {displayComponent}
+ displayComponent={displayComponent}
afc163
reviewed
Sep 12, 2018
| const state = this.state; | ||
| if (!state.count || isNaN(state.count as number)) { | ||
| if(props.displayComponent){ | ||
| return props.displayComponent |
afc163
reviewed
Sep 12, 2018
| @@ -116,8 +117,12 @@ export default class ScrollNumber extends Component<ScrollNumberProps, ScrollNum | |||
| } | |||
|
|
|||
| renderNumberElement() { | |||
| const props = this.props; | |||
There was a problem hiding this comment.
- const props = this.props;
+ const { displayComponent } = this.props;
|
Could you add a test case for this feature? |
|
@afc163 Yeah i'll make changes and add a test case this week, as soon as I get some time. |
afc163
added a commit
that referenced
this pull request
Oct 16, 2018
|
Merged in fc6ac42, thx for sending PR |
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.
Fixes issue
Please makes sure that these checkboxes are checked before submitting your PR, thank you!
master, feature for branchfeature.npm run lintand fix those errors before submitting in order to keep consistent code style.Extra checklist:
if isBugFix :