Fix displaying Details when Grid is attached to DOM (#18390)

Change-Id: Ib892eb4d40bbb655113d21b622cc117d54b2cebc

2 files changed, 23 insertions, 8 deletions

diff --git a/client/src/com/vaadin/client/connectors/GridConnector.java b/client/src/com/vaadin/client/connectors/GridConnector.java
index b720dc442f..ef52a429e7 100644
--- a/client/src/com/vaadin/client/connectors/GridConnector.java
+++ b/client/src/com/vaadin/client/connectors/GridConnector.java
@@ -735,13 +735,20 @@ public class GridConnector extends AbstractHasComponentsConnector implements
 
     private final DetailsListener detailsListener = new DetailsListener() {
         @Override
-        public void reapplyDetailsVisibility(int rowIndex, JsonObject row) {
-            if (hasDetailsOpen(row)) {
-                getWidget().setDetailsVisible(rowIndex, true);
-                detailsConnectorFetcher.schedule();
-            } else {
-                getWidget().setDetailsVisible(rowIndex, false);
-            }
+        public void reapplyDetailsVisibility(final int rowIndex,
+                final JsonObject row) {
+            Scheduler.get().scheduleDeferred(new ScheduledCommand() {
+
+                @Override
+                public void execute() {
+                    if (hasDetailsOpen(row)) {
+                        getWidget().setDetailsVisible(rowIndex, true);
+                        detailsConnectorFetcher.schedule();
+                    } else {
+                        getWidget().setDetailsVisible(rowIndex, false);
+                    }
+                }
+            });
         }
 
         private boolean hasDetailsOpen(JsonObject row) {
@@ -912,6 +919,13 @@ public class GridConnector extends AbstractHasComponentsConnector implements
     }
 
     @Override
+    public void onUnregister() {
+        customDetailsGenerator.indexToDetailsMap.clear();
+
+        super.onUnregister();
+    }
+
+    @Override
     public void onStateChanged(final StateChangeEvent stateChangeEvent) {
         super.onStateChanged(stateChangeEvent);
 
diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index 6d9e5d18ec..53ccd432c4 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -7649,7 +7649,8 @@ public class Grid<T> extends ResizeComposite implements
 
     @Override
     protected void onDetach() {
-        for (int row : visibleDetails) {
+        Set<Integer> details = new HashSet<Integer>(visibleDetails);
+        for (int row : details) {
             setDetailsVisible(row, false);
         }