Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.
Sign upConversation
This comment has been minimized.
This comment has been minimized.
ant-design-bot
commented
Sep 7, 2018
•
|
Deploy preview for ant-design ready! Built with commit df191ad |
This comment has been minimized.
This comment has been minimized.
|
@afc163 Is the CI broken? |
supra28
changed the title from
Badge: Add ReacNode to support for count prop
to
Badge: Add ReacNode support for count prop
Sep 7, 2018
IssuehuntBot
referenced this pull request
Sep 7, 2018
Closed
Typescript error when passing a react node to badge count #11134
supra28
force-pushed the
supra28:badge-fix
branch
from
9ac6c5a
to
df191ad
Sep 8, 2018
This comment has been minimized.
This comment has been minimized.
|
rebased after snapshot updates |
This comment has been minimized.
This comment has been minimized.
|
It's better to add a demo about it : ) |
| const state = this.state; | ||
| if (!state.count || isNaN(state.count as number)) { | ||
| if(props.displayComponent){ |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
supra28
Sep 12, 2018
Contributor
What exactly should I change here? It was already written this way.
This is my first time, pls give a few pointers.
This comment has been minimized.
This comment has been minimized.
| @@ -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} |
This comment has been minimized.
This comment has been minimized.
afc163
Sep 12, 2018
Member
- displayComponent = {displayComponent}
+ displayComponent={displayComponent}| const state = this.state; | ||
| if (!state.count || isNaN(state.count as number)) { | ||
| if(props.displayComponent){ | ||
| return props.displayComponent |
This comment has been minimized.
This comment has been minimized.
| @@ -116,8 +117,12 @@ export default class ScrollNumber extends Component<ScrollNumberProps, ScrollNum | ||
| } | ||
| renderNumberElement() { | ||
| const props = this.props; |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
Could you add a test case for this feature? |
This comment has been minimized.
This comment has been minimized.
|
@afc163 Yeah i'll make changes and add a test case this week, as soon as I get some time. |
This comment has been minimized.
This comment has been minimized.
added a commit
that referenced
this pull request
Oct 16, 2018
This comment has been minimized.
This comment has been minimized.
|
Merged in fc6ac42, thx for sending PR |
afc163
closed this
Oct 16, 2018
added a commit
to kimochg/ant-design
that referenced
this pull request
Nov 8, 2018
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.
supra28 commentedSep 7, 2018
•
edited
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 :