Prevent double visits after a form submission redirect in the modal c…

…ontext -> default context when the visit carries response.responseHTML
hotwired · Dec 16, 2024 · 03e18df · 03e18df
1 parent 21313e4
commit 03e18df
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Source/Turbo/Session/Session.swift b/Source/Turbo/Session/Session.swift
@@ -258,9 +258,13 @@ extension Session: VisitableDelegate {
         }
 
         // Navigating forward - complete navigation early.
-        if visitable === currentVisit.visitable && currentVisit.state == .started {
-            completeNavigationForCurrentVisit()
-            return
+        if visitable === currentVisit.visitable {
+            let currentVisitCompletedWithResponse = currentVisit.options.response?.responseHTML != nil && currentVisit.state == .completed
+
+            if currentVisit.state == .started || currentVisitCompletedWithResponse {
+                completeNavigationForCurrentVisit()
+                return
+            }
         }
 
         // Navigating backward from a web view screen to a web view screen.