A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
editor: allow attaching image as file (#8752)
01zulfi994060cce282
diff --git a/apps/mobile/app/screens/editor/tiptap/picker.ts b/apps/mobile/app/screens/editor/tiptap/picker.tsindex 648c9d76e..f243e65b2 100644--- a/apps/mobile/app/screens/editor/tiptap/picker.ts+++ b/apps/mobile/app/screens/editor/tiptap/picker.ts@@ -126,30 +126,16 @@ const file = async (fileOptions: PickerOptions) => {useTabStore.getState().getNoteIdForTab(fileOptions.tabId) ===fileOptions.noteId) {- if (isImage(file.type || "application/octet-stream")) {- editorController.current?.commands.insertImage(- {- hash: hash,- filename: fileName,- mime: file.type || "application/octet-stream",- size: file.size || 0,- dataurl: (await db.attachments.read(hash, "base64")) as string,- type: "image"- },- fileOptions.tabId- );- } else {- editorController.current?.commands.insertAttachment(- {- hash: hash,- filename: fileName,- mime: file.type || "application/octet-stream",- size: file.size || 0,- type: "file"- },- fileOptions.tabId- );- }+ editorController.current?.commands.insertAttachment(+ {+ hash: hash,+ filename: fileName,+ mime: file.type || "application/octet-stream",+ size: file.size || 0,+ type: "file"+ },+ fileOptions.tabId+ );} else {throw new Error("Failed to attach file, no tabId is set");}diff --git a/apps/web/src/components/editor/index.tsx b/apps/web/src/components/editor/index.tsxindex 77c49c9c4..0eb3824cd 100644--- a/apps/web/src/components/editor/index.tsx+++ b/apps/web/src/components/editor/index.tsx@@ -571,9 +571,9 @@ export function Editor(props: EditorProps) {onChange={onSave}onDownloadAttachment={(attachment) => saveAttachment(attachment.hash)}onPreviewAttachment={async (data) => {- const { hash, type } = data;+ const { hash, type, mime } = data;const attachment = await db.attachments.attachment(hash);- if (attachment && type === "image") {+ if (attachment && mime.startsWith("image/")) {await previewImageAttachment(attachment);} else if (attachment &&diff --git a/apps/web/src/components/editor/picker.ts b/apps/web/src/components/editor/picker.tsindex e8e0bb3e0..bd91d2a37 100644--- a/apps/web/src/components/editor/picker.ts+++ b/apps/web/src/components/editor/picker.ts@@ -42,10 +42,13 @@ export async function insertAttachments(type = "*/*") {multiple: true});if (!files) return;- return await attachFiles(files);+ return await attachFiles(files, type === "*/*");}-export async function attachFiles(files: File[]) {+export async function attachFiles(+ files: File[],+ skipSpecialImageHandling = false+) {let images = files.filter((f) => f.type.startsWith("image/"));const imageCompressionConfig = Config.get<ImageCompressionOptions>("imageCompression",@@ -87,7 +90,7 @@ export async function attachFiles(files: File[]) {const documents = files.filter((f) => !f.type.startsWith("image/"));const attachments: Attachment[] = [];for (const file of [...images, ...documents]) {- const attachment = file.type.startsWith("image/")+ const attachment = !skipSpecialImageHandling && file.type.startsWith("image/")? await pickImage(file): await pickFile(file);if (!attachment) continue;diff --git a/packages/editor/src/toolbar/tools/attachment.tsx b/packages/editor/src/toolbar/tools/attachment.tsxindex 1ab73688f..23fb3bcd0 100644--- a/packages/editor/src/toolbar/tools/attachment.tsx+++ b/packages/editor/src/toolbar/tools/attachment.tsx@@ -102,7 +102,7 @@ export function RemoveAttachment(props: ToolProps) {}const previewableFileExtensions = ["pdf"];-const previewableMimeTypes = ["application/pdf"];+const previewableMimeTypes = ["application/pdf", "image/"];function canPreviewAttachment(attachment: Attachment) {if (!attachment) return false;