Skip to content

Fix uinavigationcontrollerdelegate forwarding for real #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+3 −149
Open

Fix uinavigationcontrollerdelegate forwarding for real #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2dbc961
Fix UINavigationController delegate forwarding
tgrapperon Oct 1, 2025
4f66454
Use previous ordering
tgrapperon Oct 2, 2025
e9a6375
Remove interactive pop test
acosmicflamingo Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 0 additions & 131 deletions Examples/CaseStudiesTests/NavigationStackTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,56 +292,6 @@ final class NavigationStackTests: XCTestCase {
await assertEventuallyEqual(nav.viewControllers.count, 5)
await assertEventuallyEqual(path, [1, 2, 3, 4])
}

@MainActor
func testInteractivePopViaGestureAction() async throws {
@UIBinding var path = [Int]()
let nav = NavigationStackController(path: $path) {
UIViewController()
}
nav.navigationDestination(for: Int.self) { number in
ChildViewController(number: number)
}
try await setUp(controller: nav)

nav.traitCollection.push(value: 1)
await assertEventuallyEqual(nav.viewControllers.count, 2)
await assertEventuallyEqual(path, [1])

let interaction = MockInteractiveTransition()
let delegate = MockNavigationControllerDelegate()
delegate.interactionController = interaction
nav.delegate = delegate

let interactionExpectation = expectation(
description: "navigationController(_:interactionControllerFor:) called"
)
delegate.interactionExpectation = interactionExpectation

await MainActor.run {
_ = nav.popViewController(animated: true)
}

await fulfillment(of: [interactionExpectation], timeout: 1.0)

XCTAssertTrue(delegate.didCallInteractionController)
XCTAssertFalse(interaction.didFinish)

await MainActor.run {
interaction.update(0.5)
interaction.finish()
}

let predicate = NSPredicate(format: "viewControllers.@count == 1")
let vcCountExpectation = XCTNSPredicateExpectation(
predicate: predicate,
object: nav
)
await fulfillment(of: [vcCountExpectation], timeout: 2.0)

XCTAssertTrue(interaction.didFinish)
XCTAssertEqual(nav.viewControllers.count, 1)
}
}

private final class ChildViewController: UIViewController {
Expand All @@ -367,84 +317,3 @@ private final class ChildViewController: UIViewController {
}
}
}

private class MockInteractiveTransition: UIPercentDrivenInteractiveTransition {
private(set) var didFinish = false

override func finish() {
super.finish()
didFinish = true
}
}

private class MockAnimator: NSObject, UIViewControllerAnimatedTransitioning {
let duration: TimeInterval

init(duration: TimeInterval = 0.25) {
self.duration = duration
super.init()
}
func transitionDuration(
using transitionContext: UIViewControllerContextTransitioning?
) -> TimeInterval {
return duration
}
func animateTransition(
using transitionContext: UIViewControllerContextTransitioning
) {
// Basic animation that moves the fromView out and the toView in.
guard
let container = transitionContext.containerView as UIView?,
let fromVC = transitionContext.viewController(forKey: .from),
let toVC = transitionContext.viewController(forKey: .to)
else {
transitionContext.completeTransition(false)
return
}

let fromView = fromVC.view!
let toView = toVC.view!

// Place toView below and set starting frame
let initialFrame = transitionContext.initialFrame(for: fromVC)
toView.frame = initialFrame.offsetBy(dx: initialFrame.width, dy: 0)
container.addSubview(toView)

UIView.animate(
withDuration: transitionDuration(using: transitionContext),
delay: 0,
options: [.curveLinear]
) {
fromView.frame = initialFrame.offsetBy(dx: -initialFrame.width / 3.0, dy: 0)
toView.frame = initialFrame
} completion: { finished in
let cancelled = transitionContext.transitionWasCancelled
transitionContext.completeTransition(!cancelled)
}
}
}

private class MockNavigationControllerDelegate: NSObject, UINavigationControllerDelegate {
var interactionController: UIPercentDrivenInteractiveTransition?
var interactionExpectation: XCTestExpectation?
var didCallInteractionController = false

func navigationController(
_ navigationController: UINavigationController,
animationControllerFor operation: UINavigationController.Operation,
from fromVC: UIViewController,
to toVC: UIViewController
) -> UIViewControllerAnimatedTransitioning? {
return MockAnimator()
}
func navigationController(
_ navigationController: UINavigationController,
interactionControllerFor animationController: UIViewControllerAnimatedTransitioning
) -> UIViewControllerInteractiveTransitioning? {
didCallInteractionController = true
DispatchQueue.main.async { [weak self] in
self?.interactionExpectation?.fulfill()
}
return interactionController
}
}
21 changes: 3 additions & 18 deletions Sources/UIKitNavigation/Navigation/NavigationStackController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,24 +196,9 @@
weak var base: (any UINavigationControllerDelegate)?

override func responds(to aSelector: Selector!) -> Bool {
#if !os(tvOS) && !os(watchOS)
aSelector == #selector(navigationController(_:willShow:animated:))
|| aSelector == #selector(navigationController(_:didShow:animated:))
|| aSelector == #selector(navigationControllerSupportedInterfaceOrientations(_:))
|| aSelector == #selector(
navigationControllerPreferredInterfaceOrientationForPresentation(_:))
|| aSelector == #selector(navigationController(_:interactionControllerFor:))
|| aSelector == #selector(navigationController(_:animationControllerFor:from:to:))
|| MainActor._assumeIsolated { base?.responds(to: aSelector) }
?? false
#else
aSelector == #selector(navigationController(_:willShow:animated:))
|| aSelector == #selector(navigationController(_:didShow:animated:))
|| aSelector == #selector(navigationController(_:interactionControllerFor:))
|| aSelector == #selector(navigationController(_:animationControllerFor:from:to:))
|| MainActor._assumeIsolated { base?.responds(to: aSelector) }
?? false
#endif
aSelector == #selector(navigationController(_:didShow:animated:))
|| MainActor._assumeIsolated { base?.responds(to: aSelector) }
?? false
}

func navigationController(
Expand Down
Loading