8000 Use variables with fallbacks for utility classes by adamwathan · Pull Request #13177 · tailwindlabs/tailwindcss · GitHub
Skip to content

Use variables with fallbacks for utility classes #13177

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
RobinMalfait merged 4 commits into from
Mar 21, 2024
Merged

Use variables with fallbacks for utility classes #13177

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05d6c56
Use variables with fallbacks for utility classes
adamwathan Mar 9, 2024
4bc23ca
Update playwright test
adamwathan Mar 10, 2024
dc8ed42
rename `resolveBare` to `resolveValue`
RobinMalfait Mar 21, 2024
a9e1712
make private methods really private
RobinMalfait Mar 21, 2024
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
rename resolveBare to resolveValue
  • Loading branch information
@RobinMalfait
RobinMalfait committed Mar 21, 2024
commit dc8ed42dcb1356b5452049ea40a86e62fee902da
2 changes: 1 addition & 1 deletion packages/tailwindcss/src/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export class Theme {
return this.var(themeKey)
}

resolveBare(candidateValue: string, themeKeys: ThemeKey[]): string | null {
resolveValue(candidateValue: string, themeKeys: ThemeKey[]): string | null {
let themeKey = this.resolveKey(candidateValue, themeKeys)

if (!themeKey) return null
Expand Down
4 changes: 2 additions & 2 deletions packages/tailwindcss/src/variants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ export function createVariants(theme: Theme): Variants {
if (variant.value.kind === 'arbitrary') {
value = variant.value.value
} else if (variant.value.kind === 'named') {
value = theme.resolveBare(variant.value.value, ['--breakpoint'])
value = theme.resolveValue(variant.value.value, ['--breakpoint'])
}

if (!value) return null
Expand Down Expand Up @@ -597,7 +597,7 @@ export function createVariants(theme: Theme): Variants {
if (variant.value.kind === 'arbitrary') {
value = variant.value.value
} else if (variant.value.kind === 'named') {
value = theme.resolveBare(variant.value.value, ['--width'])
value = theme.resolveValue(variant.value.value, ['--width'])
}

if (!value) return null
Expand Down