Improve support for custom variants in group-*, peer-*, has-*, and not-* variants
#14743
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3859,7 +3859,68 @@ exports[`getVariants 1`] = ` | |
| "isArbitrary": true, | ||
| "name": "not", | ||
| "selectors": [Function], | ||
| "values": [ | ||
| "not", | ||
| "group", | ||
| "peer", | ||
| "first", | ||
| "last", | ||
| "only", | ||
| "odd", | ||
| "even", | ||
| "first-of-type", | ||
| "last-of-type", | ||
| "only-of-type", | ||
| "visited", | ||
| "target", | ||
| "open", | ||
| "default", | ||
| "checked", | ||
| "indeterminate", | ||
| "placeholder-shown", | ||
| "autofill", | ||
| "optional", | ||
| "required", | ||
| "valid", | ||
| "invalid", | ||
| "in-range", | ||
| "out-of-range", | ||
| "read-only", | ||
| "empty", | ||
| "focus-within", | ||
| "hover", | ||
| "focus", | ||
| "focus-visible", | ||
| "active", | ||
| "enabled", | ||
| "disabled", | ||
| "inert", | ||
| "has", | ||
| "aria", | ||
| "data", | ||
| "nth", | ||
| "nth-last", | ||
| "nth-of-type", | ||
| "nth-last-of-type", | ||
| "supports", | ||
| "motion-safe", | ||
| "motion-reduce", | ||
| "contrast-more", | ||
| "contrast-less", | ||
| "max", | ||
| "sm", | ||
| "min", | ||
| "@max", | ||
| "@", | ||
| "@min", | ||
| "portrait", | ||
| "landscape", | ||
| "ltr", | ||
| "rtl", | ||
| "dark", | ||
| "print", | ||
| "forced-colors", | ||
| ], | ||
| }, | ||
| { | ||
| "hasDash": true, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -87,33 +87,37 @@ export function walk( | |
| parent: AstNode | null | ||
| replaceWith(newNode: AstNode | AstNode[]): void | ||
| context: Record<string, string> | ||
| path: AstNode[] | ||
| }, | ||
| ) => void | WalkAction, | ||
| parentPath: AstNode[] = [], | ||
| context: Record<string, string> = {}, | ||
| ) { | ||
| for (let i = 0; i < ast.length; i++) { | ||
| let node = ast[i] | ||
| let path = [...parentPath, node] | ||
| let parent = parentPath.at(-1) ?? null | ||
|
|
||
| // We want context nodes to be transparent in walks. This means that | ||
| // whenever we encounter one, we immediately walk through its children and | ||
| // furthermore we also don't update the parent. | ||
| if (node.kind === 'context') { | ||
| walk(node.nodes, visit, parentPath, { ...context, ...node.context }) | ||
| continue | ||
| } | ||
|
|
||
| let status = | ||
| visit(node, { | ||
| parent, | ||
| context, | ||
| path, | ||
| replaceWith(newNode) { | ||
| ast.splice(i, 1, ...(Array.isArray(newNode) ? newNode : [newNode])) | ||
| // We want to visit the newly replaced node(s), which start at the | ||
| // current index (i). By decrementing the index here, the next loop | ||
| // will process this position (containing the replaced node) again. | ||
| i-- | ||
| }, | ||
| }) ?? WalkAction.Continue | ||
|
|
||
| // Stop the walk entirely | ||
|
|
@@ -123,11 +127,52 @@ export function walk( | |
| if (status === WalkAction.Skip) continue | ||
|
|
||
| if (node.kind === 'rule') { | ||
| walk(node.nodes, visit, path, context) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // This is a depth-first traversal of the AST | ||
| export function walkDepth( | ||
| ast: AstNode[], | ||
| visit: ( | ||
| node: AstNode, | ||
| utils: { | ||
| parent: AstNode | null | ||
| path: AstNode[] | ||
| context: Record<string, string> | ||
| replaceWith(newNode: AstNode[]): void | ||
| }, | ||
| ) => void, | ||
| parentPath: AstNode[] = [], | ||
| context: Record<string, string> = {}, | ||
| ) { | ||
| for (let i = 0; i < ast.length; i++) { | ||
| let node = ast[i] | ||
| let path = [...parentPath, node] | ||
| let parent = parentPath.at(-1) ?? null | ||
|
|
||
| if (node.kind === 'rule') { | ||
| walkDepth(node.nodes, visit, path, context) | ||
| } else if (node.kind === 'context') { | ||
| walkDepth(node.nodes, visit, parentPath, { ...context, ...node.context }) | ||
| continue | ||
| } | ||
|
|
||
| visit(node, { | ||
| parent, | ||
| context, | ||
| path, | ||
| replaceWith(newNode) { | ||
| ast.splice(i, 1, ...newNode) | ||
|
|
||
| // Skip over the newly inserted nodes (being depth-first it doesn't make sense to visit them) | ||
| i += newNode.length - 1 | ||
| }, | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| export function toCss(ast: AstNode[]) { | ||
| let atRoots: string = '' | ||
| let seenAtProperties = new Set<string>() | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.