improve prevent deletion

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

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/packages/core/src/api/blockManipulation/commands/mergeBlocks/mergeBlocks.ts b/packages/core/src/api/blockManipulation/commands/mergeBlocks/mergeBlocks.ts
@@ -169,9 +169,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(
                     {