Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
fix(mermaid): scale diagram previews to their container (closes #11736)
Elian Doran2f88e3cb4afe
diff --git a/apps/client/src/services/content_renderer.spec.ts b/apps/client/src/services/content_renderer.spec.tsindex 504bd03275..f798f9ee53 100644--- a/apps/client/src/services/content_renderer.spec.ts+++ b/apps/client/src/services/content_renderer.spec.ts@@ -58,7 +58,10 @@ vi.mock("./open.js", () => ({}}));-const getMermaidConfig = vi.fn(() => ({ theme: "default", layout: "dagre", look: "classic" }));+const getMermaidConfig = vi.fn(() => ({+ theme: "default", layout: "dagre", look: "classic",+ flowchart: { useMaxWidth: false }, gantt: { useMaxWidth: false }, pie: { useMaxWidth: true }+}));const postprocessMermaidSvg = vi.fn((...args: any[]) => `<svg class="mm">${args[0]}</svg>`);vi.mock("./mermaid.js", () => ({getMermaidConfig: () => getMermaidConfig(),@@ -884,6 +887,10 @@ describe("getRenderedContent render / doc / protectedSession / mermaid", () => {expect(mermaidInitialize).toHaveBeenCalledWith(expect.objectContaining({ layout: "dagre", look: "classic", startOnLoad: false }));+ const config = mermaidInitialize.mock.calls[0][0];+ expect(config.flowchart).toEqual({ useMaxWidth: true });+ expect(config.gantt).toEqual({ useMaxWidth: true });+ expect(config.pie).toEqual({ useMaxWidth: true });expect(postprocessMermaidSvg).toHaveBeenCalledWith("<g/>");expect($renderedContent.find("svg.mm").length).toBe(1);});diff --git a/apps/client/src/services/content_renderer.ts b/apps/client/src/services/content_renderer.tsindex e8f76f7afa..a9b49217e7 100644--- a/apps/client/src/services/content_renderer.ts+++ b/apps/client/src/services/content_renderer.ts@@ -12,6 +12,7 @@ import {type TextRepresentationResponse} from "@triliumnext/commons";import DOMPurify from "dompurify";+import type { MermaidConfig } from "mermaid";import { h, type JSX, render } from "preact";import type Component from "../components/component.js";@@ -772,7 +773,7 @@ async function renderMermaid(note: FNote | FAttachment, $renderedContent: JQuery$renderedContent.css("display", "flex").css("justify-content", "space-around");- mermaid.mermaidAPI.initialize({ ...getMermaidConfig(), startOnLoad: false });+ mermaid.mermaidAPI.initialize({ ...fitToContainer(getMermaidConfig()), startOnLoad: false });try {const { svg } = await mermaid.mermaidAPI.render(`in-mermaid-graph-${idCounter++}`, content);@@ -785,6 +786,20 @@ async function renderMermaid(note: FNote | FAttachment, $renderedContent: JQuery}}+/**+ * Sets `useMaxWidth` on every diagram type, so the SVG takes the width of the card, tooltip or+ * include box that holds it instead of the diagram's natural size, which the container crops.+ */+function fitToContainer(config: MermaidConfig): MermaidConfig {+ const fitted: Record<string, unknown> = { ...config };+ for (const [ key, value ] of Object.entries(config)) {+ if (value && typeof value === "object" && "useMaxWidth" in value) {+ fitted[key] = { ...value, useMaxWidth: true };+ }+ }+ return fitted as MermaidConfig;+}+/*** Mounts the live {@link WebView} type widget — an Electron `<webview>` or a sandboxed `<iframe>` —* into the rendered content. Used by interactive contexts (e.g. the dashboard) that opt in via