fix(preset-wind): update regex to use space rule & variant strictly (#…

…3259)
unocss · Oct 23, 2023 · 96f6449 · 96f6449
1 parent d7549e2
commit 96f6449
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 4 deletions.
diff --git a/packages/preset-wind/src/rules/spacing.ts b/packages/preset-wind/src/rules/spacing.ts
@@ -3,8 +3,8 @@ import type { Theme } from '@unocss/preset-mini'
 import { directionMap, h } from '@unocss/preset-mini/utils'
 
 export const spaces: Rule[] = [
-  [/^space-?([xy])-?(-?.+)$/, handlerSpace, { autocomplete: ['space-(x|y|block|inline)', 'space-(x|y|block|inline)-reverse', 'space-(x|y|block|inline)-$spacing'] }],
-  [/^space-?([xy])-reverse$/, ([, d]) => ({ [`--un-space-${d}-reverse`]: 1 })],
+  [/^space-([xy])-(-?.+)$/, handlerSpace, { autocomplete: ['space-(x|y|block|inline)', 'space-(x|y|block|inline)-reverse', 'space-(x|y|block|inline)-$spacing'] }],
+  [/^space-([xy])-reverse$/, ([, d]) => ({ [`--un-space-${d}-reverse`]: 1 })],
   [/^space-(block|inline)-(-?.+)$/, handlerSpace],
   [/^space-(block|inline)-reverse$/, ([, d]) => ({ [`--un-space-${d}-reverse`]: 1 })],
 ]

diff --git a/packages/preset-wind/src/variants/misc.ts b/packages/preset-wind/src/variants/misc.ts
@@ -5,7 +5,7 @@ export const variantSpaceAndDivide: Variant = (matcher) => {
   if (matcher.startsWith('_'))
     return
 
-  if (/space-?([xy])-?(-?.+)$/.test(matcher) || /divide-/.test(matcher)) {
+  if (/space-([xy])-(-?.+)$/.test(matcher) || /divide-/.test(matcher)) {
     return {
       matcher,
       selector: (input) => {

diff --git a/test/__snapshots__/postcss.test.ts.snap b/test/__snapshots__/postcss.test.ts.snap
@@ -174,6 +174,7 @@ exports[`postcss > @unocss 1`] = `
 .break-after-column{break-after:column;}
 .break-after-unset{break-after:unset;}
 .-space-x-4>:not([hidden])~:not([hidden]){--un-space-x-reverse:0;margin-left:calc(calc(1rem * calc(1 - var(--un-space-x-reverse))) * -1);margin-right:calc(calc(1rem * var(--un-space-x-reverse)) * -1);}
+.space-x-\\\\[var\\\\(--space\\\\)\\\\]>:not([hidden])~:not([hidden]),
 .space-x-\\\\$space>:not([hidden])~:not([hidden]){--un-space-x-reverse:0;margin-left:calc(var(--space) * calc(1 - var(--un-space-x-reverse)));margin-right:calc(var(--space) * var(--un-space-x-reverse));}
 .space-x-2>:not([hidden])~:not([hidden]){--un-space-x-reverse:0;margin-left:calc(0.5rem * calc(1 - var(--un-space-x-reverse)));margin-right:calc(0.5rem * var(--un-space-x-reverse));}
 .space-y-4>:not([hidden])~:not([hidden]){--un-space-y-reverse:0;margin-top:calc(1rem * calc(1 - var(--un-space-y-reverse)));margin-bottom:calc(1rem * var(--un-space-y-reverse));}

diff --git a/test/assets/output/preset-mini-targets.css b/test/assets/output/preset-mini-targets.css
@@ -91,6 +91,7 @@
 .m-xy,
 .mxy{margin:1rem;}
 .mx-1{margin-left:0.25rem;margin-right:0.25rem;}
+.my-\[var\(--hello-space-y\)\]{margin-top:var(--hello-space-y);margin-bottom:var(--hello-space-y);}
 .my-auto{margin-top:auto;margin-bottom:auto;}
 .my-revert-layer{margin-top:revert-layer;margin-bottom:revert-layer;}
 .-\!mb-safe{margin-bottom:calc(max(env(safe-area-inset-left), env(safe-area-inset-right)) * -1) !important;}
@@ -1047,4 +1048,4 @@ unocss .scope-\[unocss\]\:block{display:block;}
 /* layer: uno css */
 .uno-layer-\[uno_css\]\:block{display:block;}
 /* layer: uno_css */
-.uno-layer-uno_css\:block{display:block;}
+.uno-layer-uno_css\:block{display:block;}
diff --git a/test/assets/output/preset-wind-targets.css b/test/assets/output/preset-wind-targets.css
diff --git a/test/assets/preset-mini-targets.ts b/test/assets/preset-mini-targets.ts
@@ -596,6 +596,7 @@ export const presetMiniTargets: string[] = [
   'mt-$height',
   'my-auto',
   'my-revert-layer',
+  'my-[var(--hello-space-y)]',
   'm-none',
 
   // spacing - logical

diff --git a/test/assets/preset-wind-targets.ts b/test/assets/preset-wind-targets.ts
@@ -287,6 +287,7 @@ export const presetWindTargets: string[] = [
   'space-y-4',
   'space-x-reverse',
   'space-x-$space',
+  'space-x-[var(--space)]',
   'space-inline-2',
   'space-block-4',
   'space-block-none',