kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-02-09 22:51:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Properly cancel transitioning on ScreenStack on iOS

Browse Source
This commit is contained in:
Krzysztof Magiera
2018-08-03 16:20:01 +02:00
parent 31281d6b68
commit 3c9ea4ee07
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ios/RNSScreenStack.m
View File

@@ -149,14 +149,7 @@
if (_transitioning == transitioning) {
return;
}
if (transitioning == 0) {
// finish transition
[_interactor finishInteractiveTransition];
_interactor = nil;
} else {
[self markUpdated];
_transitioningStateChanged = YES;
}
_transitioningStateChanged = YES;
_transitioning = transitioning;
}
@@ -200,16 +193,24 @@
[controllers addObject:screen.controller];
}
if (_transitioningStateChanged) {
[_interactor cancelInteractiveTransition];
_interactor = [UIPercentDrivenInteractiveTransition new];
if (_transitioning < 0) {
[_controller setViewControllers:controllers animated:NO];
[_controller popViewControllerAnimated:YES];
if (_transitioning == 0) {
// finish or cancel transitioning
if (_controller.viewControllers.lastObject == controllers.lastObject) {
[_interactor finishInteractiveTransition];
} else {
[_interactor cancelInteractiveTransition];
}
} else {
UIViewController *lastController = [controllers lastObject];
[controllers removeLastObject];
[_controller setViewControllers:controllers animated:NO];
[_controller pushViewController:lastController animated:YES];
_interactor = [UIPercentDrivenInteractiveTransition new];
if (_transitioning < 0) {
[_controller setViewControllers:controllers animated:NO];
[_controller popViewControllerAnimated:YES];
} else {
UIViewController *lastController = [controllers lastObject];
[controllers removeLastObject];
[_controller setViewControllers:controllers animated:NO];
[_controller pushViewController:lastController animated:YES];
}
}
_transitioningStateChanged = NO;
} else {