Fix Grid frozen column declarative support (#16596)

Change-Id: I382e52e9eed1e2846036e23d9a6b95859ad3e5dc

2 files changed, 20 insertions, 4 deletions

diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index 4fda7f7288..a2487411c2 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -5427,10 +5427,6 @@ public class Grid extends AbstractComponent implements SelectionNotifier,
             setEditorEnabled(DesignAttributeHandler.readAttribute("editable",
                     attrs, boolean.class));
         }
-        if (attrs.hasKey("frozen-columns")) {
-            setFrozenColumnCount(DesignAttributeHandler.readAttribute(
-                    "frozen-columns", attrs, int.class));
-        }
         if (attrs.hasKey("rows")) {
             setHeightByRows(DesignAttributeHandler.readAttribute("rows", attrs,
                     double.class));
@@ -5487,6 +5483,12 @@ public class Grid extends AbstractComponent implements SelectionNotifier,
                 }
             }
         }
+
+        // Read frozen columns after columns are read.
+        if (attrs.hasKey("frozen-columns")) {
+            setFrozenColumnCount(DesignAttributeHandler.readAttribute(
+                    "frozen-columns", attrs, int.class));
+        }
     }
 
     @Override
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
index e17f3ee0be..b8268b1ae3 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
@@ -53,6 +53,20 @@ public class GridDeclarativeAttributeTest extends DeclarativeTestBase<Grid> {
     }
 
     @Test
+    public void testFrozenColumnsAttributes() {
+        String design = "<v-grid frozen-columns='2'><table>" //
+                + "<colgroup><col><col><col></colgroup></table></v-grid>";
+
+        Grid grid = new Grid();
+        grid.addColumn("property-0", String.class);
+        grid.addColumn("property-1", String.class);
+        grid.addColumn("property-2", String.class);
+        grid.setFrozenColumnCount(2);
+
+        testRead(design, grid);
+    }
+
+    @Test
     public void testSelectionMode() {
         String design = "<v-grid selection-mode='none'>";
         assertSame(NoSelectionModel.class, read(design).getSelectionModel()