fix(preset-mini): let negate variant negate negative numbers & functions (#3399)

chu121su12 · web-flow · commit 130943e802ec · 2023-11-30T17:15:56.000+01:00
diff --git a/packages/preset-mini/src/_utils/mappings.ts b/packages/preset-mini/src/_utils/mappings.ts
@@ -114,4 +114,4 @@ export const globalKeywords = [
   'unset',
 ]
 
-export const cssMathFnRE = /(?:calc|clamp|min|max)\s*\(.*\)/
+export const cssMathFnRE = /^(calc|clamp|min|max)\s*\((.+)\)(.*)/
diff --git a/packages/preset-mini/src/_variants/negative.ts b/packages/preset-mini/src/_variants/negative.ts
@@ -1,22 +1,36 @@
 import type { Variant } from '@unocss/core'
 import { getStringComponent } from '@unocss/rule-utils'
-import { CONTROL_MINI_NO_NEGATIVE } from '../utils'
+import { CONTROL_MINI_NO_NEGATIVE, cssMathFnRE } from '../utils'
 
-const numberRE = /[0-9.]+(?:[a-z]+|%)?/
+const numberRE = /-?[0-9.]+(?:[a-z]+|%)?/
 
 const ignoreProps = [
-  /opacity|color|flex/,
+  /\b(opacity|color|flex|backdrop-filter|^filter|transform)\b/,
 ]
 
-function negateFunctions(value: string) {
-  const match = value.match(/^(calc|clamp|max|min)\s*(\(.*)/)
+function negateMathFunction(value: string) {
+  const match = value.match(cssMathFnRE)
   if (match) {
-    const [fnBody, rest] = getStringComponent(match[2], '(', ')', ' ') ?? []
+    const [fnBody, rest] = getStringComponent(`(${match[2]})${match[3]}`, '(', ')', ' ') ?? []
     if (fnBody)
       return `calc(${match[1]}${fnBody} * -1)${rest ? ` ${rest}` : ''}`
   }
 }
 
+const negateFunctionBodyRE = /\b(hue-rotate)\s*(\(.*)/
+function negateFunctionBody(value: string) {
+  const match = value.match(negateFunctionBodyRE)
+  if (match) {
+    const [fnBody, rest] = getStringComponent(match[2], '(', ')', ' ') ?? []
+    if (fnBody) {
+      const body = numberRE.test(fnBody)
+        ? fnBody.replace(numberRE, i => i.startsWith('-') ? i.slice(1) : `-${i}`)
+        : `(calc(${fnBody} * -1))`
+      return `${match[1]}${body}${rest ? ` ${rest}` : ''}`
+    }
+  }
+}
+
 export const variantNegative: Variant = {
   name: 'negative',
   match(matcher) {
@@ -35,13 +49,20 @@ export const variantNegative: Variant = {
             return
           if (ignoreProps.some(i => i.test(v[0])))
             return
-          const negated = negateFunctions(value)
-          if (negated) {
-            v[1] = negated
+          const negatedFn = negateMathFunction(value)
+          if (negatedFn) {
+            v[1] = negatedFn
             changed = true
+            return
+          }
+          const negatedBody = negateFunctionBody(value)
+          if (negatedBody) {
+            v[1] = negatedBody
+            changed = true
+            return
           }
-          else if (numberRE.test(value)) {
-            v[1] = value.replace(numberRE, i => `-${i}`)
+          if (numberRE.test(value)) {
+            v[1] = value.replace(numberRE, i => i.startsWith('-') ? i.slice(1) : `-${i}`)
             changed = true
           }
         })
diff --git a/test/__snapshots__/postcss.test.ts.snap b/test/__snapshots__/postcss.test.ts.snap
@@ -348,6 +348,8 @@ exports[`postcss > @unocss 1`] = `
 .grayscale-\\$variable{--un-grayscale:grayscale(var(--variable));filter:var(--un-blur) var(--un-brightness) var(--un-contrast) var(--un-drop-shadow) var(--un-grayscale) var(--un-hue-rotate) var(--un-invert) var(--un-saturate) var(--un-sepia);}
 .grayscale-90{--un-grayscale:grayscale(0.9);filter:var(--un-blur) var(--un-brightness) var(--un-contrast) var(--un-drop-shadow) var(--un-grayscale) var(--un-hue-rotate) var(--un-invert) var(--un-saturate) var(--un-sepia);}
 .-backdrop-hue-rotate-90{--un-backdrop-hue-rotate:hue-rotate(-90deg);-webkit-backdrop-filter:var(--un-backdrop-blur) var(--un-backdrop-brightness) var(--un-backdrop-contrast) var(--un-backdrop-grayscale) var(--un-backdrop-hue-rotate) var(--un-backdrop-invert) var(--un-backdrop-opacity) var(--un-backdrop-saturate) var(--un-backdrop-sepia);backdrop-filter:var(--un-backdrop-blur) var(--un-backdrop-brightness) var(--un-backdrop-contrast) var(--un-backdrop-grayscale) var(--un-backdrop-hue-rotate) var(--un-backdrop-invert) var(--un-backdrop-opacity) var(--un-backdrop-saturate) var(--un-backdrop-sepia);}
+.-hue-rotate--90{--un-hue-rotate:hue-rotate(90deg);filter:var(--un-blur) var(--un-brightness) var(--un-contrast) var(--un-drop-shadow) var(--un-grayscale) var(--un-hue-rotate) var(--un-invert) var(--un-saturate) var(--un-sepia);}
+.-hue-rotate-\\[var\\(--for-hue\\,0\\.5turn\\)\\]{--un-hue-rotate:hue-rotate(var(--for-hue,-0.5turn));filter:var(--un-blur) var(--un-brightness) var(--un-contrast) var(--un-drop-shadow) var(--un-grayscale) var(--un-hue-rotate) var(--un-invert) var(--un-saturate) var(--un-sepia);}
 .-hue-rotate-90{--un-hue-rotate:hue-rotate(-90deg);filter:var(--un-blur) var(--un-brightness) var(--un-contrast) var(--un-drop-shadow) var(--un-grayscale) var(--un-hue-rotate) var(--un-invert) var(--un-saturate) var(--un-sepia);}
 .backdrop-hue-rotate-0{--un-backdrop-hue-rotate:hue-rotate(0);-webkit-backdrop-filter:var(--un-backdrop-blur) var(--un-backdrop-brightness) var(--un-backdrop-contrast) var(--un-backdrop-grayscale) var(--un-backdrop-hue-rotate) var(--un-backdrop-invert) var(--un-backdrop-opacity) var(--un-backdrop-saturate) var(--un-backdrop-sepia);backdrop-filter:var(--un-backdrop-blur) var(--un-backdrop-brightness) var(--un-backdrop-contrast) var(--un-backdrop-grayscale) var(--un-backdrop-hue-rotate) var(--un-backdrop-invert) var(--un-backdrop-opacity) var(--un-backdrop-saturate) var(--un-backdrop-sepia);}
 .backdrop-hue-rotate-360{--un-backdrop-hue-rotate:hue-rotate(360deg);-webkit-backdrop-filter:var(--un-backdrop-blur) var(--un-backdrop-brightness) var(--un-backdrop-contrast) var(--un-backdrop-grayscale) var(--un-backdrop-hue-rotate) var(--un-backdrop-invert) var(--un-backdrop-opacity) var(--un-backdrop-saturate) var(--un-backdrop-sepia);backdrop-filter:var(--un-backdrop-blur) var(--un-backdrop-brightness) var(--un-backdrop-contrast) var(--un-backdrop-grayscale) var(--un-backdrop-hue-rotate) var(--un-backdrop-invert) var(--un-backdrop-opacity) var(--un-backdrop-saturate) var(--un-backdrop-sepia);}
diff --git a/test/assets/output/preset-mini-targets.css b/test/assets/output/preset-mini-targets.css
@@ -102,6 +102,7 @@
 .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;}
 .-mb-px{margin-bottom:-1px;}
+.-mt--5cm{margin-top:5cm;}
 .-mt-safe{margin-top:calc(max(env(safe-area-inset-left), env(safe-area-inset-right)) * -1);}
 .\!-ms-safe{margin-inline-start:calc(max(env(safe-area-inset-left), env(safe-area-inset-right)) * -1) !important;}
 .me-8{margin-inline-end:2rem;}
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
@@ -1036,6 +1036,7 @@ export const presetMiniTargets: string[] = [
   '!p-5px',
   '-gap-y-5',
   '-mb-px',
+  '-mt--5cm',
   '-p-px',
   '-z-1',
 
diff --git a/test/assets/preset-wind-targets.ts b/test/assets/preset-wind-targets.ts
@@ -385,6 +385,8 @@ export const presetWindTargets: string[] = [
   '!animate-ping',
   '-backdrop-hue-rotate-90',
   '-hue-rotate-90',
+  '-hue-rotate--90',
+  '-hue-rotate-[var(--for-hue,0.5turn)]',
   'hover:animate-bounce',
 
   '-scroll-mb-px',

Original file line number	Diff line number	Diff line change
`@@ -114,4 +114,4 @@ export const globalKeywords = [`
`114`	`114`	`'unset',`
`115`	`115`	`]`
`116`	`116`
`117`		`-export const cssMathFnRE = /(?:calc\|clamp\|min\|max)\s\(.\)/`
	`117`	`+export const cssMathFnRE = /^(calc\|clamp\|min\|max)\s\((.+)\)(.)/`