Skip to content

Adding ability to select components #651

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

Closed
wants to merge 1 commit into from
Closed

Adding ability to select components #651

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
22 changes: 22 additions & 0 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Code and docs are for v3 which we highly recommend you to try. Looking for style
- [Targeting The Root](#targeting-the-root)
- [Global styles](#global-styles)
* [One-off global selectors](#one-off-global-selectors)
- [Styling components](#styling-components)
- [Dynamic styles](#dynamic-styles)
* [Via interpolated dynamic props](#via-interpolated-dynamic-props)
* [Via `className` toggling](#via-classname-toggling)
Expand Down Expand Up @@ -219,6 +220,27 @@ export default () => (
)
```

### Styling components

You may select components in styles if that components accepts `className` property:

```jsx
import React from 'react'
import Link from 'some-library'

export default () => (
<div>
<Link>About</Link>

<style jsx>{`
.Link {
text-decoration: none;
}
`}</style>
</div>
)
```

### Dynamic styles

To make a component's visual representation customizable from the outside world there are three options.
Expand Down
12 changes: 9 additions & 3 deletions src/_utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,14 @@ const joinSpreads = spreads => spreads.reduce((acc, curr) => or(acc, curr))

export const hashString = str => String(_hashString(str))

export const addClassName = (path, jsxId) => {
const jsxIdWithSpace = concat(jsxId, t.stringLiteral(' '))
export const addClassName = (path, jsxId, code) => {
const { name } = path.get('name').node
const isSelectingComponent =
name[0] === name[0].toUpperCase() && code.includes(`.${name}`)
const jsxIdWithName = isSelectingComponent
? concat(jsxId, t.stringLiteral(` ${name}`))
: jsxId
const jsxIdWithSpace = concat(jsxIdWithName, t.stringLiteral(' '))
const attributes = path.get('attributes')
const spreads = []
let className = null
Expand Down Expand Up @@ -99,7 +105,7 @@ export const addClassName = (path, jsxId) => {
} else {
className = t.jSXExpressionContainer(
spreads.length === 0
? jsxId
? jsxIdWithName
: concat(jsxIdWithSpace, or(joinSpreads(spreads), t.stringLiteral('')))
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/babel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default function({ types: t }) {
))
) {
if (state.className) {
addClassName(path, state.className)
addClassName(path, state.className, state.file.code)
}
}

Expand Down
108 changes: 56 additions & 52 deletions test/babel6/snapshots/attribute.js.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,58 +108,62 @@ Generated by [AVA](https://ava.li).

`var _this = this;␊
␊
import _JSXStyle from "styled-jsx/style";␊
import _JSXStyle from 'styled-jsx/style';␊
export default (() => {␊
const Element = 'div';␊
return <div className={"jsx-2886504620"}>␊
<div {...test.test} className={"jsx-2886504620" + " " + (test.test && test.test.className != null && test.test.className || "test")} />␊
<div {...test.test.test} className={"jsx-2886504620" + " " + (test.test.test && test.test.test.className != null && test.test.test.className || "test")} />␊
<div {..._this.test.test} className={"jsx-2886504620" + " " + (_this.test.test && _this.test.test.className != null && _this.test.test.className || "test")} />␊
<div data-test="test" className={"jsx-2886504620"} />␊
<div className={"jsx-2886504620" + " " + "test"} />␊
<div className={"jsx-2886504620" + " " + 'test'} />␊
<div className={"jsx-2886504620" + " " + `test`} />␊
<div className={"jsx-2886504620" + " " + `test${true ? ' test2' : ''}`} />␊
<div className={"jsx-2886504620" + " " + ('test ' + test || "")} />␊
<div className={"jsx-2886504620" + " " + (['test', 'test2'].join(' ') || "")} />␊
<div className={"jsx-2886504620" + " " + (true && 'test' || "")} />␊
<div className={"jsx-2886504620" + " " + ((test ? 'test' : null) || "")} />␊
<div className={"jsx-2886504620" + " " + (test || "")} />␊
<div className={"jsx-2886504620" + " " + (test && 'test' || "")} />␊
<div className={"jsx-2886504620" + " " + (test && test('test') || "")} />␊
<div className={"jsx-2886504620" + " " + (undefined || "")} />␊
<div className={"jsx-2886504620" + " " + (null || "")} />␊
<div className={"jsx-2886504620" + " " + (false || "")} />␊
<div data-test className={"jsx-2886504620" + " " + 'test'} />␊
<div data-test className={"jsx-2886504620" + " " + 'test'} />␊
<div data-test="test" className={"jsx-2886504620" + " " + 'test'} />␊
<div {...props} className={"jsx-2886504620" + " " + (props && props.className != null && props.className || 'test')} />␊
<div {...props} {...rest} className={"jsx-2886504620" + " " + (rest && rest.className != null && rest.className || props && props.className != null && props.className || 'test')} />␊
<div {...props} className={"jsx-2886504620" + " " + (props && props.className != null && props.className || `test ${test ? 'test' : ''}`)} />␊
<div {...props} className={"jsx-2886504620" + " " + (props && props.className != null && props.className || test && test('test') || "")} />␊
<div {...props} className={"jsx-2886504620" + " " + (props && props.className != null && props.className || test && test('test') && 'test' || "")} />␊
<div {...props} className={"jsx-2886504620" + " " + (props && props.className != null && props.className || test && test('test') && test2('test') || "")} />␊
<div {...props} className={"jsx-2886504620" + " " + 'test'} />␊
<div {...props} {...rest} className={"jsx-2886504620" + " " + 'test'} />␊
<div {...props} {...rest} className={"jsx-2886504620" + " " + (rest && rest.className != null && rest.className || 'test')} />␊
<div {...props} className={"jsx-2886504620" + " " + (props && props.className != null && props.className || "")} />␊
<div {...props} {...rest} className={"jsx-2886504620" + " " + (rest && rest.className != null && rest.className || props && props.className != null && props.className || "")} />␊
<div {...props} data-foo {...rest} className={"jsx-2886504620" + " " + (rest && rest.className != null && rest.className || props && props.className != null && props.className || "")} />␊
<div {...props} data-foo {...rest} className={"jsx-2886504620" + " " + (rest && rest.className != null && rest.className || 'test')} />␊
<div {...{ id: 'foo' }} className={"jsx-2886504620"} />␊
<div className={"jsx-2886504620" + " " + 'foo'} />␊
<div {...{ className: 'foo' }} className={"jsx-2886504620" + " " + "test"} />␊
<div className="test" className={"jsx-2886504620" + " " + 'foo'} />␊
<div {...bar} className={"jsx-2886504620" + " " + (bar && bar.className != null && bar.className || 'foo')} />␊
<div {...{ className: 'foo' }} {...bar} className={"jsx-2886504620" + " " + "test"} />␊
<div className="test" {...bar} className={"jsx-2886504620" + " " + (bar && bar.className != null && bar.className || 'foo')} />␊
<div className="test" className={"jsx-2886504620" + " " + (props.className || "")} />␊
<div className="test" {...bar} className={"jsx-2886504620" + " " + (bar && bar.className != null && bar.className || props.className || "")} />␊
<div className="test" {...bar} className={"jsx-2886504620" + " " + (props.className || "")} />␊
<div {...bar()} className={"jsx-2886504620" + " " + "test"} />␊
<Element className={"jsx-2886504620"} />␊
<Element className={"jsx-2886504620" + " " + "test"} />␊
<Element {...props} className={"jsx-2886504620" + " " + (props && props.className != null && props.className || "")} />␊
<_JSXStyle id={"2886504620"}>{"div.jsx-2886504620{color:red;}"}</_JSXStyle>␊
const Div = 'div';␊
const Span = 'span';␊
return <div className={"jsx-3120783688"}>␊
<div {...test.test} className={'jsx-3120783688' + ' ' + (test.test && test.test.className != null && test.test.className || 'test')} />␊
<div {...test.test.test} className={'jsx-3120783688' + ' ' + (test.test.test && test.test.test.className != null && test.test.test.className || 'test')} />␊
<div {..._this.test.test} className={'jsx-3120783688' + ' ' + (_this.test.test && _this.test.test.className != null && _this.test.test.className || 'test')} />␊
<div data-test="test" className={"jsx-3120783688"} />␊
<div className={'jsx-3120783688' + ' ' + 'test'} />␊
<div className={'jsx-3120783688' + ' ' + 'test'} />␊
<div className={'jsx-3120783688' + ' ' + `test`} />␊
<div className={'jsx-3120783688' + ' ' + `test${true ? ' test2' : ''}`} />␊
<div className={'jsx-3120783688' + ' ' + ('test ' + test || '')} />␊
<div className={'jsx-3120783688' + ' ' + (['test', 'test2'].join(' ') || '')} />␊
<div className={'jsx-3120783688' + ' ' + (true && 'test' || '')} />␊
<div className={'jsx-3120783688' + ' ' + ((test ? 'test' : null) || '')} />␊
<div className={'jsx-3120783688' + ' ' + (test || '')} />␊
<div className={'jsx-3120783688' + ' ' + (test && 'test' || '')} />␊
<div className={'jsx-3120783688' + ' ' + (test && test('test') || '')} />␊
<div className={'jsx-3120783688' + ' ' + (undefined || '')} />␊
<div className={'jsx-3120783688' + ' ' + (null || '')} />␊
<div className={'jsx-3120783688' + ' ' + (false || '')} />␊
<div data-test className={'jsx-3120783688' + ' ' + 'test'} />␊
<div data-test className={'jsx-3120783688' + ' ' + 'test'} />␊
<div data-test="test" className={'jsx-3120783688' + ' ' + 'test'} />␊
<div {...props} className={'jsx-3120783688' + ' ' + (props && props.className != null && props.className || 'test')} />␊
<div {...props} {...rest} className={'jsx-3120783688' + ' ' + (rest && rest.className != null && rest.className || props && props.className != null && props.className || 'test')} />␊
<div {...props} className={'jsx-3120783688' + ' ' + (props && props.className != null && props.className || `test ${test ? 'test' : ''}`)} />␊
<div {...props} className={'jsx-3120783688' + ' ' + (props && props.className != null && props.className || test && test('test') || '')} />␊
<div {...props} className={'jsx-3120783688' + ' ' + (props && props.className != null && props.className || test && test('test') && 'test' || '')} />␊
<div {...props} className={'jsx-3120783688' + ' ' + (props && props.className != null && props.className || test && test('test') && test2('test') || '')} />␊
<div {...props} className={'jsx-3120783688' + ' ' + 'test'} />␊
<div {...props} {...rest} className={'jsx-3120783688' + ' ' + 'test'} />␊
<div {...props} {...rest} className={'jsx-3120783688' + ' ' + (rest && rest.className != null && rest.className || 'test')} />␊
<div {...props} className={'jsx-3120783688' + ' ' + (props && props.className != null && props.className || '')} />␊
<div {...props} {...rest} className={'jsx-3120783688' + ' ' + (rest && rest.className != null && rest.className || props && props.className != null && props.className || '')} />␊
<div {...props} data-foo {...rest} className={'jsx-3120783688' + ' ' + (rest && rest.className != null && rest.className || props && props.className != null && props.className || '')} />␊
<div {...props} data-foo {...rest} className={'jsx-3120783688' + ' ' + (rest && rest.className != null && rest.className || 'test')} />␊
<div {...{ id: 'foo' }} className={"jsx-3120783688"} />␊
<div className={'jsx-3120783688' + ' ' + 'foo'} />␊
<div {...{ className: 'foo' }} className={'jsx-3120783688' + ' ' + 'test'} />␊
<div className="test" className={'jsx-3120783688' + ' ' + 'foo'} />␊
<div {...bar} className={'jsx-3120783688' + ' ' + (bar && bar.className != null && bar.className || 'foo')} />␊
<div {...{ className: 'foo' }} {...bar} className={'jsx-3120783688' + ' ' + 'test'} />␊
<div className="test" {...bar} className={'jsx-3120783688' + ' ' + (bar && bar.className != null && bar.className || 'foo')} />␊
<div className="test" className={'jsx-3120783688' + ' ' + (props.className || '')} />␊
<div className="test" {...bar} className={'jsx-3120783688' + ' ' + (bar && bar.className != null && bar.className || props.className || '')} />␊
<div className="test" {...bar} className={'jsx-3120783688' + ' ' + (props.className || '')} />␊
<div {...bar()} className={'jsx-3120783688' + ' ' + 'test'} />␊
<Div className={"jsx-3120783688"} />␊
<Div className={'jsx-3120783688' + ' ' + 'test'} />␊
<Div {...props} className={'jsx-3120783688' + ' ' + (props && props.className != null && props.className || '')} />␊
<Span className={'jsx-3120783688' + ' Span'} />␊
<Span className={'jsx-3120783688' + ' Span' + ' ' + 'test'} />␊
<Span {...props} className={'jsx-3120783688' + ' Span' + ' ' + (props && props.className != null && props.className || '')} />␊
<_JSXStyle id={"3120783688"}>{"div.jsx-3120783688{color:red;}.Span.jsx-3120783688{color:green;}"}</_JSXStyle>␊
</div>;␊
});`
Binary file modified test/babel6/snapshots/attribute.js.snap
View file
Open in desktop
Binary file not shown.
14 changes: 9 additions & 5 deletions test/fixtures/attribute-generation-classname-rewriting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export default () => {
const Element = 'div'
const Div = 'div'
const Span = 'span'
return (
<div>
<div className="test" {...test.test} />
Expand Down Expand Up @@ -47,10 +48,13 @@ export default () => {
<div className="test" {...{ className: props.className }} {...bar} />
<div className="test" {...bar} {...{ className: props.className }} />
<div className="test" {...bar()} />
<Element />
<Element className="test" />
<Element {...props} />
<style jsx>{'div { color: red }'}</style>
<Div />
<Div className="test" />
<Div {...props} />
<Span />
<Span className="test" />
<Span {...props} />
<style jsx>{'div { color: red } .Span { color: green; }'}</style>
</div>
)
}
Loading