Skip to content

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

fix(pdf): 默认使用可同步的紧凑附件卡

tianma-if0cd109265023
diff --git a/apps/web/src/components/EditorPane.tsx b/apps/web/src/components/EditorPane.tsx
index 3116935c..d22d99af 100644
--- a/apps/web/src/components/EditorPane.tsx
+++ b/apps/web/src/components/EditorPane.tsx
@@ -1283,6 +1283,7 @@ const RichEditorPane = ({
attrs: {
url: resource.url,
label: t("editor.attachmentLabel", { filename }),
+ displayMode: "compact",
},
}],
};
diff --git a/apps/web/src/components/editor/PdfAttachment.tsx b/apps/web/src/components/editor/PdfAttachment.tsx
index 169cc417..e9fc7553 100644
--- a/apps/web/src/components/editor/PdfAttachment.tsx
+++ b/apps/web/src/components/editor/PdfAttachment.tsx
@@ -1,43 +1,19 @@
-import { PdfAttachment as BasePdfAttachment } from "@edgeever/shared";
+import { PdfAttachment as BasePdfAttachment, resolvePdfDisplayMode } from "@edgeever/shared";
import { NodeViewWrapper, ReactNodeViewRenderer, type NodeViewProps } from "@tiptap/react";
-import { useEffect, useState } from "react";
import { PdfViewer } from "@/components/pdf/PdfViewer";
-import {
- PDF_PREVIEW_CHANGED_EVENT,
- PDF_PREVIEW_STORAGE_KEY,
- readPdfPreviewPreference,
- type PdfPreviewPreference,
-} from "@/lib/pdf-preview-preference";
-const PdfAttachmentNodeView = ({ node }: NodeViewProps) => {
+const PdfAttachmentNodeView = ({ node, updateAttributes }: NodeViewProps) => {
const url = typeof node.attrs.url === "string" ? node.attrs.url : "";
const label = typeof node.attrs.label === "string" ? node.attrs.label : "PDF";
- const [preference, setPreference] = useState<PdfPreviewPreference>(readPdfPreviewPreference);
-
- useEffect(() => {
- const syncPreference = () => setPreference(readPdfPreviewPreference());
- const onPreferenceChanged = (event: Event) => {
- const detail = (event as CustomEvent<PdfPreviewPreference>).detail;
- setPreference(detail === "collapsed" ? "collapsed" : "expanded");
- };
- const onStorage = (event: StorageEvent) => {
- if (!event.key || event.key === PDF_PREVIEW_STORAGE_KEY) syncPreference();
- };
- window.addEventListener(PDF_PREVIEW_CHANGED_EVENT, onPreferenceChanged);
- window.addEventListener("storage", onStorage);
- return () => {
- window.removeEventListener(PDF_PREVIEW_CHANGED_EVENT, onPreferenceChanged);
- window.removeEventListener("storage", onStorage);
- };
- }, []);
+ const displayMode = resolvePdfDisplayMode(node.attrs.displayMode);
return (
<NodeViewWrapper as="span" className="edgeever-pdf-attachment-node" contentEditable={false}>
<PdfViewer
- key={preference}
url={url}
label={label}
- defaultExpanded={preference === "expanded"}
+ expanded={displayMode === "inline"}
+ onExpandedChange={(expanded) => updateAttributes({ displayMode: expanded ? "inline" : "compact" })}
/>
</NodeViewWrapper>
);
diff --git a/apps/web/src/components/pdf/PdfViewer.tsx b/apps/web/src/components/pdf/PdfViewer.tsx
index a06dfb38..c34389a8 100644
--- a/apps/web/src/components/pdf/PdfViewer.tsx
+++ b/apps/web/src/components/pdf/PdfViewer.tsx
@@ -18,6 +18,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
import { createPortal } from "react-dom";
import { useTranslation } from "react-i18next";
import { ButtonTooltip } from "@/components/ui/button-tooltip";
+import { isDesktopResourceRuntime, toApiResourceUrl } from "@/lib/desktop-resources";
import { cn } from "@/lib/utils";
import { loadPdfJs } from "./pdfjs-loader";
import { loadPdfDocumentSource } from "./pdf-document-source";
@@ -156,6 +157,8 @@ export type PdfViewerProps = {
label: string;
className?: string;
defaultExpanded?: boolean;
+ expanded?: boolean;
+ onExpandedChange?: (expanded: boolean) => void;
fullscreen?: boolean;
onRequestClose?: () => void;
onPrevious?: () => void;
@@ -166,21 +169,25 @@ export const PdfViewer = ({
url,
label,
className,
- defaultExpanded = true,
+ defaultExpanded = false,
+ expanded: controlledExpanded,
+ onExpandedChange,
fullscreen = false,
onRequestClose,
onPrevious,
onNext,
}: PdfViewerProps) => {
const { t } = useTranslation();
+ const resolvedUrl = isDesktopResourceRuntime() ? url : toApiResourceUrl(url);
const rootRef = useRef<HTMLDivElement | null>(null);
- const [expanded, setExpanded] = useState(defaultExpanded || fullscreen);
+ const [uncontrolledExpanded, setUncontrolledExpanded] = useState(defaultExpanded);
const [nearViewport, setNearViewport] = useState(fullscreen);
const [fitWidth, setFitWidth] = useState(true);
const [zoom, setZoom] = useState(1);
const [failed, setFailed] = useState(false);
const [internalFullscreen, setInternalFullscreen] = useState(false);
const isFullscreen = fullscreen || internalFullscreen;
+ const expanded = isFullscreen || (controlledExpanded ?? uncontrolledExpanded);
useEffect(() => {
const root = rootRef.current;
@@ -222,6 +229,10 @@ export const PdfViewer = ({
const handleError = useCallback(() => setFailed(true), []);
const closeFullscreen = () => fullscreen ? onRequestClose?.() : setInternalFullscreen(false);
+ const setExpanded = (nextExpanded: boolean) => {
+ if (controlledExpanded === undefined) setUncontrolledExpanded(nextExpanded);
+ onExpandedChange?.(nextExpanded);
+ };
const active = expanded && nearViewport && !failed;
const viewer = (
@@ -254,7 +265,7 @@ export const PdfViewer = ({
</ButtonTooltip>
) : null}
<a
- href={url}
+ href={resolvedUrl}
target="_blank"
rel="noreferrer"
className="edgeever-attachment-link min-w-0 flex-1 truncate text-sm font-semibold text-slate-800"
@@ -281,10 +292,10 @@ export const PdfViewer = ({
</>
) : null}
<ButtonTooltip title={t("pdfViewer.download")}>
- <a className="pdf-viewer-action" href={url} download={label} aria-label={t("pdfViewer.download")}><Download aria-hidden="true" /></a>
+ <a className="pdf-viewer-action" href={resolvedUrl} download={label} aria-label={t("pdfViewer.download")}><Download aria-hidden="true" /></a>
</ButtonTooltip>
<ButtonTooltip title={t("pdfViewer.openExternal")}>
- <a className="pdf-viewer-action" href={url} target="_blank" rel="noreferrer" aria-label={t("pdfViewer.openExternal")}><ExternalLink aria-hidden="true" /></a>
+ <a className="pdf-viewer-action" href={resolvedUrl} target="_blank" rel="noreferrer" aria-label={t("pdfViewer.openExternal")}><ExternalLink aria-hidden="true" /></a>
</ButtonTooltip>
{isFullscreen || (expanded && !failed) ? (
<ButtonTooltip title={isFullscreen ? t("pdfViewer.exitFullscreen") : t("pdfViewer.fullscreen")}>
@@ -301,7 +312,7 @@ export const PdfViewer = ({
) : null}
{!isFullscreen ? (
<ButtonTooltip title={expanded ? t("pdfViewer.collapse") : t("pdfViewer.expand")}>
- <button type="button" className="pdf-viewer-action" aria-label={expanded ? t("pdfViewer.collapse") : t("pdfViewer.expand")} aria-expanded={expanded} onClick={() => setExpanded((value) => !value)}>
+ <button type="button" className="pdf-viewer-action" aria-label={expanded ? t("pdfViewer.collapse") : t("pdfViewer.expand")} aria-expanded={expanded} onClick={() => setExpanded(!expanded)}>
{expanded ? <ChevronUp aria-hidden="true" /> : <ChevronDown aria-hidden="true" />}
</button>
</ButtonTooltip>
@@ -313,7 +324,7 @@ export const PdfViewer = ({
</span>
) : expanded ? (
<span className={cn("block overflow-auto bg-slate-100", isFullscreen ? "min-h-0 flex-1" : "h-[min(72vh,52rem)]")}>
- <PdfDocument url={url} active={active} fitWidth={fitWidth} zoom={zoom} onError={handleError} />
+ <PdfDocument url={resolvedUrl} active={active} fitWidth={fitWidth} zoom={zoom} onError={handleError} />
</span>
) : null}
</span>
diff --git a/apps/web/src/components/pdf/pdf-document-source.test.mjs b/apps/web/src/components/pdf/pdf-document-source.test.mjs
index 4292d873..2732afea 100644
--- a/apps/web/src/components/pdf/pdf-document-source.test.mjs
+++ b/apps/web/src/components/pdf/pdf-document-source.test.mjs
@@ -13,6 +13,12 @@ describe("PDF document sources", () => {
});
});
+ test("recovers leaked desktop resource URLs in the web runtime", async () => {
+ await expect(loadPdfDocumentSource("edgeever-resource://resource/res_web", undefined)).resolves.toEqual({
+ url: "/api/v1/resources/res_web/blob",
+ });
+ });
+
test("loads synced desktop resources through the native bridge", async () => {
const source = await loadPdfDocumentSource("edgeever-resource://resource/res_123", bridge);
expect(source).toEqual({ data: new Uint8Array([1, 7]) });
diff --git a/apps/web/src/components/pdf/pdf-document-source.ts b/apps/web/src/components/pdf/pdf-document-source.ts
index 80d06904..cad34792 100644
--- a/apps/web/src/components/pdf/pdf-document-source.ts
+++ b/apps/web/src/components/pdf/pdf-document-source.ts
@@ -1,3 +1,5 @@
+import { toApiResourceUrl } from "@/lib/desktop-resources";
+
type PdfResourceBridge = Pick<EdgeEverDesktopBridge, "readResource" | "readStagedResource">;
export type PdfDocumentSource = { url: string } | { data: Uint8Array };
@@ -20,7 +22,7 @@ export const loadPdfDocumentSource = async (
url: string,
bridge: PdfResourceBridge | undefined = typeof window === "undefined" ? undefined : window.edgeeverDesktop,
): Promise<PdfDocumentSource> => {
- if (!bridge) return { url };
+ if (!bridge) return { url: toApiResourceUrl(url) };
const stagedId = parseDesktopResourceId(url, "edgeever-staged:");
if (stagedId) {
diff --git a/apps/web/src/components/settings/PreferenceCard.tsx b/apps/web/src/components/settings/PreferenceCard.tsx
index a7deb0c0..c768154a 100644
--- a/apps/web/src/components/settings/PreferenceCard.tsx
+++ b/apps/web/src/components/settings/PreferenceCard.tsx
@@ -1,4 +1,4 @@
-import { AlignHorizontalJustifyCenter, ChartNoAxesCombined, FileCode2, FileText, Image, Keyboard, Languages, MousePointerClick, Palette, RefreshCw, Sparkles } from "lucide-react";
+import { AlignHorizontalJustifyCenter, ChartNoAxesCombined, FileCode2, Image, Keyboard, Languages, MousePointerClick, Palette, RefreshCw, Sparkles } from "lucide-react";
import { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { writeSyncIntervalPreference, type EditorContentAlignment, type ShortcutSettings, type SyncIntervalPreference } from "@/lib/app-helpers";
@@ -18,13 +18,6 @@ import {
readAiSpaceShortcutPreference,
writeAiSpaceShortcutPreference,
} from "@/lib/ai-space-shortcut-preference";
-import {
- PDF_PREVIEW_CHANGED_EVENT,
- PDF_PREVIEW_STORAGE_KEY,
- readPdfPreviewPreference,
- writePdfPreviewPreference,
- type PdfPreviewPreference,
-} from "@/lib/pdf-preview-preference";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
@@ -86,7 +79,6 @@ export const PreferenceCard = ({
const [linkOpenMode, setLinkOpenMode] = useState<EditorLinkOpenMode>(() => getStoredEditorLinkOpenMode());
const [aiSelectionMenuEnabled, setAiSelectionMenuEnabled] = useState(readAiSelectionMenuPreference);
const [aiSpaceShortcutEnabled, setAiSpaceShortcutEnabled] = useState(readAiSpaceShortcutPreference);
- const [pdfPreviewPreference, setPdfPreviewPreference] = useState<PdfPreviewPreference>(readPdfPreviewPreference);
useEffect(() => {
const mediaQuery = window.matchMedia("(max-width: 640px)");
@@ -96,23 +88,6 @@ export const PreferenceCard = ({
return () => mediaQuery.removeEventListener("change", handler);
}, []);
- useEffect(() => {
- const syncPreference = () => setPdfPreviewPreference(readPdfPreviewPreference());
- const onPreferenceChanged = (event: Event) => {
- const detail = (event as CustomEvent<PdfPreviewPreference>).detail;
- setPdfPreviewPreference(detail === "collapsed" ? "collapsed" : "expanded");
- };
- const onStorage = (event: StorageEvent) => {
- if (!event.key || event.key === PDF_PREVIEW_STORAGE_KEY) syncPreference();
- };
- window.addEventListener(PDF_PREVIEW_CHANGED_EVENT, onPreferenceChanged);
- window.addEventListener("storage", onStorage);
- return () => {
- window.removeEventListener(PDF_PREVIEW_CHANGED_EVENT, onPreferenceChanged);
- window.removeEventListener("storage", onStorage);
- };
- }, []);
-
useEffect(() => {
const syncPreference = () => setAiSpaceShortcutEnabled(readAiSpaceShortcutPreference());
const onPreferenceChanged = (event: Event) => {
@@ -433,27 +408,6 @@ export const PreferenceCard = ({
</div>
</div>
- <div className="flex min-h-16 flex-col items-start gap-3 px-4 py-3 sm:flex-row sm:items-center sm:justify-between sm:gap-4">
- <div className="flex min-w-0 items-start gap-3">
- <FileText className="mt-0.5 h-4 w-4 shrink-0 text-emerald-700" />
- <div className="min-w-0">
- <div className="text-sm font-semibold text-slate-900">{t("settings.pdfPreviewDefaultTitle")}</div>
- <div className="mt-0.5 text-xs leading-4 text-slate-500">{t("settings.pdfPreviewDefaultDescription")}</div>
- </div>
- </div>
- <div className="flex w-full shrink-0 justify-start sm:w-44 sm:justify-end">
- <Switch
- checked={pdfPreviewPreference === "expanded"}
- onCheckedChange={(enabled) => {
- const nextPreference = enabled ? "expanded" : "collapsed";
- writePdfPreviewPreference(nextPreference);
- setPdfPreviewPreference(nextPreference);
- }}
- aria-label={t("settings.pdfPreviewDefaultAria")}
- />
- </div>
- </div>
-
<div className="flex min-h-16 flex-col items-start gap-3 px-4 py-3 sm:flex-row sm:items-center sm:justify-between sm:gap-4">
<div className="flex min-w-0 items-start gap-3">
<Sparkles className="mt-0.5 h-4 w-4 shrink-0 text-emerald-700" />
diff --git a/apps/web/src/lib/desktop-repository.ts b/apps/web/src/lib/desktop-repository.ts
index 0fbae905..95be554b 100644
--- a/apps/web/src/lib/desktop-repository.ts
+++ b/apps/web/src/lib/desktop-repository.ts
@@ -216,7 +216,10 @@ export const createDesktopRepository = (): EdgeEverRepository => ({
},
createMemo: (input) => {
- const rpcParams: DesktopMemoCreateParams = input;
+ const rpcParams: DesktopMemoCreateParams = {
+ ...input,
+ contentMarkdown: mapMarkdownResourceUrls(input.contentMarkdown, toApiResourceUrl),
+ };
return request("memo.create", rpcParams).then((result) => {
window.dispatchEvent(new CustomEvent("edgeever:sync-queue-changed"));
return result;
diff --git a/apps/web/src/lib/desktop-resources.test.mjs b/apps/web/src/lib/desktop-resources.test.mjs
index 5c11acbb..b340d2ef 100644
--- a/apps/web/src/lib/desktop-resources.test.mjs
+++ b/apps/web/src/lib/desktop-resources.test.mjs
@@ -38,6 +38,15 @@ describe("desktop resource URLs", () => {
expect(mapped.content?.[0]?.attrs?.src).toBe("/api/v1/resources/resource-1/blob");
});
+ test("restores PDF node URLs before a memo is saved", () => {
+ const mapped = mapTiptapResourceUrls({
+ type: "doc",
+ content: [{ type: "pdfAttachment", attrs: { url: "edgeever-resource://resource/resource-pdf" } }],
+ }, toApiResourceUrl);
+
+ expect(mapped.content?.[0]?.attrs?.url).toBe("/api/v1/resources/resource-pdf/blob");
+ });
+
test("exposes staged offline attachments as local resources", () => {
expect(createStagedResourceListItem({ id: "stage-1", memoId: "memo-1", name: "photo.png", type: "image/png", size: 42 }, "2026-01-01T00:00:00.000Z")).toMatchObject({
id: "staged_stage-1",
diff --git a/apps/web/src/lib/desktop-resources.ts b/apps/web/src/lib/desktop-resources.ts
index fd123625..1d68563e 100644
--- a/apps/web/src/lib/desktop-resources.ts
+++ b/apps/web/src/lib/desktop-resources.ts
@@ -40,7 +40,7 @@ export const mapTiptapResourceUrls = (doc: TiptapDoc, mapper: (url: string) => s
const result: Record<string, unknown> = {};
for (const [key, child] of Object.entries(value)) {
- result[key] = (key === "src" || key === "href") && typeof child === "string" ? mapper(child) : visit(child);
+ result[key] = (key === "src" || key === "href" || key === "url") && typeof child === "string" ? mapper(child) : visit(child);
}
return result;
};
diff --git a/apps/web/src/lib/desktop-sync.test.mjs b/apps/web/src/lib/desktop-sync.test.mjs
index d519eac8..bc5188c5 100644
--- a/apps/web/src/lib/desktop-sync.test.mjs
+++ b/apps/web/src/lib/desktop-sync.test.mjs
@@ -5,6 +5,7 @@ const {
hasDesktopSyncStateReset,
mergeMemoIdMappings,
mergeSyncedMemos,
+ normalizeDesktopMemoPayload,
orderBootstrapNotebooks,
resolveDesktopMemoSyncBase,
rewriteStagedResource,
@@ -24,6 +25,21 @@ describe("desktop staged resource sync", () => {
});
});
+ test("never sends desktop-only PDF URLs to the cloud", () => {
+ expect(normalizeDesktopMemoPayload({
+ contentJson: {
+ type: "doc",
+ content: [{ type: "pdfAttachment", attrs: { url: "edgeever-resource://resource/res_pdf" } }],
+ },
+ contentMarkdown: "[Attachment: report.pdf](edgeever-resource://resource/res_pdf)",
+ })).toMatchObject({
+ contentJson: {
+ content: [{ attrs: { url: "/api/v1/resources/res_pdf/blob" } }],
+ },
+ contentMarkdown: "[Attachment: report.pdf](/api/v1/resources/res_pdf/blob)",
+ });
+ });
+
test("does not consume a staged image before a saved memo update references it", () => {
const stagedId = "stage-1";
diff --git a/apps/web/src/lib/desktop-sync.ts b/apps/web/src/lib/desktop-sync.ts
index b3952317..f37ed265 100644
--- a/apps/web/src/lib/desktop-sync.ts
+++ b/apps/web/src/lib/desktop-sync.ts
@@ -9,7 +9,7 @@ import {
type TiptapDoc,
} from "@edgeever/shared";
import { api, ApiRequestError } from "@/lib/api";
-import { isDesktopResourceRuntime } from "@/lib/desktop-resources";
+import { isDesktopResourceRuntime, mapMarkdownResourceUrls, mapTiptapResourceUrls, toApiResourceUrl } from "@/lib/desktop-resources";
import { notifyMemoIdRemapped, notifyMemoSyncAcknowledged } from "@/lib/sync-events";
type StagedResourceRewrite = { memoId: string; placeholder: string; url: string };
@@ -108,6 +108,16 @@ export const rewriteStagedResource = (value: unknown, rewrites: StagedResourceRe
return value;
};
+export const normalizeDesktopMemoPayload = (payload: Record<string, unknown>): Record<string, unknown> => ({
+ ...payload,
+ contentJson: payload.contentJson && typeof payload.contentJson === "object"
+ ? mapTiptapResourceUrls(payload.contentJson as TiptapDoc, toApiResourceUrl)
+ : payload.contentJson,
+ contentMarkdown: typeof payload.contentMarkdown === "string"
+ ? mapMarkdownResourceUrls(payload.contentMarkdown, toApiResourceUrl)
+ : payload.contentMarkdown,
+});
+
const patchCreatedMemoResources = async (rewrites: StagedResourceRewrite[]) => {
const memoIds = [...new Set(rewrites.map((rewrite) => rewrite.memoId))];
if (memoIds.length === 0) return;
@@ -188,9 +198,12 @@ const acknowledge = async (
};
const syncOutboxItem = async (item: DesktopOutboxItem, stagedRewrites: StagedResourceRewrite[]) => {
- const payload = stagedRewrites.length > 0
+ const rewrittenPayload = stagedRewrites.length > 0
? rewriteStagedResource(item.payload, stagedRewrites.filter((rewrite) => rewrite.memoId === String(item.payload.memoId ?? item.entityId))) as Record<string, unknown>
: item.payload;
+ const payload = item.kind === "memo.create" || item.kind === "memo.update"
+ ? normalizeDesktopMemoPayload(rewrittenPayload)
+ : rewrittenPayload;
if (item.kind === "memo.create") {
const data = await api.createMemo({
notebookId: String(payload.notebookId),
diff --git a/apps/web/src/lib/pdf-preview-preference.test.mjs b/apps/web/src/lib/pdf-preview-preference.test.mjs
deleted file mode 100644
index f81f10b7..00000000
--- a/apps/web/src/lib/pdf-preview-preference.test.mjs
+++ /dev/null
@@ -1,11 +0,0 @@
-import { describe, expect, test } from "bun:test";
-import { resolvePdfPreviewPreference } from "./pdf-preview-preference.ts";
-
-describe("PDF preview preference", () => {
- test("defaults to expanded and accepts the explicit collapsed mode", () => {
- expect(resolvePdfPreviewPreference(null)).toBe("expanded");
- expect(resolvePdfPreviewPreference("expanded")).toBe("expanded");
- expect(resolvePdfPreviewPreference("unexpected")).toBe("expanded");
- expect(resolvePdfPreviewPreference("collapsed")).toBe("collapsed");
- });
-});
diff --git a/apps/web/src/lib/pdf-preview-preference.ts b/apps/web/src/lib/pdf-preview-preference.ts
deleted file mode 100644
index 3b19a58d..00000000
--- a/apps/web/src/lib/pdf-preview-preference.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-export type PdfPreviewPreference = "expanded" | "collapsed";
-
-export const PDF_PREVIEW_STORAGE_KEY = "edgeever.pdfPreviewMode.v1";
-export const PDF_PREVIEW_CHANGED_EVENT = "edgeever:pdf-preview-preference-changed";
-
-export const resolvePdfPreviewPreference = (value: string | null): PdfPreviewPreference =>
- value === "collapsed" ? "collapsed" : "expanded";
-
-export const readPdfPreviewPreference = (): PdfPreviewPreference => {
- try {
- return resolvePdfPreviewPreference(
- typeof window === "undefined" ? null : window.localStorage.getItem(PDF_PREVIEW_STORAGE_KEY),
- );
- } catch {
- return "expanded";
- }
-};
-
-export const writePdfPreviewPreference = (preference: PdfPreviewPreference) => {
- try {
- window.localStorage.setItem(PDF_PREVIEW_STORAGE_KEY, preference);
- } catch {
- // Local storage can be unavailable in private or restricted browser contexts.
- }
- window.dispatchEvent(new CustomEvent(PDF_PREVIEW_CHANGED_EVENT, { detail: preference }));
-};
diff --git a/packages/shared/src/content.test.mjs b/packages/shared/src/content.test.mjs
index 6852ff66..b02fb5ac 100644
--- a/packages/shared/src/content.test.mjs
+++ b/packages/shared/src/content.test.mjs
@@ -8,6 +8,7 @@ import {
MERGE_DIVIDER_NODE_TYPE,
PDF_ATTACHMENT_NODE_TYPE,
mergeMemoDocs,
+ resolvePdfDisplayMode,
resolveMemoContentDoc,
resolveMemoContentMarkdown,
resolveMergedMemoTitle,
@@ -36,7 +37,11 @@ describe("PDF attachment Markdown compatibility", () => {
type: "paragraph",
content: [{
type: PDF_ATTACHMENT_NODE_TYPE,
- attrs: { label: "Attachment: report.pdf", url: "/api/v1/resources/res_pdf/blob" },
+ attrs: {
+ label: "Attachment: report.pdf",
+ url: "/api/v1/resources/res_pdf/blob",
+ displayMode: "compact",
+ },
}],
});
expect(docToMarkdown(doc)).toBe(markdown);
@@ -62,6 +67,33 @@ describe("PDF attachment Markdown compatibility", () => {
const doc = markdownToDoc("- [Product brief.pdf](/api/v1/resources/res_pdf/blob)");
expect(doc.content[0]?.content?.[0]?.content?.[0]?.content?.[0]?.type).toBe(PDF_ATTACHMENT_NODE_TYPE);
});
+
+ test("defaults legacy values to compact and accepts the persisted inline mode", () => {
+ expect(resolvePdfDisplayMode(undefined)).toBe("compact");
+ expect(resolvePdfDisplayMode("expanded")).toBe("compact");
+ expect(resolvePdfDisplayMode("inline")).toBe("inline");
+ });
+
+ test("keeps a per-attachment display mode in rich content without changing Markdown", () => {
+ const richDoc = {
+ type: "doc",
+ content: [{
+ type: "paragraph",
+ content: [{
+ type: PDF_ATTACHMENT_NODE_TYPE,
+ attrs: {
+ label: "Attachment: report.pdf",
+ url: "/api/v1/resources/res_pdf/blob",
+ displayMode: "inline",
+ },
+ }],
+ }],
+ };
+
+ expect(resolveMemoContentDoc(richDoc, "[Attachment: report.pdf](/api/v1/resources/res_pdf/blob)"))
+ .toEqual(richDoc);
+ expect(docToMarkdown(richDoc)).toBe("[Attachment: report.pdf](/api/v1/resources/res_pdf/blob)");
+ });
});
describe("memo character count", () => {
diff --git a/packages/shared/src/content.ts b/packages/shared/src/content.ts
index 8c6d8789..89824830 100644
--- a/packages/shared/src/content.ts
+++ b/packages/shared/src/content.ts
@@ -27,9 +27,12 @@ export {
export {
PdfAttachment,
PDF_ATTACHMENT_NODE_TYPE,
+ PDF_DISPLAY_MODES,
isPdfAttachment,
+ resolvePdfDisplayMode,
upgradeStandalonePdfLinks,
} from "./pdf-attachment";
+export type { PdfDisplayMode } from "./pdf-attachment";
export type TiptapTextNode = {
type: "text";
diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.ts
index 0026e293..8367c487 100644
--- a/packages/shared/src/i18n/en-US.ts
+++ b/packages/shared/src/i18n/en-US.ts
@@ -182,9 +182,6 @@ export const enUS = {
imageCompressionTitle: "Compress note images",
imageCompressionDescription: "Compress large images locally before upload to reduce storage use.",
imageCompressionAria: "Compress note images",
- pdfPreviewDefaultTitle: "Expand PDF previews by default",
- pdfPreviewDefaultDescription: "Show PDF contents inline by default, or turn this off for compact cards. Saved in this browser.",
- pdfPreviewDefaultAria: "Expand note PDF previews by default",
aiStreamingTitle: "Stream AI responses",
aiStreamingDescription: "Turn on to watch AI content generation in real time; turn off for greater stability.",
aiStreamingAria: "Stream AI responses",
diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.ts
index 6bc5e459..572d3cbb 100644
--- a/packages/shared/src/i18n/zh-CN.ts
+++ b/packages/shared/src/i18n/zh-CN.ts
@@ -182,9 +182,6 @@ export const zhCN = {
imageCompressionTitle: "压缩笔记内图片",
imageCompressionDescription: "上传大图时在本地压缩,节省资源占用。",
imageCompressionAria: "是否压缩笔记内图片",
- pdfPreviewDefaultTitle: "默认展开 PDF 预览",
- pdfPreviewDefaultDescription: "开启后,笔记内 PDF 默认直接显示内容;关闭后默认显示紧凑卡片。偏好保存在当前浏览器中。",
- pdfPreviewDefaultAria: "笔记内 PDF 是否默认展开预览",
aiStreamingTitle: "流式返回 AI 结果",
aiStreamingDescription: "开启后实时展示 AI 内容生成过程;关闭可获得更高稳定性。",
aiStreamingAria: "是否流式返回 AI 结果",
diff --git a/packages/shared/src/pdf-attachment.ts b/packages/shared/src/pdf-attachment.ts
index 875bc1a1..380fab19 100644
--- a/packages/shared/src/pdf-attachment.ts
+++ b/packages/shared/src/pdf-attachment.ts
@@ -2,6 +2,11 @@ import { mergeAttributes, Node } from "@tiptap/core";
import type { TiptapDoc, TiptapMark, TiptapNode, TiptapTextNode } from "./content";
export const PDF_ATTACHMENT_NODE_TYPE = "edgeeverPdfAttachment" as const;
+export const PDF_DISPLAY_MODES = ["compact", "inline"] as const;
+export type PdfDisplayMode = (typeof PDF_DISPLAY_MODES)[number];
+
+export const resolvePdfDisplayMode = (value: unknown): PdfDisplayMode =>
+ value === "inline" ? "inline" : "compact";
const PDF_LINK_PATTERN = /^\[([^\]]+)\]\(([^\s)]+)(?:\s+"[^"]*")?\)/;
@@ -31,6 +36,13 @@ export const PdfAttachment = Node.create({
parseHTML: (element) => element.getAttribute("data-pdf-label") || "PDF",
renderHTML: (attributes) => ({ "data-pdf-label": attributes.label || "PDF" }),
},
+ displayMode: {
+ default: "compact",
+ parseHTML: (element) => resolvePdfDisplayMode(element.getAttribute("data-pdf-display-mode")),
+ renderHTML: (attributes) => ({
+ "data-pdf-display-mode": resolvePdfDisplayMode(attributes.displayMode),
+ }),
+ },
};
},
@@ -50,7 +62,7 @@ export const PdfAttachment = Node.create({
parseMarkdown: (token) => ({
type: PDF_ATTACHMENT_NODE_TYPE,
- attrs: { url: token.url || "", label: token.label || "PDF" },
+ attrs: { url: token.url || "", label: token.label || "PDF", displayMode: "compact" },
}),
renderMarkdown: (node) => `[${escapeMarkdownLabel(String(node.attrs?.label || "PDF"))}](${String(node.attrs?.url || "")})`,
@@ -95,7 +107,7 @@ export const upgradeStandalonePdfLinks = (doc: TiptapDoc): TiptapDoc => {
...node,
content: [{
type: PDF_ATTACHMENT_NODE_TYPE,
- attrs: { url: href, label: child.text },
+ attrs: { url: href, label: child.text, displayMode: "compact" },
}],
};
}