Execute JS in the very end of the message processing event loop

Fixes #4444
vaadin · Jul 31, 2018 · 253c118 · 253c118
1 parent afe3149
commit 253c118
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/flow-client/src/main/java/com/vaadin/client/communication/MessageHandler.java b/flow-client/src/main/java/com/vaadin/client/communication/MessageHandler.java
@@ -378,10 +378,12 @@ assert getServerId(valueMap) == -1
 
             if (json.hasKey(JsonConstants.UIDL_KEY_EXECUTE)) {
                 // Invoke JS only after all tree changes have been
-                // propagated
-                Reactive.addPostFlushListener(
-                        () -> registry.getExecuteJavaScriptProcessor().execute(
-                                json.getArray(JsonConstants.UIDL_KEY_EXECUTE)));
+                // propagated and in the very end of the browser event loop
+                Reactive.addPostFlushListener(() -> Scheduler.get()
+                        .scheduleFinally(() -> registry
+                                .getExecuteJavaScriptProcessor()
+                                .execute(json.getArray(
+                                        JsonConstants.UIDL_KEY_EXECUTE))));
             }
 
             Console.log("handleUIDLMessage: "