Skip to content

website: Fall back to primary.background for themes without selection.background #3242

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
madcodelife merged 1 commit into from
Sep 25, 2026
+7 −5
Merged

website: Fall back to primary.background for themes without selection.background #3242

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
12 changes: 7 additions & 5 deletions website/src/lib/theme-catalog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ export const themes = Object.entries(files)

export const themeInfo = Object.fromEntries(themes.map(({ id, mode, name, source }) => [id, { mode, name, source }]));

const tokens: Record<string, string> = {
// A list names fallbacks in order, matching the component theme's fallbacks.
const tokens: Record<string, string | string[]> = {
background: 'background',
foreground: 'foreground',
card: 'background',
Expand Down Expand Up @@ -61,7 +62,7 @@ const tokens: Record<string, string> = {
'brand-hover': 'primary.hover.background',
'brand-contrast': 'primary.foreground',
'brand-subtle': 'muted.background',
selection: 'selection.background',
selection: ['selection.background', 'primary.background'],
success: 'base.green',
warning: 'base.yellow',
destructive: 'base.red',
Expand Down Expand Up @@ -95,9 +96,10 @@ function highlightColor(highlight: Record<string, unknown> | undefined, key: str
}

export const themeCss = themes.map(({ id, colors, highlight }) => {
const declarations = Object.entries(tokens).flatMap(([token, source]) => {
const value = source.startsWith('editor.') || source.startsWith('syntax.')
? highlightColor(highlight, source) : colors[source];
const resolve = (source: string) => source.startsWith('editor.') || source.startsWith('syntax.')
? highlightColor(highlight, source) : colors[source];
const declarations = Object.entries(tokens).flatMap(([token, sources]) => {
const value = [sources].flat().map(resolve).find(Boolean);
return value ? [`--${token}:${value};`] : [];
});
return `html[data-theme="${id}"]{${declarations.join('')}}`;
Expand Down
Loading