Skip to content

Improve canonicalization for & > :pseudo and & :pseudo arbitrary variants #19178

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

Merged
merged 2 commits into from
Oct 22, 2025
Merged

Improve canonicalization for & > :pseudo and & :pseudo arbitrary variants #19178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c29780e
Improve canonicalization for `& > :pseudo` and `& :pseudo` arbitrary …
thecrypticace Oct 22, 2025
dd1ddf2
Update changelog
thecrypticace Oct 22, 2025
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- _Experimental_: Add `@container-size` utility ([#18901](https://github.com/tailwindlabs/tailwindcss/pull/18901))

### Changed

- Improve canonicalization for `& > :pseudo` and `& :pseudo` arbitrary variants ([#19178](https://github.com/tailwindlabs/tailwindcss/pull/19178))

### Fixed

- Discard candidates with an empty data type ([#19172](https://github.com/tailwindlabs/tailwindcss/pull/19172))
Expand Down
5 changes: 5 additions & 0 deletions packages/tailwindcss/src/canonicalize-candidates.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,11 @@ describe.each([['default'], ['with-variant'], ['important'], ['prefix']])('%s',
['[&:first-child]:flex', 'first:flex'],
['[&:not(:first-child)]:flex', 'not-first:flex'],

['[&_:first-child]:flex', '**:first:flex'],
['[&_>_:first-child]:flex', '*:first:flex'],
['[&_:--custom]:flex', '**:[:--custom]:flex'],
['[&_>_:--custom]:flex', '*:[:--custom]:flex'],

// in-* variants
['[p_&]:flex', 'in-[p]:flex'],
['[.foo_&]:flex', 'in-[.foo]:flex'],
Expand Down
18 changes: 15 additions & 3 deletions packages/tailwindcss/src/canonicalize-candidates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1610,7 +1610,7 @@ function modernizeArbitraryValuesVariant(
ast[1].kind === 'combinator' &&
ast[1].value.trim() === '>' &&
ast[2].kind === 'selector' &&
isAttributeSelector(ast[2])
(isAttributeSelector(ast[2]) || ast[2].value[0] === ':')
) {
ast = [ast[2]]
prefixedVariant = designSystem.parseVariant('*')
Expand All @@ -1628,7 +1628,7 @@ function modernizeArbitraryValuesVariant(
ast[1].kind === 'combinator' &&
ast[1].value.trim() === '' && // space, but trimmed because there could be multiple spaces
ast[2].kind === 'selector' &&
isAttributeSelector(ast[2])
(isAttributeSelector(ast[2]) || ast[2].value[0] === ':')
) {
ast = [ast[2]]
prefixedVariant = designSystem.parseVariant('**')
Expand Down Expand Up @@ -1742,7 +1742,19 @@ function modernizeArbitraryValuesVariant(
return null
})(targetNode.value)

if (newVariant === null) continue
if (newVariant === null) {
if (prefixedVariant) {
replaceObject(variant, {
kind: 'arbitrary',
selector: target.value,
relative: false,
} satisfies Variant)

return [prefixedVariant, variant]
}

continue
}

// Add `not-` prefix
if (compoundNot) newVariant = `not-${newVariant}`
Expand Down