Fix ActiveCellHandler scrolling to frozen columns (#13334)

Change-Id: Ia4fe23e70e6a1585a1ecd91ef44212cde286d29d

diff --git a/client/src/com/vaadin/client/ui/grid/Grid.java b/client/src/com/vaadin/client/ui/grid/Grid.java
index 4efe42a82505f14bd7945923c291fdac63164ded..442bc1a228d9a5de74019ab46a5fdf8fc048cacb 100644 (file)
--- a/client/src/com/vaadin/client/ui/grid/Grid.java
+++ b/client/src/com/vaadin/client/ui/grid/Grid.java
@@ -298,7 +298,12 @@ public class Grid<T> extends Composite implements
             if (container == escalator.getBody()) {
                 scrollToRow(activeRow);
             }
-            escalator.scrollToColumn(activeColumn, ScrollDestination.ANY, 10);
+
+            if (activeColumn >= escalator.getColumnConfiguration()
+                    .getFrozenColumnCount()) {
+                escalator.scrollToColumn(activeColumn, ScrollDestination.ANY,
+                        10);
+            }
 
             if (this.container == container) {
                 if (container != escalator.getBody()) {