Don't remove frozen columns when columns reordered in Grid #16901

Change-Id: Ib812ecd6afeb92d56bb179bcb120c65f20d26a8c

2 files changed, 20 insertions, 1 deletions

diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index 31cf4ec866..4b27e17e37 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -4680,7 +4680,6 @@ public class Grid<T> extends ResizeComposite implements
 
         escalator.getColumnConfiguration()
                 .setFrozenColumnCount(numberOfColumns);
-
     }
 
     /**
@@ -5960,6 +5959,9 @@ public class Grid<T> extends ResizeComposite implements
         // Do ComplexRenderer.init and render new content
         conf.insertColumns(0, columns.size());
 
+        // Number of frozen columns should be kept same #16901
+        updateFrozenColumns();
+
         // Update column widths.
         for (Column<?, T> column : columns) {
             column.reapplyWidth();
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
index 9e7256e0d3..2f5d0e7291 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
@@ -94,6 +94,23 @@ public class GridClientColumnPropertiesTest extends GridBasicClientFeaturesTest
     }
 
     @Test
+    public void testFrozenColumns_columnsReordered_frozenColumnsKept() {
+        openTestURL();
+
+        selectMenuPath("Component", "State", "Frozen column count", "2 columns");
+
+        assertTrue(cellIsFrozen(1, 0));
+        assertTrue(cellIsFrozen(1, 1));
+        assertFalse(cellIsFrozen(1, 2));
+
+        selectMenuPath("Component", "State", "Reverse grid columns");
+
+        assertTrue(cellIsFrozen(1, 0));
+        assertTrue(cellIsFrozen(1, 1));
+        assertFalse(cellIsFrozen(1, 2));
+    }
+
+    @Test
     public void testBrokenRenderer() {
         setDebug(true);
         openTestURL();