Skip to content

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

fix(web): keep diagram title and metadata on one header row

tianma-if3725ab6f8017
diff --git a/apps/web/src/components/DiagramEditorPane.test.mjs b/apps/web/src/components/DiagramEditorPane.test.mjs
index 8091a32c..ee309f3a 100644
--- a/apps/web/src/components/DiagramEditorPane.test.mjs
+++ b/apps/web/src/components/DiagramEditorPane.test.mjs
@@ -433,9 +433,22 @@ describe("diagram editor canvas surface", () => {
expect(source).toContain('graph.startBatch("quick-create")');
});
- test("keeps the desktop header compact without shrinking mobile controls", () => {
- expect(source).toContain("MEMO_EDITOR_TOP_ROW_CLASS_NAME");
- expect(source).toContain("MEMO_EDITOR_TITLE_REGION_CLASS_NAME");
+ test("keeps notebook and tags on the title row above the diagram toolbar", () => {
+ const topRow = source.indexOf('cn(MEMO_EDITOR_TOP_ROW_CLASS_NAME, "border-b-0")');
+ const metadata = source.indexOf("<MemoEditorMetadataRow");
+ const status = source.indexOf("ref={setHeaderStatusCluster}");
+ const headerEnd = source.indexOf("</header>");
+ const toolbar = source.indexOf("<DiagramToolbar\n");
+ expect(topRow).toBeGreaterThan(-1);
+ expect(metadata).toBeGreaterThan(topRow);
+ expect(status).toBeGreaterThan(metadata);
+ expect(headerEnd).toBeGreaterThan(status);
+ expect(toolbar).toBeGreaterThan(headerEnd);
+ expect(source).toContain('rowClassName="shrink-0 flex-nowrap"');
+ expect(source).toContain("nextTitleStatusClearance");
+ expect(source).toContain('cn(MEMO_EDITOR_TOP_ROW_CLASS_NAME, "border-b-0")');
+ expect(source).not.toContain("MEMO_EDITOR_TITLE_REGION_CLASS_NAME");
+ expect(source.match(/<MemoEditorMetadataRow/g)).toHaveLength(1);
expect(toolbarSource).toContain("<MemoEditorToolbarRow");
});
diff --git a/apps/web/src/components/DiagramEditorPane.tsx b/apps/web/src/components/DiagramEditorPane.tsx
index b44af889..4795341c 100644
--- a/apps/web/src/components/DiagramEditorPane.tsx
+++ b/apps/web/src/components/DiagramEditorPane.tsx
@@ -1,6 +1,6 @@
import { diagramEditorSnapshot } from "@/lib/diagram-editor-snapshot";
import { MemoTitleInput } from "@/components/MemoTitleInput";
-import { useCallback, useEffect, useMemo, useRef, useState, type DragEvent as ReactDragEvent, type PointerEvent as ReactPointerEvent, type ReactNode } from "react";
+import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, type DragEvent as ReactDragEvent, type PointerEvent as ReactPointerEvent, type ReactNode } from "react";
import { Dom, Export, Graph, History, Keyboard, Scroller, Selection, type Edge, type Node } from "@antv/x6";
import * as m from "motion/react-m";
import {
@@ -154,8 +154,8 @@ import { MemoEditorMetadataRow } from "@/components/MemoEditorMetadataRow";
import { MemoEditorFocusModeButton, MemoEditorTopRowLeading, MemoEditorUpdatedLabel } from "@/components/MemoEditorTopRowLeading";
import { MemoEditorToolbarDivider } from "@/components/MemoEditorToolbarChrome";
import {
- MEMO_EDITOR_TITLE_REGION_CLASS_NAME,
MEMO_EDITOR_TOP_ROW_CLASS_NAME,
+ nextTitleStatusClearance,
} from "@/components/MemoEditorChromeDensity";
import { EditorNoteSearchBar } from "@/components/editor/EditorNoteSearchBar";
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
@@ -1684,6 +1684,9 @@ export const DiagramEditorPane = ({
const [searchQuery, setSearchQuery] = useState("");
const [searchIndex, setSearchIndex] = useState(0);
const [mobileNotebookSheetOpen, setMobileNotebookSheetOpen] = useState(false);
+ const [headerTitleSlot, setHeaderTitleSlot] = useState<HTMLDivElement | null>(null);
+ const [headerStatusCluster, setHeaderStatusCluster] = useState<HTMLDivElement | null>(null);
+ const [titleStatusClearancePx, setTitleStatusClearancePx] = useState(0);
const [notebookUpdatePending, setNotebookUpdatePending] = useState(false);
const searchInputRef = useRef<HTMLInputElement | null>(null);
const [zoomPercent, setZoomPercent] = useState(100);
@@ -3024,6 +3027,32 @@ export const DiagramEditorPane = ({
if (searchMatches[0]) selectSearchMatch(0);
}, [searchMatches, selectSearchMatch]);
+ useLayoutEffect(() => {
+ const titleSlot = headerTitleSlot;
+ const status = headerStatusCluster;
+ if (!titleSlot || !status) return;
+ let frame = 0;
+ const measure = () => {
+ const titleRect = titleSlot.getBoundingClientRect();
+ const statusRect = status.getBoundingClientRect();
+ if (titleRect.width < 1 || statusRect.width < 1) return;
+ const paddingRight = Number.parseFloat(getComputedStyle(titleSlot).paddingRight) || 0;
+ const inputRight = titleRect.right - paddingRight;
+ setTitleStatusClearancePx((current) => nextTitleStatusClearance(current, inputRight, statusRect.left));
+ };
+ measure();
+ const observer = new ResizeObserver(() => {
+ cancelAnimationFrame(frame);
+ frame = requestAnimationFrame(measure);
+ });
+ observer.observe(titleSlot);
+ observer.observe(status);
+ return () => {
+ cancelAnimationFrame(frame);
+ observer.disconnect();
+ };
+ }, [editorDirty, headerStatusCluster, headerTitleSlot, saveError, saving]);
+
if (!document) return null;
const kindLabel = document.kind === "mind-map" ? t("diagram.mindMap") : document.kind === "architecture" ? t("diagram.architecture") : t("diagram.flowchart");
const updatedLabel = formatDateTime(memo.updatedAt);
@@ -3048,8 +3077,17 @@ export const DiagramEditorPane = ({
<TooltipProvider>
<div className="flex h-full min-h-0 flex-col bg-card">
<header className="shrink-0 border-b border-slate-200 bg-card">
- <div className={MEMO_EDITOR_TOP_ROW_CLASS_NAME}>
+ <div className={cn(MEMO_EDITOR_TOP_ROW_CLASS_NAME, "border-b-0")}>
+ <div
+ className="min-w-0 w-full"
+ style={titleStatusClearancePx > 0 ? { paddingRight: titleStatusClearancePx } : undefined}
+ >
+ <div
+ ref={setHeaderTitleSlot}
+ className="flex min-w-0 flex-wrap items-center gap-x-2 gap-y-1 px-4 sm:flex-nowrap"
+ >
<MemoEditorTopRowLeading
+ className="min-w-0 flex-1"
mobileBackButton={(
<Tooltip>
<TooltipTrigger asChild>
@@ -3062,6 +3100,7 @@ export const DiagramEditorPane = ({
)}
titleInput={(
<MemoTitleInput
+ className="w-full min-w-0 px-2"
value={title}
readOnly={readOnly}
placeholder={kindLabel}
@@ -3081,8 +3120,30 @@ export const DiagramEditorPane = ({
/>
)}
/>
+ <MemoEditorMetadataRow
+ rowClassName="shrink-0 flex-nowrap"
+ contentMarkdown={memo.contentMarkdown}
+ disabled={readOnly}
+ mobileNotebookPickerOpen={mobileNotebookSheetOpen}
+ notebookOptions={notebookOptions}
+ notebookUpdatePending={notebookUpdatePending || saving}
+ repository={repository}
+ selectedNotebookId={memoRef.current.notebookId}
+ tagsText={tagsText}
+ title={title}
+ onMobileNotebookPickerOpenChange={setMobileNotebookSheetOpen}
+ onNotebookChange={handleNotebookChange}
+ onTagsChange={(nextTagsText) => {
+ tagsRef.current = nextTagsText;
+ setTagsText(nextTagsText);
+ setTagsDirty(true);
+ setDirtyVersion((current) => current + 1);
+ }}
+ />
+ </div>
+ </div>
- <div className="flex shrink-0 items-center gap-1">
+ <div ref={setHeaderStatusCluster} className="absolute right-1 top-0 flex h-full shrink-0 items-center gap-1 sm:right-2">
<div className="flex min-w-0 items-center gap-1.5">
<MemoEditorUpdatedLabel updatedLabel={updatedLabel} />
<m.span
@@ -3193,27 +3254,6 @@ export const DiagramEditorPane = ({
</div>
</div>
- <div className={MEMO_EDITOR_TITLE_REGION_CLASS_NAME}>
- <MemoEditorMetadataRow
- contentMarkdown={memo.contentMarkdown}
- disabled={readOnly}
- mobileNotebookPickerOpen={mobileNotebookSheetOpen}
- notebookOptions={notebookOptions}
- notebookUpdatePending={notebookUpdatePending || saving}
- repository={repository}
- selectedNotebookId={memoRef.current.notebookId}
- tagsText={tagsText}
- title={title}
- onMobileNotebookPickerOpenChange={setMobileNotebookSheetOpen}
- onNotebookChange={handleNotebookChange}
- onTagsChange={(nextTagsText) => {
- tagsRef.current = nextTagsText;
- setTagsText(nextTagsText);
- setTagsDirty(true);
- setDirtyVersion((current) => current + 1);
- }}
- />
- </div>
{searchOpen ? (
<EditorNoteSearchBar
inputRef={searchInputRef}
diff --git a/apps/web/src/components/MemoEditorChromeDensity.ts b/apps/web/src/components/MemoEditorChromeDensity.ts
index 4647a24e..441c4d31 100644
--- a/apps/web/src/components/MemoEditorChromeDensity.ts
+++ b/apps/web/src/components/MemoEditorChromeDensity.ts
@@ -14,9 +14,6 @@ export const MEMO_EDITOR_TOOLBAR_PADDING_CLASS_NAME =
export const MEMO_EDITOR_TOOLBAR_COLLAPSED_CLASS_NAME =
"max-h-12 overflow-hidden sm:max-h-9";
-export const MEMO_EDITOR_TITLE_REGION_CLASS_NAME =
- `space-y-1 pb-2 pt-1 sm:pb-2 sm:pt-1 ${MEMO_EDITOR_READING_GUTTER_CLASS_NAME}`;
-
/** Extra right inset so the title field stops before the header status cluster. */
export const nextTitleStatusClearance = (
current: number,