From 105585657da75f26739f68abbb060a553afebfcc Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Wed, 28 Feb 2024 19:34:19 +0000
Subject: [PATCH 1/5] fix: shouldPreventMove not being respected

---
 core/block_dragger.ts | 56 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 10 deletions(-)

diff --git a/core/block_dragger.ts b/core/block_dragger.ts
index 8d57344ea2e..c2acb08b64e 100644
--- a/core/block_dragger.ts
+++ b/core/block_dragger.ts
@@ -71,8 +71,18 @@ export class BlockDragger implements IBlockDragger {
 
   /** Whether the block would be deleted if dropped immediately. */
   protected wouldDeleteBlock_ = false;
+
   protected startXY_: Coordinate;
 
+  /** The parent block at the start of the drag. */
+  private startParentConn: RenderedConnection | null = null;
+
+  /**
+   * The child block at the start of the drag. Only gets set if
+   * `healStack` is true.
+   */
+  private startChildConn: RenderedConnection | null = null;
+
   /**
    * @deprecated To be removed in v11. Updating icons is now handled by the
    *     block's `moveDuringDrag` method.
@@ -137,6 +147,13 @@ export class BlockDragger implements IBlockDragger {
     blockAnimation.disconnectUiStop();
 
     if (this.shouldDisconnect_(healStack)) {
+      this.startParentConn =
+        this.draggingBlock_.outputConnection?.targetConnection ??
+        this.draggingBlock_.previousConnection?.targetConnection;
+      if (healStack) {
+        this.startChildConn =
+          this.draggingBlock_.nextConnection?.targetConnection;
+      }
       this.disconnectBlock_(healStack, currentDragDeltaXY);
     }
     this.draggingBlock_.setDragging(true);
@@ -424,17 +441,10 @@ export class BlockDragger implements IBlockDragger {
         .getLayerManager()
         ?.moveOffDragLayer(this.draggingBlock_, layers.BLOCK);
       this.draggingBlock_.setDragging(false);
-      if (delta) {
-        // !preventMove
+      if (preventMove) {
+        this.moveToOriginalPosition();
+      } else if (delta) {
         this.updateBlockAfterMove_();
-      } else {
-        // Blocks dragged directly from a flyout may need to be bumped into
-        // bounds.
-        bumpObjects.bumpIntoBounds(
-          this.draggingBlock_.workspace,
-          this.workspace_.getMetricsManager().getScrollMetrics(true),
-          this.draggingBlock_,
-        );
       }
     }
     // Must dispose after `updateBlockAfterMove_` is called to not break the
@@ -445,6 +455,32 @@ export class BlockDragger implements IBlockDragger {
     eventUtils.setGroup(false);
   }
 
+  /**
+   * Moves the dragged block back to its original position before the start of
+   * the drag. Reconnects any parent and child blocks.\
+   */
+  private moveToOriginalPosition() {
+    this.startChildConn?.connect(this.draggingBlock_.nextConnection);
+    if (this.startParentConn) {
+      switch (this.startParentConn?.type) {
+        case ConnectionType.INPUT_VALUE:
+          this.startParentConn?.connect(this.draggingBlock_.outputConnection);
+          break;
+        case ConnectionType.NEXT_STATEMENT:
+          this.startParentConn?.connect(this.draggingBlock_.previousConnection);
+      }
+    } else {
+      this.draggingBlock_.moveTo(this.startXY_, ['drag']);
+      // Blocks dragged directly from a flyout may need to be bumped into
+      // bounds.
+      bumpObjects.bumpIntoBounds(
+        this.draggingBlock_.workspace,
+        this.workspace_.getMetricsManager().getScrollMetrics(true),
+        this.draggingBlock_,
+      );
+    }
+  }
+
   /**
    * Calculates the drag delta and new location values after a block is dragged.
    *

From 04d175bed4f84b62fdf1dc8c7e3ecf36ede9f4fe Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Tue, 5 Mar 2024 21:50:30 +0000
Subject: [PATCH 2/5] fix: PR comments

---
 core/block_dragger.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/block_dragger.ts b/core/block_dragger.ts
index c2acb08b64e..972c5fa2bea 100644
--- a/core/block_dragger.ts
+++ b/core/block_dragger.ts
@@ -457,17 +457,17 @@ export class BlockDragger implements IBlockDragger {
 
   /**
    * Moves the dragged block back to its original position before the start of
-   * the drag. Reconnects any parent and child blocks.\
+   * the drag. Reconnects any parent and child blocks.
    */
   private moveToOriginalPosition() {
     this.startChildConn?.connect(this.draggingBlock_.nextConnection);
     if (this.startParentConn) {
-      switch (this.startParentConn?.type) {
+      switch (this.startParentConn.type) {
         case ConnectionType.INPUT_VALUE:
-          this.startParentConn?.connect(this.draggingBlock_.outputConnection);
+          this.startParentConn.connect(this.draggingBlock_.outputConnection);
           break;
         case ConnectionType.NEXT_STATEMENT:
-          this.startParentConn?.connect(this.draggingBlock_.previousConnection);
+          this.startParentConn.connect(this.draggingBlock_.previousConnection);
       }
     } else {
       this.draggingBlock_.moveTo(this.startXY_, ['drag']);

From 9bc96570e2a470df0743352d8cd0edee3b2b2dd4 Mon Sep 17 00:00:00 2001
From: "Evan W. Patton" <ewpatton@mit.edu>
Date: Tue, 21 Jan 2025 19:18:49 -0500
Subject: [PATCH 3/5] fix: Insertion marker inline should match original block

Change-Id: Iaf0375fe0f30612965730d72836e9fba0a2e61f4
---
 core/connection_previewers/insertion_marker_previewer.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/connection_previewers/insertion_marker_previewer.ts b/core/connection_previewers/insertion_marker_previewer.ts
index 414d8dfe7da..3038502287d 100644
--- a/core/connection_previewers/insertion_marker_previewer.ts
+++ b/core/connection_previewers/insertion_marker_previewer.ts
@@ -158,6 +158,7 @@ export class InsertionMarkerPreviewer implements IConnectionPreviewer {
   private createInsertionMarker(origBlock: BlockSvg) {
     const result = this.workspace.newBlock(origBlock.type);
     result.setInsertionMarker(true);
+    result.setInputsInline(origBlock.getInputsInline());
     if (origBlock.saveExtraState) {
       const state = origBlock.saveExtraState(true);
       if (state && result.loadExtraState) {

From e34b8c8b48033fb1981e65c3fc421601af08c703 Mon Sep 17 00:00:00 2001
From: "Evan W. Patton" <ewpatton@mit.edu>
Date: Tue, 21 Jan 2025 19:22:29 -0500
Subject: [PATCH 4/5] release: v10.5.0-beta.1

Change-Id: Ibb13574e499354033b9ce1858910d85d069eef5b
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a7ac581f02d..d0f30e3f48d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blockly",
-  "version": "10.4.3",
+  "version": "10.5.0-beta.1",
   "description": "Blockly is a library for building visual programming editors.",
   "keywords": [
     "blockly"

From b4c6ff0b1bfb5005f678ac05d220bf8015e12f60 Mon Sep 17 00:00:00 2001
From: "Evan W. Patton" <ewpatton@mit.edu>
Date: Wed, 19 Feb 2025 17:22:59 -0500
Subject: [PATCH 5/5] fix: Address control color and opacity concerns

Change-Id: I3d76b3cac3e5a2a4c9a4c6a7a5bfba08f810e5f9
---
 core/trashcan.ts  |   4 ++--
 media/sprites.png | Bin 2595 -> 2653 bytes
 media/sprites.svg |   6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/trashcan.ts b/core/trashcan.ts
index 42c32ea1f34..b253a6f320d 100644
--- a/core/trashcan.ts
+++ b/core/trashcan.ts
@@ -736,10 +736,10 @@ const ANIMATION_LENGTH = 80;
 const ANIMATION_FRAMES = 4;
 
 /** The minimum (resting) opacity of the trashcan and lid. */
-const OPACITY_MIN = 0.4;
+const OPACITY_MIN = 1.0;
 
 /** The maximum (hovered) opacity of the trashcan and lid. */
-const OPACITY_MAX = 0.8;
+const OPACITY_MAX = 1.0;
 
 /**
  * The maximum angle the trashcan lid can opens to. At the end of the open
diff --git a/media/sprites.png b/media/sprites.png
index 20aadb6c4c31f4a46f0a3316241788687c2fc444..18f844bdfdc92096af96fbf2669c032c6e2c2ba3 100644
GIT binary patch
literal 2653
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

delta 2580
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
U5s_{tbPxc{jI3}k4Bg2828>m$`2YX_

diff --git a/media/sprites.svg b/media/sprites.svg
index 3f09ef3a4d6..aa78ff742ea 100644
--- a/media/sprites.svg
+++ b/media/sprites.svg
@@ -18,16 +18,16 @@
   text-anchor: middle;
 }
 .trash {
-  fill: #888;
+  fill: #000;
 }
 .zoom {
   fill: none;
-  stroke: #888;
+  stroke: #000;
   stroke-width: 2;
   stroke-linecap: round;
 }
 .zoom>.center {
-  fill: #888;
+  fill: #000;
   stroke-width: 0;
 }
   </style>