From 4de439b64e6c135486796b8d344dce59dee1c771 Mon Sep 17 00:00:00 2001
From: Tobias Weinert <tweini@gmail.com>
Date: Thu, 21 Apr 2022 23:01:11 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20dragging=20fails=20for=20collapsed=20blo?=
 =?UTF-8?q?cks=20with=20Icons,=20which=20have=20been=20=E2=80=A6=20(#6081)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 6076 "dragging fails" improved

* fix: "dragging fails (bug #6076)" tested version

* fix: "dragging fails (bug google#6076)" moved fix-code after L625
---
 core/serialization/blocks.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 150ea865f..fa6b9886c 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -611,8 +611,14 @@ const initBlock = function(block, rendered) {
     // operation to decrease load time.
     block.setConnectionTracking(false);
 
-    block.initSvg();
-    block.render(false);
+    blockSvg.initSvg();
+    blockSvg.render(false);
+    // fixes #6076 JSO deserialization doesn't
+    // set .iconXY_ property so here it will be set
+    const icons = block.getIcons();
+    for (let i = 0; i < icons.length; i++) {
+      icons[i].computeIconLocation();
+    }
   } else {
     block.initModel();
   }