Merge pull request #911 from tailwindcss/fix-global-variants

Fix global variants not working when configs are merged
tailwindlabs · May 13, 2019 · fa17b48 · fa17b48
2 parents 7e7b6d9 + 0183b86
commit fa17b48
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 1 deletion.
diff --git a/__tests__/resolveConfig.test.js b/__tests__/resolveConfig.test.js
@@ -261,6 +261,70 @@ test('variants key is merged instead of replaced', () => {
   })
 })
 
+test('a global variants list replaces the default', () => {
+  const userConfig = {
+    variants: ['responsive', 'hover', 'focus', 'active'],
+  }
+
+  const defaultConfig = {
+    prefix: '-',
+    important: false,
+    separator: ':',
+    theme: {
+      colors: {
+        'grey-darker': '#606f7b',
+        'grey-dark': '#8795a1',
+        grey: '#b8c2cc',
+        'grey-light': '#dae1e7',
+        'grey-lighter': '#f1f5f8',
+      },
+      fonts: {
+        sans: ['system-ui', 'BlinkMacSystemFont', '-apple-system', 'Roboto', 'sans-serif'],
+        serif: ['Constantia', 'Lucida Bright', 'Georgia', 'serif'],
+      },
+      screens: {
+        sm: '500px',
+        md: '750px',
+        lg: '1000px',
+      },
+    },
+    variants: {
+      appearance: ['responsive'],
+      backgroundAttachment: ['responsive'],
+      borderCollapse: [],
+      borderColors: ['responsive', 'hover', 'focus'],
+      borderRadius: ['responsive'],
+    },
+  }
+
+  const result = resolveConfig([userConfig, defaultConfig])
+
+  expect(result).toEqual({
+    prefix: '-',
+    important: false,
+    separator: ':',
+    theme: {
+      colors: {
+        'grey-darker': '#606f7b',
+        'grey-dark': '#8795a1',
+        grey: '#b8c2cc',
+        'grey-light': '#dae1e7',
+        'grey-lighter': '#f1f5f8',
+      },
+      fonts: {
+        sans: ['system-ui', 'BlinkMacSystemFont', '-apple-system', 'Roboto', 'sans-serif'],
+        serif: ['Constantia', 'Lucida Bright', 'Georgia', 'serif'],
+      },
+      screens: {
+        sm: '500px',
+        md: '750px',
+        lg: '1000px',
+      },
+    },
+    variants: ['responsive', 'hover', 'focus', 'active'],
+  })
+})
+
 test('missing top level keys are pulled from the default config', () => {
   const userConfig = {}
 

diff --git a/src/util/resolveConfig.js b/src/util/resolveConfig.js
@@ -65,7 +65,11 @@ export default function resolveConfig(configs) {
   return defaults(
     {
       theme: resolveFunctionKeys(mergeExtensions(defaults({}, ...map(configs, 'theme')))),
-      variants: defaults({}, ...map(configs, 'variants')),
+      variants: (firstVariants => {
+        return Array.isArray(firstVariants)
+          ? firstVariants
+          : defaults({}, ...map(configs, 'variants'))
+      })(defaults({}, ...map(configs)).variants),
     },
     ...configs
   )