Commit c4336dd

committed

Warn the case when a string is being merged with an object

1 parent cb0501f commit c4336ddCopy full SHA for c4336dd

File tree

+12

-0

lines changed

+12

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,12 @@ export function themeable(original = {}, mixin) {`
`183`	`183`
`184`	`184`	`let newValue`
`185`	`185`
	`186`	`+ //when you are mixing an string with a object it should fail`
	`187`	`+ invariant(!(typeof originalValue === 'string' && typeof mixinValue === 'object'),`
	`188`	+ `You are merging a string "${originalValue}" with an Object,` +
	`189`	`+ 'Make sure you are passing the proper theme descriptors.'`
	`190`	`+ )`
	`191`	`+`
`186`	`192`	`//check if values are nested objects`
`187`	`193`	`if (typeof originalValue === 'object' && typeof mixinValue === 'object') {`
`188`	`194`	`//go recursive`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -555,4 +555,10 @@ describe('themeable function', () => {`
`555`	`555`	`const result = themeable(themeA, themeB)`
`556`	`556`	`expect(result).toEqual(expected)`
`557`	`557`	`})`
	`558`	`+`
	`559`	`+ it('throws an exception when its called mixing a string with an object', () => {`
	`560`	`+ expect(() => {`
	`561`	`+ themeable('fail', { test: { foo: 'baz' } })`
	`562`	`+ }).toThrow(/sureyouarepassingtheproperthemedescriptors/)`
	`563`	`+ })`
`558`	`564`	`})`

Comments

(0)