Fixes right click selection focus issues in Tree. (#12618)

Change-Id: I1057424fc8956b05e15a92c32e48a767e9fc8df9

1 files changed, 18 insertions, 2 deletions

diff --git a/client/src/com/vaadin/client/ui/tree/TreeConnector.java b/client/src/com/vaadin/client/ui/tree/TreeConnector.java
index ef016c31b7..7560a0f56b 100644
--- a/client/src/com/vaadin/client/ui/tree/TreeConnector.java
+++ b/client/src/com/vaadin/client/ui/tree/TreeConnector.java
@@ -18,6 +18,7 @@ package com.vaadin.client.ui.tree;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 
 import com.google.gwt.aria.client.Roles;
 import com.google.gwt.dom.client.Element;
@@ -136,9 +137,24 @@ public class TreeConnector extends AbstractComponentConnector implements
             getWidget().lastSelection = getWidget().getNodeByKey(
                     getWidget().lastSelection.key);
         }
+
         if (getWidget().focusedNode != null) {
-            getWidget().setFocusedNode(
-                    getWidget().getNodeByKey(getWidget().focusedNode.key));
+
+            Set<String> selectedIds = getWidget().selectedIds;
+
+            // If the focused node is not between the selected nodes, we need to
+            // refresh the focused node to prevent an undesired scroll. #12618.
+            if (!selectedIds.isEmpty()
+                    && !selectedIds.contains(getWidget().focusedNode.key)) {
+                String keySelectedId = selectedIds.iterator().next();
+
+                TreeNode nodeToSelect = getWidget().getNodeByKey(keySelectedId);
+
+                getWidget().setFocusedNode(nodeToSelect);
+            } else {
+                getWidget().setFocusedNode(
+                        getWidget().getNodeByKey(getWidget().focusedNode.key));
+            }
         }
 
         if (getWidget().lastSelection == null