From 2f87243466121871016d3257def12c73f1d94c19 Mon Sep 17 00:00:00 2001
From: Sam El-Husseini <sam.elhusseini@gmail.com>
Date: Fri, 22 Nov 2019 17:30:25 -0800
Subject: [PATCH] Fix bug with tabbing out of Blockly (#3470)

* Pipe handled cursor action correctly.
---
 core/block_svg.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/block_svg.js b/core/block_svg.js
index a21dc745b..eb2e0674b 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -646,13 +646,14 @@ Blockly.BlockSvg.prototype.setCollapsed = function(collapsed) {
 Blockly.BlockSvg.prototype.tab = function(start, forward) {
   var tabCursor = new Blockly.TabNavigateCursor();
   tabCursor.setCurNode(Blockly.ASTNode.createFieldNode(start));
+  var currentNode = tabCursor.getCurNode();
   var action = forward ?
       Blockly.navigation.ACTION_NEXT : Blockly.navigation.ACTION_PREVIOUS;
 
   tabCursor.onBlocklyAction(action);
 
   var nextNode = tabCursor.getCurNode();
-  if (nextNode) {
+  if (nextNode && nextNode !== currentNode) {
     var nextField = /** @type {!Blockly.Field} */ (nextNode.getLocation());
     nextField.showEditor();
   }