Skip to content

Commit 91da66c

Browse files
authored
Fix freeze on swipe back after modal interactive dismissal (#81)
1 parent 9af486b commit 91da66c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Examples/Demo/Demo.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@
339339
CODE_SIGN_STYLE = Automatic;
340340
CURRENT_PROJECT_VERSION = 1;
341341
DEVELOPMENT_ASSET_PATHS = "\"Demo/Preview Content\"";
342-
DEVELOPMENT_TEAM = 895A67RTTU;
342+
DEVELOPMENT_TEAM = 26CPNYHDUU;
343343
ENABLE_PREVIEWS = YES;
344344
GENERATE_INFOPLIST_FILE = YES;
345345
INFOPLIST_FILE = Demo/Info.plist;
@@ -376,7 +376,7 @@
376376
CODE_SIGN_STYLE = Automatic;
377377
CURRENT_PROJECT_VERSION = 1;
378378
DEVELOPMENT_ASSET_PATHS = "\"Demo/Preview Content\"";
379-
DEVELOPMENT_TEAM = 895A67RTTU;
379+
DEVELOPMENT_TEAM = 26CPNYHDUU;
380380
ENABLE_PREVIEWS = YES;
381381
GENERATE_INFOPLIST_FILE = YES;
382382
INFOPLIST_FILE = Demo/Info.plist;

Sources/NavigationTransitions/NavigationTransition+UIKit.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,10 @@ final class NavigationGestureRecognizerDelegate: NSObject, UIGestureRecognizerDe
290290
self.navigationController = controller
291291
}
292292

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

0 commit comments

Comments
 (0)