Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 13 additions & 7 deletions src/createStyled.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,18 @@ import type {
TagNameOrStyledElementType
} from './types'

const createStyled = (jss: Function) => (
baseStyles: BaseStylesType = {}
): StyledType => {
const getStyledArgs = (
tagNameOrStyledElement: TagNameOrStyledElementType
): StyledElementAttrsType => {
if (typeof tagNameOrStyledElement === 'string') {
return {tagName: tagNameOrStyledElement, style: {}}
}

const {tagName, style} = tagNameOrStyledElement
return {tagName, style}
}

const createStyled = (jss: Function) => (baseStyles: BaseStylesType = {}): StyledType => {
let staticSheet
let dynamicSheet

Expand All @@ -34,10 +43,7 @@ const createStyled = (jss: Function) => (
tagNameOrStyledElement: TagNameOrStyledElementType,
ownStyle: ComponentStyleType
): StyledElementType => {
const {tagName, style}: StyledElementAttrsType = typeof tagNameOrStyledElement === 'string'
? {tagName: tagNameOrStyledElement, style: {}}
: tagNameOrStyledElement

const {tagName, style} = getStyledArgs(tagNameOrStyledElement)
const elementStyle = {...style, ...ownStyle}

return styled({tagName, baseStyles, elementStyle, mountSheets})
Expand Down
9 changes: 6 additions & 3 deletions src/tests/__snapshots__/index.spec.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ exports[`test renders correctly App with default Styled 1`] = `
</h1>
</header>
<section
className="section-11-0-12">
className="section-11-0-12"
data-name="content">
<button
className="button-14-0-13 button-15-0-14">
primitive test
Expand Down Expand Up @@ -37,7 +38,8 @@ exports[`test renders correctly App with default styled 1`] = `
</h1>
</header>
<section
className="section-3-0-3">
className="section-3-0-3"
data-name="content">
<button
className="button-6-0-4 button-7-0-5">
primitive test
Expand Down Expand Up @@ -67,7 +69,8 @@ exports[`test renders correctly App with injectStyled 1`] = `
</h1>
</header>
<section
className="section-19-0-22">
className="section-19-0-22"
data-name="content">
<button
className="button-22-0-23 button-23-0-24">
primitive test
Expand Down
1 change: 1 addition & 0 deletions src/tests/index.spec.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'react-dom'
import renderer from 'react-test-renderer'
import React from 'react'

Expand Down
24 changes: 15 additions & 9 deletions src/utils/filterProps.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
import isNativeProp from 'is-react-prop'
import isReactProp from 'is-react-prop'

export default (props: Object) => (
Object
.entries(props)
.reduce((acc, [name, value]) => (isNativeProp(name)
? {...acc, [name]: value}
: acc
), {})
)
export default (props: Object) => {
const filtered = {}
const propNames = Object.keys(props)
let name

for (let i = 0; i < propNames.length; i++) {
name = propNames[i]
if (isReactProp(name)) {
filtered[name] = props[name]
}
}

return filtered
}