Skip to content

Make --theme(…) return CSS variables #17036

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
philipp-spiess merged 11 commits into from
Mar 20, 2025
Merged

Make --theme(…) return CSS variables #17036

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1ce8bd9
Add ability to force theme function resolution as inline
philipp-spiess Mar 7, 2025
972b63e
Force-inline when `--theme(…)` is used inside at rules
philipp-spiess Mar 7, 2025
ec02aa7
Prefix all CSS variables inside preflight
philipp-spiess Mar 7, 2025
dfc21a7
Ensure fallbacks are emitted as CSS variables too
philipp-spiess Mar 7, 2025
82a76ec
Update change log
philipp-spiess Mar 7, 2025
932633b
Handle `--theme(…, initial)` when encountered by an `--theme(…, fallb…
philipp-spiess Mar 10, 2025
31036ca
Don't inject the fallback if the injected fallback is `initial`
philipp-spiess Mar 10, 2025
2f50ecd
Update tests
philipp-spiess Mar 10, 2025
feb93a9
Fixes
philipp-spiess Mar 18, 2025
14c2ee9
Merge branch 'main' into chore/--theme-as-var
philipp-spiess Mar 18, 2025
50ab909
Fix snaps
philipp-spiess Mar 20, 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
Prev Previous commit
Next Next commit
Update tests
  • Loading branch information
@philipp-spiess
philipp-spiess committed Mar 17, 2025
commit 2f50ecd9932ff4cfee3b52956488e66586065c61
27 changes: 20 additions & 7 deletions packages/tailwindcss/src/css-functions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ describe('--theme(…)', () => {
`)
})

test('--theme(…) contains the fallback when the default namespace is unset and a prior `--theme(…)` function contains `initial`', async () => {
test('--theme(…) injects the fallback when the value it refers is set to a `--theme(…)` function containing `initial`', async () => {
expect(
await compileCss(css`
@theme prefix(tw) {
Expand All @@ -235,7 +235,7 @@ describe('--theme(…)', () => {
`)
})

test('--theme(…) contains the fallback when the default namespace is unset and a prior `--theme(…)` function contains `initial` in @reference', async () => {
test('--theme(…) injects the fallback when the value it refers is set to a `--theme(…)` function containing `initial` in @reference mode', async () => {
expect(
await compileCss(css`
@theme reference prefix(tw) {
Expand All @@ -252,7 +252,7 @@ describe('--theme(…)', () => {
`)
})

test('--theme(…) returns the fallback when the default namespace is unset and a prior `--theme(…)` function returns `initial` as inline value', async () => {
test('--theme(…) returns the fallback when the value it refers is set to a `--theme(…)` function that returns `initial` as inline value', async () => {
expect(
await compileCss(css`
@theme prefix(tw) {
Expand All @@ -269,7 +269,7 @@ describe('--theme(…)', () => {
`)
})

test('--theme(…) returns the fallback when the default namespace is unset in @reference mode', async () => {
test('--theme(…) returns the fallback when the value it refers is set to a `--theme(…)` function that returns `initial` as inline value in @reference mode', async () => {
expect(
await compileCss(css`
@theme reference prefix(tw) {
Expand All @@ -286,7 +286,7 @@ describe('--theme(…)', () => {
`)
})

test.only('--theme(…) does not inject the fallback if the fallback is `initial`', async () => {
test('--theme(…) does not inject the fallback if the fallback is `initial`', async () => {
Copy link
Contributor

@thecrypticace thecrypticace Mar 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test name feels wrong. The different thing about this test is that the theme key exists and therefore the fallback isn't used.

Copy link
Member Author

@philipp-spiess philipp-spiess Mar 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch!

expect(
await compileCss(
css`
Expand Down Expand Up @@ -323,7 +323,7 @@ describe('--theme(…)', () => {
`)
})

test('--theme(…) forces the value to be retrieved as inline when used inside an at rule', async () => {
test('--theme(…) forces the value to be retrieved as inline when used inside an at-rule', async () => {
expect(
await compileCss(css`
@theme {
Expand Down Expand Up @@ -357,7 +357,7 @@ describe('--theme(…)', () => {
`)
})

test('--theme(…) can only be used with CSS variables from your theme', async () => {
test('--theme(…) can only be used with CSS variables from your @theme', async () => {
expect(() =>
compileCss(css`
@theme {
Expand All @@ -370,6 +370,19 @@ describe('--theme(…)', () => {
).rejects.toThrowErrorMatchingInlineSnapshot(
`[Error: The --theme(…) function can only be used with CSS variables from your theme.]`,
)

expect(() =>
compileCss(css`
@theme {
--color-red-500: #f00;
}
.red {
color: --theme(--color-green-500);
}
`),
).rejects.toThrowErrorMatchingInlineSnapshot(
`[Error: Could not resolve value for theme function: \`theme(--color-green-500)\`. Consider checking if the variable name is correct or provide a fallback value to silence this error.]`,
)
})
})

Expand Down
Loading