From fcd0f364db6faf4b6e6cae57f524c29b7a89be60 Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Sat, 16 Mar 2019 16:22:31 -0400
Subject: [PATCH] Pass theme to closures as function instead of object

---
 __tests__/resolveConfig.test.js | 74 +++++++++++++++++++++++++++++----
 src/util/resolveConfig.js       |  5 ++-
 2 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/__tests__/resolveConfig.test.js b/__tests__/resolveConfig.test.js
index d80eb0e91..a72a4a0e7 100644
--- a/__tests__/resolveConfig.test.js
+++ b/__tests__/resolveConfig.test.js
@@ -322,8 +322,8 @@ test('functions in the default theme section are lazily evaluated', () => {
         magenta: 'magenta',
         yellow: 'yellow',
       },
-      backgroundColors: ({ colors }) => colors,
-      textColors: ({ colors }) => colors,
+      backgroundColors: theme => theme('colors'),
+      textColors: theme => theme('colors'),
     },
     variants: {
       backgroundColors: ['responsive', 'hover', 'focus'],
@@ -369,12 +369,12 @@ test('functions in the user theme section are lazily evaluated', () => {
         green: 'green',
         blue: 'blue',
       },
-      backgroundColors: ({ colors }) => ({
-        ...colors,
+      backgroundColors: theme => ({
+        ...theme('colors'),
         customBackground: '#bada55',
       }),
-      textColors: ({ colors }) => ({
-        ...colors,
+      textColors: theme => ({
+        ...theme('colors'),
         customText: '#facade',
       }),
     },
@@ -461,7 +461,7 @@ test('theme values in the extend section extend the existing theme', () => {
         '50': '.5',
         '100': '1',
       },
-      backgroundColors: ({ colors }) => colors,
+      backgroundColors: theme => theme('colors'),
     },
     variants: {
       backgroundColors: ['responsive', 'hover', 'focus'],
@@ -510,7 +510,7 @@ test('theme values in the extend section extend the user theme', () => {
         '20': '.2',
         '40': '.4',
       },
-      height: theme => theme.width,
+      height: theme => theme('width'),
       extend: {
         opacity: {
           '60': '.6',
@@ -618,7 +618,7 @@ test('theme values in the extend section can extend values that are depended on
         magenta: 'magenta',
         yellow: 'yellow',
       },
-      backgroundColors: ({ colors }) => colors,
+      backgroundColors: theme => theme('colors'),
     },
     variants: {
       backgroundColors: ['responsive', 'hover', 'focus'],
@@ -701,3 +701,59 @@ test('theme values in the extend section are not deeply merged', () => {
     },
   })
 })
+
+test('the theme function can use a default value if the key is missing', () => {
+  const userConfig = {
+    theme: {
+      colors: {
+        red: 'red',
+        green: 'green',
+        blue: 'blue',
+      },
+    },
+  }
+
+  const defaultConfig = {
+    prefix: '-',
+    important: false,
+    separator: ':',
+    theme: {
+      colors: {
+        cyan: 'cyan',
+        magenta: 'magenta',
+        yellow: 'yellow',
+      },
+      borderColor: theme => ({
+        default: theme('colors.gray', 'currentColor'),
+        ...theme('colors'),
+      }),
+    },
+    variants: {
+      borderColor: ['responsive', 'hover', 'focus'],
+    },
+  }
+
+  const result = resolveConfig([userConfig, defaultConfig])
+
+  expect(result).toEqual({
+    prefix: '-',
+    important: false,
+    separator: ':',
+    theme: {
+      colors: {
+        red: 'red',
+        green: 'green',
+        blue: 'blue',
+      },
+      borderColor: {
+        default: 'currentColor',
+        red: 'red',
+        green: 'green',
+        blue: 'blue',
+      },
+    },
+    variants: {
+      borderColor: ['responsive', 'hover', 'focus'],
+    },
+  })
+})
diff --git a/src/util/resolveConfig.js b/src/util/resolveConfig.js
index 6189d6cdc..1c7a4237f 100644
--- a/src/util/resolveConfig.js
+++ b/src/util/resolveConfig.js
@@ -2,12 +2,15 @@ import mergeWith from 'lodash/mergeWith'
 import isFunction from 'lodash/isFunction'
 import defaults from 'lodash/defaults'
 import map from 'lodash/map'
+import get from 'lodash/get'
 
 function resolveFunctionKeys(object) {
+  const getKey = (key, defaultValue) => get(object, key, defaultValue)
+
   return Object.keys(object).reduce((resolved, key) => {
     return {
       ...resolved,
-      [key]: isFunction(object[key]) ? object[key](object) : object[key],
+      [key]: isFunction(object[key]) ? object[key](getKey) : object[key],
     }
   }, {})
 }