Handle navigation events only if Grid has focus (#13334)

Change-Id: Ia3fa7463b92e0b2a7a5b61e1e270996ef7d6bb6e

diff --git a/client/src/com/vaadin/client/ui/grid/Grid.java b/client/src/com/vaadin/client/ui/grid/Grid.java
index f280b264938818376f5cda93fa9f1672b51bce20..a32a31b0291b7ecb86432aed2b785722611f88bb 100644 (file)
--- a/client/src/com/vaadin/client/ui/grid/Grid.java
+++ b/client/src/com/vaadin/client/ui/grid/Grid.java
@@ -1923,8 +1923,10 @@ public class Grid<T> extends Composite implements
                 }
             }
 
-            if (activeCellHandler.getNavigationEvents().contains(
-                    event.getType())) {
+            Collection<String> navigation = activeCellHandler
+                    .getNavigationEvents();
+            if (navigation.contains(event.getType())
+                    && (Util.getFocusedElement() == getElement() || cell != null)) {
                 activeCellHandler.handleNavigationEvent(event, cell);
             }
         }