Skip to content

fix(render): add xml:space="preserve" to SVG text elements #1

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

fix(render): add xml:space="preserve" to SVG text elements #1

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
2 changes: 1 addition & 1 deletion packages/viterm/tests/__snapshots__/matchers.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`snapshot matchers > toMatchSvgSnapshot creates a snapshot file 1`] = `
"<svg xmlns="http://www.w3.org/2000/svg" width="76.8" height="20" viewBox="0 0 76.8 20" preserveAspectRatio="xMidYMid meet">
<rect width="100%" height="100%" fill="#1e1e1e"/>
<text x="0" y="16" font-family="&apos;TermlessMono&apos;, &apos;TermlessSymbols&apos;, &apos;TermlessNerd&apos;, &apos;TermlessEmoji&apos;, &apos;Menlo&apos;, &apos;Monaco&apos;, monospace" font-size="16" fill="#d4d4d4">
<text xml:space="preserve" x="0" y="16" font-family="&apos;TermlessMono&apos;, &apos;TermlessSymbols&apos;, &apos;TermlessNerd&apos;, &apos;TermlessEmoji&apos;, &apos;Menlo&apos;, &apos;Monaco&apos;, monospace" font-size="16" fill="#d4d4d4">
<tspan x="0 9.6 19.2 28.8 38.4 48 57.6 67.2">SVG Test</tspan>
</text>
<rect x="0" y="0" width="9.6" height="20" fill="#aeafad" opacity="0.5"/>
Expand Down
8 changes: 4 additions & 4 deletions packages/viterm/tests/__snapshots__/svg-serializer.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`toMatchSvgSnapshot matcher > accepts name option > basic 1`] = `
"<svg xmlns="http://www.w3.org/2000/svg" width="38.4" height="20" viewBox="0 0 38.4 20" preserveAspectRatio="xMidYMid meet">
<rect width="100%" height="100%" fill="#1e1e1e"/>
<text x="0" y="16" font-family="&apos;TermlessMono&apos;, &apos;TermlessSymbols&apos;, &apos;TermlessNerd&apos;, &apos;TermlessEmoji&apos;, &apos;Menlo&apos;, &apos;Monaco&apos;, monospace" font-size="16" fill="#d4d4d4">
<text xml:space="preserve" x="0" y="16" font-family="&apos;TermlessMono&apos;, &apos;TermlessSymbols&apos;, &apos;TermlessNerd&apos;, &apos;TermlessEmoji&apos;, &apos;Menlo&apos;, &apos;Monaco&apos;, monospace" font-size="16" fill="#d4d4d4">
<tspan x="0 9.6 19.2 28.8">Test</tspan>
</text>
<rect x="0" y="0" width="9.6" height="20" fill="#aeafad" opacity="0.5"/>
Expand All @@ -13,7 +13,7 @@ exports[`toMatchSvgSnapshot matcher > accepts name option > basic 1`] = `
exports[`toMatchSvgSnapshot matcher > accepts theme option 1`] = `
"<svg xmlns="http://www.w3.org/2000/svg" width="38.4" height="20" viewBox="0 0 38.4 20" preserveAspectRatio="xMidYMid meet">
<rect width="100%" height="100%" fill="#000000"/>
<text x="0" y="16" font-family="&apos;TermlessMono&apos;, &apos;TermlessSymbols&apos;, &apos;TermlessNerd&apos;, &apos;TermlessEmoji&apos;, &apos;Menlo&apos;, &apos;Monaco&apos;, monospace" font-size="16" fill="#ffffff">
<text xml:space="preserve" x="0" y="16" font-family="&apos;TermlessMono&apos;, &apos;TermlessSymbols&apos;, &apos;TermlessNerd&apos;, &apos;TermlessEmoji&apos;, &apos;Menlo&apos;, &apos;Monaco&apos;, monospace" font-size="16" fill="#ffffff">
<tspan x="0 9.6 19.2 28.8">Test</tspan>
</text>
<rect x="0" y="0" width="9.6" height="20" fill="#aeafad" opacity="0.5"/>
Expand All @@ -23,10 +23,10 @@ exports[`toMatchSvgSnapshot matcher > accepts theme option 1`] = `
exports[`toMatchSvgSnapshot matcher > produces SVG output from TerminalReadable 1`] = `
"<svg xmlns="http://www.w3.org/2000/svg" width="48" height="40" viewBox="0 0 48 40" preserveAspectRatio="xMidYMid meet">
<rect width="100%" height="100%" fill="#1e1e1e"/>
<text x="0" y="16" font-family="&apos;TermlessMono&apos;, &apos;TermlessSymbols&apos;, &apos;TermlessNerd&apos;, &apos;TermlessEmoji&apos;, &apos;Menlo&apos;, &apos;Monaco&apos;, monospace" font-size="16" fill="#d4d4d4">
<text xml:space="preserve" x="0" y="16" font-family="&apos;TermlessMono&apos;, &apos;TermlessSymbols&apos;, &apos;TermlessNerd&apos;, &apos;TermlessEmoji&apos;, &apos;Menlo&apos;, &apos;Monaco&apos;, monospace" font-size="16" fill="#d4d4d4">
<tspan x="0 9.6 19.2 28.8 38.4">Hello</tspan>
</text>
<text x="0" y="36" font-family="&apos;TermlessMono&apos;, &apos;TermlessSymbols&apos;, &apos;TermlessNerd&apos;, &apos;TermlessEmoji&apos;, &apos;Menlo&apos;, &apos;Monaco&apos;, monospace" font-size="16" fill="#d4d4d4">
<text xml:space="preserve" x="0" y="36" font-family="&apos;TermlessMono&apos;, &apos;TermlessSymbols&apos;, &apos;TermlessNerd&apos;, &apos;TermlessEmoji&apos;, &apos;Menlo&apos;, &apos;Monaco&apos;, monospace" font-size="16" fill="#d4d4d4">
<tspan x="0 9.6 19.2 28.8 38.4">World</tspan>
</text>
<rect x="0" y="0" width="9.6" height="20" fill="#aeafad" opacity="0.5"/>
Expand Down
5 changes: 4 additions & 1 deletion src/render/svg.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,10 @@ function renderTextRows(lines: Cell[][], opts: ResolvedOptions): string[] {
}
if (!textOpen) {
parts.push(
`<text x="0" y="${y}" font-family="${escapeXml(fontFamily)}" font-size="${fontSize}" fill="${themeFg}">`,
// xml:space="preserve" is required: without it, XML whitespace
// collapsing eats leading/run-of-space characters in tspans, which
// desyncs them from the per-character x position lists.
`<text xml:space="preserve" x="0" y="${y}" font-family="${escapeXml(fontFamily)}" font-size="${fontSize}" fill="${themeFg}">`,
)
textOpen = true
}
Expand Down