Fix creation of space blocks on bulk delete

sugarlabs · May 22, 2024 · 0022fad · 0022fad
1 parent 46b62b1
commit 0022fad
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/js/piemenus.js b/js/piemenus.js
@@ -3452,8 +3452,24 @@ const piemenuBlockContext = (block) => {
         that.blocks.extract();
         if (that.blocks.selectionModeOn){
             const blocksArray = that.blocks.selectedBlocks;
-            for(let i = 0; i < blocksArray.length; i++){
-                that.blocks.sendStackToTrash(blocksArray[i]);
+            // figure out which of blocks in selectedBlocks are clamp blocks and nonClamp one's.
+            const clampBlocks = [];
+            const nonClampBlocks = [];
+
+            for (let i = 0; i < blocksArray.length; i++) {
+                if (that.blocks.selectedBlocks[i].isClampBlock()) {
+                    clampBlocks.push(that.blocks.selectedBlocks[i]);
+                } else if (that.blocks.selectedBlocks[i].isDisconnected()) {
+                    nonClampBlocks.push(that.blocks.selectedBlocks[i]);
+                }
+            }
+
+            for (let i = 0; i < clampBlocks.length; i++) {
+                that.blocks.sendStackToTrash(clampBlocks[i]);
+            }
+
+            for (let i = 0; i < nonClampBlocks.length; i++) {
+                that.blocks.sendStackToTrash(nonClampBlocks[i]);
             }
             // set selection mode to false
             that.blocks.setSelectionToActivity(false);