Fix var(…) as the opacity value inside the theme(…) function
#14653
Conversation
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
RobinMalfait
changed the title
theme(.../var(--foo)) syntaxvar(…) as the opacity value inside the theme(…) function
RobinMalfait
commented
Oct 11, 2024
| @@ -136,6 +136,27 @@ describe('theme function', () => { | |||
| `) | |||
| }) | |||
|
|
|||
| test('theme(colors.red.500/75%)', async () => { | |||
There was a problem hiding this comment.
Same test as below, but without spaces. Already worked, but added for completeness sake.
| } | ||
| .red { | ||
| /* prettier-ignore */ | ||
| color: theme(colors.red.500/var(--opacity,50%)); |
There was a problem hiding this comment.
Prettier injected a space var(--opacity, 50%), but explicitly didn't want it so I added the prettier-ignore comment.
philipp-spiess
approved these changes
Oct 14, 2024
CHANGELOG.md
Outdated
| @@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 | |||
| - Pass options when using `addComponents` and `matchComponents` ([#14590](https://github.com/tailwindlabs/tailwindcss/pull/14590)) | |||
| - Ensure `boxShadow` and `animation` theme keys in JS config files are accessible under `--shadow-*` and `--animate-*` using the `theme()` function ([#14642](https://github.com/tailwindlabs/tailwindcss/pull/14642)) | |||
| - Ensure all theme keys with new names are also accessible under their old names when using the `theme()` function with the legacy dot notation syntax ([#14642](https://github.com/tailwindlabs/tailwindcss/pull/14642)) | |||
| - Fix `var(…)` as the opacity value inside the `theme(…)` function ([#14653](https://github.com/tailwindlabs/tailwindcss/pull/14653)) | |||
There was a problem hiding this comment.
Suggested change
| - Fix `var(…)` as the opacity value inside the `theme(…)` function ([#14653](https://github.com/tailwindlabs/tailwindcss/pull/14653)) | |
| - Allow `var(…)` for the opacity modifier inside `theme([path] / [modifier])` function calls ([#14653](https://github.com/tailwindlabs/tailwindcss/pull/14653)) |
Maybe if we word it like this it's also an addition and not a fix? I’m not sure about the theme function arguments, maybe it's fine to abbreviate with … but I was wondering if this makes it clearer what the modifier position is in this case.
There was a problem hiding this comment.
I think it should be a fix because without it we would generate invalid CSS
There was a problem hiding this comment.
How about something like this?
Ensure `var(…)` can be used as the opacity value inside the `theme([path] / [modifier])` function
thecrypticace
approved these changes
Oct 14, 2024
RobinMalfait
force-pushed
the
fix/var-in-theme-function
branch
from
54c3987 to
2ef8891
Compare
This means that we have to handle 2 cases: 1. Handle the `/` as a separator 2. Stringify the AST node, instead of using the value, because the `var(--opacity)` part is a (nested) AST node.
RobinMalfait
force-pushed
the
fix/var-in-theme-function
branch
from
5926c05 to
b0ed890
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Inside the
theme(…)function, we can use the/character for applying an opacity. For exampletheme(colors.red.500 / 50%)will apply a 50% opacity to thecolors.red.500value.However, if you used a variable instead of the hardcoded
50%value, then this was not parsed correctly. E.g.:theme(colors.red.500 / var(--opacity))If we have this exact syntax (with the spaces), then it parses, but some information is lost:
Results in:
Notice that the
var(--opacity)is just parsed asvar, and the--opacityis lost.Additionally, if we drop the spaces, then it doesn't parse at all:
Results in:
This means that we have to handle 2 issues to make this work:
/character as a proper separator.varin this case)).