Detect restore visit in viewWillAppear when navigating from a native …

…screen
hotwired · Feb 27, 2024 · 661b3a9 · 661b3a9
1 parent 1390d04
commit 661b3a9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Source/Session/Session.swift b/Source/Session/Session.swift
@@ -214,6 +214,7 @@ extension Session: VisitDelegate {
 
 extension Session: VisitableDelegate {
     public func visitableViewWillAppear(_ visitable: Visitable) {
+        let lastDisappearingVisit = self.disappearingVisitForSnapshotting
         self.disappearingVisitForSnapshotting = nil
 
         guard let topmostVisit = self.topmostVisit, let currentVisit = self.currentVisit else { return }
@@ -228,7 +229,7 @@ extension Session: VisitableDelegate {
         } else if visitable === currentVisit.visitable && currentVisit.state == .started {
             // Navigating forward - complete navigation early
             completeNavigationForCurrentVisit()
-        } else if visitable !== topmostVisit.visitable {
+        } else if visitable !== topmostVisit.visitable || visitable === lastDisappearingVisit?.visitable {
             // Navigating backward
             visit(visitable, action: .restore)
         }