improve prevent deletion

TypeCellOS · Nov 27, 2024 · b0854f9 · b0854f9
1 parent 8ebf69a
commit b0854f9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/packages/core/src/api/blockManipulation/commands/mergeBlocks/mergeBlocks.ts b/packages/core/src/api/blockManipulation/commands/mergeBlocks/mergeBlocks.ts
@@ -125,14 +125,18 @@ const mergeBlocks = (
     // TODO: test merging between a columnList and paragraph, between two columnLists, and v.v.
     let startPos = prevBlockInfo.blockContent.afterPos - 1;
     let endPos = nextBlockInfo.blockContent.beforePos + 1;
-
-    // Check if the previous block is an image
-    if (prevBlockInfo.blockNoteType === "image") {
-      // If the next block contains text, merging will remove the image (previous block) and retain the text
+    const isPrevFileBlock =
+      prevBlockInfo.blockNoteType === "image" ||
+      prevBlockInfo.blockNoteType === "file" ||
+      prevBlockInfo.blockNoteType === "audio";
+
+    // Check if the previous is a file block
+    if (isPrevFileBlock) {
+      // If the next block contains text, merging will remove the file (previous block) and retain the text
       if (nextBlockInfo.blockContent.node.textContent) {
         endPos = nextBlockInfo.blockContent.beforePos;
       } else {
-        // If the next block has no text, merging will remove the text block and retain the image
+        // If the next block has no text, merging will remove the text block and retain the file
         startPos = prevBlockInfo.blockContent.afterPos;
       }
     }
@@ -169,9 +173,12 @@ export const mergeBlocksCommand =
       prevBlockInfo
     );
 
-    const prevBlockIsImage = prevBlockInfo.blockNoteType === "image";
+    const isPrevFileBlock =
+      prevBlockInfo.blockNoteType === "image" ||
+      prevBlockInfo.blockNoteType === "file" ||
+      prevBlockInfo.blockNoteType === "audio";
 
-    if (!canMerge(bottomNestedBlockInfo, nextBlockInfo) && !prevBlockIsImage) {
+    if (!canMerge(bottomNestedBlockInfo, nextBlockInfo) && !isPrevFileBlock) {
       return false;
     }
 

diff --git a/packages/core/src/extensions/KeyboardShortcuts/KeyboardShortcutsExtension.ts b/packages/core/src/extensions/KeyboardShortcuts/KeyboardShortcutsExtension.ts
@@ -297,9 +297,12 @@ export const KeyboardShortcutsExtension = Extension.create<{
                   "inline*" &&
                   bottomBlock.blockContent.node.childCount === 0);
 
-              const isImageBlock = bottomBlock.blockNoteType === "image";
+              const isFileBlock =
+                bottomBlock.blockNoteType === "image" ||
+                bottomBlock.blockNoteType === "file" ||
+                bottomBlock.blockNoteType === "audio";
 
-              if (prevBlockNotTableAndNoContent && !isImageBlock) {
+              if (prevBlockNotTableAndNoContent && !isFileBlock) {
                 return chain()
                   .cut(
                     {