Skip to content

Commit 854247e

Browse files
melbaldoveclaudemaria-rcks
authored
fix(web): expanded SVG diagrams fill the image viewer (pingdotgg#27519)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
1 parent 84ad7ae commit 854247e

4 files changed

Lines changed: 60 additions & 3 deletions

File tree

‎apps/web/src/components/ChatMarkdown.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1614,7 +1614,12 @@ const CHAT_MARKDOWN_COMPONENTS = {
16141614
fenceTitle={fenceTitle}
16151615
theme={resolvedTheme}
16161616
isStreaming={isStreaming && !isClosedCodeFence(node, text, codeBlock.code)}
1617-
onExpand={(src) => expandMedia({ images: [{ src, name: "Mermaid diagram" }], index: 0 })}
1617+
onExpand={(src) =>
1618+
expandMedia({
1619+
images: [{ src, name: "Mermaid diagram", mimeType: "image/svg+xml" }],
1620+
index: 0,
1621+
})
1622+
}
16181623
>
16191624
{highlightedCode}
16201625
</MarkdownMermaidCodeBlock>

‎apps/web/src/components/chat/ExpandedImageDialog.browser.test.tsx‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,46 @@ const snapShotSource: SnapShotSource = {
1616
windowTitle: "Downloads",
1717
};
1818

19+
const D2_SVG =
20+
'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1174 920"><rect width="1174" height="920"/></svg>';
21+
1922
describe("ExpandedImageDialog", () => {
23+
it.each(["/work/pipeline.svg", "/work/diagram#v2.svg", "/work/diagram?v2.svg"])(
24+
"fits a markdown SVG without intrinsic size to the viewer: %s",
25+
async (path) => {
26+
const src = URL.createObjectURL(new Blob([D2_SVG], { type: "image/svg+xml" }));
27+
using _src = { [Symbol.dispose]: () => URL.revokeObjectURL(src) };
28+
await using screen = await render(
29+
<ExpandedImageDialog
30+
preview={{
31+
images: [
32+
{
33+
src,
34+
name: "Pipeline",
35+
actionsSource: {
36+
kind: "image",
37+
name: "Pipeline",
38+
src,
39+
reference: { kind: "file", path },
40+
},
41+
},
42+
],
43+
index: 0,
44+
}}
45+
onClose={vi.fn()}
46+
/>,
47+
// The dialog renders no links and reads no route.
48+
{ router: false },
49+
);
50+
51+
const viewer = screen.getByRole("region", { name: "Pipeline, zoomable image" });
52+
const availableWidth = window.innerWidth * 0.92 - (window.innerWidth >= 640 ? 96 : 0);
53+
await vi.waitFor(() =>
54+
expect(viewer.element().getBoundingClientRect().width).toBeCloseTo(availableWidth, 0),
55+
);
56+
},
57+
);
58+
2059
it("Escape closes a popup opened inside the dialog before the dialog", async () => {
2160
const onClose = vi.fn();
2261
await using screen = await render(

‎apps/web/src/components/chat/ExpandedImageDialog.tsx‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import { Atom } from "effect/reactivity";
2525
import { appAtomRegistry } from "~/rpc/atomRegistry";
2626
import { expandedImageKey } from "./ExpandedImagePreview";
2727
import { registerThreadOverlay } from "./threadOverlayRetention";
28+
import { mediaReferenceFileName } from "@t3tools/client-runtime/media-reference";
29+
import { mediaMimeType, mediaMimeTypeFromExtension } from "@t3tools/shared/mediaPreview";
2830

2931
interface ExpandedImageDialogProps {
3032
preview: ExpandedImagePreview;
@@ -42,6 +44,16 @@ function ExpandedMediaFailure({ children }: { children: ReactNode }) {
4244
);
4345
}
4446

47+
function itemMimeType(item: ExpandedImageItem): string | undefined {
48+
if (item.mimeType) return item.mimeType;
49+
const reference = item.actionsSource?.reference;
50+
const fileName = reference && mediaReferenceFileName(reference);
51+
if (fileName) {
52+
return mediaMimeTypeFromExtension(fileName.slice(fileName.lastIndexOf("."))) ?? undefined;
53+
}
54+
return mediaMimeType(item.src ?? "") ?? undefined;
55+
}
56+
4557
function ExpandedVideo({ item }: { readonly item: ExpandedImageItem }) {
4658
const asset = item.actionsSource?.asset;
4759
const assetUrl = useAssetUrlState(asset?.environmentId ?? null, asset?.resource ?? null);
@@ -222,7 +234,7 @@ export const ExpandedImageDialog = memo(function ExpandedImageDialog({
222234
key={`${index}:${item.src}`}
223235
src={item.src}
224236
name={item.name}
225-
mimeType={item.mimeType}
237+
mimeType={itemMimeType(item)}
226238
onError={() => setFailedImageSrc(item.src)}
227239
/>
228240
)}

‎apps/web/src/components/chat/ZoomableImage.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@ export function ZoomableImage({
7171
const suppressClickRef = useRef(false);
7272
const [dragging, setDragging] = useState(false);
7373
const maxHeight = Math.max(1, Math.min(viewerSize.height * 0.86, viewerSize.height - 160));
74+
// A vector scales without loss, and an SVG without width and height reports a tiny default size.
7475
const fit = Math.min(
75-
1,
76+
mimeType === "image/svg+xml" ? Infinity : 1,
7677
(viewerSize.width * 0.92 - (viewerSize.width >= 640 ? 96 : 0)) / (naturalSize.width || 1),
7778
maxHeight / (naturalSize.height || 1),
7879
);

0 commit comments

Comments
 (0)