apply review suggestion

vaadin · Nov 26, 2024 · 2d0834e · 2d0834e
1 parent 4ef3417
commit 2d0834e
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/flow-server/src/main/java/com/vaadin/flow/hotswap/Hotswapper.java b/flow-server/src/main/java/com/vaadin/flow/hotswap/Hotswapper.java
@@ -349,13 +349,14 @@ private UIRefreshStrategy computeRefreshStrategy(UI ui,
                                 .isAssignableFrom(chainItem.getClass())))
                 .distinct().toList();
 
+        UIRefreshStrategy refreshStrategy;
         // A full chain refresh should be triggered if there are modal
         // components, since they could be attached to UI or parent layouts
-        boolean hasModalComponents = ui.hasModalComponent();
-        UIRefreshStrategy refreshStrategy;
-        if (!targetChainChangedItems.isEmpty()) {
-            refreshStrategy = targetChainChangedItems.stream().allMatch(
-                    chainItem -> chainItem == route && !hasModalComponents)
+        if (ui.hasModalComponent()) {
+            refreshStrategy = UIRefreshStrategy.PUSH_REFRESH_CHAIN;
+        } else if (!targetChainChangedItems.isEmpty()) {
+            refreshStrategy = targetChainChangedItems.stream()
+                    .allMatch(chainItem -> chainItem == route)
                             ? UIRefreshStrategy.PUSH_REFRESH_ROUTE
                             : UIRefreshStrategy.PUSH_REFRESH_CHAIN;
         } else {
@@ -365,6 +366,7 @@ private UIRefreshStrategy computeRefreshStrategy(UI ui,
             refreshStrategy = computeRefreshStrategyForUITree(ui,
                     changedClasses, targetsChain, route);
         }
+
         // A different layout might have been applied after hotswap
         if (refreshStrategy == UIRefreshStrategy.SKIP) {
             RouteRegistry registry = ui.getInternals().getRouter()