Merge pull request #4422 from alschmiedt/flyout_patch

Flyout patch release
google · Oct 30, 2020 · 85874cd · 85874cd
2 parents ef8687d + 1150283
commit 85874cd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/blockly_compressed.js b/blockly_compressed.js
diff --git a/blockly_compressed.js.map b/blockly_compressed.js.map
diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js
@@ -376,7 +376,7 @@ Blockly.HorizontalFlyout.prototype.reflowInternal_ = function() {
       // is in the correct position relative to the new absolute edge (ie
       // toolbox edge).
       this.targetWorkspace.translate(
-          0, this.targetWorkspace.scrollY + flyoutHeight);
+          this.targetWorkspace.scrollX, this.targetWorkspace.scrollY + flyoutHeight);
     }
 
     // Record the height for .getMetrics_ and .position.

diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js
@@ -385,7 +385,7 @@ Blockly.VerticalFlyout.prototype.reflowInternal_ = function() {
       // is in the correct position relative to the new absolute edge (ie
       // toolbox edge).
       this.targetWorkspace.translate(
-          this.targetWorkspace.scrollX + flyoutWidth, 0);
+          this.targetWorkspace.scrollX + flyoutWidth, this.targetWorkspace.scrollY);
     }
 
     // Record the width for .getMetrics_ and .position.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blockly",
-  "version": "3.20200924.3",
+  "version": "3.20200924.4",
   "description": "Blockly is a library for building visual programming editors.",
   "keywords": [
     "blockly"