From 7a453dce177d849305c549296986eb21e171bae0 Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Fri, 7 Jun 2019 13:14:38 +0300 Subject: Fix regression that broke PreserveOnRefresh functionality with Navigator (#11615) * Fix regression that broke PreserveOnRefresh functionality with Navigator Fixes https://github.com/vaadin/framework/issues/11614 Old patch https://github.com/vaadin/framework/issues/11416 calls navigateTo allways when Navigator is present, which is wrong, since it is needed only when navigation state has truly changed. * Add test to the fix --- server/src/main/java/com/vaadin/ui/UI.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'server') diff --git a/server/src/main/java/com/vaadin/ui/UI.java b/server/src/main/java/com/vaadin/ui/UI.java index 682e1f38f2..2a3b913e16 100644 --- a/server/src/main/java/com/vaadin/ui/UI.java +++ b/server/src/main/java/com/vaadin/ui/UI.java @@ -161,6 +161,12 @@ public abstract class UI extends AbstractSingleComponentContainer private LoadingIndicatorConfiguration loadingIndicatorConfiguration = new LoadingIndicatorConfigurationImpl( this); + /** + * Holder for old navigation state, needed in doRefresh in order not to call + * navigateTo too often + */ + private String oldNavigationState; + /** * Scroll Y position. */ @@ -871,10 +877,15 @@ public abstract class UI extends AbstractSingleComponentContainer page.updateBrowserWindowSize(newWidth, newHeight, true); // Navigate if there is navigator, this is needed in case of - // PushStateNavigation + // PushStateNavigation. Call navigateTo only if state have + // truly changed Navigator navigator = getNavigator(); if (navigator != null) { - navigator.navigateTo(navigator.getState()); + if (oldNavigationState == null) oldNavigationState = getNavigator().getState(); + if (!navigator.getState().equals(oldNavigationState)) { + navigator.navigateTo(navigator.getState()); + oldNavigationState = navigator.getState(); + } } } -- cgit v1.2.3