AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.
HTML ai-agentcloudflarecloudflare-d1cloudflare-r2cloudflare-workersdockerelectronevernoteevernote-alternativeknowledge-basemcpnote-takingobsidian-alternativeoffline-firstpersonal-knowledge-basepwaself-hostedsqlitetiptapweb-clipper
feat(web): improve Mermaid rendering controls and diagram viewer (#123)
DDV44f89061934f
diff --git a/apps/web/src/components/MermaidCodeBlock.tsx b/apps/web/src/components/MermaidCodeBlock.tsxindex b55b1b59..4e26eeb7 100644--- a/apps/web/src/components/MermaidCodeBlock.tsx+++ b/apps/web/src/components/MermaidCodeBlock.tsx@@ -1,8 +1,11 @@import { useEffect, useState } from "react";import { NodeViewContent, NodeViewWrapper, type NodeViewProps } from "@tiptap/react";import { useTranslation } from "react-i18next";-import { useTheme } from "./ThemeProvider";+import { Check, CircleAlert, Code2, Copy, Maximize2, Workflow } from "lucide-react";+import { MERMAID_THEME_PALETTES, useTheme } from "./ThemeProvider";+import { MermaidViewer } from "./MermaidViewer";import { copyTextToClipboard } from "@/lib/clipboard";+import { renderMermaidWithFallback } from "@/lib/mermaid-renderer";type MermaidModule = typeof import("mermaid")["default"];type BeautifulMermaidModule = typeof import("beautiful-mermaid");@@ -30,12 +33,13 @@ const loadBeautifulMermaid = () => {export const MermaidCodeBlock = ({ editor, node }: NodeViewProps) => {const { t } = useTranslation();- const { mermaidTheme } = useTheme();+ const { mermaidRenderer, mermaidTheme, setMermaidRenderer } = useTheme();const language = typeof node.attrs.language === "string" ? node.attrs.language.toLowerCase() : "plaintext";const source = node.textContent.trim();const isMermaid = language === "mermaid";const [svg, setSvg] = useState("");const [sourceVisible, setSourceVisible] = useState(false);+ const [viewerOpen, setViewerOpen] = useState(false);const [renderState, setRenderState] = useState<"idle" | "loading" | "ready" | "error">("idle");const [copyState, setCopyState] = useState<"idle" | "copied" | "error">("idle");@@ -61,55 +65,51 @@ export const MermaidCodeBlock = ({ editor, node }: NodeViewProps) => {const timer = window.setTimeout(() => {setRenderState("loading");- void loadBeautifulMermaid()- .then(({ renderMermaidSVG, THEMES }) => {- try {- return renderMermaidSVG(source, {- ...THEMES[mermaidTheme],- transparent: true,- font: "Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, sans-serif",- padding: 24,- });- } catch {- return null;- }- })- .then((beautifulSvg) => {- if (beautifulSvg) return beautifulSvg;- return loadMermaid().then(async (mermaid) => {- const palette = (await loadBeautifulMermaid()).THEMES[mermaidTheme];- mermaid.initialize({- startOnLoad: false,- securityLevel: "strict",- suppressErrorRendering: true,- theme: "base",- themeVariables: {- background: palette.bg,- primaryColor: palette.surface ?? palette.bg,- primaryTextColor: palette.fg,- primaryBorderColor: palette.border ?? palette.fg,- lineColor: palette.line ?? palette.fg,- textColor: palette.fg,- mainBkg: palette.bg,- nodeBorder: palette.border ?? palette.fg,- edgeLabelBackground: palette.bg,- actorBkg: palette.surface ?? palette.bg,- actorBorder: palette.border ?? palette.fg,- actorTextColor: palette.fg,- signalColor: palette.line ?? palette.fg,- signalTextColor: palette.fg,- },- });- const valid = await mermaid.parse(source, { suppressErrors: true });- if (!valid) {- throw new Error("Invalid Mermaid diagram");- }+ const renderBeautiful = () => loadBeautifulMermaid()+ .then(({ renderMermaidSVG, THEMES }) => renderMermaidSVG(source, {+ ...THEMES[mermaidTheme],+ transparent: true,+ font: "Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, sans-serif",+ padding: 24,+ }));+ const renderOfficial = () => loadMermaid().then(async (mermaid) => {+ const palette = MERMAID_THEME_PALETTES[mermaidTheme];+ mermaid.initialize({+ startOnLoad: false,+ securityLevel: "strict",+ suppressErrorRendering: true,+ theme: "base",+ themeVariables: {+ background: palette.bg,+ primaryColor: palette.surface ?? palette.bg,+ primaryTextColor: palette.fg,+ primaryBorderColor: palette.border ?? palette.fg,+ lineColor: palette.line ?? palette.fg,+ textColor: palette.fg,+ mainBkg: palette.bg,+ nodeBorder: palette.border ?? palette.fg,+ edgeLabelBackground: palette.bg,+ actorBkg: palette.surface ?? palette.bg,+ actorBorder: palette.border ?? palette.fg,+ actorTextColor: palette.fg,+ signalColor: palette.line ?? palette.fg,+ signalTextColor: palette.fg,+ },+ });+ const valid = await mermaid.parse(source, { suppressErrors: true });+ if (!valid) throw new Error("Invalid Mermaid diagram");- mermaidRenderSequence += 1;- const { svg: fallbackSvg } = await mermaid.render(`edgeever-mermaid-${mermaidRenderSequence}`, source);- return fallbackSvg;- });- })+ mermaidRenderSequence += 1;+ const { svg: renderedSvg } = await mermaid.render(`edgeever-mermaid-${mermaidRenderSequence}`, source);+ return renderedSvg;+ });+ const renderPromise = renderMermaidWithFallback({+ renderer: mermaidRenderer,+ renderBeautiful,+ renderOfficial,+ });++ void renderPromise.then((nextSvg) => {if (!cancelled) {setSvg(nextSvg);@@ -128,7 +128,7 @@ export const MermaidCodeBlock = ({ editor, node }: NodeViewProps) => {cancelled = true;window.clearTimeout(timer);};- }, [isMermaid, mermaidTheme, source]);+ }, [isMermaid, mermaidRenderer, mermaidTheme, source]);return (<NodeViewWrapper@@ -137,41 +137,106 @@ export const MermaidCodeBlock = ({ editor, node }: NodeViewProps) => {: "edgeever-code-block"}data-language={language}>- <button- type="button"- className="edgeever-code-copy-button"- contentEditable={false}- aria-label={t(copyState === "copied" ? "editorToolbar.codeCopied" : copyState === "error" ? "editorToolbar.codeCopyFailed" : "editorToolbar.copyCode")}- title={t(copyState === "copied" ? "editorToolbar.codeCopied" : copyState === "error" ? "editorToolbar.codeCopyFailed" : "editorToolbar.copyCode")}- onClick={(event) => {- event.preventDefault();- event.stopPropagation();- void handleCopy();- }}- onMouseDown={(event) => event.preventDefault()}- >- {copyState === "copied"- ? t("editorToolbar.codeCopied")- : copyState === "error"- ? t("editorToolbar.codeCopyFailed")- : t("editorToolbar.copyCode")}- </button>+ {isMermaid ? (+ <div className="edgeever-mermaid-toolbar" contentEditable={false}>+ <button+ type="button"+ className="edgeever-mermaid-tool-button"+ aria-label={t(mermaidRenderer === "mermaid"+ ? "editorToolbar.mermaidUseOrthogonalLayout"+ : "editorToolbar.mermaidUseStandardLayout")}+ title={t(mermaidRenderer === "mermaid"+ ? "editorToolbar.mermaidUseOrthogonalLayout"+ : "editorToolbar.mermaidUseStandardLayout")}+ aria-pressed={mermaidRenderer === "beautiful"}+ onClick={(event) => {+ event.preventDefault();+ event.stopPropagation();+ setMermaidRenderer(mermaidRenderer === "mermaid" ? "beautiful" : "mermaid");+ }}+ onMouseDown={(event) => event.preventDefault()}+ >+ <Workflow aria-hidden="true" />+ </button>+ <button+ type="button"+ className="edgeever-mermaid-tool-button"+ data-state={copyState}+ aria-label={t(copyState === "copied" ? "editorToolbar.codeCopied" : copyState === "error" ? "editorToolbar.codeCopyFailed" : "editorToolbar.copyCode")}+ title={t(copyState === "copied" ? "editorToolbar.codeCopied" : copyState === "error" ? "editorToolbar.codeCopyFailed" : "editorToolbar.copyCode")}+ onClick={(event) => {+ event.preventDefault();+ event.stopPropagation();+ void handleCopy();+ }}+ onMouseDown={(event) => event.preventDefault()}+ >+ {copyState === "copied"+ ? <Check aria-hidden="true" />+ : copyState === "error"+ ? <CircleAlert aria-hidden="true" />+ : <Copy aria-hidden="true" />}+ </button>+ {editor.isEditable && (+ <button+ type="button"+ className="edgeever-mermaid-tool-button"+ aria-label={t(sourceVisible ? "editorToolbar.mermaidHideSource" : "editorToolbar.mermaidShowSource")}+ title={t(sourceVisible ? "editorToolbar.mermaidHideSource" : "editorToolbar.mermaidShowSource")}+ aria-pressed={sourceVisible}+ onClick={(event) => {+ event.preventDefault();+ event.stopPropagation();+ setSourceVisible((visible) => !visible);+ }}+ onMouseDown={(event) => event.preventDefault()}+ >+ <Code2 aria-hidden="true" />+ </button>+ )}+ {svg && (+ <button+ type="button"+ className="edgeever-mermaid-tool-button"+ aria-label={t("editorToolbar.mermaidOpenViewer")}+ title={t("editorToolbar.mermaidOpenViewer")}+ onClick={(event) => {+ event.preventDefault();+ event.stopPropagation();+ setViewerOpen(true);+ }}+ onMouseDown={(event) => event.preventDefault()}+ >+ <Maximize2 aria-hidden="true" />+ </button>+ )}+ </div>+ ) : (+ <button+ type="button"+ className="edgeever-code-copy-button"+ contentEditable={false}+ aria-label={t(copyState === "copied" ? "editorToolbar.codeCopied" : copyState === "error" ? "editorToolbar.codeCopyFailed" : "editorToolbar.copyCode")}+ title={t(copyState === "copied" ? "editorToolbar.codeCopied" : copyState === "error" ? "editorToolbar.codeCopyFailed" : "editorToolbar.copyCode")}+ onClick={(event) => {+ event.preventDefault();+ event.stopPropagation();+ void handleCopy();+ }}+ onMouseDown={(event) => event.preventDefault()}+ >+ {copyState === "copied"+ ? t("editorToolbar.codeCopied")+ : copyState === "error"+ ? t("editorToolbar.codeCopyFailed")+ : t("editorToolbar.copyCode")}+ </button>+ )}{isMermaid && (<divclassName="edgeever-mermaid-preview"contentEditable={false}- onClick={() => editor.isEditable && setSourceVisible((visible) => !visible)}- onKeyDown={(event) => {- if (editor.isEditable && (event.key === "Enter" || event.key === " ")) {- event.preventDefault();- setSourceVisible((visible) => !visible);- }- }}- aria-label={editor.isEditable- ? `${t("editorToolbar.mermaidPreview")} · ${t("editorToolbar.mermaidSource")}`- : undefined}- role={editor.isEditable ? "button" : undefined}- tabIndex={editor.isEditable ? 0 : undefined}+ aria-label={t("editorToolbar.mermaidPreview")}>{!source && <p className="edgeever-mermaid-message">{t("editorToolbar.mermaidEmpty")}</p>}{source && renderState === "loading" && !svg && (@@ -199,6 +264,19 @@ export const MermaidCodeBlock = ({ editor, node }: NodeViewProps) => {aria-multiline="true"aria-readonly={!editor.isEditable}/>+ {isMermaid && svg && (+ <MermaidViewer+ closeLabel={t("editorToolbar.mermaidCloseViewer")}+ fallbackBackgroundColor={MERMAID_THEME_PALETTES[mermaidTheme].bg}+ open={viewerOpen}+ resetZoomLabel={t("editorToolbar.mermaidResetZoom")}+ svg={svg}+ viewerLabel={t("editorToolbar.mermaidViewer")}+ zoomInLabel={t("editorToolbar.mermaidZoomIn")}+ zoomOutLabel={t("editorToolbar.mermaidZoomOut")}+ onClose={() => setViewerOpen(false)}+ />+ )}</NodeViewWrapper>);};diff --git a/apps/web/src/components/MermaidViewer.tsx b/apps/web/src/components/MermaidViewer.tsxnew file mode 100644index 00000000..0642ec02--- /dev/null+++ b/apps/web/src/components/MermaidViewer.tsx@@ -0,0 +1,124 @@+import { useEffect, useMemo, useRef, useState } from "react";+import { RotateCcw } from "lucide-react";+import Lightbox, { type ZoomRef } from "yet-another-react-lightbox";+import Zoom from "yet-another-react-lightbox/plugins/zoom";+import "yet-another-react-lightbox/styles.css";+import {+ getMermaidSvgPresentation,+ normalizeMermaidSvgForViewer,+ resolveMermaidViewerBackground,+} from "@/lib/mermaid-svg";++interface MermaidViewerProps {+ closeLabel: string;+ fallbackBackgroundColor: string;+ open: boolean;+ resetZoomLabel: string;+ svg: string;+ viewerLabel: string;+ zoomInLabel: string;+ zoomOutLabel: string;+ onClose: () => void;+}++export const MermaidViewer = ({+ closeLabel,+ fallbackBackgroundColor,+ open,+ resetZoomLabel,+ svg,+ viewerLabel,+ zoomInLabel,+ zoomOutLabel,+ onClose,+}: MermaidViewerProps) => {+ const zoomRef = useRef<ZoomRef | null>(null);+ const [objectUrl, setObjectUrl] = useState("");+ const [zoom, setZoom] = useState(1);+ const presentation = useMemo(() => getMermaidSvgPresentation(svg), [svg]);+ const viewerSvg = useMemo(() => normalizeMermaidSvgForViewer(svg, presentation), [presentation, svg]);+ const backgroundColor = resolveMermaidViewerBackground(+ presentation.backgroundColor,+ fallbackBackgroundColor+ );++ useEffect(() => {+ if (!open || !svg) {+ setObjectUrl("");+ return;+ }++ const nextUrl = URL.createObjectURL(new Blob([viewerSvg], { type: "image/svg+xml;charset=utf-8" }));+ setObjectUrl(nextUrl);+ return () => URL.revokeObjectURL(nextUrl);+ }, [open, svg, viewerSvg]);++ useEffect(() => {+ if (!open) setZoom(1);+ }, [open]);++ if (!open || !objectUrl) return null;++ const resetButton = (+ <button+ key="reset-mermaid-zoom"+ type="button"+ className="edgeever-mermaid-viewer-reset"+ disabled={zoom <= 1}+ aria-label={resetZoomLabel}+ title={resetZoomLabel}+ onClick={() => zoomRef.current?.changeZoom(1)}+ >+ <RotateCcw aria-hidden="true" />+ </button>+ );++ return (+ <Lightbox+ className="edgeever-mermaid-viewer"+ open+ close={onClose}+ index={0}+ slides={[{+ src: objectUrl,+ alt: viewerLabel,+ width: presentation.width,+ height: presentation.height,+ imageFit: "contain",+ }]}+ plugins={[Zoom]}+ labels={{+ Close: closeLabel,+ "Photo gallery": viewerLabel,+ "Zoom in": zoomInLabel,+ "Zoom out": zoomOutLabel,+ }}+ toolbar={{ buttons: ["zoom", resetButton, "close"] }}+ carousel={{ finite: true, padding: 24, imageFit: "contain" }}+ controller={{+ closeOnBackdropClick: true,+ closeOnPullDown: false,+ closeOnPullUp: false,+ disableSwipeNavigation: true,+ }}+ zoom={{+ ref: zoomRef,+ maxZoomPixelRatio: 6,+ zoomInMultiplier: 1.5,+ keyboardMoveDistance: 80,+ pinchZoomV4: true,+ scrollToZoom: true,+ }}+ animation={{ fade: 160, zoom: 180 }}+ on={{ zoom: ({ zoom: nextZoom }) => setZoom(nextZoom) }}+ render={{+ buttonPrev: () => null,+ buttonNext: () => null,+ }}+ styles={{+ root: { "--yarl__color_backdrop": backgroundColor },+ container: { backgroundColor },+ }}+ />+ );+};diff --git a/apps/web/src/components/ThemeProvider.tsx b/apps/web/src/components/ThemeProvider.tsxindex 42b6181d..60c012e6 100644--- a/apps/web/src/components/ThemeProvider.tsx+++ b/apps/web/src/components/ThemeProvider.tsx@@ -21,6 +21,37 @@ export const MERMAID_THEME_NAMES = [] as const;export type MermaidThemeName = (typeof MERMAID_THEME_NAMES)[number];+interface MermaidThemePalette {+ bg: string;+ fg: string;+ line?: string;+ accent?: string;+ muted?: string;+ surface?: string;+ border?: string;+}++export const MERMAID_THEME_PALETTES: Record<MermaidThemeName, MermaidThemePalette> = {+ "zinc-light": { bg: "#FFFFFF", fg: "#27272A" },+ "zinc-dark": { bg: "#18181B", fg: "#FAFAFA" },+ "tokyo-night": { bg: "#1a1b26", fg: "#a9b1d6", line: "#3d59a1", accent: "#7aa2f7", muted: "#565f89" },+ "tokyo-night-storm": { bg: "#24283b", fg: "#a9b1d6", line: "#3d59a1", accent: "#7aa2f7", muted: "#565f89" },+ "tokyo-night-light": { bg: "#d5d6db", fg: "#343b58", line: "#34548a", accent: "#34548a", muted: "#9699a3" },+ "catppuccin-mocha": { bg: "#1e1e2e", fg: "#cdd6f4", line: "#585b70", accent: "#cba6f7", muted: "#6c7086" },+ "catppuccin-latte": { bg: "#eff1f5", fg: "#4c4f69", line: "#9ca0b0", accent: "#8839ef", muted: "#9ca0b0" },+ nord: { bg: "#2e3440", fg: "#d8dee9", line: "#4c566a", accent: "#88c0d0", muted: "#616e88" },+ "nord-light": { bg: "#eceff4", fg: "#2e3440", line: "#aab1c0", accent: "#5e81ac", muted: "#7b88a1" },+ dracula: { bg: "#282a36", fg: "#f8f8f2", line: "#6272a4", accent: "#bd93f9", muted: "#6272a4" },+ "github-light": { bg: "#ffffff", fg: "#1f2328", line: "#d1d9e0", accent: "#0969da", muted: "#59636e" },+ "github-dark": { bg: "#0d1117", fg: "#e6edf3", line: "#3d444d", accent: "#4493f8", muted: "#9198a1" },+ "solarized-light": { bg: "#fdf6e3", fg: "#657b83", line: "#93a1a1", accent: "#268bd2", muted: "#93a1a1" },+ "solarized-dark": { bg: "#002b36", fg: "#839496", line: "#586e75", accent: "#268bd2", muted: "#586e75" },+ "one-dark": { bg: "#282c34", fg: "#abb2bf", line: "#4b5263", accent: "#c678dd", muted: "#5c6370" },+};++export const MERMAID_RENDERERS = ["mermaid", "beautiful"] as const;+export type MermaidRenderer = (typeof MERMAID_RENDERERS)[number];+export const EDITOR_THEME_NAMES = ["default","minimal-emerald",@@ -78,6 +109,8 @@ interface ThemeContextValue {setPreference: (preference: ThemePreference) => void;mermaidTheme: MermaidThemeName;setMermaidTheme: (theme: MermaidThemeName) => void;+ mermaidRenderer: MermaidRenderer;+ setMermaidRenderer: (renderer: MermaidRenderer) => void;editorTheme: EditorThemeName;setEditorTheme: (theme: EditorThemeName) => void;customEditorThemes: CustomEditorTheme[];@@ -92,6 +125,7 @@ interface ThemeProviderProps {const THEME_STORAGE_KEY = "edgeever.theme";const MERMAID_THEME_STORAGE_KEY = "edgeever.mermaid-theme";+const MERMAID_RENDERER_STORAGE_KEY = "edgeever.mermaid-renderer";const EDITOR_THEME_STORAGE_KEY = "edgeever.editor-theme";const CUSTOM_EDITOR_THEME_STORAGE_KEY = "edgeever.custom-editor-theme";const CUSTOM_EDITOR_THEMES_STORAGE_KEY = "edgeever.custom-editor-themes";@@ -120,6 +154,12 @@ export const getStoredMermaidTheme = (): MermaidThemeName => {return MERMAID_THEME_NAMES.includes(stored as MermaidThemeName) ? stored as MermaidThemeName : "zinc-light";};+export const getStoredMermaidRenderer = (): MermaidRenderer => {+ if (typeof window === "undefined") return "mermaid";+ const stored = window.localStorage.getItem(MERMAID_RENDERER_STORAGE_KEY);+ return MERMAID_RENDERERS.includes(stored as MermaidRenderer) ? stored as MermaidRenderer : "mermaid";+};+export const getStoredEditorTheme = (): string => {if (typeof window === "undefined") return "default";const stored = window.localStorage.getItem(EDITOR_THEME_STORAGE_KEY);@@ -194,6 +234,7 @@ export const ThemeProvider = ({ children }: ThemeProviderProps) => {const [preference, setPreferenceState] = useState<ThemePreference>(getStoredThemePreference);const [resolvedTheme, setResolvedTheme] = useState<ResolvedTheme>(() => resolveTheme(preference));const [mermaidTheme, setMermaidThemeState] = useState<MermaidThemeName>(getStoredMermaidTheme);+ const [mermaidRenderer, setMermaidRendererState] = useState<MermaidRenderer>(getStoredMermaidRenderer);const [editorTheme, setEditorThemeState] = useState<string>(getStoredEditorTheme);const [customEditorThemes, setCustomEditorThemesState] = useState<CustomEditorTheme[]>(getStoredCustomEditorThemes);@@ -247,6 +288,11 @@ export const ThemeProvider = ({ children }: ThemeProviderProps) => {setMermaidThemeState(nextTheme);window.localStorage.setItem(MERMAID_THEME_STORAGE_KEY, nextTheme);},+ mermaidRenderer,+ setMermaidRenderer: (nextRenderer: MermaidRenderer) => {+ setMermaidRendererState(nextRenderer);+ window.localStorage.setItem(MERMAID_RENDERER_STORAGE_KEY, nextRenderer);+ },editorTheme,setEditorTheme: (nextTheme: string) => {setEditorThemeState(nextTheme);@@ -257,7 +303,7 @@ export const ThemeProvider = ({ children }: ThemeProviderProps) => {customEditorTheme,setCustomEditorTheme,}),- [customEditorThemes, customEditorTheme, editorTheme, mermaidTheme, preference, resolvedTheme]+ [customEditorThemes, customEditorTheme, editorTheme, mermaidRenderer, mermaidTheme, preference, resolvedTheme]);return <ThemeContext.Provider value={value}>{children}</ThemeContext.Provider>;@@ -272,4 +318,3 @@ export const useTheme = () => {return context;};-diff --git a/apps/web/src/lib/mermaid-renderer.test.mjs b/apps/web/src/lib/mermaid-renderer.test.mjsnew file mode 100644index 00000000..5c821f00--- /dev/null+++ b/apps/web/src/lib/mermaid-renderer.test.mjs@@ -0,0 +1,28 @@+import { describe, expect, test } from "bun:test";+import { renderMermaidSVG } from "beautiful-mermaid";+import mermaid from "mermaid";+import { renderMermaidWithFallback } from "./mermaid-renderer";++const GANTT_SOURCE = `gantt+ dateFormat YYYY-MM-DD+ section Web+ Compatibility fallback :fallback, 2026-07-30, 1d`;++describe("Mermaid renderer fallback", () => {+ test("uses the official renderer for a valid Gantt diagram unsupported by beautiful-mermaid", async () => {+ expect(await mermaid.parse(GANTT_SOURCE, { suppressErrors: true })).toBeTruthy();++ let officialRenderCount = 0;+ const svg = await renderMermaidWithFallback({+ renderer: "beautiful",+ renderBeautiful: () => renderMermaidSVG(GANTT_SOURCE),+ renderOfficial: () => {+ officialRenderCount += 1;+ return '<svg data-renderer="mermaid"></svg>';+ },+ });++ expect(officialRenderCount).toBe(1);+ expect(svg).toContain('data-renderer="mermaid"');+ });+});diff --git a/apps/web/src/lib/mermaid-renderer.ts b/apps/web/src/lib/mermaid-renderer.tsnew file mode 100644index 00000000..cb1a3f4b--- /dev/null+++ b/apps/web/src/lib/mermaid-renderer.ts@@ -0,0 +1,23 @@+export type MermaidRendererName = "mermaid" | "beautiful";++interface MermaidRenderFallbackOptions {+ renderer: MermaidRendererName;+ renderBeautiful: () => string | Promise<string>;+ renderOfficial: () => string | Promise<string>;+}++export const renderMermaidWithFallback = async ({+ renderer,+ renderBeautiful,+ renderOfficial,+}: MermaidRenderFallbackOptions) => {+ if (renderer === "beautiful") {+ try {+ return await renderBeautiful();+ } catch {+ return renderOfficial();+ }+ }++ return renderOfficial();+};diff --git a/apps/web/src/lib/mermaid-svg.test.mjs b/apps/web/src/lib/mermaid-svg.test.mjsnew file mode 100644index 00000000..a2c21b3e--- /dev/null+++ b/apps/web/src/lib/mermaid-svg.test.mjs@@ -0,0 +1,95 @@+import { describe, expect, test } from "bun:test";+import { MERMAID_THEME_PALETTES } from "../components/ThemeProvider";+import {+ getMermaidSvgPresentation,+ normalizeMermaidSvgForViewer,+ resolveMermaidViewerBackground,+} from "./mermaid-svg";++describe("Mermaid SVG presentation", () => {+ test("uses the viewBox as the authoritative diagram dimensions", () => {+ expect(getMermaidSvgPresentation(+ '<svg width="400" height="300" viewBox="0 0 1935.6325833333335 1888.952" style="--bg:#FFFFFF;--fg:#27272A"></svg>'+ )).toEqual({+ width: 1935.6325833333335,+ height: 1888.952,+ backgroundColor: "#FFFFFF",+ foregroundColor: "#27272A",+ });+ });++ test("falls back to explicit dimensions when the viewBox is unavailable", () => {+ expect(getMermaidSvgPresentation('<svg width="720px" height="480px"></svg>')).toEqual({+ width: 720,+ height: 480,+ backgroundColor: null,+ foregroundColor: null,+ });+ });++ test("uses safe defaults and rejects arbitrary style values", () => {+ expect(getMermaidSvgPresentation('<svg style="--bg:url(javascript:alert(1));--fg:rgb(15, 23, 42)"></svg>')).toEqual({+ width: 1600,+ height: 900,+ backgroundColor: null,+ foregroundColor: "rgb(15, 23, 42)",+ });+ });++ test("uses the selected Mermaid palette for official SVGs without a root background", () => {+ const lightAppBackground = "#ffffff";+ const darkMermaidBackground = MERMAID_THEME_PALETTES["github-dark"].bg;+ const presentation = getMermaidSvgPresentation(+ '<svg width="100%" viewBox="0 0 640 360" class="flowchart" aria-roledescription="flowchart-v2"></svg>'+ );+ const resolvedBackground = resolveMermaidViewerBackground(+ presentation.backgroundColor,+ darkMermaidBackground+ );++ expect(presentation.backgroundColor).toBeNull();+ expect(resolvedBackground).toBe(darkMermaidBackground);+ expect(resolvedBackground).not.toBe(lightAppBackground);+ expect(resolveMermaidViewerBackground("#123456", darkMermaidBackground)).toBe("#123456");+ });++ test("gives percentage-sized SVGs explicit intrinsic viewer dimensions", () => {+ const originalDOMParser = globalThis.DOMParser;+ const originalXMLSerializer = globalThis.XMLSerializer;+ const root = {+ attributes: new Map([+ ["width", "100%"],+ ["height", null],+ ["viewBox", "0 0 1609.306640625 3598"],+ ["style", null],+ ]),+ tagName: "svg",+ getAttribute(name) {+ return this.attributes.get(name) ?? null;+ },+ setAttribute(name, value) {+ this.attributes.set(name, value);+ },+ };++ globalThis.DOMParser = class {+ parseFromString() {+ return { documentElement: root, querySelector: () => null };+ }+ };+ globalThis.XMLSerializer = class {+ serializeToString() {+ return `width=${root.attributes.get("width")};height=${root.attributes.get("height")}`;+ }+ };++ try {+ expect(normalizeMermaidSvgForViewer(+ '<svg width="100%" viewBox="0 0 1609.306640625 3598"></svg>'+ )).toBe("width=1609.306640625;height=3598");+ } finally {+ globalThis.DOMParser = originalDOMParser;+ globalThis.XMLSerializer = originalXMLSerializer;+ }+ });+});diff --git a/apps/web/src/lib/mermaid-svg.ts b/apps/web/src/lib/mermaid-svg.tsnew file mode 100644index 00000000..d431c041--- /dev/null+++ b/apps/web/src/lib/mermaid-svg.ts@@ -0,0 +1,104 @@+export interface MermaidSvgPresentation {+ width: number;+ height: number;+ backgroundColor: string | null;+ foregroundColor: string | null;+}++const DEFAULT_WIDTH = 1600;+const DEFAULT_HEIGHT = 900;++const toPositiveNumber = (value: string | null | undefined) => {+ const parsed = Number.parseFloat(value ?? "");+ return Number.isFinite(parsed) && parsed > 0 ? parsed : null;+};++const normalizeCssColor = (value: string | null | undefined) => {+ const color = value?.trim();+ if (!color) return null;++ return /^(?:#[\da-f]{3,8}|(?:rgb|hsl)a?\([\d\s.,%+-]+\)|[a-z]+)$/i.test(color) ? color : null;+};++const readCssVariable = (style: string | null | undefined, name: string) => {+ const match = style?.match(new RegExp(`(?:^|;)\\s*${name}\\s*:\\s*([^;]+)`, "i"));+ return normalizeCssColor(match?.[1]);+};++const readPresentation = ({+ width,+ height,+ viewBox,+ style,+}: {+ width?: string | null;+ height?: string | null;+ viewBox?: string | null;+ style?: string | null;+}): MermaidSvgPresentation => {+ const viewBoxParts = viewBox?.trim().split(/[\s,]+/).map(Number) ?? [];+ const viewBoxWidth = viewBoxParts.length === 4 && viewBoxParts.every(Number.isFinite) && viewBoxParts[2] > 0+ ? viewBoxParts[2]+ : null;+ const viewBoxHeight = viewBoxParts.length === 4 && viewBoxParts.every(Number.isFinite) && viewBoxParts[3] > 0+ ? viewBoxParts[3]+ : null;++ return {+ width: viewBoxWidth ?? toPositiveNumber(width) ?? DEFAULT_WIDTH,+ height: viewBoxHeight ?? toPositiveNumber(height) ?? DEFAULT_HEIGHT,+ backgroundColor: readCssVariable(style, "--bg"),+ foregroundColor: readCssVariable(style, "--fg"),+ };+};++const readPresentationFromMarkup = (svg: string) => {+ const rootAttributes = svg.match(/<svg\b([^>]*)>/i)?.[1] ?? "";+ const readAttribute = (name: string) =>+ rootAttributes.match(new RegExp(`\\b${name}\\s*=\\s*(["'])(.*?)\\1`, "i"))?.[2] ?? null;++ return readPresentation({+ width: readAttribute("width"),+ height: readAttribute("height"),+ viewBox: readAttribute("viewBox"),+ style: readAttribute("style"),+ });+};++export const getMermaidSvgPresentation = (svg: string): MermaidSvgPresentation => {+ if (typeof DOMParser !== "undefined") {+ const document = new DOMParser().parseFromString(svg, "image/svg+xml");+ const root = document.documentElement;+ if (root.tagName.toLowerCase() === "svg" && !document.querySelector("parsererror")) {+ return readPresentation({+ width: root.getAttribute("width"),+ height: root.getAttribute("height"),+ viewBox: root.getAttribute("viewBox"),+ style: root.getAttribute("style"),+ });+ }+ }++ return readPresentationFromMarkup(svg);+};++export const resolveMermaidViewerBackground = (+ svgBackgroundColor: string | null,+ paletteBackgroundColor: string+) => svgBackgroundColor ?? paletteBackgroundColor;++export const normalizeMermaidSvgForViewer = (+ svg: string,+ presentation = getMermaidSvgPresentation(svg)+) => {+ if (typeof DOMParser === "undefined" || typeof XMLSerializer === "undefined") return svg;++ const document = new DOMParser().parseFromString(svg, "image/svg+xml");+ const root = document.documentElement;+ if (root.tagName.toLowerCase() !== "svg" || document.querySelector("parsererror")) return svg;++ // Mermaid emits width="100%", which gives Blob-backed images incorrect intrinsic dimensions.+ root.setAttribute("width", String(presentation.width));+ root.setAttribute("height", String(presentation.height));+ return new XMLSerializer().serializeToString(document);+};diff --git a/apps/web/src/styles/globals.css b/apps/web/src/styles/globals.cssindex bc9752f1..bb1be78e 100644--- a/apps/web/src/styles/globals.css+++ b/apps/web/src/styles/globals.css@@ -447,17 +447,76 @@ textarea {background: transparent;}-.ProseMirror .edgeever-mermaid-preview {+.ProseMirror .edgeever-mermaid-toolbar {+ position: absolute;+ top: 0.5rem;+ right: 0.5rem;+ z-index: 2;display: flex;- min-height: 6rem;+ gap: 0.25rem;+ padding: 0.25rem;+ border: 1px solid #d9e2dc;+ border-radius: 7px;+ background: rgb(255 255 255 / 0.94);+ box-shadow: 0 1px 3px rgb(15 23 42 / 0.08);+ backdrop-filter: blur(6px);+}++.ProseMirror .edgeever-mermaid-tool-button {+ display: inline-flex;+ width: 2rem;+ height: 2rem;+ flex: 0 0 2rem;align-items: center;justify-content: center;- overflow-x: auto;- padding: 1.25rem 0.5rem;+ border: 0;+ border-radius: 5px;background: transparent;+ color: #475569;cursor: pointer;}+.ProseMirror .edgeever-mermaid-tool-button svg {+ width: 1rem;+ height: 1rem;+ stroke-width: 2;+}++.ProseMirror .edgeever-mermaid-tool-button:hover,+.ProseMirror .edgeever-mermaid-tool-button:focus-visible,+.ProseMirror .edgeever-mermaid-tool-button[aria-pressed="true"] {+ background: #eaf5ee;+ color: #0f766e;+ outline: none;+}++.ProseMirror .edgeever-mermaid-tool-button:focus-visible {+ box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #0f766e;+}++.ProseMirror .edgeever-mermaid-tool-button[data-state="copied"] {+ color: #15803d;+}++.ProseMirror .edgeever-mermaid-tool-button[data-state="error"] {+ color: #be123c;+}++.ProseMirror .edgeever-mermaid-preview {+ display: flex;+ max-height: min(70vh, 44rem);+ min-height: 6rem;+ align-items: center;+ justify-content: center;+ overflow: auto;+ overscroll-behavior: contain;+ padding: 3.25rem 1rem 1rem;+ border: 1px solid #d9e2dc;+ border-radius: 8px;+ background: #fbfdfb;+ scrollbar-color: rgb(100 116 139 / 0.35) transparent;+}+.ProseMirror .edgeever-mermaid-message,.ProseMirror .edgeever-mermaid-error {margin: 0;@@ -472,15 +531,17 @@ textarea {.ProseMirror .edgeever-mermaid-svg {display: flex;width: 100%;+ min-width: 0;+ align-self: flex-start;justify-content: center;}.ProseMirror .edgeever-mermaid-svg svg {display: block;- width: auto;+ width: 100%;max-width: 100%;height: auto;- max-height: 30rem;+ max-height: none;}.ProseMirror .edgeever-mermaid-source {@@ -1037,6 +1098,27 @@ textarea {background: transparent;}+:root.dark .ProseMirror .edgeever-mermaid-toolbar {+ border-color: #334155;+ background: rgb(15 23 42 / 0.94);+ box-shadow: 0 1px 3px rgb(0 0 0 / 0.28);+}++:root.dark .ProseMirror .edgeever-mermaid-tool-button {+ color: #cbd5e1;+}++:root.dark .ProseMirror .edgeever-mermaid-tool-button:hover,+:root.dark .ProseMirror .edgeever-mermaid-tool-button:focus-visible,+:root.dark .ProseMirror .edgeever-mermaid-tool-button[aria-pressed="true"] {+ background: #1e3a2a;+ color: #5eead4;+}++:root.dark .ProseMirror .edgeever-mermaid-tool-button:focus-visible {+ box-shadow: 0 0 0 2px #0f172a, 0 0 0 4px #5eead4;+}+:root.dark .ProseMirror .edgeever-code-source {border-color: #166534;background: #13261a;@@ -1044,7 +1126,8 @@ textarea {}:root.dark .ProseMirror .edgeever-mermaid-preview {- background: transparent;+ border-color: #334155;+ background: #0f172a;}:root.dark .markdown-content {@@ -1068,6 +1151,88 @@ textarea {color: #cbd5e1;}+.edgeever-mermaid-viewer .yarl__toolbar {+ top: max(0.5rem, env(safe-area-inset-top));+ right: max(0.5rem, env(safe-area-inset-right));+ gap: 0.25rem;+ padding: 0.25rem;+ border: 1px solid rgb(255 255 255 / 0.18);+ border-radius: 8px;+ background: rgb(15 23 42 / 0.88);+ box-shadow: 0 4px 16px rgb(0 0 0 / 0.24);+ backdrop-filter: blur(8px);+}++.edgeever-mermaid-viewer .yarl__button,+.edgeever-mermaid-viewer-reset {+ display: inline-flex;+ width: 2.75rem;+ height: 2.75rem;+ padding: 0;+ align-items: center;+ justify-content: center;+ border: 0;+ border-radius: 6px;+ background: transparent;+ color: #f8fafc;+ filter: none;+ cursor: pointer;+}++.edgeever-mermaid-viewer .yarl__button:hover,+.edgeever-mermaid-viewer .yarl__button:focus-visible,+.edgeever-mermaid-viewer-reset:hover,+.edgeever-mermaid-viewer-reset:focus-visible {+ background: rgb(255 255 255 / 0.14);+ outline: none;+}++.edgeever-mermaid-viewer .yarl__button:focus-visible,+.edgeever-mermaid-viewer-reset:focus-visible {+ box-shadow: inset 0 0 0 2px #5eead4;+}++.edgeever-mermaid-viewer-reset:disabled {+ opacity: 0.38;+ cursor: default;+}++.edgeever-mermaid-viewer-reset svg {+ width: 1.5rem;+ height: 1.5rem;+}++.edgeever-mermaid-viewer .yarl__slide_image {+ user-select: none;+}++.edgeever-mermaid-viewer .yarl__slide_wrapper_interactive {+ cursor: grab;+}++.edgeever-mermaid-viewer .yarl__slide_wrapper_interactive:active {+ cursor: grabbing;+}++@media (pointer: coarse) {+ .ProseMirror .edgeever-mermaid-tool-button {+ width: 2.75rem;+ height: 2.75rem;+ flex-basis: 2.75rem;+ }++ .ProseMirror .edgeever-mermaid-preview {+ padding-top: 4rem;+ }+}++@media (prefers-reduced-motion: reduce) {+ .edgeever-mermaid-viewer * {+ transition-duration: 0.01ms !important;+ animation-duration: 0.01ms !important;+ }+}+:root.dark .markdown-content code {background-color: #13261a;border-color: #166534;diff --git a/apps/web/src/styles/mobile-markdown-editor.css b/apps/web/src/styles/mobile-markdown-editor.cssindex c44f3b5a..d9e74fb1 100644--- a/apps/web/src/styles/mobile-markdown-editor.css+++ b/apps/web/src/styles/mobile-markdown-editor.css@@ -455,34 +455,91 @@ input {}.edgeever-mobile-tiptap-content .edgeever-mermaid-code-block {+ position: relative;margin: 18px 0;overflow: visible;background: transparent;}+.edgeever-mobile-tiptap-content .edgeever-mermaid-toolbar {+ position: absolute;+ top: 0.5rem;+ right: 0.5rem;+ z-index: 2;+ display: flex;+ gap: 0.25rem;+ padding: 0.25rem;+ border: 1px solid #d9e2dc;+ border-radius: 7px;+ background: rgb(255 255 255 / 0.94);+ box-shadow: 0 1px 3px rgb(15 23 42 / 0.08);+ backdrop-filter: blur(6px);+}++.edgeever-mobile-tiptap-content .edgeever-mermaid-tool-button {+ display: inline-flex;+ width: 2.75rem;+ height: 2.75rem;+ flex: 0 0 2.75rem;+ align-items: center;+ justify-content: center;+ border: 0;+ border-radius: 5px;+ background: transparent;+ color: #475569;+}++.edgeever-mobile-tiptap-content .edgeever-mermaid-tool-button svg {+ width: 1.125rem;+ height: 1.125rem;+ stroke-width: 2;+}++.edgeever-mobile-tiptap-content .edgeever-mermaid-tool-button:active,+.edgeever-mobile-tiptap-content .edgeever-mermaid-tool-button:focus-visible,+.edgeever-mobile-tiptap-content .edgeever-mermaid-tool-button[aria-pressed="true"] {+ background: #eaf5ee;+ color: #0f766e;+ outline: none;+}++.edgeever-mobile-tiptap-content .edgeever-mermaid-tool-button[data-state="copied"] {+ color: #15803d;+}++.edgeever-mobile-tiptap-content .edgeever-mermaid-tool-button[data-state="error"] {+ color: #be123c;+}+.edgeever-mobile-tiptap-content .edgeever-mermaid-preview {display: flex;+ max-height: min(70vh, 36rem);min-height: 6rem;align-items: center;justify-content: center;- overflow-x: auto;- padding: 1rem 0.25rem;- background: transparent;- cursor: pointer;+ overflow: auto;+ overscroll-behavior: contain;+ padding: 4rem 0.75rem 0.75rem;+ border: 1px solid #d9e2dc;+ border-radius: 8px;+ background: #fbfdfb;+ scrollbar-color: rgb(100 116 139 / 0.35) transparent;}.edgeever-mobile-tiptap-content .edgeever-mermaid-svg {display: flex;width: 100%;+ min-width: 0;+ align-self: flex-start;justify-content: center;}.edgeever-mobile-tiptap-content .edgeever-mermaid-svg svg {display: block;- width: auto;+ width: 100%;max-width: 100%;height: auto;- max-height: 440px;+ max-height: none;}.edgeever-mobile-tiptap-content .edgeever-mermaid-source {diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.tsindex a29f3c42..73f1ea8a 100644--- a/packages/shared/src/i18n/en-US.ts+++ b/packages/shared/src/i18n/en-US.ts@@ -693,6 +693,16 @@ export const enUS = {mermaidInvalid: "Invalid Mermaid syntax. Edit the source below.",mermaidEmpty: "Enter Mermaid source below to generate a diagram.",mermaidSource: "Mermaid source",+ mermaidShowSource: "Show Mermaid source",+ mermaidHideSource: "Hide Mermaid source",+ mermaidUseStandardLayout: "Switch to standard layout",+ mermaidUseOrthogonalLayout: "Switch to orthogonal layout",+ mermaidOpenViewer: "Open Mermaid diagram viewer",+ mermaidViewer: "Mermaid diagram viewer",+ mermaidZoomIn: "Zoom in diagram",+ mermaidZoomOut: "Zoom out diagram",+ mermaidResetZoom: "Reset diagram zoom",+ mermaidCloseViewer: "Close diagram viewer",horizontalRule: "Divider",themeBlock: "Insert content block",deleteThemeBlock: "Delete themed block",diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.tsindex 62bc7801..38e31dd6 100644--- a/packages/shared/src/i18n/zh-CN.ts+++ b/packages/shared/src/i18n/zh-CN.ts@@ -693,6 +693,16 @@ export const zhCN = {mermaidInvalid: "Mermaid 语法有误,请修改下方源码。",mermaidEmpty: "在下方输入 Mermaid 源码以生成图表。",mermaidSource: "Mermaid 源码",+ mermaidShowSource: "显示 Mermaid 源码",+ mermaidHideSource: "隐藏 Mermaid 源码",+ mermaidUseStandardLayout: "切换到标准布局",+ mermaidUseOrthogonalLayout: "切换到正交布局",+ mermaidOpenViewer: "放大查看 Mermaid 图表",+ mermaidViewer: "Mermaid 图表查看器",+ mermaidZoomIn: "放大图表",+ mermaidZoomOut: "缩小图表",+ mermaidResetZoom: "重置图表缩放",+ mermaidCloseViewer: "关闭图表查看器",horizontalRule: "分割线",themeBlock: "插入内容块",deleteThemeBlock: "删除主题化组件",