fix: bumping a block after duplicate breaking undo (#5844)

* fix: bumping a block after duplicate breaking undo * fix: fixup dependencies
google · Jan 6, 2022 · 5204569 · 5204569
1 parent 8a71f87
commit 5204569
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/core/clipboard.js b/core/clipboard.js
@@ -15,7 +15,6 @@
  */
 goog.module('Blockly.clipboard');
 
-const eventUtils = goog.require('Blockly.Events.utils');
 /* eslint-disable-next-line no-unused-vars */
 const {ICopyable} = goog.requireType('Blockly.ICopyable');
 
@@ -55,9 +54,7 @@ const paste = function() {
   }
   if (copyData.typeCounts &&
       workspace.isCapacityAvailable(copyData.typeCounts)) {
-    eventUtils.setGroup(true);
     workspace.paste(copyData.saveInfo);
-    eventUtils.setGroup(false);
     return true;
   }
   return false;

diff --git a/core/workspace_svg.js b/core/workspace_svg.js
@@ -1524,6 +1524,11 @@ WorkspaceSvg.prototype.paste = function(state) {
     this.currentGesture_.cancel();  // Dragging while pasting?  No.
   }
 
+  const existingGroup = eventUtils.getGroup();
+  if (!existingGroup) {
+    eventUtils.setGroup(true);
+  }
+
   // Checks if this is JSON. JSON has a type property, while elements don't.
   if (state['type']) {
     this.pasteBlock_(null, /** @type {!blocks.State} */ (state));
@@ -1535,6 +1540,8 @@ WorkspaceSvg.prototype.paste = function(state) {
       this.pasteBlock_(xmlBlock, null);
     }
   }
+
+  eventUtils.setGroup(existingGroup);
 };
 
 /**

diff --git a/tests/deps.js b/tests/deps.js