Skip to content

Commit 4f20ecc

Browse files
author
lttb
committed
rename mix -> composes
1 parent eeaaa98 commit 4f20ecc

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

examples/simple/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ const Header = () => (
3333

3434
const Content = () => (
3535
<styled.section
36-
mix="content"
36+
composes="content"
3737
attrs={{
3838
'data-name': 'content',
3939
ref: (c) => { console.log('SECTION REF', c) },
4040
}}
4141
padding={20}
4242
>
43-
<styled.p mix="text">check this out</styled.p>
43+
<styled.p composes="text">check this out</styled.p>
4444

4545
<styled.button>first button</styled.button>
4646
<styled.button margin={10}>second button</styled.button>

src/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import domElements from './dom-elements'
88

99
const JSS = createJSS(preset())
1010

11-
const getClasses = ({ mix = [], classes = {} }) => mix
11+
const getClasses = ({ composes = [], classes = {} }) => composes
1212
.reduce((acc, className) => acc.concat(classes[className] || []), [])
1313
.join(' ')
1414

@@ -18,14 +18,14 @@ export const prepareStyled = ({ jss = JSS } = {}) => (styles) => {
1818

1919
const Injector = injectSheet(styles)
2020

21-
const createStyledElement = (tag, name = tag) => ({ mix = '', children, attrs, force, ...data }) => {
21+
const createStyledElement = (tag, name = tag) => ({ composes = '', children, attrs, force, ...data }) => {
2222
const Element = ({ classes }) => React.createElement(
2323
tag,
2424
{
2525
...attrs,
2626
className: getClasses({
2727
classes,
28-
mix: mix.split(' ').concat(force ? [] : name),
28+
composes: composes.split(' ').concat(force ? [] : name),
2929
}),
3030
},
3131
children,

0 commit comments

Comments
 (0)