Skip to content

Dismiss should be called on child being passed in dismiss closure #310

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 8 commits into
base: main
Choose a base branch
from
Open

Dismiss should be called on child being passed in dismiss closure #310

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bfe030e
Dismiss should be called on child being passed in onDismiss closure
acosmicflamingo Oct 1, 2025
3e53a67
Dismiss 'self' when presentedByID's controller did not trigger dismissal
acosmicflamingo Oct 1, 2025
d98a77e
Merge remote-tracking branch 'upstream/main' into fix-dismissing-vc
acosmicflamingo Oct 1, 2025
5864d6b
Dismiss presentedViewController instead of 'self' when not nil
acosmicflamingo Oct 1, 2025
8f65819
Always pass 'controller' to dismiss closure
acosmicflamingo Oct 1, 2025
59e4e83
Dismiss presentedViewController if non-nil or self in dismiss closure
acosmicflamingo Oct 1, 2025
30b6613
wip
acosmicflamingo Oct 1, 2025
4f3baae
Try to fix iOS 26 crash
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
33 changes: 22 additions & 11 deletions Sources/UIKitNavigation/Navigation/Presentation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,17 @@
} present: { [weak self] child, transaction in
guard let self else { return }
if presentedViewController != nil {
self.dismiss(animated: !transaction.uiKit.disablesAnimations) {
self.dismiss(
animated: !transaction.uiKit.disablesAnimations
) {
onDismiss?()
self.present(child, animated: !transaction.uiKit.disablesAnimations)
}
} else {
self.present(child, animated: !transaction.uiKit.disablesAnimations)
}
} dismiss: { [weak self] _, transaction in
self?.dismiss(animated: !transaction.uiKit.disablesAnimations) {
} dismiss: { child, transaction in
child.dismiss(animated: !transaction.uiKit.disablesAnimations) {
onDismiss?()
}
}
Expand Down Expand Up @@ -350,13 +352,12 @@
}
}
let childController = content(unwrappedItem)
let onDismiss = {
[
weak self,
presentationID = id(unwrappedItem.wrappedValue)
] in
let onDismiss = { [
weak self,
presentationID = id(unwrappedItem.wrappedValue)
] in
if let wrappedValue = item.wrappedValue,
presentationID == id(wrappedValue)
presentationID == id(wrappedValue)
{
inFlightController = self?.presentedByID[key]?.controller
item.wrappedValue = nil
Expand All @@ -381,10 +382,20 @@
}
} else if let presented = presentedByID[key] {
if let controller = presented.controller {
dismiss(controller, transaction)
var controllerToDismiss: UIViewController? = nil
if let tmpController = inFlightController {
controllerToDismiss = inFlightController
inFlightController = nil
} else if controller.presentedViewController != nil {
controllerToDismiss = self
} else {
controllerToDismiss = controller
}
if let controllerToDismiss {
dismiss(controllerToDismiss, transaction)
}
}
self.presentedByID[key] = nil
inFlightController = nil
}
}
}
Expand Down
Loading