Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2026-02-23 19:49:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

editor: allow attaching image as file (#8752)

Browse Source 
* editor: allow attaching image as file
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>

* web: fix image previews for regular attachments

* mobile: allow images to be added as attachment without preview

* web: minor refactor
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>

---------

Co-authored-by: Ammar Ahmed <ammarahmed6506@gmail.com>
This commit is contained in:
01zulfi
2026-02-02 10:26:03 +05:00
committed by GitHub
parent 75103dc706
commit 994060cce2
4 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apps/mobile/app/screens/editor/tiptap/picker.ts
View File

@@ -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");
}

4
apps/web/src/components/editor/index.tsx
View File

@@ -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 &&

9
apps/web/src/components/editor/picker.ts
View File

@@ -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;

2
packages/editor/src/toolbar/tools/attachment.tsx
View File

@@ -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;