-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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.
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
Add support for colored box shadows #5979
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3d629fd
WIP
adamwathan 6359067
add box shadow parser
RobinMalfait 6ad27bb
use box shadow parser
RobinMalfait b7a9a26
Update default shadows, add boxShadowColor key, add shadow datatype
adamwathan d8a0daf
Update tests
adamwathan e7d65ee
add `valid` flag to `boxShadow` parser
RobinMalfait File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| let KEYWORDS = new Set(['inset', 'inherit', 'initial', 'revert', 'unset']) | ||
| let COMMA = /\,(?![^(]*\))/g // Comma separator that is not located between brackets. E.g.: `cubiz-bezier(a, b, c)` these don't count. | ||
| let SPACE = /\ +(?![^(]*\))/g // Similar to the one above, but with spaces instead. | ||
| let LENGTH = /^-?(\d+)(.*?)$/g | ||
|
|
||
| export function parseBoxShadowValue(input) { | ||
| let shadows = input.split(COMMA) | ||
| return shadows.map((shadow) => { | ||
| let value = shadow.trim() | ||
| let result = { raw: value } | ||
| let parts = value.split(SPACE) | ||
| let seen = new Set() | ||
|
|
||
| for (let part of parts) { | ||
| // Reset index, since the regex is stateful. | ||
| LENGTH.lastIndex = 0 | ||
|
|
||
| // Keyword | ||
| if (!seen.has('KEYWORD') && KEYWORDS.has(part)) { | ||
| result.keyword = part | ||
| seen.add('KEYWORD') | ||
| } | ||
|
|
||
| // Length value | ||
| else if (LENGTH.test(part)) { | ||
| if (!seen.has('X')) { | ||
| result.x = part | ||
| seen.add('X') | ||
| } else if (!seen.has('Y')) { | ||
| result.y = part | ||
| seen.add('Y') | ||
| } else if (!seen.has('BLUR')) { | ||
| result.blur = part | ||
| seen.add('BLUR') | ||
| } else if (!seen.has('SPREAD')) { | ||
| result.spread = part | ||
| seen.add('SPREAD') | ||
| } | ||
| } | ||
|
|
||
| // Color or unknown | ||
| else { | ||
| if (!result.color) { | ||
| result.color = part | ||
| } else { | ||
| if (!result.unknown) result.unknown = [] | ||
| result.unknown.push(part) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return result | ||
| }) | ||
| } | ||
|
|
||
| export function formatBoxShadowValue(shadows) { | ||
| return shadows | ||
| .map((shadow) => { | ||
| return [shadow.keyword, shadow.x, shadow.y, shadow.blur, shadow.spread, shadow.color] | ||
| .filter(Boolean) | ||
| .join(' ') | ||
| }) | ||
| .join(', ') | ||
| } |
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
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
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
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
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we encode this information in each shadow itself? Like an
isValidflag or something?Not a requirement, but I noticed the same logic in multiple places.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I agree or even have the parse function return an error or something if it doesn’t parse a proper value. Moar tuples? Is this Elm?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hah, I think we can just encode it as a
validflag. When we re-print, then we can use therawvalue in case the value is not valid.E.g.: