From f4961f602edb11db04bbbf39a64983f015209f3e Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Thu, 15 Feb 2024 15:38:14 -0800
Subject: [PATCH 1/2] Merge pull request #7859 from
 BeksOmega/fix/previewer-disposing

fix: connection previewer disposing too early
(cherry picked from commit da3ec253bf4af918d5914c87c62b3f4caa0322be)
---
 core/block_dragger.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/block_dragger.ts b/core/block_dragger.ts
index e6be293917b..26d265183a0 100644
--- a/core/block_dragger.ts
+++ b/core/block_dragger.ts
@@ -382,7 +382,6 @@ export class BlockDragger implements IBlockDragger {
 
     blockAnimation.disconnectUiStop();
     this.connectionPreviewer.hidePreview();
-    this.connectionPreviewer.dispose();
 
     const preventMove =
       !!this.dragTarget_ &&
@@ -417,6 +416,9 @@ export class BlockDragger implements IBlockDragger {
         );
       }
     }
+    // Must dispose after `updateBlockAfterMove_` is called to not break the
+    // dynamic connections plugin.
+    this.connectionPreviewer.dispose();
     this.workspace_.setResizesEnabled(true);
 
     eventUtils.setGroup(false);

From 50e22feaeb24cd58eb861e3a991cbc8ba9828436 Mon Sep 17 00:00:00 2001
From: Maribeth Moffatt <maribethb@google.com>
Date: Thu, 15 Feb 2024 15:55:24 -0800
Subject: [PATCH 2/2] release: update version number to 10.4.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 792268cf8df..7ea0d49a0d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "blockly",
-  "version": "10.4.0",
+  "version": "10.4.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "blockly",
-      "version": "10.4.0",
+      "version": "10.4.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
diff --git a/package.json b/package.json
index 7214ba3d14f..88ec169ead6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blockly",
-  "version": "10.4.0",
+  "version": "10.4.1",
   "description": "Blockly is a library for building visual programming editors.",
   "keywords": [
     "blockly"