Skip to content

Support spacing scale as line-height modifiers #14966

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
adamwathan merged 2 commits into from
Nov 11, 2024
Merged

Support spacing scale as line-height modifiers #14966

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db30e0d
Support spacing scale as line-height modifiers
adamwathan Nov 11, 2024
6ca2594
Update changelog
adamwathan Nov 11, 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
18 changes: 8 additions & 10 deletions packages/tailwindcss/src/utilities.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14811,11 +14811,10 @@ test('text', async () => {
await compileCss(
css`
@theme {
--spacing: 0.25rem;
--color-red-500: #ef4444;
--leading-6: 1.5rem;
--text-sm: 0.875rem;
--text-sm--line-height: 1.25rem;
--leading-9: 2.25rem;
}
@tailwind utilities;
`,
Expand Down Expand Up @@ -14868,11 +14867,10 @@ test('text', async () => {
),
).toMatchInlineSnapshot(`
":root {
--spacing: .25rem;
--color-red-500: #ef4444;
--leading-6: 1.5rem;
--text-sm: .875rem;
--text-sm--line-height: 1.25rem;
--leading-9: 2.25rem;
}

.text-sm {
Expand All @@ -14882,32 +14880,32 @@ test('text', async () => {

.text-\\[12px\\]\\/6 {
font-size: 12px;
line-height: var(--leading-6);
line-height: calc(var(--spacing) * 6);
}

.text-\\[50\\%\\]\\/6 {
font-size: 50%;
line-height: var(--leading-6);
line-height: calc(var(--spacing) * 6);
}

.text-\\[clamp\\(1rem\\,var\\(--size\\)\\,3rem\\)\\]\\/9 {
font-size: clamp(1rem, var(--size), 3rem);
line-height: var(--leading-9);
line-height: calc(var(--spacing) * 9);
}

.text-\\[larger\\]\\/6 {
font-size: larger;
line-height: var(--leading-6);
line-height: calc(var(--spacing) * 6);
}

.text-\\[xx-large\\]\\/6 {
font-size: xx-large;
line-height: var(--leading-6);
line-height: calc(var(--spacing) * 6);
}

.text-sm\\/6 {
font-size: var(--text-sm);
line-height: var(--leading-6);
line-height: calc(var(--spacing) * 6);
}

.text-sm\\/\\[4px\\] {
Expand Down
12 changes: 12 additions & 0 deletions packages/tailwindcss/src/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3902,6 +3902,12 @@ export function createUtilities(theme: Theme) {
? candidate.modifier.value
: theme.resolve(candidate.modifier.value, ['--leading'])

if (!modifier && isValidSpacingMultiplier(candidate.modifier.value)) {
let multiplier = theme.resolve(null, ['--spacing'])
if (!multiplier) return null
modifier = `calc(${multiplier} * ${candidate.modifier.value})`
}

if (modifier) {
return [decl('font-size', value), decl('line-height', modifier)]
}
Expand Down Expand Up @@ -3942,6 +3948,12 @@ export function createUtilities(theme: Theme) {
? candidate.modifier.value
: theme.resolve(candidate.modifier.value, ['--leading'])

if (!modifier && isValidSpacingMultiplier(candidate.modifier.value)) {
let multiplier = theme.resolve(null, ['--spacing'])
if (!multiplier) return null
modifier = `calc(${multiplier} * ${candidate.modifier.value})`
}

let declarations = [decl('font-size', fontSize)]
modifier && declarations.push(decl('line-height', modifier))
return declarations
Expand Down