Skip to content

Support setting a default letter spacing for a custom font family #19245

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+212 −1
Open

Support setting a default letter spacing for a custom font family #19245

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
154 changes: 154 additions & 0 deletions packages/tailwindcss/src/compat/config.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,83 @@ describe('default font family compatibility', () => {
`)
})

test('overriding `fontFamily.sans[1].letterSpacing` sets letter-spacing', async ({ expect }) => {
let input = css`
@theme default {
--default-font-family: var(--font-family-sans);
Copy link
Contributor

@thecrypticace thecrypticace Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not for this PR but our default theme uses --theme() instead of var(…). We should probably mirror the actual usage in these tests.

--default-font-feature-settings: var(--font-family-sans--font-feature-settings);
--default-font-variation-settings: var(--font-family-sans--font-variation-settings);
}
@config "./config.js";
@tailwind utilities;
`

let compiler = await compile(input, {
loadModule: async () => ({
module: {
theme: {
fontFamily: {
sans: ['Potato Sans', { letterSpacing: '0.05em' }],
},
},
},
base: '/root',
}),
})

expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
".font-sans {
font-family: Potato Sans;
letter-spacing: 0.05em;
}
"
`)
})

test('overriding `fontFeatureSettings`, `fontVariationSettings`, and `letterSpacing` for `fontFamily.sans` sets all properties', async ({
expect,
}) => {
let input = css`
@theme default {
--default-font-family: var(--font-family-sans);
--default-font-feature-settings: var(--font-family-sans--font-feature-settings);
--default-font-variation-settings: var(--font-family-sans--font-variation-settings);
}
@config "./config.js";
@tailwind utilities;
`

let compiler = await compile(input, {
loadModule: async () => ({
module: {
theme: {
fontFamily: {
sans: [
'Potato Sans',
{
fontFeatureSettings: '"cv06"',
fontVariationSettings: '"XHGT" 0.7',
letterSpacing: '0.05em',
},
],
},
},
},
base: '/root',
}),
})

expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
".font-sans {
font-family: Potato Sans;
font-feature-settings: "cv06";
font-variation-settings: "XHGT" 0.7;
letter-spacing: 0.05em;
}
"
`)
})

test('overriding `--font-family-sans` in `@theme` without `default` preserves the original `--default-font-*` values', async ({
expect,
}) => {
Expand Down Expand Up @@ -989,6 +1066,83 @@ describe('default font family compatibility', () => {
`)
})

test('overriding `fontFamily.mono[1].letterSpacing` sets letter-spacing', async ({ expect }) => {
let input = css`
@theme default {
--default-mono-font-family: var(--font-family-mono);
--default-mono-font-feature-settings: var(--font-family-mono--font-feature-settings);
--default-mono-font-variation-settings: var(--font-family-mono--font-variation-settings);
}
@config "./config.js";
@tailwind utilities;
`

let compiler = await compile(input, {
loadModule: async () => ({
module: {
theme: {
fontFamily: {
mono: ['Potato Mono', { letterSpacing: '-0.02em' }],
},
},
},
base: '/root',
}),
})

expect(compiler.build(['font-mono'])).toMatchInlineSnapshot(`
".font-mono {
font-family: Potato Mono;
letter-spacing: -0.02em;
}
"
`)
})

test('overriding `fontFeatureSettings`, `fontVariationSettings`, and `letterSpacing` for `fontFamily.mono` sets all properties', async ({
expect,
}) => {
let input = css`
@theme default {
--default-mono-font-family: var(--font-mono);
--default-mono-font-feature-settings: var(--font-mono--font-feature-settings);
--default-mono-font-variation-settings: var(--font-mono--font-variation-settings);
}
@config "./config.js";
@tailwind utilities;
`

let compiler = await compile(input, {
loadModule: async () => ({
module: {
theme: {
fontFamily: {
mono: [
'Potato Mono',
{
fontFeatureSettings: '"cv06"',
fontVariationSettings: '"XHGT" 0.7',
letterSpacing: '-0.02em',
},
],
},
},
},
base: '/root',
}),
})

expect(compiler.build(['font-mono'])).toMatchInlineSnapshot(`
".font-mono {
font-family: Potato Mono;
font-feature-settings: "cv06";
font-variation-settings: "XHGT" 0.7;
letter-spacing: -0.02em;
}
"
`)
})

Copy link
Contributor

@thecrypticace thecrypticace Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I kinda feel like this test is redundant (if sans works then mono should work too) — but it matches some of the existing stuff so probably fine.

test('overriding `--font-family-mono` in `@theme` without `default` preserves the original `--default-mono-font-*` values', async ({
expect,
}) => {
Expand Down
56 changes: 56 additions & 0 deletions packages/tailwindcss/src/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1748,6 +1748,62 @@ describe('Parsing theme values from CSS', () => {
`)
})

test('font families with letter-spacing option', async () => {
expect(
await compileCss(
css`
@theme {
--font-display: 'Oswald', sans-serif;
--font-display--letter-spacing: 0.05em;
}
@tailwind utilities;
`,
['font-display'],
),
).toMatchInlineSnapshot(`
":root, :host {
--font-display: "Oswald", sans-serif;
--font-display--letter-spacing: .05em;
}

.font-display {
font-family: var(--font-display);
letter-spacing: var(--font-display--letter-spacing);
}"
`)
})

test('font families with font-feature-settings, font-variation-settings, and letter-spacing', async () => {
expect(
await compileCss(
css`
@theme {
--font-display: 'Oswald', sans-serif;
--font-display--font-feature-settings: 'cv02', 'cv03', 'cv04', 'cv11';
--font-display--font-variation-settings: 'opsz' 32;
--font-display--letter-spacing: 0.05em;
}
@tailwind utilities;
`,
['font-display'],
),
).toMatchInlineSnapshot(`
":root, :host {
--font-display: "Oswald", sans-serif;
--font-display--font-feature-settings: "cv02", "cv03", "cv04", "cv11";
--font-display--font-variation-settings: "opsz" 32;
--font-display--letter-spacing: .05em;
}

.font-display {
font-family: var(--font-display);
font-feature-settings: var(--font-display--font-feature-settings);
font-variation-settings: var(--font-display--font-variation-settings);
letter-spacing: var(--font-display--letter-spacing);
}"
`)
})

test('unsetting `--inset-*` does not unset `--inset-shadow-*`', async () => {
expect(
await compileCss(
Expand Down
3 changes: 2 additions & 1 deletion packages/tailwindcss/src/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3774,7 +3774,7 @@ export function createUtilities(theme: Theme) {
let value = theme.resolveWith(
candidate.value.value,
['--font'],
['--font-feature-settings', '--font-variation-settings'],
['--font-feature-settings', '--font-variation-settings', '--letter-spacing'],
)
if (value) {
let [families, options = {}] = value
Expand All @@ -3783,6 +3783,7 @@ export function createUtilities(theme: Theme) {
decl('font-family', families),
decl('font-feature-settings', options['--font-feature-settings']),
decl('font-variation-settings', options['--font-variation-settings']),
decl('letter-spacing', options['--letter-spacing']),
]
}
}
Expand Down