Skip to content

fix(code-block): preserve empty lines in code blocks #420

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

fix(code-block): preserve empty lines in code blocks #420

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
97 changes: 51 additions & 46 deletions packages/streamdown/lib/code-block/body.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,54 +90,59 @@ export const CodeBlockBody = memo(
key={index}
>
{/* biome-ignore lint/complexity/noExcessiveCognitiveComplexity: dual-theme token style mapping */}
{row.map((token, tokenIndex) => {
// Shiki dual-theme tokens put direct CSS properties (color,
// background-color) into htmlStyle alongside CSS custom
// properties (--shiki-dark, etc). Direct properties as inline
// styles override the Tailwind class-based dark mode approach,
// so we redirect them to CSS custom properties instead.
const tokenStyle: Record<string, string> = {};
let hasBg = Boolean(token.bgColor);

if (token.color) {
tokenStyle["--sdm-c"] = token.color;
}
if (token.bgColor) {
tokenStyle["--sdm-tbg"] = token.bgColor;
}

if (token.htmlStyle) {
for (const [key, value] of Object.entries(
token.htmlStyle
)) {
if (key === "color") {
tokenStyle["--sdm-c"] = value;
} else if (key === "background-color") {
tokenStyle["--sdm-tbg"] = value;
hasBg = true;
} else {
tokenStyle[key] = value;
{row.length === 0 || (row.length === 1 && row[0].content === "") ? (
// Empty line: insert newline to preserve copy behavior
"\n"
) : (
row.map((token, tokenIndex) => {
// Shiki dual-theme tokens put direct CSS properties (color,
// background-color) into htmlStyle alongside CSS custom
// properties (--shiki-dark, etc). Direct properties as inline
// styles override the Tailwind class-based dark mode approach,
// so we redirect them to CSS custom properties instead.
const tokenStyle: Record<string, string> = {};
let hasBg = Boolean(token.bgColor);

if (token.color) {
tokenStyle["--sdm-c"] = token.color;
}
if (token.bgColor) {
tokenStyle["--sdm-tbg"] = token.bgColor;
}

if (token.htmlStyle) {
for (const [key, value] of Object.entries(
token.htmlStyle
)) {
if (key === "color") {
tokenStyle["--sdm-c"] = value;
} else if (key === "background-color") {
tokenStyle["--sdm-tbg"] = value;
hasBg = true;
} else {
tokenStyle[key] = value;
}
}
}
}

return (
<span
className={cn(
"text-[var(--sdm-c,inherit)]",
"dark:text-[var(--shiki-dark,var(--sdm-c,inherit))]",
hasBg && "bg-[var(--sdm-tbg)]",
hasBg && "dark:bg-[var(--shiki-dark-bg,var(--sdm-tbg))]"
)}
// biome-ignore lint/suspicious/noArrayIndexKey: "This is a stable key."
key={tokenIndex}
style={tokenStyle as CSSProperties}
{...token.htmlAttrs}
>
{token.content}
</span>
);
})}

return (
<span
className={cn(
"text-[var(--sdm-c,inherit)]",
"dark:text-[var(--shiki-dark,var(--sdm-c,inherit))]",
hasBg && "bg-[var(--sdm-tbg)]",
hasBg && "dark:bg-[var(--shiki-dark-bg,var(--sdm-tbg))]"
)}
// biome-ignore lint/suspicious/noArrayIndexKey: "This is a stable key."
key={tokenIndex}
style={tokenStyle as CSSProperties}
{...token.htmlAttrs}
>
{token.content}
</span>
);
})
)}
</span>
))}
</code>
Expand Down