fix: blocks not being returned to the correct drag layer if their dra…

…g is reverted with no parent
google · Apr 3, 2024 · 37b0ffb · 37b0ffb
1 parent a73e8a3
commit 37b0ffb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/core/dragging/block_drag_strategy.ts b/core/dragging/block_drag_strategy.ts
@@ -424,6 +424,9 @@ export class BlockDragStrategy implements IDragStrategy {
       }
     } else {
       this.block.moveTo(this.startLoc!, ['drag']);
+      this.workspace
+        .getLayerManager()
+        ?.moveOffDragLayer(this.block, layers.BLOCK);
       // Blocks dragged directly from a flyout may need to be bumped into
       // bounds.
       bumpObjects.bumpIntoBounds(

diff --git a/core/trashcan.ts b/core/trashcan.ts
@@ -697,6 +697,14 @@ export class Trashcan
     };
     return blockInfo;
   }
+
+  wouldDelete(_element: IDraggable): boolean {
+    return false;
+  }
+
+  shouldPreventMove(_dragElement: IDraggable): boolean {
+    return true;
+  }
 }
 
 /** Width of both the trash can and lid images. */