fix: 6076 "dragging fails" improved

google · Apr 20, 2022 · a0171b1 · a0171b1
1 parent 9e2d17f
commit a0171b1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/core/block_dragger.js b/core/block_dragger.js
@@ -429,7 +429,11 @@ const BlockDragger = class {
     // Moving icons moves their associated bubbles.
     for (let i = 0; i < this.dragIconData_.length; i++) {
       const data = this.dragIconData_[i];
-      data.icon.setIconLocation(Coordinate.sum(data.location, dxy));
+      // Don't move hidden Icons as they can have not been initialized.
+      // fixes #6076
+      if (!this.draggingBlock_.isCollapsed() || !data.icon.collapseHidden) {
+        data.icon.setIconLocation(Coordinate.sum(data.location, dxy));
+      }
     }
   }
 

diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
@@ -527,6 +527,12 @@ const loadIcons = function(block, state) {
       setTimeout(() => blockSvg.getCommentIcon().setVisible(true), 1);
     }
   }
+  // 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();
+  }
 };
 
 /**