From d227ec2c89b1a7a3f099877d22592f184b3c814d Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Wed, 22 Mar 2023 21:43:57 +0000
Subject: [PATCH 1/3] fix: remove forced rerender from mutator (#6918)

(cherry picked from commit d897cdcf1d972f3af7804f7f4f9b5874ffb17f9c)
---
 core/mutator.ts | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/core/mutator.ts b/core/mutator.ts
index d5a051f5297..58ce528e99f 100644
--- a/core/mutator.ts
+++ b/core/mutator.ts
@@ -460,21 +460,7 @@ export class Mutator extends Icon {
       const block = this.getBlock();
       const oldExtraState = BlockChange.getExtraBlockState_(block);
 
-      // Switch off rendering while the source block is rebuilt.
-      const savedRendered = block.rendered;
-      // TODO(#4288): We should not be setting the rendered property to false.
-      block.rendered = false;
-
-      // Allow the source block to rebuild itself.
       block.compose!(this.rootBlock);
-      // Restore rendering and show the changes.
-      block.rendered = savedRendered;
-      // Mutation may have added some elements that need initializing.
-      block.initSvg();
-
-      if (block.rendered) {
-        block.render();
-      }
 
       const newExtraState = BlockChange.getExtraBlockState_(block);
       if (oldExtraState !== newExtraState) {

From 4271e1a4a7cecd8b88ca8770838c975a09585bb4 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Thu, 6 Apr 2023 11:41:12 -0700
Subject: [PATCH 2/3] fix: disposing during dragging (#6954)

(cherry picked from commit 2167afab8508df666071d82154752d49ee891d1d)
---
 core/block_dragger.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/block_dragger.ts b/core/block_dragger.ts
index 5809f74844b..0a2cb0f3310 100644
--- a/core/block_dragger.ts
+++ b/core/block_dragger.ts
@@ -346,6 +346,7 @@ export class BlockDragger implements IBlockDragger {
 
   /** Fire a move event at the end of a block drag. */
   protected fireMoveEvent_() {
+    if (this.draggingBlock_.isDeadOrDying()) return;
     const event = new (eventUtils.get(eventUtils.BLOCK_MOVE))(
                       this.draggingBlock_) as BlockMove;
     event.oldCoordinate = this.startXY_;

From 860dddd08f75ceb145ac36d30a5051a4eebe3dce Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Thu, 6 Apr 2023 18:55:00 +0000
Subject: [PATCH 3/3] release: Update version number to 9.3.2

---
 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 aa62e50ef1d..518096d917f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "blockly",
-  "version": "9.3.1",
+  "version": "9.3.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "blockly",
-      "version": "9.3.1",
+      "version": "9.3.2",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
diff --git a/package.json b/package.json
index ed1d14fa5de..077724ae4bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blockly",
-  "version": "9.3.1",
+  "version": "9.3.2",
   "description": "Blockly is a library for building visual programming editors.",
   "keywords": [
     "blockly"