♻️ Restore array as prop value in createRule

exah · Mar 7, 2019 · 2ea8967 · 2ea8967
1 parent 46c910e
commit 2ea8967
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/src/core/create-rule.js b/src/core/create-rule.js
@@ -1,9 +1,9 @@
-import { isBool, isNum, isFn, identity, isStr, mapObj, isObj } from '@exah/utils'
+import { isBool, isNum, isFn, identity, isStr, mapObj, isObj, toArr } from '@exah/utils'
 import { wrap, wrapIfMedia, getThemeMedia } from '../utils'
 
 const has = (a, b) => b.some((key) => a.includes(key))
 
-function everyMedia (props, value, wrapper = identity) {
+function everyMedia (props, value, wrapper) {
   const media = getThemeMedia(props)
 
   if (isObj(value) && has(Object.keys(media), Object.keys(value))) {
@@ -60,11 +60,14 @@ function createRule ({
     return isFn(result) ? getValues(result, input, props, mediaKey) : result
   }
 
-  return (input, props, mediaKey) => everyMedia(
-    props,
-    getValues(getValue, input, props, mediaKey),
-    (result) => getStyle(result, input, props, mediaKey)
-  )
+  return (inputs, props, mediaKey) => toArr(inputs).reduce((acc, input) => ({
+    ...acc,
+    ...everyMedia(
+      props,
+      getValues(getValue, input, props, mediaKey),
+      (result) => getStyle(result, input, props, mediaKey)
+    )
+  }), {})
 }
 
 export {

diff --git a/src/styles/__tests__/box-style.js b/src/styles/__tests__/box-style.js
@@ -1,4 +1,4 @@
-import { boxStyle, cs } from '../..'
+import { boxStyle } from '../..'
 import { toStyles } from '../../../test-helpers'
 
 const theme = {
@@ -36,7 +36,7 @@ test('default', () => {
 test('red, shadow', () => {
   const result = toStyles(boxStyle({
     theme,
-    boxStyle: cs('red', 'shadow')
+    boxStyle: [ 'red', 'shadow' ]
   }))
 
   expect(result).toEqual({
@@ -49,7 +49,7 @@ test('red, shadow', () => {
 test('variant', () => {
   const result = toStyles(boxStyle.variant({
     theme,
-    variant: cs('red', 'shadow')
+    variant: [ 'red', 'shadow' ]
   }))
 
   expect(result).toEqual({

diff --git a/src/styles/__tests__/text-style.js b/src/styles/__tests__/text-style.js
@@ -1,4 +1,4 @@
-import { textStyle, cs } from '../..'
+import { textStyle } from '../..'
 import { toStyles } from '../../../test-helpers'
 
 const theme = {
@@ -52,7 +52,7 @@ test('responsive', () => {
 test('all', () => {
   const result = toStyles(textStyle({
     theme,
-    textStyle: cs('responsive', 'heading')
+    textStyle: [ 'responsive', 'heading' ]
   }))
 
   expect(result).toEqual({
@@ -68,7 +68,7 @@ test('all', () => {
 test('variant', () => {
   const result = toStyles(textStyle.variant({
     theme,
-    variant: cs('responsive', 'heading')
+    variant: [ 'responsive', 'heading' ]
   }))
 
   expect(result).toEqual({