wip

Author: davdroman

Sources/NavigationTransitions/NavigationTransition+UIKit.swift

@@ -142,11 +142,7 @@ extension UINavigationController {
             defaultDelegate = delegate
         }
 
-        if transition.isDefault {
-            delegate = defaultDelegate
-        } else {
-            customDelegate = NavigationTransitionDelegate(transition: transition, baseDelegate: defaultDelegate)
-        }
+        customDelegate = NavigationTransitionDelegate(transition: transition, baseDelegate: defaultDelegate)
 
         #if !os(tvOS)
         if defaultPanRecognizer == nil {

Sources/NavigationTransitions/NavigationTransitionDelegate.swift

@@ -26,11 +26,16 @@ final class NavigationTransitionDelegate: NSObject, UINavigationControllerDelega
     }
 
     func navigationController(_ navigationController: UINavigationController, interactionControllerFor animationController: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
-        return interactionController
+        if !transition.isDefault {
+            return interactionController
+        } else {
+            return nil
+        }
     }
 
     func navigationController(_ navigationController: UINavigationController, animationControllerFor operation: UINavigationController.Operation, from fromVC: UIViewController, to toVC: UIViewController) -> UIViewControllerAnimatedTransitioning? {
         if
+            !transition.isDefault,
             let animation = transition.animation,
             let operation = NavigationTransitionOperation(operation)
         {