diff options
| author | Artur <artur@vaadin.com> | 2017-03-09 11:35:45 +0200 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2017-03-09 11:35:45 +0200 |
| commit | 610c6522da483b7b05cba1a71d7451642e916dc5 (patch) | |
| tree | d50b416813c3975638a0751ba21a09a7bf6b9a04 /server/src/main/java | |
| parent | 761c94ab2e1019f7d83d4e8d63254de1ee591d75 (diff) | |
| download | vaadin-framework-610c6522da483b7b05cba1a71d7451642e916dc5.tar.gz vaadin-framework-610c6522da483b7b05cba1a71d7451642e916dc5.zip | |
Correctly detach components in merged cells (#8773)
* Correctly detach components in merged cells
This was already once fixed in 7.7 in #8142
Diffstat (limited to 'server/src/main/java')
| -rw-r--r-- | server/src/main/java/com/vaadin/ui/components/grid/StaticSection.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/server/src/main/java/com/vaadin/ui/components/grid/StaticSection.java b/server/src/main/java/com/vaadin/ui/components/grid/StaticSection.java index 840fa7b115..dcf27fb357 100644 --- a/server/src/main/java/com/vaadin/ui/components/grid/StaticSection.java +++ b/server/src/main/java/com/vaadin/ui/components/grid/StaticSection.java @@ -388,6 +388,13 @@ public abstract class StaticSection<ROW extends StaticSection.StaticRow<?>> for (CELL cell : cells.values()) { cell.detach(); } + for (CellState cellState : rowState.cellGroups.keySet()) { + if (cellState.type == GridStaticCellType.WIDGET + && cellState.connector != null) { + ((Component) cellState.connector).setParent(null); + cellState.connector = null; + } + } } void checkIfAlreadyMerged(String columnId) { |