Commit 4e5f234

landabasojavivelasco

authored and

committed

Check for valid types in themes. (#45)

* Check for valid types in themes. Fixes #44 * Update themr.js

1 parent b2032bb commit 4e5f234Copy full SHA for 4e5f234

File tree

-2

lines changed

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,13 @@ export function themeable(original = {}, mixin) {`
`178`	`178`
`179`	`179`	`//merging reducer`
`180`	`180`	`(result, key) => {`
`181`		`- const originalValue = original[key] \|\| ''`
`182`		`- const mixinValue = mixin[key] \|\| ''`
	`181`	`+`
	`182`	`+ const originalValue = typeof original[key] !== 'function'`
	`183`	`+ ? (original[key] \|\| '')`
	`184`	`+ : '';`
	`185`	`+ const mixinValue = typeof mixin[key] !== 'function'`
	`186`	`+ ? (mixin[key] \|\| '')`
	`187`	`+ : '';`
`183`	`188`
`184`	`189`	`let newValue`
`185`	`190`

Comments

(0)