Allow a nav controller to be pushed into a modal stack

There are times where this is expected (e.g. EKEventEditViewController inherits from a nav controller and it must be presented).
hotwired · Apr 26, 2024 · e207125 · e207125
1 parent 15a9958
commit e207125
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Source/Turbo Navigator/TurboNavigationHierarchyController.swift b/Source/Turbo Navigator/TurboNavigationHierarchyController.swift
@@ -86,7 +86,10 @@ class TurboNavigationHierarchyController {
                 delegate.visit(visitable, on: .main, with: proposal.options)
             }
         case .modal:
-            if navigationController.presentedViewController != nil, !modalNavigationController.isBeingDismissed {
+            if let proposedModalNavController = controller as? UINavigationController {
+                proposedModalNavController.setModalPresentationStyle(via: proposal)
+                navigationController.present(proposedModalNavController, animated: true)
+            } else if navigationController.presentedViewController != nil, !modalNavigationController.isBeingDismissed {
                 pushOrReplace(on: modalNavigationController, with: controller, via: proposal)
             } else {
                 modalNavigationController.setViewControllers([controller], animated: true)
@@ -151,7 +154,10 @@ class TurboNavigationHierarchyController {
                 delegate.visit(visitable, on: .main, with: proposal.options)
             }
         case .modal:
-            if navigationController.presentedViewController != nil {
+            if let proposedModalNavController = controller as? UINavigationController {
+                proposedModalNavController.setModalPresentationStyle(via: proposal)
+                navigationController.present(proposedModalNavController, animated: true)
+            } else if navigationController.presentedViewController != nil {
                 modalNavigationController.replaceLastViewController(with: controller)
             } else {
                 modalNavigationController.setViewControllers([controller], animated: false)