Implement navigation to same screen again

lazaronixon · Oct 8, 2023 · 23a68ac · 23a68ac
1 parent c33ad41
commit 23a68ac
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/...alizer/templates/ios_stack/TurboNativeProject/Controllers/TurboNavigationController.swift b/...alizer/templates/ios_stack/TurboNativeProject/Controllers/TurboNavigationController.swift
@@ -22,9 +22,14 @@ class TurboNavigationController : UINavigationController {
         }
 
         // - Create view controller appropriate for url/properties
-        // - Navigate to that with the correct presentation
         let viewController = makeViewController(for: url, properties: properties)
-        navigate(to: viewController, action: options.action, properties: properties)
+
+        // - Navigate to that with the correct presentation
+        if session.topmostVisitable?.visitableURL == url {
+            navigate(to: viewController, action: .replace, properties: properties)
+        } else {
+            navigate(to: viewController, action: options.action, properties: properties)
+        }
 
         // Initiate the visit with Turbo
         if isVisitable(properties) {
@@ -77,7 +82,7 @@ extension TurboNavigationController {
 
     private func title(from properties: PathProperties) -> String? {
         return properties["title"] as? String
-    }    
+    }
 
     private func noticeMessage(from url: URL) -> String? {
         URLComponents(url: url, resolvingAgainstBaseURL: false)?.queryItems?.first(where: { $0.name == "notice" })?.value

diff --git a/...ializer/templates/ios_tabs/TurboNativeProject/Controllers/TurboNavigationController.swift b/...ializer/templates/ios_tabs/TurboNativeProject/Controllers/TurboNavigationController.swift
@@ -22,9 +22,14 @@ class TurboNavigationController : UINavigationController {
         }
 
         // - Create view controller appropriate for url/properties
-        // - Navigate to that with the correct presentation
         let viewController = makeViewController(for: url, properties: properties)
-        navigate(to: viewController, action: options.action, properties: properties)
+
+        // - Navigate to that with the correct presentation
+        if session.topmostVisitable?.visitableURL == url {
+            navigate(to: viewController, action: .replace, properties: properties)
+        } else {
+            navigate(to: viewController, action: options.action, properties: properties)
+        }
 
         // Initiate the visit with Turbo
         if isVisitable(properties) {