diff --git a/app/globals.css b/app/globals.css index 5e7936f5bb..b2ad30d7eb 100644 --- a/app/globals.css +++ b/app/globals.css @@ -1678,25 +1678,33 @@ pre, code { user-select: none; } .mermaid-zoom-viewport { + position: relative; min-width: 0; min-height: 0; - overflow: auto; - padding: 24px; + overflow: hidden; background: var(--bg); - -webkit-overflow-scrolling: touch; + cursor: grab; + touch-action: none; + user-select: none; + overscroll-behavior: contain; +} +.mermaid-zoom-viewport.is-dragging { + cursor: grabbing; } .mermaid-zoom-canvas { + position: absolute; + top: 0; + left: 0; padding: 12px; border: 1px solid var(--border); border-radius: 7px; background: var(--bg-panel); - margin: 0 auto; - transition: width 0.15s ease; + transform-origin: 0 0; } +/* The viewer pins the svg to its viewBox pixels (MermaidBlock.tsx) and scales + the wrapper, so its own max-width and 100% sizing must not apply. */ .mermaid-zoom-canvas svg { display: block; - width: 100% !important; - height: auto; max-width: none !important; } @@ -1708,10 +1716,6 @@ pre, code { .mermaid-zoom-title { font-size: 10px; } - - .mermaid-zoom-viewport { - padding: 12px; - } } /* File viewer toolbar */ diff --git a/components/MermaidBlock.tsx b/components/MermaidBlock.tsx index 25e4a63a70..5eacd33859 100644 --- a/components/MermaidBlock.tsx +++ b/components/MermaidBlock.tsx @@ -1,6 +1,6 @@ "use client"; -import { memo, useEffect, useMemo, useRef, useState, type ReactNode } from "react"; +import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, type ReactNode } from "react"; import SyntaxHighlighter from "react-syntax-highlighter/dist/esm/prism-light"; import { vs } from "react-syntax-highlighter/dist/cjs/styles/prism"; import { vscDarkPlus } from "react-syntax-highlighter/dist/cjs/styles/prism"; @@ -17,9 +17,17 @@ interface MermaidBlockProps { defaultPreview?: boolean; } -const ZOOM_STEP = 0.25; -const ZOOM_MIN = 0.5; -const ZOOM_MAX = 3; +// The viewer lays the diagram out at its natural pixel size and scales it with +// a transform, so the zooms below are relative to 100% of that size. +const ZOOM_STEP = 1.25; +const ZOOM_MIN = 0.1; +const ZOOM_MAX = 8; +/** Space kept around the diagram when it is fitted to the viewport. */ +const FIT_PADDING = 16; +/** A press that moved less than this (CSS px) is a click, not a pan. */ +const DRAG_THRESHOLD = 3; +/** Wheel zoom strength: one notch (deltaY 100) is about a 22% step. */ +const WHEEL_ZOOM_SPEED = 0.002; export function downloadMermaidSvg(svg: SVGSVGElement): void { // Mermaid's HTML serialization can leave void tags such as
unclosed. @@ -148,18 +156,81 @@ export function MermaidBlock({ code, isStreaming, defaultPreview = false }: Merm ); } +/** Zoom scale plus the translation of the diagram's top-left corner in the viewport. */ +interface MermaidView { + scale: number; + x: number; + y: number; +} + +interface MermaidDrag { + pointerId: number; + startX: number; + startY: number; + originX: number; + originY: number; + /** The press started on empty space, so releasing it without a drag closes the viewer. */ + onBackground: boolean; + moved: boolean; +} + +function clampZoom(scale: number): number { + return Math.min(ZOOM_MAX, Math.max(ZOOM_MIN, scale)); +} + +/** Fit the diagram to the viewport width (never enlarging past its own size), centered. */ +function fitMermaidView( + viewportWidth: number, + viewportHeight: number, + contentWidth: number, + contentHeight: number, +): MermaidView { + const availableWidth = Math.max(1, viewportWidth - FIT_PADDING * 2); + const scale = contentWidth > 0 ? clampZoom(Math.min(1, availableWidth / contentWidth)) : 1; + const width = contentWidth * scale; + const height = contentHeight * scale; + return { + scale, + x: (viewportWidth - width) / 2, + y: height + FIT_PADDING * 2 <= viewportHeight ? (viewportHeight - height) / 2 : FIT_PADDING, + }; +} + function MermaidZoomDialog({ svg, onClose }: { svg: string; onClose: () => void }) { const { t } = useI18n(); const dialogRef = useRef(null); - const [zoom, setZoom] = useState(1); + const viewportRef = useRef(null); + const canvasRef = useRef(null); + const dragRef = useRef(null); + const [view, setView] = useState({ scale: 1, x: 0, y: 0 }); + const [dragging, setDragging] = useState(false); - useEffect(() => { + // Show the dialog, then pin the svg to the pixel size in its viewBox and fit + // it to the view. Both belong to one layout effect: a closed has no + // layout box, so measuring before showModal() would only read zeros. + useLayoutEffect(() => { const dialog = dialogRef.current; - if (!dialog) return; + const viewport = viewportRef.current; + const canvas = canvasRef.current; + if (!dialog || !viewport || !canvas) return; const previousOverflow = document.body.style.overflow; document.body.style.overflow = "hidden"; - dialog.showModal(); + if (!dialog.open) dialog.showModal(); + + // Mermaid sizes its svg to the container (width="100%"), which leaves + // nothing to scale. + const svgElement = canvas.querySelector("svg"); + const viewBox = svgElement?.viewBox?.baseVal; + const measured = svgElement?.getBoundingClientRect(); + const width = viewBox?.width || measured?.width || 0; + const height = viewBox?.height || measured?.height || 0; + if (svgElement && width && height) { + svgElement.style.setProperty("width", `${width}px`, "important"); + svgElement.style.setProperty("height", `${height}px`, "important"); + svgElement.style.setProperty("max-width", "none", "important"); + setView(fitMermaidView(viewport.clientWidth, viewport.clientHeight, canvas.offsetWidth, canvas.offsetHeight)); + } return () => { document.body.style.overflow = previousOverflow; @@ -167,6 +238,106 @@ function MermaidZoomDialog({ svg, onClose }: { svg: string; onClose: () => void }; }, []); + /** Zoom by `factor`, keeping the diagram point under (pointerX, pointerY) in place. */ + const zoomAt = useCallback((pointerX: number, pointerY: number, factor: number) => { + setView((current) => { + const scale = clampZoom(current.scale * factor); + if (scale === current.scale) return current; + const ratio = scale / current.scale; + return { + scale, + x: pointerX - (pointerX - current.x) * ratio, + y: pointerY - (pointerY - current.y) * ratio, + }; + }); + }, []); + + const zoomFromCenter = (factor: number) => { + const viewport = viewportRef.current; + if (!viewport) return; + zoomAt(viewport.clientWidth / 2, viewport.clientHeight / 2, factor); + }; + + const fitToView = () => { + const viewport = viewportRef.current; + const canvas = canvasRef.current; + if (!viewport || !canvas) return; + setView(fitMermaidView(viewport.clientWidth, viewport.clientHeight, canvas.offsetWidth, canvas.offsetHeight)); + }; + + // React attaches wheel listeners passively, so preventDefault (no page scroll + // behind the dialog) needs a listener of our own. + useEffect(() => { + const viewport = viewportRef.current; + if (!viewport) return; + + const handleWheel = (event: WheelEvent) => { + event.preventDefault(); + const rect = viewport.getBoundingClientRect(); + const delta = event.deltaMode === 1 + ? event.deltaY * 16 + : event.deltaMode === 2 + ? event.deltaY * rect.height + : event.deltaY; + if (!delta) return; + zoomAt( + event.clientX - rect.left, + event.clientY - rect.top, + Math.exp(-delta * WHEEL_ZOOM_SPEED), + ); + }; + + viewport.addEventListener("wheel", handleWheel, { passive: false }); + return () => viewport.removeEventListener("wheel", handleWheel); + }, [zoomAt]); + + const endDrag = (event: { pointerId: number }) => { + const drag = dragRef.current; + if (!drag || drag.pointerId !== event.pointerId) return null; + dragRef.current = null; + setDragging(false); + const viewport = viewportRef.current; + if (viewport?.hasPointerCapture(event.pointerId)) viewport.releasePointerCapture(event.pointerId); + return drag; + }; + + const handlePointerDown = (event: React.PointerEvent) => { + const viewport = viewportRef.current; + if (!viewport || event.button !== 0 || !event.isPrimary) return; + dragRef.current = { + pointerId: event.pointerId, + startX: event.clientX, + startY: event.clientY, + originX: view.x, + originY: view.y, + onBackground: event.target === viewport, + moved: false, + }; + viewport.setPointerCapture(event.pointerId); + }; + + const handlePointerMove = (event: React.PointerEvent) => { + const drag = dragRef.current; + if (!drag || drag.pointerId !== event.pointerId) return; + const dx = event.clientX - drag.startX; + const dy = event.clientY - drag.startY; + if (!drag.moved) { + if (Math.abs(dx) < DRAG_THRESHOLD && Math.abs(dy) < DRAG_THRESHOLD) return; + drag.moved = true; + setDragging(true); + } + setView((current) => ({ scale: current.scale, x: drag.originX + dx, y: drag.originY + dy })); + }; + + const handlePointerUp = (event: React.PointerEvent) => { + const drag = endDrag(event); + if (drag && !drag.moved && drag.onBackground) onClose(); + }; + + const handlePointerCancel = (event: React.PointerEvent) => { + endDrag(event); + }; + return ( void
- {Math.round(zoom * 100)}% + {Math.round(view.scale * 100)}%
{ - if (event.target === event.currentTarget) onClose(); - }} + ref={viewportRef} + className={["mermaid-zoom-viewport", dragging ? "is-dragging" : ""].filter(Boolean).join(" ")} + onPointerDown={handlePointerDown} + onPointerMove={handlePointerMove} + onPointerUp={handlePointerUp} + onPointerCancel={handlePointerCancel} + onLostPointerCapture={handlePointerCancel} + onDragStart={(event) => event.preventDefault()} >
diff --git a/docs/agents/sessions.md b/docs/agents/sessions.md index e99fbb77b6..d15d0e75ea 100644 --- a/docs/agents/sessions.md +++ b/docs/agents/sessions.md @@ -200,6 +200,12 @@ Files: `lib/markdown.ts` (`markdownClobberPrefix`, `rehypeMatchClobberedIds`, `j - The pieces are plain divs, not `memo`'d: React already leaves a div whose text is unchanged alone. A memo bailout keeps the old props, and each old piece is a V8 slice pinning the whole thinking string of the chunk it last changed in: streaming 2M Chinese characters retained 995 MB until the reply ended, 9 MB without memo (React 19 in headless Chrome). - Expanding a finished block still lays out all of it once, as before (about 500 ms for that text at 4x). `content-visibility: auto` on the pieces would skip the ones off screen (70 ms to the first frame), but its placeholder heights, about half the real ones in the bench, change the scroll height as pieces come into view; it is not used. +## Mermaid viewer: zoom at the pointer, drag to pan (`MermaidZoomDialog` in `components/MermaidBlock.tsx`) +- Mermaid emits an svg sized to its container (`width="100%"`, a `max-width` style), so there is nothing to scale and no natural size to pan over. The viewer pins the svg to the pixels of its own `viewBox` (inline `width`/`height` marked important, `max-width: none`) and moves the wrapper with `transform: translate(x, y) scale(zoom)`, `transform-origin: 0 0`. 100% is therefore the diagram's own pixel size, and fit-to-width (the toolbar's reset) never enlarges past it. +- Anchored zoom is one line of math: the content point under the pointer is `(pointer - offset) / zoom`, so the next offset is `pointer - (pointer - offset) * (next / current)`. The wheel listener is added by hand in an effect with `{ passive: false }`: React's own `wheel` handler is passive, so `preventDefault()` (the page behind the modal must not scroll) would be ignored. +- Left-drag pans with pointer capture, so a drag that leaves the viewport keeps panning. The capture also makes every `click` land on the viewport, so background-click-to-close is decided in `pointerup`: the press must have started on the viewport itself (`event.target === viewport`) and moved less than 3 px — otherwise a pan that ends over empty space would dismiss the diagram. +- `showModal()` and the measuring/fitting belong to the same `useLayoutEffect`: a closed `` has no layout box, so `clientWidth` and `offsetWidth` read zero before it opens, and a `useEffect` open would paint one frame of an unfitted diagram. + ## Exported session HTML - `/api/sessions/[id]/export` delegates to pi's export helper, then makes the generated HTML's recursive tree helpers iterative, so very deep linear sessions do not overflow the browser call stack.