From 41fe298a62455264dbdfce68408310a1eaf6c7a3 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Wed, 17 Apr 2024 20:53:57 +0000
Subject: [PATCH] fix: cut shortcut for workspace comments (#8036)

---
 core/shortcut_items.ts | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/core/shortcut_items.ts b/core/shortcut_items.ts
index 48a7f7719..b5abf5554 100644
--- a/core/shortcut_items.ts
+++ b/core/shortcut_items.ts
@@ -161,19 +161,32 @@ export function registerCut() {
         !workspace.options.readOnly &&
         !Gesture.inProgress() &&
         selected != null &&
-        selected instanceof BlockSvg &&
+        isDeletable(selected) &&
         selected.isDeletable() &&
+        isDraggable(selected) &&
         selected.isMovable() &&
         !selected.workspace!.isFlyout
       );
     },
     callback(workspace) {
       const selected = common.getSelected();
-      if (!selected || !isCopyable(selected)) return false;
-      copyData = selected.toCopyData();
-      copyWorkspace = workspace;
-      (selected as BlockSvg).checkAndDelete();
-      return true;
+
+      if (selected instanceof BlockSvg) {
+        copyData = selected.toCopyData();
+        copyWorkspace = workspace;
+        selected.checkAndDelete();
+        return true;
+      } else if (
+        isDeletable(selected) &&
+        selected.isDeletable() &&
+        isCopyable(selected)
+      ) {
+        copyData = selected.toCopyData();
+        copyWorkspace = workspace;
+        selected.dispose();
+        return true;
+      }
+      return false;
     },
     keyCodes: [ctrlX, altX, metaX],
   };