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
refactor: simplify note image sharing (#292)
tianma-if45c3f2004a2a
diff --git a/apps/web/src/components/EditorPane.tsx b/apps/web/src/components/EditorPane.tsxindex cd247c21..73c1580f 100644--- a/apps/web/src/components/EditorPane.tsx+++ b/apps/web/src/components/EditorPane.tsx@@ -36,7 +36,6 @@ import {Info,FileDown,FileCode2,- ImageDown,Printer,Link2,Share2,@@ -151,7 +150,7 @@ import { downloadMarkdownFile } from "@/lib/note-markdown-export";import { NOTE_HTML_FULL_STYLES } from "@/lib/note-html-export-assets";import { downloadNoteHtmlFile, getHtmlImageEmbedNoticeKind } from "@/lib/note-html-export";import { openNotePrintPreview, serializeNoteDocumentForPrint } from "@/lib/note-print";-import { downloadNoteImage, type NoteImageFormat } from "@/lib/note-image-export";+import type { NoteImageFormat } from "@/lib/note-image-export";import { getAiSlashCommandStart, saveAndSyncEditor, shouldOpenAiFromSpace } from "@/lib/editor-shortcuts";import {AI_SPACE_SHORTCUT_CHANGED_EVENT,@@ -2898,34 +2897,6 @@ const RichEditorPane = ({useMobilePlainTextEditor,]);- const imageExportInProgressRef = useRef(false);- const handleExportImage = useCallback(async (format: NoteImageFormat) => {- const options = buildImageExportOptions(format);- if (!options) return;- if (imageExportInProgressRef.current) {- window.alert(t("editor.imageExport.inProgress"));- return;- }-- imageExportInProgressRef.current = true;- try {- const result = await downloadNoteImage(options);- const noticeKind = getHtmlImageEmbedNoticeKind(result.images);- if (noticeKind === "partial") {- window.alert(t("editor.imageExport.imageEmbedPartial", result.images));- } else if (noticeKind === "failed-all") {- window.alert(t("editor.imageExport.imageEmbedFailed", result.images));- }- } catch {- window.alert(t("editor.imageExport.error"));- } finally {- imageExportInProgressRef.current = false;- }- }, [- buildImageExportOptions,- t,- ]);-const handleOpenImageShare = useCallback(() => {const options = buildImageExportOptions("png");if (!options) return;@@ -2987,12 +2958,6 @@ const RichEditorPane = ({case "share-image":handleOpenImageShare();break;- case "export-png":- void handleExportImage("png");- break;- case "export-jpeg":- void handleExportImage("jpeg");- break;case "save-as-template":handleSaveAsTemplate();break;@@ -3001,7 +2966,6 @@ const RichEditorPane = ({documentActionRequest,editor,handleExportHtml,- handleExportImage,handleExportMarkdown,handleExportPdf,handleOpenImageShare,@@ -4321,20 +4285,6 @@ const RichEditorPane = ({<Share2 className="h-4 w-4 text-slate-500" />{t("editor.imageShare.action")}</DropdownMenuItem>- <DropdownMenuItem- className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"- onClick={() => void handleExportImage("png")}- >- <ImageDown className="h-4 w-4 text-slate-500" />- {t("editor.exportPng")}- </DropdownMenuItem>- <DropdownMenuItem- className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"- onClick={() => void handleExportImage("jpeg")}- >- <ImageDown className="h-4 w-4 text-slate-500" />- {t("editor.exportJpeg")}- </DropdownMenuItem>{readOnly ? (<><DropdownMenuItemdiff --git a/apps/web/src/components/MemoListPane.tsx b/apps/web/src/components/MemoListPane.tsxindex 29d7b9e7..05c2de42 100644--- a/apps/web/src/components/MemoListPane.tsx+++ b/apps/web/src/components/MemoListPane.tsx@@ -43,7 +43,6 @@ import {Share2,FileDown,FileCode2,- ImageDown,Printer,Pencil,Copy,@@ -1588,20 +1587,6 @@ export const MemoListPane = ({<Share2 className="h-4 w-4 text-slate-500" />{t("editor.imageShare.action")}</DropdownMenuItem>- <DropdownMenuItem- className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"- onClick={() => requestContextDocumentAction("export-png")}- >- <ImageDown className="h-4 w-4 text-slate-500" />- {t("editor.exportPng")}- </DropdownMenuItem>- <DropdownMenuItem- className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"- onClick={() => requestContextDocumentAction("export-jpeg")}- >- <ImageDown className="h-4 w-4 text-slate-500" />- {t("editor.exportJpeg")}- </DropdownMenuItem><DropdownMenuItemclassName="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"onClick={() => requestContextDocumentAction("save-as-template")}diff --git a/apps/web/src/components/dialogs/ShareNoteImageDialog.tsx b/apps/web/src/components/dialogs/ShareNoteImageDialog.tsxindex ec38d397..602e7404 100644--- a/apps/web/src/components/dialogs/ShareNoteImageDialog.tsx+++ b/apps/web/src/components/dialogs/ShareNoteImageDialog.tsx@@ -94,20 +94,20 @@ export const ShareNoteImageDialog = ({);const noticeKind = prepared ? getHtmlImageEmbedNoticeKind(prepared.images) : "none";- const complete = async () => {+ const share = async () => {if (!prepared || !shareFile) return;- if (canUseSystemShare) {- try {- await navigator.share({ files: [shareFile], title: source.title });- onOpenChange(false);- } catch (shareError) {- if (shareError instanceof DOMException && shareError.name === "AbortError") return;- setError(true);- }- return;+ try {+ await navigator.share({ files: [shareFile], title: source.title });+ onOpenChange(false);+ } catch (shareError) {+ if (shareError instanceof DOMException && shareError.name === "AbortError") return;+ setError(true);}+ };++ const download = () => {+ if (!prepared) return;downloadPreparedNoteImage(prepared);- onOpenChange(false);};return (@@ -206,10 +206,16 @@ export const ShareNoteImageDialog = ({<DialogFooter className="border-t border-slate-200 px-5 py-4"><Button variant="ghost" onClick={() => onOpenChange(false)}>{t("common.cancel")}</Button>- <Button variant="solid" disabled={!prepared} onClick={() => void complete()}>- {canUseSystemShare ? <Share2 className="h-4 w-4" /> : <Download className="h-4 w-4" />}- {t(canUseSystemShare ? "editor.imageShare.share" : "editor.imageShare.download")}+ <Button variant={canUseSystemShare ? "outline" : "solid"} disabled={!prepared} onClick={download}>+ <Download className="h-4 w-4" />+ {t("editor.imageShare.download")}</Button>+ {canUseSystemShare ? (+ <Button variant="solid" disabled={!prepared} onClick={() => void share()}>+ <Share2 className="h-4 w-4" />+ {t("editor.imageShare.share")}+ </Button>+ ) : null}</DialogFooter></DialogContent></Dialog>diff --git a/apps/web/src/lib/app-helpers.ts b/apps/web/src/lib/app-helpers.tsindex 2d1deca6..65e69ce2 100644--- a/apps/web/src/lib/app-helpers.ts+++ b/apps/web/src/lib/app-helpers.ts@@ -36,8 +36,6 @@ export type MemoDocumentAction =| "export-html"| "export-pdf"| "share-image"- | "export-png"- | "export-jpeg"| "save-as-template";export type MemoDocumentActionRequest = {id: number;diff --git a/tests/e2e/note-image-export.spec.ts b/tests/e2e/note-image-export.spec.tsindex 49ed11d8..168d1f4f 100644--- a/tests/e2e/note-image-export.spec.ts+++ b/tests/e2e/note-image-export.spec.ts@@ -1,4 +1,4 @@-import { expect, test, type APIRequestContext, type Download, type Page } from "@playwright/test";+import { expect, test, type APIRequestContext, type Download } from "@playwright/test";import sharp from "sharp";const E2E_USERNAME = process.env.EDGE_EVER_E2E_USERNAME || "admin";@@ -11,13 +11,6 @@ const login = async (request: APIRequestContext) => {expect(response.ok(), `login failed: ${response.status()} ${await response.text()}`).toBe(true);};-const downloadImage = async (page: Page, format: "JPEG" | "PNG") => {- await page.getByRole("button", { name: /笔记更多操作|More note actions/ }).click();- const downloadPromise = page.waitForEvent("download");- await page.getByRole("menuitem", { name: new RegExp(`导出 ${format}|Export ${format}`, "i") }).click();- return downloadPromise;-};-const inspectDownload = async (download: Download) => {const path = await download.path();expect(path).not.toBeNull();@@ -28,7 +21,7 @@ const inspectDownload = async (download: Download) => {return { metadata, statistics, topLeft: Array.from(pixels.slice(0, info.channels)) };};-test("exports a long note as one non-blank PNG and JPEG", async ({ page, request }) => {+test("downloads a long note as one non-blank PNG or JPEG from the share dialog", async ({ page, request }) => {test.setTimeout(90_000);await login(request);const notebooksResponse = await request.get("/api/v1/notebooks");@@ -54,23 +47,26 @@ test("exports a long note as one non-blank PNG and JPEG", async ({ page, requestawait page.locator(`[data-memo-id="${memoId}"]`).locator("button").first().click();await expect(page.locator(".ProseMirror")).toContainText("Visible export content 80");- for (const format of ["PNG", "JPEG"] as const) {- const download = await downloadImage(page, format);- expect(download.suggestedFilename()).toMatch(format === "PNG" ? /\.png$/i : /\.jpg$/i);- expect(download.suggestedFilename()).not.toMatch(/\.zip$/i);-- const { metadata, statistics } = await inspectDownload(download);- expect(metadata.format).toBe(format === "PNG" ? "png" : "jpeg");- expect(metadata.width).toBeGreaterThan(700);- expect(metadata.height).toBeGreaterThan(4_800);- expect(statistics.channels.some((channel) => channel.stdev > 5)).toBe(true);- }-await page.getByRole("button", { name: /笔记更多操作|More note actions/ }).click();+ await expect(page.getByRole("menuitem", { name: /导出 PNG|Export PNG/ })).toHaveCount(0);+ await expect(page.getByRole("menuitem", { name: /导出 JPEG|Export JPEG/ })).toHaveCount(0);await page.getByRole("menuitem", { name: /分享为图片|Share as image/ }).click();const dialog = page.getByRole("dialog", { name: /分享为图片|Share as image/ });await expect(dialog).toBeVisible();await expect(dialog.getByRole("img", { name: /笔记分享图片预览|Note image share preview/ })).toBeVisible({ timeout: 20_000 });++ const pngDownloadPromise = page.waitForEvent("download");+ await dialog.getByRole("button", { name: /下载图片|Download image/ }).click();+ const pngDownload = await pngDownloadPromise;+ expect(pngDownload.suggestedFilename()).toMatch(/\.png$/i);+ expect(pngDownload.suggestedFilename()).not.toMatch(/\.zip$/i);+ const pngImage = await inspectDownload(pngDownload);+ expect(pngImage.metadata.format).toBe("png");+ expect(pngImage.metadata.width).toBeGreaterThan(700);+ expect(pngImage.metadata.height).toBeGreaterThan(4_800);+ expect(pngImage.statistics.channels.some((channel) => channel.stdev > 5)).toBe(true);+ await expect(dialog).toBeVisible();+await dialog.getByRole("button", { name: /薄荷|Mint/ }).click();await dialog.getByRole("checkbox", { name: /笔记本|Notebook/ }).click();await dialog.getByRole("combobox").click();