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
8 changes: 4 additions & 4 deletions src/styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ const styled = ({element, ownStyle, mountSheet, jss}: StyledArgs) => {
const {
style,
tagName,
reactComponent = tagName
reactComponent,
}: {
style?: ComponentStyleType,
tagName: string,
reactComponent?: string | typeof element
reactComponent?: typeof element
} = getParamsByElement(element)

const elementStyle = {...style, ...ownStyle}
Expand Down Expand Up @@ -114,15 +114,15 @@ const styled = ({element, ownStyle, mountSheet, jss}: StyledArgs) => {
render() {
const {children, className, ...attrs} = this.props

const props = filterProps(tagName, attrs)
const props = reactComponent ? attrs : filterProps(tagName, attrs)
const tagClass = composeClasses([
this.staticClassName,
staticTagName && this.sheet.classes[staticTagName],
this.dynamicTagName && this.sheet.classes[this.dynamicTagName],
className
])

return createElement(reactComponent, {...props, className: tagClass}, children)
return createElement(reactComponent || tagName, {...props, className: tagClass}, children)
}
}

Expand Down
26 changes: 25 additions & 1 deletion src/tests/__snapshots__/functional.spec.jsx.snap
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`functional tests Compose React Components should pass props 1`] = `
<Component>
<StyledElement
className="testClassName"
testProp={1}
testProp2="2"
>
<Component
className="StyledElement-1-id testClassName"
testProp={1}
testProp2="2"
>
{"testProp":1,"testProp2":"2","className":"StyledElement-1-id testClassName"}
</Component>
</StyledElement>
</Component>
`;

exports[`functional tests Compose React Components should pass props 2`] = `
".StyledElement-1-id {
padding: 10px;
}"
`;

exports[`functional tests Compose React Components should use .displayName 1`] = `
<StyledElement>
<TestDisplayName
Expand Down Expand Up @@ -56,7 +80,7 @@ exports[`functional tests Compose React Components should use .name 3`] = `

exports[`functional tests Compose React Components should use .name 4`] = `
".StyledElement-1-id {
padding: 30px;
padding: 10px;
}"
`;

Expand Down
10 changes: 9 additions & 1 deletion src/tests/functional.spec.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,18 @@ describe('functional tests', () => {

it('should use .name', () => {
const StyledTest = styled(props => <h1 {...props}>test</h1>)({
padding: 30,
padding: 10,
})
assertComponent(StyledTest)
assertSheet(styled.sheet)
})

it('should pass props', () => {
const StyledTest = styled(props => JSON.stringify(props))({
padding: 10,
})
assertComponent(() => <StyledTest testProp={1} testProp2="2" className="testClassName" />)
assertSheet(styled.sheet)
})
})
})