Skip to content
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

Jump to bottom

Fix navigation controller root bug #74

Merged
merged 8 commits into from
Jan 13, 2021
Merged

Fix navigation controller root bug #74

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
697c11f
Make sure to present immediately if the root is a UINavigationController
CJEkman Jan 8, 2021
cb9b00a
Fix dismiss button bug
CJEkman Jan 8, 2021
d883894
Update Presentation/UIViewController+Presentation.swift
CJEkman Jan 11, 2021
a330469
Update Presentation/PresentationStyle.swift
CJEkman Jan 11, 2021
10c1352
Update Presentation/PresentationStyle.swift
nataliq-pp Jan 11, 2021
8d8caf2
Add UI test in example project covering the dismiss button's function
CJEkman Jan 12, 2021
be07087
Update changelog
CJEkman Jan 12, 2021
c8547f8
Bump version to 1.13.3
CJEkman Jan 12, 2021
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
2 changes: 1 addition & 1 deletion Presentation/PresentationStyle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public extension PresentationStyle {
}
}

bag += presented.installDismissButton().onValue {
bag += viewController.installDismissButton().onValue {
CJEkman marked this conversation as resolved.
Show resolved Hide resolved
completion(.failure(PresentError.dismissed))
}

Expand Down
2 changes: 1 addition & 1 deletion Presentation/UIViewController+Presentation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public extension UIViewController {
// iOS 13 temporary fix for issue #40: https://github.com/iZettle/Presentation/issues/40
let shouldPresentImmediately: Bool
if #available(iOS 13.0, *) {
shouldPresentImmediately = root is UISplitViewController || vc is UISplitViewController
shouldPresentImmediately = root is UISplitViewController || vc is UISplitViewController || (root as? UINavigationController)?.viewControllers.isEmpty == true
} else {
shouldPresentImmediately = false
}
Expand Down