Skip to content

fix: properly normalize subtraction followed by a variable #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: properly normalize subtraction followed by a variable #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/brown-poets-scream.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@twind/core': patch
'@twind/preset-tailwind': patch
---

properly normalize subtraction followed by a variable (fixes #429)
17 changes: 11 additions & 6 deletions packages/core/src/rules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,7 @@ function camelize(value: string): string {
return value.replace(/-./g, (x) => x[1].toUpperCase())
}

const cssVariableRE = /var\((--.+?)[,)]/g
/**
* @internal
* @param value
Expand All @@ -662,11 +663,15 @@ export function normalize(value: string): string {

// Add spaces around operators inside math functions like calc() that do not follow an operator
// or '('.
.replace(/(calc|min|max|clamp)\(.+\)/g, (match) =>
match.replace(
/(-?\d*\.?\d(?!\b-.+[,)](?![^+\-/*])\D)(?:%|[a-z]+)?|\))([+\-/*])/g,
'$1 $2 ',
),
)
.replace(/(calc|min|max|clamp)\(.+\)/g, (match) => {
const vars: string[] = []
return match
.replace(cssVariableRE, (match, g1) => {
vars.push(g1)
return match.replace(g1, '--v')
})
.replace(/(-?\d*\.?\d(?!\b-\d.+[,)](?![^+\-/*])\D)(?:%|[a-z]+)?|\))([+\-/*])/g, '$1 $2 ')
.replace(cssVariableRE, (match, g1) => match.replace(g1, vars.shift() as string))
})
)
}
3 changes: 3 additions & 0 deletions packages/preset-tailwind/src/rules.test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,6 +1095,9 @@
"w-[calc((100%+2rem)/2)]": ".w-\\[calc\\(\\(100\\%\\+2rem\\)\\/2\\)\\]{width:calc((100% + 2rem) / 2)}",
"w-[calc(var(--index,1)*0.2s)]": ".w-\\[calc\\(var\\(--index\\,1\\)\\*0\\.2s\\)\\]{width:calc(var(--index,1) * 0.2s)}",
"w-[calc(var(--index)*0.2s)]": ".w-\\[calc\\(var\\(--index\\)\\*0\\.2s\\)\\]{width:calc(var(--index) * 0.2s)}",
"w-[calc(1-var(--something)*0.5)]": ".w-\\[calc\\(1-var\\(--something\\)\\*0\\.5\\)\\]{width:calc(1 - var(--something) * 0.5)}",
"w-[calc(1-(var(--something)*0.5))]": ".w-\\[calc\\(1-\\(var\\(--something\\)\\*0\\.5\\)\\)\\]{width:calc(1 - (var(--something) * 0.5))}",
"w-[calc(1-((12-3)*0.5))]": ".w-\\[calc\\(1-\\(\\(12-3\\)\\*0\\.5\\)\\)\\]{width:calc(1 - ((12 - 3) * 0.5))}",
"bg-[#1da1f2]": ".bg-\\[\\#1da1f2\\]{--tw-bg-opacity:1;background-color:rgba(29,161,242,var(--tw-bg-opacity))}",
"translate-x-[-650px]": [
"*,::before,::after,::backdrop{--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-transform:translateX(var(--tw-translate-x)) translateY(var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}",
Expand Down