fix: remove selection column even when grid is detached (#7947) (#8029)

vaadin-bot · HerbertsVaadin · ugur-vaadin · web-flow · commit 68397f909c70 · 2025-09-17T10:11:23.000+02:00
* Fix multiple calls of `setSelectionMode` causing multiple checkboxes

* refactor: simplify parent check

* test: add unit test for fix

---------

Co-authored-by: Herberts &lt;80950643+HerbertsVaadin@users.noreply.github.com&gt;
Co-authored-by: ugur-vaadin &lt;ugur@vaadin.com&gt;
diff --git a/vaadin-grid-flow-parent/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/AbstractGridMultiSelectionModel.java b/vaadin-grid-flow-parent/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/AbstractGridMultiSelectionModel.java
@@ -102,7 +102,7 @@ private void insertSelectionColumn(Grid<T> grid,
     protected void remove() {
         super.remove();
         deselectAll();
-        if (selectionColumn.getElement().getNode().isAttached()) {
+        if (selectionColumn.getParent().map(getGrid()::equals).orElse(false)) {
             getGrid().getElement().removeChild(selectionColumn.getElement());
         }
     }
diff --git a/vaadin-grid-flow-parent/vaadin-grid-flow/src/test/java/com/vaadin/flow/component/grid/AbstractGridMultiSelectionModelTest.java b/vaadin-grid-flow-parent/vaadin-grid-flow/src/test/java/com/vaadin/flow/component/grid/AbstractGridMultiSelectionModelTest.java
@@ -705,6 +705,17 @@ public void setItemSelectableProvider_updatesSelectAllVisibility() {
                 .getProperty("_selectAllHidden", false));
     }
 
+    @Test
+    public void setMultiSelect_removeGrid_setSingleSelect_addGrid_selectionColumnRemoved() {
+        grid.setItems("foo", "bar");
+        grid.setSelectionMode(SelectionMode.MULTI);
+        ui.remove(grid);
+        grid.setSelectionMode(SelectionMode.SINGLE);
+        ui.add(grid);
+        Assert.assertThrows(IllegalStateException.class,
+                () -> getGridSelectionColumn(grid));
+    }
+
     private void verifySelectAllCheckboxVisibilityInMultiSelectMode(
             boolean inMemory, boolean unknownItemCount,
             boolean expectedVisibility,
