Skip to content

fix: preserve arbitrary values using CSS variables during Tailwind v4… #19188

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

Closed
wants to merge 1 commit into from
+28 −16
Closed

fix: preserve arbitrary values using CSS variables during Tailwind v4… #19188

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
44 changes: 28 additions & 16 deletions packages/tailwindcss/src/canonicalize-candidates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,13 @@ const spacing = new DefaultMap<DesignSystem, DefaultMap<string, number | null> |
})

function arbitraryUtilities(candidate: Candidate, options: SignatureOptions): Candidate {
// Add guard: Skip conversion if candidate uses CSS variables or complex expressions (var(), calc(), spaces, commas, slashes)
if (candidate.kind === 'functional' && candidate.value?.kind === 'arbitrary') {
const raw = String(candidate.value.value ?? '')
if (/var\(--[^)]+\)|calc\(|\s|,|\//.test(raw)) {
return candidate
}
}
// We are only interested in arbitrary properties and arbitrary values
if (
// Arbitrary property
Expand Down Expand Up @@ -673,6 +680,12 @@ function arbitraryUtilities(candidate: Candidate, options: SignatureOptions): Ca
let value =
candidate.kind === 'arbitrary' ? candidate.value : (candidate.value?.value ?? null)
if (value === null) return

// Always cast value to string for consistency
const valueStr = String(value)

// Detect complex values (var(), calc(), spaces, commas, slashes)
const isComplex = /var\(--[^)]+\)|calc\(|\s|,|\//.test(valueStr)

let spacingMultiplier = spacing.get(designSystem)?.get(value) ?? null
let rootPrefix = ''
Expand All @@ -689,19 +702,20 @@ function arbitraryUtilities(candidate: Candidate, options: SignatureOptions): Ca
)) {
if (rootPrefix) root = `${rootPrefix}${root}`

// Try as bare value
for (let replacementCandidate of parseCandidate(designSystem, `${root}-${value}`)) {
yield replacementCandidate
}

// Try as bare value with modifier
if (candidate.modifier) {
for (let replacementCandidate of parseCandidate(
designSystem,
`${root}-${value}${candidate.modifier}`,
)) {
// Skip bare-value attempts for complex values to prevent gap-(--gap) corruption
if (!isComplex) {
for (let replacementCandidate of parseCandidate(designSystem, `${root}-${valueStr}`)) {
yield replacementCandidate
}
// Always use printModifier() for modifiers
if (candidate.modifier) {
for (let replacementCandidate of parseCandidate(
designSystem,
`${root}-${valueStr}${printModifier(candidate.modifier)}`,
)) {
yield replacementCandidate
}
}
}

// Try bare value based on the `--spacing` value. E.g.:
Expand All @@ -726,16 +740,14 @@ function arbitraryUtilities(candidate: Candidate, options: SignatureOptions): Ca
}
}

// Try as arbitrary value
for (let replacementCandidate of parseCandidate(designSystem, `${root}-[${value}]`)) {
// Bracketed arbitrary values are always safe — keep them
for (let replacementCandidate of parseCandidate(designSystem, `${root}-[${valueStr}]`)) {
yield replacementCandidate
}

// Try as arbitrary value with modifier
if (candidate.modifier) {
for (let replacementCandidate of parseCandidate(
designSystem,
`${root}-[${value}]${printModifier(candidate.modifier)}`,
`${root}-[${valueStr}]${printModifier(candidate.modifier)}`,
)) {
yield replacementCandidate
}
Expand Down