Skip to content
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.

Sign up for GitHub

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

Generate different id per style tag #44

Merged
merged 1 commit into from
Dec 19, 2016
Merged

Generate different id per style tag #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions src/babel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const STYLE_ATTRIBUTE = 'jsx'
const GLOBAL_ATTRIBUTE = 'global'
const MARKUP_ATTRIBUTE = 'data-jsx'
const STYLE_COMPONENT = '_JSXStyle'
const STYLE_COMPONENT_ID = 'styleId'
const STYLE_COMPONENT_CSS = 'css'

export default function ({types: t}) {
Expand All @@ -31,14 +32,20 @@ export default function ({types: t}) {
expr.value
)

const makeStyledJsxTag = transformedCss => (
const makeStyledJsxTag = (id, transformedCss) => (
t.JSXElement(
t.JSXOpeningElement(
t.JSXIdentifier(STYLE_COMPONENT),
[t.JSXAttribute(
t.JSXIdentifier(STYLE_COMPONENT_CSS),
t.JSXExpressionContainer(t.stringLiteral(transformedCss))
)],
[
t.JSXAttribute(
t.JSXIdentifier(STYLE_COMPONENT_ID),
t.JSXExpressionContainer(t.numericLiteral(id))
),
t.JSXAttribute(
t.JSXIdentifier(STYLE_COMPONENT_CSS),
t.JSXExpressionContainer(t.stringLiteral(transformedCss))
)
],
true
),
null,
Expand All @@ -65,7 +72,8 @@ export default function ({types: t}) {

const el = path.node

if (el.name && el.name.name !== 'style') {
if (el.name &&
(el.name.name !== 'style' && el.name.name !== STYLE_COMPONENT)) {
for (const attr of el.attributes) {
if (attr.name === MARKUP_ATTRIBUTE) {
// avoid double attributes
Expand Down Expand Up @@ -131,14 +139,16 @@ export default function ({types: t}) {
}

const styleText = getExpressionText(expression)
const styleId = hash(styleText)

state.styles.push([
styleId,
styleText,
expression.loc
])
}

state.jsxId = hash(state.styles.map(s => s[0]).join(''))
state.jsxId = hash(state.styles.map(s => s[1]).join(''))
state.hasJSXStyle = true
state.file.hasJSXStyle = true
// next visit will be: JSXOpeningElement
Expand All @@ -159,14 +169,14 @@ export default function ({types: t}) {
}

// we replace styles with the function call
const [css, loc] = state.styles.shift()
const [id, css, loc] = state.styles.shift()

const isGlobal = el.attributes.some(attr => (
attr.name.name === GLOBAL_ATTRIBUTE
))

if (isGlobal) {
path.replaceWith(makeStyledJsxTag(css))
path.replaceWith(makeStyledJsxTag(id, css))
return
}

Expand All @@ -191,7 +201,7 @@ export default function ({types: t}) {
transformedCss = transform(state.jsxId, css)
}

path.replaceWith(makeStyledJsxTag(transformedCss))
path.replaceWith(makeStyledJsxTag(id, transformedCss))
}
},
Program: {
Expand Down
4 changes: 2 additions & 2 deletions src/render.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ export default typeof window === 'undefined' ? renderOnServer : renderOnClient

function renderOnServer(components) {
for (const {props} of components) {
memory[props['data-jsx']] = props.css
memory[props.styleId] = props.css
}
}

function renderOnClient(components) {
const styles = {}
for (const c of components) {
styles[c.props['data-jsx']] = c
styles[c.props.styleId] = c
}

patch(diff(prevStyles, styles))
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/class.out.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ export default class {
render() {
return <div data-jsx={1891769468}>
<p data-jsx={1891769468}>test</p>
<_JSXStyle css={"p[data-jsx=\"1891769468\"] {color: red;}"} data-jsx={1891769468} />
<_JSXStyle styleId={1891769468} css={"p[data-jsx=\"1891769468\"] {color: red;}"} />
</div>;
}

}
}
4 changes: 2 additions & 2 deletions test/fixtures/global.out.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import _JSXStyle from "styled-jsx/style";
<div data-jsx={3367785191}>
<_JSXStyle css={"\n body {\n color: red\n }\n "} data-jsx={3367785191} />
</div>;
<_JSXStyle styleId={3367785191} css={"\n body {\n color: red\n }\n "} />
</div>;
6 changes: 3 additions & 3 deletions test/fixtures/mixed-global-scoped.out.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import _JSXStyle from 'styled-jsx/style';
export default (() => <div data-jsx={793889750}>
<p data-jsx={793889750}>test</p>
<_JSXStyle css={"body { background: red }"} data-jsx={793889750} />
<_JSXStyle css={"p[data-jsx=\"793889750\"] {color: red }"} data-jsx={793889750} />
</div>);
<_JSXStyle styleId={3149549172} css={"body { background: red }"} />
<_JSXStyle styleId={188072295} css={"p[data-jsx=\"793889750\"] {color: red }"} />
</div>);
4 changes: 2 additions & 2 deletions test/fixtures/source-maps.out.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import _JSXStyle from 'styled-jsx/style';
export default (() => <div data-jsx={188072295}>
<p data-jsx={188072295}>test</p>
<p data-jsx={188072295}>woot</p>
<_JSXStyle css={"p[data-jsx=\"188072295\"] {color: red }\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNvdXJjZS1tYXBzLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlnQixBQUFFLHlCQUFhIiwiZmlsZSI6InNvdXJjZS1tYXBzLmpzIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGRlZmF1bHQgKCkgPT4gKFxuICA8ZGl2PlxuICAgIDxwPnRlc3Q8L3A+XG4gICAgPHA+d29vdDwvcD5cbiAgICA8c3R5bGUganN4PnsncCB7IGNvbG9yOiByZWQgfSd9PC9zdHlsZT5cbiAgPC9kaXY+XG4pXG4iXX0= */\n/*@ sourceURL=source-maps.js */"} data-jsx={188072295} />
</div>);
<_JSXStyle styleId={188072295} css={"p[data-jsx=\"188072295\"] {color: red }\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNvdXJjZS1tYXBzLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlnQixBQUFFLHlCQUFhIiwiZmlsZSI6InNvdXJjZS1tYXBzLmpzIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGRlZmF1bHQgKCkgPT4gKFxuICA8ZGl2PlxuICAgIDxwPnRlc3Q8L3A+XG4gICAgPHA+d29vdDwvcD5cbiAgICA8c3R5bGUganN4PnsncCB7IGNvbG9yOiByZWQgfSd9PC9zdHlsZT5cbiAgPC9kaXY+XG4pXG4iXX0= */\n/*@ sourceURL=source-maps.js */"} />
</div>);
4 changes: 2 additions & 2 deletions test/fixtures/stateless.out.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ export default (() => <div data-jsx={188072295}>
<p data-jsx={188072295}>test</p>
<p data-jsx={188072295}>woot</p>
<p data-jsx={188072295}>woot</p>
<_JSXStyle css={"p[data-jsx=\"188072295\"] {color: red }"} data-jsx={188072295} />
</div>);
<_JSXStyle styleId={188072295} css={"p[data-jsx=\"188072295\"] {color: red }"} />
</div>);
4 changes: 2 additions & 2 deletions test/fixtures/whitespace.out.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ export default (() => <div data-jsx={188072295}>
<p data-jsx={188072295}>test</p>
<p data-jsx={188072295}>woot</p>
<p data-jsx={188072295}>woot</p>
<_JSXStyle css={"p[data-jsx=\"188072295\"] {color: red }"} data-jsx={188072295} />
</div>);
<_JSXStyle styleId={188072295} css={"p[data-jsx=\"188072295\"] {color: red }"} />
</div>);