Skip to content

Preserve custom properties in keyframes #16376

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 4 commits into from
Feb 21, 2025
Merged

Preserve custom properties in keyframes #16376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb87d8a
Add failing test
adamwathan Feb 8, 2025
6780faf
Fix
thecrypticace Feb 9, 2025
ecc9435
Update changelog
thecrypticace Feb 9, 2025
9e36376
Fixes and making sure it does work with transitive dependencies
philipp-spiess Feb 21, 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
8 changes: 7 additions & 1 deletion packages/tailwindcss/src/ast.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,9 @@ export function optimizeAst(

// Track variables defined in `@theme`
if (context.theme && node.property[0] === '-' && node.property[1] === '-') {
cssThemeVariables.get(parent).add(node)
if (!context.keyframes) {
cssThemeVariables.get(parent).add(node)
}
}

// Track used CSS variables
Expand Down Expand Up @@ -354,6 +356,10 @@ export function optimizeAst(

// AtRule
else if (node.kind === 'at-rule') {
if (node.name === '@keyframes') {
context = { ...context, keyframes: true }
}

let copy = { ...node, nodes: [] }
for (let child of node.nodes) {
transform(child, copy.nodes, context, depth + 1)
Expand Down
38 changes: 38 additions & 0 deletions packages/tailwindcss/src/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1613,6 +1613,44 @@ describe('Parsing theme values from CSS', () => {
`)
})

// https://github.com/tailwindlabs/tailwindcss/issues/16374
test('custom properties in keyframes preserved', async () => {
expect(
await compileCss(
css`
@theme {
--animate-foo: used 1s infinite;

@keyframes used {
to {
--other: var(--angle);
--angle: 360deg;
}
}
}

@tailwind utilities;
`,
['animate-foo'],
),
).toMatchInlineSnapshot(`
":root, :host {
--animate-foo: used 1s infinite;
}

.animate-foo {
animation: var(--animate-foo);
}

@keyframes used {
to {
--other: var(--angle);
--angle: 360deg;
}
}"
`)
})

test('keyframes are generated when used in an animation using `@theme inline`', async () => {
expect(
await compileCss(
Expand Down