Try waiting for animation

hotwired · Jul 4, 2024 · 65292df · 65292df
1 parent 5116ec2
commit 65292df
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/Source/Turbo Navigator/TurboNavigationHierarchyController.swift b/Source/Turbo Navigator/TurboNavigationHierarchyController.swift
@@ -168,21 +168,28 @@ class TurboNavigationHierarchyController {
         if navigationController.presentedViewController != nil {
             if modalNavigationController.viewControllers.count == 1 {
                 navigationController.dismiss(animated: proposal.animated)
-                refreshIfTopViewControllerIsVisitable(from: .main)
+                refreshIfTopViewControllerIsVisitable(from: .main, animated: proposal.animated)
             } else {
                 modalNavigationController.popViewController(animated: proposal.animated)
-                refreshIfTopViewControllerIsVisitable(from: .modal)
+                refreshIfTopViewControllerIsVisitable(from: .modal, animated: proposal.animated)
             }
         } else {
             navigationController.popViewController(animated: proposal.animated)
-            refreshIfTopViewControllerIsVisitable(from: .main)
+            refreshIfTopViewControllerIsVisitable(from: .main, animated: proposal.animated)
         }
     }
 
-    private func refreshIfTopViewControllerIsVisitable(from stack: NavigationStackType) {
+    private func refreshIfTopViewControllerIsVisitable(from stack: NavigationStackType, animated: Bool) {
         if let navControllerTopmostVisitable = navController(for: stack).topViewController as? Visitable {
-            delegate.refreshVisitable(navigationStack: stack,
-                                      newTopmostVisitable: navControllerTopmostVisitable)
+            if animated {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.333) {
+                    self.delegate.refreshVisitable(navigationStack: stack,
+                                                   newTopmostVisitable: navControllerTopmostVisitable)
+                }
+            } else {
+                delegate.refreshVisitable(navigationStack: stack,
+                                          newTopmostVisitable: navControllerTopmostVisitable)
+            }
         }
     }
 

diff --git a/Source/Turbo Navigator/TurboNavigator.swift b/Source/Turbo Navigator/TurboNavigator.swift
@@ -219,14 +219,10 @@ extension TurboNavigator: TurboNavigationHierarchyControllerDelegate {
                           newTopmostVisitable: any Visitable) {
         switch navigationStack {
         case .main:
-            session.visit(newTopmostVisitable, 
-                          options: .init(action: .replace))
+            session.visit(newTopmostVisitable, reload: true)
         case .modal:
-            modalSession.visit(newTopmostVisitable, 
-                               options: .init(action: .replace))
+            modalSession.visit(newTopmostVisitable, reload: true)
         }
-
-        newTopmostVisitable.visitableViewDidRequestRefresh()
     }
 }