Insert columns using correct logical row index (#18103)

Change-Id: I7010f4ca938e29c0b348aac15581c0aeb48d2dc0

2 files changed, 57 insertions, 3 deletions

diff --git a/client/src/com/vaadin/client/widgets/Escalator.java b/client/src/com/vaadin/client/widgets/Escalator.java
index bb497e7e13..55462d18fe 100644
--- a/client/src/com/vaadin/client/widgets/Escalator.java
+++ b/client/src/com/vaadin/client/widgets/Escalator.java
@@ -1645,7 +1645,8 @@ public class Escalator extends Widget implements RequiresResize,
 
             for (int row = 0; row < getDomRowCount(); row++) {
                 final TableRowElement tr = getTrByVisualIndex(row);
-                paintInsertCells(tr, row, offset, numberOfColumns);
+                int logicalRowIndex = getLogicalRowIndex(tr);
+                paintInsertCells(tr, logicalRowIndex, offset, numberOfColumns);
             }
             reapplyRowWidths();
 
@@ -2127,6 +2128,11 @@ public class Escalator extends Widget implements RequiresResize,
          * @return the height of this table section
          */
         protected abstract double getHeightOfSection();
+
+        protected int getLogicalRowIndex(final TableRowElement tr) {
+            return tr.getSectionRowIndex();
+        };
+
     }
 
     private abstract class AbstractStaticRowContainer extends
@@ -3396,7 +3402,8 @@ public class Escalator extends Widget implements RequiresResize,
             }
         }
 
-        private int getLogicalRowIndex(final Element tr) {
+        @Override
+        protected int getLogicalRowIndex(final TableRowElement tr) {
             assert tr.getParentNode() == root : "The given element isn't a row element in the body";
             int internalIndex = visualRowOrder.indexOf(tr);
             return getTopRowLogicalIndex() + internalIndex;
@@ -3854,7 +3861,8 @@ public class Escalator extends Widget implements RequiresResize,
             }
 
             // Convert DOM coordinates to logical coordinates for rows
-            Element rowElement = cell.getElement().getParentElement();
+            TableRowElement rowElement = (TableRowElement) cell.getElement()
+                    .getParentElement();
             return new Cell(getLogicalRowIndex(rowElement), cell.getColumn(),
                     cell.getElement());
         }
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java
index 9f63c2b177..6392ee6a22 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java
@@ -864,6 +864,52 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
 
     }
 
+    @Test
+    public void hideScrollAndShow() {
+        toggleHidableColumnAPI(1);
+        toggleHideColumnAPI(1);
+
+        getGridElement().scrollToRow(500);
+        Assert.assertEquals("(500, 0)", getGridElement().getCell(500, 0)
+                .getText());
+        Assert.assertEquals("(500, 2)", getGridElement().getCell(500, 1)
+                .getText());
+
+        toggleHideColumnAPI(1);
+
+        Assert.assertEquals("(500, 0)", getGridElement().getCell(500, 0)
+                .getText());
+        Assert.assertEquals("(500, 1)", getGridElement().getCell(500, 1)
+                .getText());
+    }
+
+    @Test
+    public void scrollHideAndShow() {
+        toggleHidableColumnAPI(0);
+        toggleHidableColumnAPI(1);
+
+        Assert.assertEquals("(500, 0)", getGridElement().getCell(500, 0)
+                .getText());
+        Assert.assertEquals("(500, 1)", getGridElement().getCell(500, 1)
+                .getText());
+
+        toggleHideColumnAPI(0);
+        toggleHideColumnAPI(1);
+
+        Assert.assertEquals("(500, 2)", getGridElement().getCell(500, 0)
+                .getText());
+        Assert.assertEquals("(500, 3)", getGridElement().getCell(500, 1)
+                .getText());
+
+        toggleHideColumnAPI(0);
+        toggleHideColumnAPI(1);
+
+        Assert.assertEquals("(500, 0)", getGridElement().getCell(500, 0)
+                .getText());
+        Assert.assertEquals("(500, 1)", getGridElement().getCell(500, 1)
+                .getText());
+    }
+
     private void loadSpannedCellsFixture() {
         selectMenuPath("Component", "State", "Width", "1000px");
         appendHeaderRow();