Skip to content

Fix custom spacing values shadowing leading-none staticValues #19773

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

Open
mvanhorn wants to merge 1 commit into
base: main
Choose a base branch
from
+50 −9
Open

Fix custom spacing values shadowing leading-none staticValues #19773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 32 additions & 0 deletions packages/tailwindcss/src/utilities.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24618,6 +24618,38 @@ test('leading', async () => {
`)
})

test('leading-none is not shadowed by --spacing-none', async () => {
expect(
await compileCss(
css`
@theme {
--spacing-none: 0;
}
@tailwind utilities;
`,
['leading-none'],
),
).toMatchInlineSnapshot(`
"@layer properties {
@supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
*, :before, :after, ::backdrop {
--tw-leading: initial;
}
}
}

.leading-none {
--tw-leading: 1;
line-height: 1;
}

@property --tw-leading {
syntax: "*";
inherits: false
}"
`)
})

test('tracking', async () => {
expect(
await compileCss(
Expand Down
27 changes: 18 additions & 9 deletions packages/tailwindcss/src/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,24 @@ export function createUtilities(theme: Theme) {
value = candidate.value.value
dataType = candidate.value.dataType
} else {
value = theme.resolve(
candidate.value.fraction ?? candidate.value.value,
desc.themeKeys ?? [],
)
let resolvedValue = candidate.value.fraction ?? candidate.value.value

// First try resolving against just the primary theme key.
value = theme.resolve(resolvedValue, desc.themeKeys?.slice(0, 1) ?? [])

// If the primary theme key didn't match, check static values before
// falling back to secondary theme keys (like `--spacing`). This
// ensures e.g. `leading-none` produces `line-height: 1` even when
// `--spacing-none` is defined in the theme.
if (value === null && !negative && desc.staticValues && !candidate.modifier) {
let fallback = desc.staticValues[candidate.value.value]
if (fallback) return fallback.map(cloneAstNode)
}

// Fall back to the full set of theme keys.
if (value === null) {
value = theme.resolve(resolvedValue, desc.themeKeys ?? [])
}

// Automatically handle things like `w-1/2` without requiring `1/2` to
// exist as a theme value.
Expand All @@ -439,11 +453,6 @@ export function createUtilities(theme: Theme) {
value = desc.handleBareValue(candidate.value)
if (!value?.includes('/') && candidate.modifier) return
}

if (value === null && !negative && desc.staticValues && !candidate.modifier) {
let fallback = desc.staticValues[candidate.value.value]
if (fallback) return fallback.map(cloneAstNode)
}
}

// If there is no value, don't generate any rules.
Expand Down