fix: re-enable color prop for the badge component#648
Merged
Conversation
chinesedfan
reviewed
Nov 25, 2017
| const BadgeText = styled.Text` | ||
| ${{ ...fonts.fontPrimaryBold }}; | ||
| background-color: transparent; | ||
| ${({ color }) => `color: ${color || colors.black};`}; |
Member
There was a problem hiding this comment.
It reminds me a question that, what's the differences between this way with color: ${({color}) => (color || color.black)};?
Member
There was a problem hiding this comment.
Both styles are OK. But the one I mentioned is more similar with styled-components official documents.
Member
Author
There was a problem hiding this comment.
@chinesedfan just had the time to test, it's exactly the same.
I switched to the syntax you proposed as it's clearer.
I guess the difference between the two syntaxes, is that with the one I originally used, you can choose to output no style at all based on tests, which is not possible with the other one:
${({ foo }) => foo ? `color: '#FFCC00'` : ''};You could also output more styles in the condition
chinesedfan
approved these changes
Dec 4, 2017
lex111
approved these changes
Dec 4, 2017
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Screenshots
Description
#535 seems to have lost the
colorprop for the badge text, making it always black (the default).This fixed the style be reading from that prop again when it's available.