From c919198b3d1eb823a98881e89afd8d2dec9ba247 Mon Sep 17 00:00:00 2001 From: Saya Date: Sat, 25 Jun 2022 21:00:31 +0800 Subject: [PATCH] feat(preset-mini): enable multipass on combinator variants (#1156) --- packages/preset-mini/src/variants/combinators.ts | 1 + test/__snapshots__/preset-mini.test.ts.snap | 2 ++ test/assets/preset-mini-targets.ts | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/preset-mini/src/variants/combinators.ts b/packages/preset-mini/src/variants/combinators.ts index 2dfceff153..100ff1d2ac 100644 --- a/packages/preset-mini/src/variants/combinators.ts +++ b/packages/preset-mini/src/variants/combinators.ts @@ -15,6 +15,7 @@ const scopeMatcher = (strict: boolean, name: string, template: string): VariantO } } }, + multiPass: true, } } diff --git a/test/__snapshots__/preset-mini.test.ts.snap b/test/__snapshots__/preset-mini.test.ts.snap index f05e9b998f..82885c8482 100644 --- a/test/__snapshots__/preset-mini.test.ts.snap +++ b/test/__snapshots__/preset-mini.test.ts.snap @@ -373,6 +373,7 @@ div:hover .group-\\\\[div\\\\:hover\\\\]-\\\\[combinator\\\\:test-4\\\\]{combina .c-\\\\$color-variable, .c-\\\\$color-variable\\\\/\\\\$opacity-variable, .c-\\\\$color-variable\\\\/10{color:var(--color-variable);} +.checked\\\\:next\\\\:hover\\\\:text-slate-500:hover+*:checked{--un-text-opacity:1;color:rgba(100,116,139,var(--un-text-opacity));} .checked\\\\:next\\\\:text-slate-100+*:checked{--un-text-opacity:1;color:rgba(241,245,249,var(--un-text-opacity));} .color-\\\\$red{color:var(--red);} .color-blue, @@ -390,6 +391,7 @@ div:hover .group-\\\\[div\\\\:hover\\\\]-\\\\[combinator\\\\:test-4\\\\]{combina .in-range\\\\:color-pink-100:in-range, .open\\\\:color-pink-100[open], .out-of-range\\\\:color-pink-100:out-of-range{--un-text-opacity:1;color:rgba(252,231,243,var(--un-text-opacity));} +.next\\\\:checked\\\\:children\\\\:text-slate-600>*:checked+*{--un-text-opacity:1;color:rgba(71,85,105,var(--un-text-opacity));} .next\\\\:checked\\\\:text-slate-200:checked+*{--un-text-opacity:1;color:rgba(226,232,240,var(--un-text-opacity));} .placeholder-color-red-1::placeholder, .text-red-100, diff --git a/test/assets/preset-mini-targets.ts b/test/assets/preset-mini-targets.ts index 0b8ebf4c34..59af61cb0d 100644 --- a/test/assets/preset-mini-targets.ts +++ b/test/assets/preset-mini-targets.ts @@ -883,9 +883,11 @@ export const presetMiniTargets: string[] = [ '[@supports(display:grid)]:bg-red/33', '[@supports(display:grid)]:[*+&]:bg-red/34', - // variants - tagged & pseudo + // variants - combinators + pseudo 'checked:next:text-slate-100', 'next:checked:text-slate-200', + 'checked:next:hover:text-slate-500', + 'next:checked:children:text-slate-600', // variants - multiple parents 'sm:lt-lg:p-10',