Skip to content

Fix freeze on swipe back after modal interactive dismissal #81

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

Merged
merged 3 commits into from
Jun 21, 2023
Merged

Fix freeze on swipe back after modal interactive dismissal #81

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
afe6f3a
wip
davdroman Jun 21, 2023
db39875
wip
davdroman Jun 21, 2023
d27dd8f
wip [skip ci]
davdroman Jun 21, 2023
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
4 changes: 2 additions & 2 deletions Examples/Demo/Demo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Demo/Preview Content\"";
DEVELOPMENT_TEAM = 895A67RTTU;
DEVELOPMENT_TEAM = 26CPNYHDUU;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Demo/Info.plist;
Expand Down Expand Up @@ -376,7 +376,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Demo/Preview Content\"";
DEVELOPMENT_TEAM = 895A67RTTU;
DEVELOPMENT_TEAM = 26CPNYHDUU;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Demo/Info.plist;
Expand Down
4 changes: 3 additions & 1 deletion Sources/NavigationTransitions/NavigationTransition+UIKit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,10 @@ final class NavigationGestureRecognizerDelegate: NSObject, UIGestureRecognizerDe
self.navigationController = controller
}

// TODO: swizzle instead
func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
let isNotOnRoot = navigationController.viewControllers.count > 1
return isNotOnRoot
let noModalIsPresented = navigationController.presentedViewController == nil // TODO: check if this check is still needed after iOS 17 public release
return isNotOnRoot && noModalIsPresented
}
}