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

Show file tree
Hide file tree
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
Fixes
  • Loading branch information
@philipp-spiess
philipp-spiess committed Mar 18, 2025
commit feb93a9f191ebb7cedc58cb174c547c51a42cdab
2 changes: 1 addition & 1 deletion packages/tailwindcss/src/__snapshots__/index.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ exports[`compiling CSS > prefix all CSS variables inside preflight 1`] = `

::placeholder {
opacity: 1;
color: color-mix(in oklab, currentColor 50%, transparent);
color: oklab(from currentColor l a b / 50%);
}

textarea {
Expand Down
14 changes: 7 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(…) injects the fallback when the value it refers is set to a `--theme(…)` function containing `initial`', async () => {
test('--theme(…) injects the fallback when the value it refers is set to a `--theme(…)` function with the fallback `initial`', async () => {
expect(
await compileCss(css`
@theme prefix(tw) {
Expand All @@ -235,7 +235,7 @@ describe('--theme(…)', () => {
`)
})

test('--theme(…) injects the fallback when the value it refers is set to a `--theme(…)` function containing `initial` in @reference mode', async () => {
test('--theme(…) injects the fallback when the value it refers is set to a `--theme(…)` function with the fallback `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 value it refers is set to a `--theme(…)` function that returns `initial` as inline value', async () => {
test('--theme(…) resolves with the fallback when the value it refers is set to a `--theme(… inline)` function with the fallback `initial`', async () => {
expect(
await compileCss(css`
@theme prefix(tw) {
Expand All @@ -269,19 +269,19 @@ describe('--theme(…)', () => {
`)
})

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 () => {
test('--theme(…) resolves with the fallback when the value it refers is set to a `--theme(… inline)` function with the fallback `initial` in @reference mode', async () => {
expect(
await compileCss(css`
@theme reference prefix(tw) {
--default-font-family: --theme(--font-family, initial);
--default-font-family: --theme(--font-family inline, initial);
}
.red {
font-family: --theme(--default-font-family, Potato Sans, sans-serif);
font-family: --theme(--default-font-family inline, Potato Sans, sans-serif);
}
`),
).toMatchInlineSnapshot(`
".red {
font-family: var(--tw-default-font-family, Potato Sans, sans-serif);
font-family: Potato Sans, sans-serif;
}"
`)
})
Expand Down
13 changes: 8 additions & 5 deletions packages/tailwindcss/src/css-functions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,17 @@ function theme(
return resolvedValue
}

// Inject the fallback…
//
// - …as the value if the value returned is `initial`
// - …expect any `initial` fallbacks on `var(…)`, `theme(…)`, or `--theme(…)`
// - …as the fallback if a `var(…)` with no fallback is returned
let joinedFallback = fallback.join(', ')
if (joinedFallback === 'initial') return resolvedValue

// When the resolved value returns `initial`, resolve with the the fallback value
if (resolvedValue === 'initial') return joinedFallback

// Inject the fallback of a `--theme(…)` function into the fallback of a referenced `--theme(…)`
// function or `var(…)` declaration. If the referenced function already defines a fallback, we use
// a potential fallback value of `initial` in the referenced function to determine if we should
// inject the fallback value of the caller. If that's not the case, we keep the fallback as-is
// (this is needed for theme variables in reference-mode).
if (
resolvedValue.startsWith('var(') ||
resolvedValue.startsWith('theme(') ||
Expand Down