This repository was archived by the owner on Mar 4, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 53
fix(css-shorthands): expanding the shorthand properties in the styles #296
Closed
Closed
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
1b01f56
-added css-shorthand-expand dependency and incorporated it in the mer…
e1cc5f8
-introduced the logic for expanding the css shorthands in a fela plugin
bb969c5
-refactored the expand css shorthand fela plugin
6b9b926
-added logic for expanding the shorthand css props in the nested pseu…
4f695db
Merge branch 'master' into bug/css-shorthand
5c7f583
-replaced css-shorthand-props with shortcss (because if known bug and…
cffae90
-fixed checking for a shorthand prop
3b8453a
-better description of the tests
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 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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
import * as _ from 'lodash' | ||
import * as SC from 'shortcss' | ||
|
||
export default () => { | ||
const expandCssShorthands = styles => { | ||
return _.keys(styles).reduce((acc, cssPropertyName) => { | ||
const cssPropertyValue = styles[cssPropertyName] | ||
|
||
if (typeof cssPropertyValue === 'object') { | ||
return { ...acc, [cssPropertyName]: expandCssShorthands(cssPropertyValue) } | ||
} | ||
|
||
if (SC.isShorthand(_.kebabCase(cssPropertyName))) { | ||
const expandedProps = SC.expand(_.kebabCase(cssPropertyName), String(cssPropertyValue)) | ||
return { ...acc, ...transformKebabCaseKeysToCamelCase(expandedProps) } | ||
} | ||
|
||
return { ...acc, [cssPropertyName]: cssPropertyValue } | ||
}, {}) | ||
} | ||
|
||
return expandCssShorthands | ||
} | ||
|
||
const transformKebabCaseKeysToCamelCase = obj => { | ||
return _.mapKeys(obj, (value, key) => { | ||
return _.camelCase(key) | ||
}) | ||
} |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
import felaExpandCssShorthandsPlugin from 'src/lib/felaExpandCssShorthandsPlugin' | ||
|
||
const expandCssShorthands = felaExpandCssShorthandsPlugin() | ||
|
||
describe('felaExpandCssShorthandsPlugin', () => { | ||
test('should expand one-word css prop', () => { | ||
const style = { | ||
display: 'block', | ||
margin: '0px 10px', | ||
} | ||
|
||
expect(expandCssShorthands(style)).toEqual({ | ||
display: 'block', | ||
marginTop: '0px', | ||
marginRight: '10px', | ||
marginBottom: '0px', | ||
marginLeft: '10px', | ||
}) | ||
}) | ||
|
||
test('should expand two-words css prop', () => { | ||
const style = { | ||
borderColor: 'red', | ||
} | ||
|
||
expect(expandCssShorthands(style)).toEqual({ | ||
borderTopColor: 'red', | ||
borderRightColor: 'red', | ||
borderBottomColor: 'red', | ||
borderLeftColor: 'red', | ||
}) | ||
}) | ||
|
||
test('should expand pseudo object', () => { | ||
const style = { | ||
display: 'block', | ||
'::before': { | ||
margin: '0px', | ||
}, | ||
} | ||
|
||
expect(expandCssShorthands(style)).toEqual({ | ||
display: 'block', | ||
'::before': { | ||
marginTop: '0px', | ||
marginRight: '0px', | ||
marginBottom: '0px', | ||
marginLeft: '0px', | ||
}, | ||
}) | ||
}) | ||
|
||
test('should expand nested pseudo object', () => { | ||
const style = { | ||
display: 'block', | ||
'::before': { | ||
margin: '0px', | ||
':hover': { | ||
padding: '10px', | ||
}, | ||
}, | ||
} | ||
|
||
expect(expandCssShorthands(style)).toEqual({ | ||
display: 'block', | ||
'::before': { | ||
marginTop: '0px', | ||
marginRight: '0px', | ||
marginBottom: '0px', | ||
marginLeft: '0px', | ||
':hover': { | ||
paddingTop: '10px', | ||
paddingRight: '10px', | ||
paddingBottom: '10px', | ||
paddingLeft: '10px', | ||
}, | ||
}, | ||
}) | ||
}) | ||
}) |
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
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.
Uh oh!
There was an error while loading. Please reload this page.