From 62cf25f718b7ef8bdec543a0b4e71c59df944c30 Mon Sep 17 00:00:00 2001 From: fedeTibaldo Date: Fri, 16 Feb 2018 18:09:20 +0100 Subject: [PATCH] Change priority order to (from the highest): focus-active-hover --- __tests__/variantsAtRule.test.js | 12 ++++++------ src/lib/substituteVariantsAtRules.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/__tests__/variantsAtRule.test.js b/__tests__/variantsAtRule.test.js index 58bbaaf02..b4d1d9d09 100644 --- a/__tests__/variantsAtRule.test.js +++ b/__tests__/variantsAtRule.test.js @@ -101,12 +101,12 @@ test('it can generate hover, active and focus variants', () => { const output = ` .banana { color: yellow; } .chocolate { color: brown; } - .focus\\:banana:focus { color: yellow; } - .focus\\:chocolate:focus { color: brown; } - .active\\:banana:active { color: yellow; } - .active\\:chocolate:active { color: brown; } .hover\\:banana:hover { color: yellow; } .hover\\:chocolate:hover { color: brown; } + .active\\:banana:active { color: yellow; } + .active\\:chocolate:active { color: brown; } + .focus\\:banana:focus { color: yellow; } + .focus\\:chocolate:focus { color: brown; } ` return run(input).then(result => { @@ -127,10 +127,10 @@ test('it wraps the output in a responsive at-rule if responsive is included as a @responsive { .banana { color: yellow; } .chocolate { color: brown; } - .focus\\:banana:focus { color: yellow; } - .focus\\:chocolate:focus { color: brown; } .hover\\:banana:hover { color: yellow; } .hover\\:chocolate:hover { color: brown; } + .focus\\:banana:focus { color: yellow; } + .focus\\:chocolate:focus { color: brown; } } ` diff --git a/src/lib/substituteVariantsAtRules.js b/src/lib/substituteVariantsAtRules.js index 1487471f1..9df30520b 100644 --- a/src/lib/substituteVariantsAtRules.js +++ b/src/lib/substituteVariantsAtRules.js @@ -61,7 +61,7 @@ export default function(config) { atRule.before(atRule.clone().nodes) - _.forEach(['focus', 'active', 'hover', 'group-hover'], variant => { + _.forEach(['hover', 'active', 'focus', 'group-hover'], variant => { if (variants.includes(variant)) { variantGenerators[variant](atRule, unwrappedConfig) }