Fix @PushStateNavigation with @PreserveOnRefresh (#11417)

Navigation needs to be done also in doRefresh(..) in similar fashion as in doInit(..) Fixes #11416
vaadin · Jan 22, 2019 · f1d1c50 · f1d1c50
1 parent 78fd7fc
commit f1d1c50
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/server/src/main/java/com/vaadin/ui/UI.java b/server/src/main/java/com/vaadin/ui/UI.java
@@ -869,6 +869,13 @@ public void doRefresh(VaadinRequest request) {
 
         page.updateLocation(newLocation.toString(), true, false);
         page.updateBrowserWindowSize(newWidth, newHeight, true);
+
+        // Navigate if there is navigator, this is needed in case of
+        // PushStateNavigation
+        Navigator navigator = getNavigator();
+        if (navigator != null) {
+            navigator.navigateTo(navigator.getState());
+        }
     }
 
     /**