Fix Components cleanup on Header/FooterRow remove in Grid (#19497)

Change-Id: I596d0cc13b782398b4c5c8338b8370e69862ea88

1 files changed, 11 insertions, 0 deletions

diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index 06ab8d1581..4074672675 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -2467,6 +2467,12 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
             }
 
             abstract protected String getCellTagName();
+
+            void detach() {
+                for (CELLTYPE cell : cells.values()) {
+                    cell.detach();
+                }
+            }
         }
 
         /**
@@ -2674,6 +2680,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
                             .html()));
                 }
             }
+
+            void detach() {
+                removeComponentIfPresent();
+            }
         }
 
         protected Grid grid;
@@ -2720,6 +2730,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
                         + rowIndex);
             }
             ROWTYPE row = rows.remove(rowIndex);
+            row.detach();
             getSectionState().rows.remove(rowIndex);
 
             markAsDirty();