Respect proposal context when popping

hotwired · Jun 2, 2024 · 8341cbe · 8341cbe
1 parent 7a59155
commit 8341cbe
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Source/Turbo Navigator/TurboNavigationHierarchyController.swift b/Source/Turbo Navigator/TurboNavigationHierarchyController.swift
@@ -131,14 +131,16 @@ class TurboNavigationHierarchyController {
     }
 
     private func pop(via proposal: VisitProposal) {
-        if navigationController.presentedViewController != nil {
+        switch proposal.context {
+        case .default:
+            navigationController.popViewController(animated: true)
+
+        case .modal:
             if modalNavigationController.viewControllers.count == 1 {
                 navigationController.dismiss(animated: proposal.animated)
             } else {
                 modalNavigationController.popViewController(animated: proposal.animated)
             }
-        } else {
-            navigationController.popViewController(animated: proposal.animated)
         }
     }