chore(blocks): reuse attachment upload method (#9007)

toeverything · Dec 18, 2024 · 789a172 · 789a172
1 parent bf0a93f
commit 789a172
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 32 deletions.
diff --git a/packages/blocks/src/attachment-block/utils.ts b/packages/blocks/src/attachment-block/utils.ts
@@ -37,7 +37,7 @@ function isAttachmentUploading(blockId: string) {
 /**
  * This function will not verify the size of the file.
  */
-async function uploadAttachmentBlob(
+export async function uploadAttachmentBlob(
   editorHost: EditorHost,
   blockId: string,
   blob: Blob
@@ -63,15 +63,12 @@ async function uploadAttachmentBlob(
   } finally {
     setAttachmentUploaded(blockId);
 
-    const attachmentModel = doc.getBlockById(
-      blockId
-    ) as AttachmentBlockModel | null;
+    const block = doc.getBlock(blockId);
 
     doc.withoutTransact(() => {
-      if (!attachmentModel) {
-        return;
-      }
-      doc.updateBlock(attachmentModel, {
+      if (!block) return;
+
+      doc.updateBlock(block.model, {
         sourceId,
       } satisfies Partial<AttachmentBlockProps>);
     });

diff --git a/packages/blocks/src/root-block/edgeless/utils/common.ts b/packages/blocks/src/root-block/edgeless/utils/common.ts
@@ -31,10 +31,7 @@ import {
   Vec,
 } from '@blocksuite/global/utils';
 
-import {
-  setAttachmentUploaded,
-  setAttachmentUploading,
-} from '../../../attachment-block/utils.js';
+import { uploadAttachmentBlob } from '../../../attachment-block/utils.js';
 import { calcBoundByOrigin, readImageSize } from '../components/utils.js';
 import { DEFAULT_NOTE_OFFSET_X, DEFAULT_NOTE_OFFSET_Y } from './consts.js';
 import { addBlock } from './crud.js';
@@ -102,26 +99,7 @@ export async function addAttachments(
 
   // upload file and update the attachment model
   const uploadPromises = dropInfos.map(async ({ blockId, file }) => {
-    let sourceId: string | undefined;
-    try {
-      setAttachmentUploading(blockId);
-      sourceId = await std.doc.blobSync.set(file);
-    } catch (error) {
-      console.error(error);
-      if (error instanceof Error) {
-        toast(
-          std.host,
-          `Failed to upload attachment! ${error.message || error.toString()}`
-        );
-      }
-    } finally {
-      setAttachmentUploaded(blockId);
-      std.doc.withoutTransact(() => {
-        gfx.updateElement(blockId, {
-          sourceId,
-        } satisfies Partial<AttachmentBlockProps>);
-      });
-    }
+    await uploadAttachmentBlob(std.host, blockId, file);
     return blockId;
   });
   const blockIds = await Promise.all(uploadPromises);