Skip to content

fix(app): render code blocks with theme-aware Shiki palette #2447

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
magic-peach wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(app): render code blocks with theme-aware Shiki palette #2447

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
13 changes: 13 additions & 0 deletions apps/app/src/app/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,19 @@ select:disabled {
--sidebar-ring: var(--slate-8);
}

/* Shiki emits both palettes as CSS variables (themes option in markdown.tsx);
swap token colors to the dark palette when the app theme is dark. */
.dark .shiki,
.dark .shiki span,
[data-theme="dark"] .shiki,
[data-theme="dark"] .shiki span {
color: var(--shiki-dark) !important;
background-color: var(--shiki-dark-bg) !important;
font-style: var(--shiki-dark-font-style) !important;
font-weight: var(--shiki-dark-font-weight) !important;
text-decoration: var(--shiki-dark-text-decoration) !important;
}

@theme inline {
--font-sans: 'Geist Variable', sans-serif;
--font-heading: 'IBM Plex Sans Variable', sans-serif;
Expand Down
3 changes: 2 additions & 1 deletion apps/app/src/components/markdown/markdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,8 @@ const highlightedMarkdownParser = new Marked({
return codeToHtml(code, {
lang: language,
meta: { __raw: props.join(" ") },
theme: "github-light",
themes: { light: "github-light", dark: "github-dark" },
defaultColor: "light",
transformers: [
transformerNotationDiff({ matchAlgorithm: "v3" }),
transformerNotationHighlight({ matchAlgorithm: "v3" }),
Expand Down
3 changes: 2 additions & 1 deletion apps/app/src/react-app/domains/session/surface/markdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ const highlightedMarkdownParser = new Marked<string, string>({
return codeToHtml(code, {
lang: language,
meta: { __raw: props.join(" ") },
theme: "github-light",
themes: { light: "github-light", dark: "github-dark" },
defaultColor: "light",
transformers: [
transformerNotationDiff({ matchAlgorithm: "v3" }),
transformerNotationHighlight({ matchAlgorithm: "v3" }),
Expand Down