Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(diagram): drop Fit button and make zoom percent editable

tianma-if767f4638cfd9
diff --git a/apps/web/src/components/DiagramEditorPane.test.mjs b/apps/web/src/components/DiagramEditorPane.test.mjs
index a2cf0967..2a465fef 100644
--- a/apps/web/src/components/DiagramEditorPane.test.mjs
+++ b/apps/web/src/components/DiagramEditorPane.test.mjs
@@ -222,13 +222,24 @@ describe("diagram editor canvas surface", () => {
expect(toolbarSource).not.toContain('<Button size="icon" variant="ghost" aria-label={t("diagram.autoLayout")}');
});
- test("exposes view recovery separately from document layout", () => {
- expect(toolbarSource).toContain("onFit");
- expect(toolbarSource).toContain('t("diagram.fit")');
- expect(source).toContain("onFit={() =>");
+ test("does not put a fit-to-canvas control on the toolbar", () => {
+ expect(toolbarSource).not.toContain("onFit");
+ expect(toolbarSource).not.toContain('t("diagram.fit")');
+ expect(source).not.toContain("onFit={() =>");
expect(source).toContain("fitDiagramContent(graph, document, containerRef.current, 40, layout.viewport, { readable: true });");
});
+ test("lets the zoom percent be typed instead of only resetting to 100%", () => {
+ expect(toolbarSource).toContain("onZoomTo");
+ expect(toolbarSource).toContain("parseDiagramZoomPercent");
+ expect(toolbarSource).toContain('t("diagram.zoomPercent")');
+ expect(toolbarSource).toContain('t("diagram.zoomPercentHint")');
+ expect(toolbarSource).toContain("onPointerDown={(event) => event.stopPropagation()}");
+ expect(toolbarSource).not.toContain("onResetZoom");
+ expect(source).toContain("onZoomTo={(percent) =>");
+ expect(source).toContain("zoomDiagram(graph, percent / 100, true)");
+ });
+
test("delegates every diagram kind to one shared toolbar shell", () => {
expect(source).toContain("<DiagramToolbar");
expect(source).toContain("leading={!readOnly ? (");
diff --git a/apps/web/src/components/DiagramEditorPane.tsx b/apps/web/src/components/DiagramEditorPane.tsx
index 42b96e95..ce7c7de0 100644
--- a/apps/web/src/components/DiagramEditorPane.tsx
+++ b/apps/web/src/components/DiagramEditorPane.tsx
@@ -139,6 +139,7 @@ import {
type DiagramLayoutViewport,
} from "@/lib/diagram-layout";
import { applyDiagramScrollerFitOptions, diagramCanvasIsReady, isUsableDiagramBounds } from "@/lib/diagram-scroller-fit";
+import { DIAGRAM_ZOOM_SCALE_MAX, DIAGRAM_ZOOM_SCALE_MIN } from "@/lib/diagram-zoom";
import { resolveDiagramPalette, type DiagramAppearance } from "@/lib/diagram-theme";
import { isLocalMemoId } from "@/lib/local-mirror";
import { isBrowserOffline } from "@/lib/network-status";
@@ -1604,7 +1605,7 @@ export const DiagramEditorPane = ({
background: { color: diagramCanvasColor(document.kind, documentTheme, appearance) },
grid: false,
panning: false,
- mousewheel: { enabled: true, modifiers: ["ctrl", "meta"], minScale: 0.3, maxScale: 2.5 },
+ mousewheel: { enabled: true, modifiers: ["ctrl", "meta"], minScale: DIAGRAM_ZOOM_SCALE_MIN, maxScale: DIAGRAM_ZOOM_SCALE_MAX },
interacting: () => !readOnly && !spacePanActiveRef.current,
connecting: {
allowBlank: document.kind === "flowchart",
@@ -2933,17 +2934,11 @@ export const DiagramEditorPane = ({
onUndo={() => runHistoryAction("undo")}
zoomPercent={zoomPercent}
onRead={document.kind === "flowchart" ? () => { if (graphRef.current) readDiagramContent(graphRef.current, document); } : undefined}
- onFit={() => { const graph = graphRef.current; if (graph) fitDiagramContent(graph, document, containerRef.current); }}
- onResetZoom={() => {
+ onZoomTo={(percent) => {
const graph = graphRef.current;
if (!graph) return;
+ zoomDiagram(graph, percent / 100, true);
ensureDiagramPaperContainsNodes(graph);
- zoomDiagram(graph, 1, true);
- ensureDiagramPaperContainsNodes(graph);
- const bounds = diagramNodeBounds(graph);
- const scroller = getDiagramScroller(graph);
- if (bounds && scroller) scroller.centerPoint(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2);
- else if (bounds) graph.centerPoint(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2);
}}
onZoomIn={() => {
const graph = graphRef.current;
diff --git a/apps/web/src/components/DiagramToolbar.tsx b/apps/web/src/components/DiagramToolbar.tsx
index 3415c311..6588d87f 100644
--- a/apps/web/src/components/DiagramToolbar.tsx
+++ b/apps/web/src/components/DiagramToolbar.tsx
@@ -1,4 +1,4 @@
-import type { PointerEventHandler, ReactNode } from "react";
+import { useEffect, useRef, useState, type KeyboardEvent, type PointerEventHandler, type ReactNode } from "react";
import {
Boxes,
BookOpen,
@@ -6,7 +6,6 @@ import {
Download,
FileCode2,
FileImage,
- Scan,
Redo2,
Trash2,
Undo2,
@@ -37,6 +36,7 @@ import {
} from "@/components/ui/dropdown-menu";
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
import type { DiagramAppearance } from "@/lib/diagram-theme";
+import { parseDiagramZoomPercent } from "@/lib/diagram-zoom";
import { cn } from "@/lib/utils";
const structureGroupLabelKey = (id: typeof DIAGRAM_STRUCTURE_GROUPS[number]["id"]) => (
@@ -151,9 +151,8 @@ type DiagramToolbarProps = {
structure?: DiagramStructure;
onUndo: () => void;
onRead?: () => void;
- onFit: () => void;
- onResetZoom: () => void;
zoomPercent: number;
+ onZoomTo: (percent: number) => void;
onZoomIn: () => void;
onZoomOut: () => void;
readOnly: boolean;
@@ -178,6 +177,84 @@ export const DiagramToolbarAddTrigger = ({
);
};
+const DiagramZoomPercentField = ({
+ zoomPercent,
+ onZoomTo,
+}: {
+ zoomPercent: number;
+ onZoomTo: (percent: number) => void;
+}) => {
+ const { t } = useTranslation();
+ const [draft, setDraft] = useState(String(zoomPercent));
+ const [focused, setFocused] = useState(false);
+ const commitOnBlurRef = useRef(true);
+
+ useEffect(() => {
+ if (!focused) setDraft(String(zoomPercent));
+ }, [focused, zoomPercent]);
+
+ const commit = (raw = draft) => {
+ const next = parseDiagramZoomPercent(raw);
+ if (next == null) {
+ setDraft(String(zoomPercent));
+ return;
+ }
+ if (next !== zoomPercent) onZoomTo(next);
+ setDraft(String(next));
+ };
+
+ const keepCanvasShortcutsOut = (event: KeyboardEvent<HTMLInputElement>) => {
+ event.stopPropagation();
+ if (event.key === "Enter") {
+ event.preventDefault();
+ commitOnBlurRef.current = false;
+ commit();
+ event.currentTarget.blur();
+ }
+ if (event.key === "Escape") {
+ event.preventDefault();
+ commitOnBlurRef.current = false;
+ setDraft(String(zoomPercent));
+ event.currentTarget.blur();
+ }
+ };
+
+ return (
+ <Tooltip open={focused || undefined}>
+ <TooltipTrigger asChild>
+ <label
+ className="inline-flex h-8 w-16 cursor-text items-center justify-center gap-0 rounded-md text-slate-600 hover:bg-slate-50 hover:text-slate-900 focus-within:bg-slate-50 focus-within:text-slate-900"
+ onPointerDown={(event) => event.stopPropagation()}
+ >
+ <input
+ aria-label={t("diagram.zoomPercent")}
+ autoComplete="off"
+ className="h-8 w-7 bg-transparent pr-0 text-right text-xs tabular-nums outline-none"
+ inputMode="numeric"
+ spellCheck={false}
+ value={draft}
+ onBlur={() => {
+ if (commitOnBlurRef.current) commit();
+ else commitOnBlurRef.current = true;
+ setFocused(false);
+ }}
+ onChange={(event) => setDraft(event.target.value)}
+ onFocus={(event) => {
+ setFocused(true);
+ event.currentTarget.select();
+ }}
+ onKeyDown={keepCanvasShortcutsOut}
+ onKeyUp={(event) => event.stopPropagation()}
+ onPointerDown={(event) => event.stopPropagation()}
+ />
+ <span aria-hidden="true" className="text-xs">%</span>
+ </label>
+ </TooltipTrigger>
+ <TooltipContent>{t("diagram.zoomPercentHint")}</TooltipContent>
+ </Tooltip>
+ );
+};
+
export const DiagramToolbar = ({
appearance,
canRedo,
@@ -194,9 +271,8 @@ export const DiagramToolbar = ({
onStructureChange,
onUndo,
onRead,
- onFit,
- onResetZoom,
zoomPercent,
+ onZoomTo,
onZoomIn,
onZoomOut,
readOnly,
@@ -226,9 +302,8 @@ export const DiagramToolbar = ({
)}
<MemoEditorToolbarDivider />
<Tooltip><TooltipTrigger asChild><Button size="icon" variant="ghost" aria-label={t("diagram.zoomOut")} onClick={onZoomOut}><ZoomOut className="h-4 w-4" /></Button></TooltipTrigger><TooltipContent>{t("diagram.zoomOut")}</TooltipContent></Tooltip>
- <Tooltip><TooltipTrigger asChild><Button size="sm" variant="ghost" className="w-16 tabular-nums" aria-label={t("diagram.resetZoom")} onClick={onResetZoom}>{zoomPercent}%</Button></TooltipTrigger><TooltipContent>{t("diagram.resetZoom")}</TooltipContent></Tooltip>
+ <DiagramZoomPercentField zoomPercent={zoomPercent} onZoomTo={onZoomTo} />
<Tooltip><TooltipTrigger asChild><Button size="icon" variant="ghost" aria-label={t("diagram.zoomIn")} onClick={onZoomIn}><ZoomIn className="h-4 w-4" /></Button></TooltipTrigger><TooltipContent>{t("diagram.zoomIn")}</TooltipContent></Tooltip>
- <Tooltip><TooltipTrigger asChild><Button size="sm" variant="ghost" aria-label={t("diagram.fit")} onClick={onFit}><Scan className="h-4 w-4" /><span>{t("diagram.fit")}</span></Button></TooltipTrigger><TooltipContent>{t("diagram.fit")}</TooltipContent></Tooltip>
{onRead ? <Tooltip><TooltipTrigger asChild><Button size="sm" variant="ghost" onClick={onRead}><BookOpen className="h-4 w-4" />{t("diagram.readFlow")}</Button></TooltipTrigger><TooltipContent>{t("diagram.readFlowHint")}</TooltipContent></Tooltip> : null}
<MemoEditorToolbarDivider />
{onStructureChange ? (
diff --git a/apps/web/src/lib/diagram-zoom.test.mjs b/apps/web/src/lib/diagram-zoom.test.mjs
new file mode 100644
index 00000000..17567111
--- /dev/null
+++ b/apps/web/src/lib/diagram-zoom.test.mjs
@@ -0,0 +1,26 @@
+import { describe, expect, test } from "bun:test";
+import {
+ DIAGRAM_ZOOM_PERCENT_MAX,
+ DIAGRAM_ZOOM_PERCENT_MIN,
+ parseDiagramZoomPercent,
+} from "./diagram-zoom.ts";
+
+describe("parseDiagramZoomPercent", () => {
+ test("reads whole numbers and a trailing percent sign", () => {
+ expect(parseDiagramZoomPercent("85")).toBe(85);
+ expect(parseDiagramZoomPercent("85%")).toBe(85);
+ expect(parseDiagramZoomPercent(" 200 % ")).toBe(200);
+ });
+
+ test("rounds fractional values and clamps to the wheel zoom range", () => {
+ expect(parseDiagramZoomPercent("85.6")).toBe(86);
+ expect(parseDiagramZoomPercent("10")).toBe(DIAGRAM_ZOOM_PERCENT_MIN);
+ expect(parseDiagramZoomPercent("400")).toBe(DIAGRAM_ZOOM_PERCENT_MAX);
+ });
+
+ test("rejects empty or non-numeric input", () => {
+ expect(parseDiagramZoomPercent("")).toBeNull();
+ expect(parseDiagramZoomPercent("%")).toBeNull();
+ expect(parseDiagramZoomPercent("abc")).toBeNull();
+ });
+});
diff --git a/apps/web/src/lib/diagram-zoom.ts b/apps/web/src/lib/diagram-zoom.ts
new file mode 100644
index 00000000..08591b8f
--- /dev/null
+++ b/apps/web/src/lib/diagram-zoom.ts
@@ -0,0 +1,16 @@
+export const DIAGRAM_ZOOM_SCALE_MIN = 0.3;
+export const DIAGRAM_ZOOM_SCALE_MAX = 2.5;
+export const DIAGRAM_ZOOM_PERCENT_MIN = Math.round(DIAGRAM_ZOOM_SCALE_MIN * 100);
+export const DIAGRAM_ZOOM_PERCENT_MAX = Math.round(DIAGRAM_ZOOM_SCALE_MAX * 100);
+
+export const clampDiagramZoomPercent = (percent: number) => (
+ Math.min(DIAGRAM_ZOOM_PERCENT_MAX, Math.max(DIAGRAM_ZOOM_PERCENT_MIN, Math.round(percent)))
+);
+
+export const parseDiagramZoomPercent = (raw: string) => {
+ const matched = raw.trim().replace(/%/g, "").trim();
+ if (!matched) return null;
+ const value = Number.parseFloat(matched);
+ if (!Number.isFinite(value)) return null;
+ return clampDiagramZoomPercent(value);
+};
diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.ts
index 79ffc8f7..d26704d3 100644
--- a/packages/shared/src/i18n/en-US.ts
+++ b/packages/shared/src/i18n/en-US.ts
@@ -354,6 +354,8 @@ export const enUS = {
redo: "Redo",
zoomIn: "Zoom in",
zoomOut: "Zoom out",
+ zoomPercent: "Zoom percent",
+ zoomPercentHint: "Type 30%–250%, press Enter",
listCounts: "{{nodes}} nodes · {{edges}} links",
resetZoom: "Reset to 100% and center",
readFlow: "Read from start",
diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.ts
index 2cfe9a05..11be2523 100644
--- a/packages/shared/src/i18n/zh-CN.ts
+++ b/packages/shared/src/i18n/zh-CN.ts
@@ -354,6 +354,8 @@ export const zhCN = {
redo: "重做",
zoomIn: "放大",
zoomOut: "缩小",
+ zoomPercent: "缩放百分比",
+ zoomPercentHint: "输入 30%–250%,回车确认",
listCounts: "{{nodes}} 节点 · {{edges}} 连线",
resetZoom: "恢复 100% 并居中",
readFlow: "从起点阅读",