Skip to content

Commit

Permalink
Apply all first-class variants using modules: all
Browse files Browse the repository at this point in the history
  • Loading branch information
adamwathan committed Nov 2, 2018
1 parent 4f5ad90 commit 655963a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
6 changes: 3 additions & 3 deletions __tests__/mergeConfigWithDefaults.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ test('setting modules to "all" creates all variants for all modules', () => {

expect(result).toEqual({
modules: {
flexbox: ['responsive', 'hover', 'focus', 'group-hover'],
textAlign: ['responsive', 'hover', 'focus', 'group-hover'],
textColors: ['responsive', 'hover', 'focus', 'group-hover'],
flexbox: ['responsive', 'group-hover', 'hover', 'focus-within', 'focus', 'active'],
textAlign: ['responsive', 'group-hover', 'hover', 'focus-within', 'focus', 'active'],
textColors: ['responsive', 'group-hover', 'hover', 'focus-within', 'focus', 'active'],
},
options: {},
})
Expand Down
9 changes: 8 additions & 1 deletion src/util/mergeConfigWithDefaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@ import _ from 'lodash'

function mergeModules(userModules, defaultModules) {
if (userModules === 'all') {
return _.mapValues(defaultModules, () => ['responsive', 'hover', 'focus', 'group-hover'])
return _.mapValues(defaultModules, () => [
'responsive',
'group-hover',
'hover',
'focus-within',
'focus',
'active',
])
}

return _.defaults(userModules, defaultModules)
Expand Down

0 comments on commit 655963a

Please sign in to comment.