fix: ignore non-column children when setting column order (#6733)

vaadin · Oct 21, 2024 · e01de0c · e01de0c
1 parent 994acec
commit e01de0c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.../vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/GridColumnOrderHelper.java b/.../vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/GridColumnOrderHelper.java
@@ -174,8 +174,8 @@ private void reorderColumnsAndConsumeIDs(Component column,
 
         // holds the current immediate child columns.
         final Set<AbstractColumn<?>> childColumns = new HashSet<>();
-        column.getChildren().filter(c -> !(c instanceof GridSelectionColumn))
-                .forEach(it -> childColumns.add((AbstractColumn) it));
+        column.getChildren().filter(c -> c instanceof AbstractColumn<?>)
+                .forEach(it -> childColumns.add((AbstractColumn<?>) it));
         // the new order of the children is computed here.
         final List<AbstractColumn<?>> newOrder = new ArrayList<>();
 

diff --git a/...nt/vaadin-grid-flow/src/test/java/com/vaadin/flow/component/grid/GridColumnOrderTest.java b/...nt/vaadin-grid-flow/src/test/java/com/vaadin/flow/component/grid/GridColumnOrderTest.java
@@ -28,6 +28,7 @@
 import org.junit.Test;
 
 import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.component.html.Label;
 import com.vaadin.flow.data.renderer.IconRenderer;
 
@@ -314,6 +315,16 @@ public void setColumnOrder_joinedHeader3() {
                 secondColumn, thirdColumn }, grid.getColumns().toArray());
     }
 
+    @Test
+    public void setColumnOrder_ignoresNonColumnChildren() {
+        grid.setEmptyStateComponent(new Div());
+
+        grid.setColumnOrder(fourthColumn, thirdColumn, secondColumn,
+                firstColumn);
+        assertArrayEquals(new Object[] { fourthColumn, thirdColumn,
+                secondColumn, firstColumn }, grid.getColumns().toArray());
+    }
+
     private String dumpColumnHierarchyFromDOM() {
         return dumpColumnHierarchyFromDOM(grid);
     }