Skip to content
Closed
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
6 changes: 5 additions & 1 deletion src/models/StyledComponent.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import css from '../constructors/css'
import normalizeProps from '../utils/normalizeProps'
import removeFalseProps from '../utils/removeFalseProps'
import isVueComponent from '../utils/isVueComponent'

export default (ComponentStyle) => {
Expand Down Expand Up @@ -68,7 +69,10 @@ export default (ComponentStyle) => {
},
computed: {
generatedClassName () {
const componentProps = { theme: this.theme, ...this.$props }
const componentProps = {
theme: this.theme,
...removeFalseProps(this.$props)
}
return this.generateAndInjectStyles(componentProps)
},
theme () {
Expand Down
12 changes: 12 additions & 0 deletions src/utils/removeFalseProps.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export default function removeFalseProps (props = {}) {
return Object.fromEntries(
Object.entries(props)
// Remove entries with `undefined`, `null` or `false` values.
.filter(([key, value]) => (value === 0 || Boolean(value)))
.map(([key, value]) => {
return (typeof value === 'object')
? [key, removeFalseProps(value)]
: [key, value]
})
)
}
22 changes: 22 additions & 0 deletions src/utils/test/removeFalseProps.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import expect from 'expect'
import removeFalseProps from '../removeFalseProps'

describe('removeFalseProps', () => {
it('removes entries with `undefined`, `null` or `false` values', () => {
expect(removeFalseProps({})).toEqual({})
expect(removeFalseProps({
prop1: undefined,
prop2: true,
prop3: 'string',
prop4: 0,
prop5: 1,
prop6: null,
prop7: false,
})).toEqual({
prop2: true,
prop3: 'string',
prop4: 0,
prop5: 1,
})
})
})