Skip to content

Commit ed2edc8

Browse files
committed
Minor refactor of injectStyled and styled
1 parent 779c0ce commit ed2edc8

2 files changed

Lines changed: 7 additions & 15 deletions

File tree

src/injectStyled.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@ import type {StyledType} from './types'
66
const injectStyled = (styled: StyledType) => (InnerComponent: ReactClass<any>) => {
77
const sheet = styled.mountSheet()
88

9-
const classNames = Object.keys(sheet.classes)
10-
11-
const classes = [...classNames]
12-
.reduce((acc, name) => ({
13-
...acc,
14-
[name]: composeClasses([sheet.classes[name]]),
15-
}), {})
9+
const classes = Object.keys(sheet.classes).reduce((acc, name) => ({
10+
...acc,
11+
[name]: composeClasses([sheet.classes[name]]),
12+
}), {})
1613

1714
return (props: Object) => createElement(InnerComponent, {classes, ...props})
1815
}

src/styled.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
import {Component, createElement} from 'react'
2-
import type {
3-
Rule,
4-
} from 'jss/lib/types'
52

63
import filterProps from './utils/filterProps'
74
import composeClasses from './utils/composeClasses'
@@ -36,7 +33,6 @@ const styled = ({tagName, elementStyle, mountSheet}: StyledArgs) => {
3633
dynamicTagName = ''
3734

3835
sheet: JssSheet
39-
rulesIndex: Rule[]
4036

4137
constructor(props: StyledElementPropsType) {
4238
super(props)
@@ -47,9 +43,8 @@ const styled = ({tagName, elementStyle, mountSheet}: StyledArgs) => {
4743

4844
componentWillMount() {
4945
this.sheet = this.sheet || mountSheet()
50-
this.rulesIndex = this.sheet.rules.index
51-
52-
const rulesTotal = this.rulesIndex.length
46+
const rulesIndex = this.sheet.rules.index
47+
const rulesTotal = rulesIndex.length
5348

5449
if (staticStyle && !this.sheet.getRule(staticTagName)) {
5550
this.sheet.addRule(staticTagName, staticStyle)
@@ -61,7 +56,7 @@ const styled = ({tagName, elementStyle, mountSheet}: StyledArgs) => {
6156
this.sheet.addRule(this.dynamicTagName, dynamicStyle)
6257
}
6358

64-
classMap[this.dynamicTagName] = this.rulesIndex.slice(rulesTotal)
59+
classMap[this.dynamicTagName] = rulesIndex.slice(rulesTotal)
6560
this.updateSheet(this.props)
6661
}
6762

0 commit comments

Comments
 (0)