Fix navigation using keyboard to frozen column when there are hidden columns (#8277)

3 files changed, 24 insertions, 5 deletions

diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
index 0c95e24700..6ee452c864 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
@@ -251,4 +251,9 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest {
         }
         return null;
     }
+
+    protected void toggleColumnHidden(int column) {
+        selectMenuPath("Component", "Columns", "Column " + column, "Hidden");
+    }
+
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java
index 0ed3de39d4..28d5df339c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java
@@ -153,13 +153,13 @@ public class GridColumnResizeTest extends GridBasicFeaturesTest {
         selectMenuPath("Component", "Columns",
                 "Toggle all column hidden state");
         // Hides although already hidden
-        selectMenuPath("Component", "Columns", "Column 0", "Hidden");
+        toggleColumnHidden(0);
         // Shows
-        selectMenuPath("Component", "Columns", "Column 0", "Hidden");
+        toggleColumnHidden(0);
         // Hides although already hidden
-        selectMenuPath("Component", "Columns", "Column 2", "Hidden");
+        toggleColumnHidden(2);
         // Shows
-        selectMenuPath("Component", "Columns", "Column 2", "Hidden");
+        toggleColumnHidden(2);
         GridCellElement cell = getGridElement().getCell(0, 1);
         dragResizeColumn(1, 0, -cell.getSize().getWidth());
         assertGreaterOrEqual("Cell got too small.", cell.getSize().getWidth(),
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
index aacb32c982..0717ab5592 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
@@ -229,4 +229,18 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest {
                 column == focusedColumn
                         && Math.abs(row - focusedRow) <= rowTolerance);
     }
-}
\ No newline at end of file
+
+    @Test
+    public void testNavigateOverHiddenColumnToFrozenColumn() {
+        openTestURL();
+        setFrozenColumns(3);
+        toggleColumnHidden(1);
+        getGridElement().getCell(0, 2).click();
+        assertFocusedCell(0, 2);
+        new Actions(getDriver()).sendKeys(Keys.ARROW_LEFT).perform();
+        assertFocusedCell(0, 1);
+        new Actions(getDriver()).sendKeys(Keys.ARROW_LEFT).perform();
+        assertFocusedCell(0, 0);
+    }
+
+}