Skip to content

Commit 655963a

Browse files
committed
Apply all first-class variants using modules: all
1 parent 4f5ad90 commit 655963a

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

__tests__/mergeConfigWithDefaults.test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ test('setting modules to "all" creates all variants for all modules', () => {
7272

7373
expect(result).toEqual({
7474
modules: {
75-
flexbox: ['responsive', 'hover', 'focus', 'group-hover'],
76-
textAlign: ['responsive', 'hover', 'focus', 'group-hover'],
77-
textColors: ['responsive', 'hover', 'focus', 'group-hover'],
75+
flexbox: ['responsive', 'group-hover', 'hover', 'focus-within', 'focus', 'active'],
76+
textAlign: ['responsive', 'group-hover', 'hover', 'focus-within', 'focus', 'active'],
77+
textColors: ['responsive', 'group-hover', 'hover', 'focus-within', 'focus', 'active'],
7878
},
7979
options: {},
8080
})

src/util/mergeConfigWithDefaults.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@ import _ from 'lodash'
22

33
function mergeModules(userModules, defaultModules) {
44
if (userModules === 'all') {
5-
return _.mapValues(defaultModules, () => ['responsive', 'hover', 'focus', 'group-hover'])
5+
return _.mapValues(defaultModules, () => [
6+
'responsive',
7+
'group-hover',
8+
'hover',
9+
'focus-within',
10+
'focus',
11+
'active',
12+
])
613
}
714

815
return _.defaults(userModules, defaultModules)

0 commit comments

Comments
 (0)