✨ Add themeSelector

exah · Jun 9, 2018 · 22cd670 · 22cd670
1 parent ee145b1
commit 22cd670
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/index.js b/src/index.js
@@ -8,6 +8,7 @@ export {
   propSelector,
   propSelector as ps,
   combineSelectors as cs,
+  themeSelector as ts,
   sizeValue,
   spaceValue,
   skipPropValue

diff --git a/src/utils/helpers.js b/src/utils/helpers.js
@@ -25,14 +25,21 @@ const handlePropStyle = (style, value, ...args) => isFn(style)
   ? style(value, ...args)
   : value === true ? style : null
 
-const propSelector = curryN(2, (name, value) => (style, ...args) => ({
-  [name]: handlePropStyle(style, value, ...args)
+const propSelector = curryN(2, (name, value) => (style, props, mediaKey) => ({
+  [name]: handlePropStyle(style, value, props, mediaKey)
 }))
 
-const combineSelectors = (...selectors) => (style, ...args) => selectors.map(
+const themeSelector = (fn) => (style = identity, props, mediaKey) => handlePropStyle(
+  style,
+  fn(props.theme),
+  props,
+  mediaKey
+)
+
+const combineSelectors = (...selectors) => (style, props, mediaKey) => selectors.map(
   (selectorOrValue) => isFn(selectorOrValue)
-    ? selectorOrValue(style, ...args)
-    : handlePropStyle(style, selectorOrValue, ...args)
+    ? selectorOrValue(style, props, mediaKey)
+    : handlePropStyle(style, selectorOrValue, props, mediaKey)
 )
 
 const wrapIfMedia = (query, style) => wrap(
@@ -64,6 +71,7 @@ export {
   combineSelectors,
   handlePropStyle,
   sizeValue,
+  themeSelector,
   spaceValue,
   skipPropValue
 }
diff --git a/test/prop-selector.js → test/selectors.js b/test/prop-selector.js → test/selectors.js