Skip to content

Commit 3860127

Browse files
committed
Move generateTagName to utils, use camelCase for filename
1 parent 35eac8b commit 3860127

6 files changed

Lines changed: 23 additions & 22 deletions

File tree

src/index.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ import {PureComponent, createElement} from 'react'
22
import {create as createJss, getDynamicStyles} from 'jss'
33
import preset from 'jss-preset-default'
44

5-
import filterProps from './utils/filter-props'
6-
import composeClasses from './utils/compose-classes'
5+
import filterProps from './utils/filterProps'
6+
import composeClasses from './utils/composeClasses'
7+
import generateTagName from './utils/generateTagName'
78
import type {
89
BaseStylesType,
910
ComponentStyleType,
@@ -23,9 +24,6 @@ const createStyled = (
2324
baseStyles: BaseStylesType = {}
2425
): StyledType => {
2526
const sheets = {}
26-
let counter = 0
27-
28-
const getScopedTagName = (tagName: string) => `${tagName}-${++counter}`
2927

3028
const mountSheets = () => {
3129
if (!sheets.staticSheet) {
@@ -50,7 +48,7 @@ const createStyled = (
5048

5149
const elementStyle = {...style, ...ownStyle}
5250
const dynamicStyle = getDynamicStyles(elementStyle)
53-
const staticTagName = getScopedTagName(tagName)
51+
const staticTagName = generateTagName(tagName)
5452

5553
return class StyledElement extends PureComponent {
5654
static tagName: string = tagName
@@ -62,7 +60,7 @@ const createStyled = (
6260

6361
constructor(props) {
6462
super(props)
65-
this.dynamicTagName = getScopedTagName(tagName)
63+
this.dynamicTagName = generateTagName(tagName)
6664
}
6765

6866
componentWillMount() {

src/injectStyled.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {createElement} from 'react'
22

3-
import composeClasses from './utils/compose-classes'
3+
import composeClasses from './utils/composeClasses'
44
import type {StyledType} from './types'
55

66
const injectStyled = (styled: StyledType) => (InnerComponent: ReactClass<any>) => {

src/tests/__snapshots__/index.spec.jsx.snap

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
exports[`test renders correctly App with default Styled 1`] = `
22
<div
3-
className="div-1-0-9">
3+
className="div-14-0-9">
44
<header
5-
className="header-2-0-10">
5+
className="header-15-0-10">
66
<h1
7-
className="h1-5-0-11">
7+
className="h1-18-0-11">
88
Title
99
</h1>
1010
</header>
1111
<section
12-
className="section-3-0-12">
12+
className="section-16-0-12">
1313
<button
14-
className="button-6-0-13 button-11-0-14">
14+
className="button-19-0-13 button-24-0-14">
1515
primitive test
1616
</button>
1717
<button
18-
className="button-6-0-13 button-12-0-15">
18+
className="button-19-0-13 button-25-0-15">
1919
dynamic primitive test
2020
</button>
2121
</section>
2222
<section
23-
className="section-4-0-16">
23+
className="section-17-0-16">
2424
Another section
2525
</section>
2626
</div>
@@ -58,27 +58,27 @@ exports[`test renders correctly App with injectStyled 1`] = `
5858
<div
5959
className="root-0-17">
6060
<div
61-
className="div-1-0-19">
61+
className="div-27-0-19">
6262
<header
63-
className="header-2-0-20">
63+
className="header-28-0-20">
6464
<h1
65-
className="h1-5-0-21">
65+
className="h1-31-0-21">
6666
Title
6767
</h1>
6868
</header>
6969
<section
70-
className="section-3-0-22">
70+
className="section-29-0-22">
7171
<button
72-
className="button-6-0-23 button-11-0-24">
72+
className="button-32-0-23 button-37-0-24">
7373
primitive test
7474
</button>
7575
<button
76-
className="button-6-0-23 button-12-0-25">
76+
className="button-32-0-23 button-38-0-25">
7777
dynamic primitive test
7878
</button>
7979
</section>
8080
<section
81-
className="section-4-0-26">
81+
className="section-30-0-26">
8282
Another section
8383
</section>
8484
</div>

src/utils/generateTagName.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
let tagNameCounter = 0
2+
3+
export default (tagName: string) => `${tagName}-${++tagNameCounter}`

0 commit comments

Comments
 (0)