mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove destination view controller when transition canceled

Browse Source
This commit is contained in:
Michael Chen 2018-06-05 09:41:10 -04:00
parent 92fb1d96b8
commit d3b078e984
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m
View File

@ -106,10 +106,7 @@
// Replaces the current view controller. // Replaces the current view controller.
NSMutableArray *viewControllers = [NSMutableArray arrayWithArray:self.navigationObject.navigationController.viewControllers]; NSMutableArray *viewControllers = [NSMutableArray arrayWithArray:self.navigationObject.navigationController.viewControllers];
if (viewControllers.count > 1) { [viewControllers replaceObjectAtIndex:([self.navigationObject.navigationController.viewControllers count] - 1) withObject:self.navigationObject.viewController];
[viewControllers removeObjectAtIndex:0];
}
[viewControllers replaceObjectAtIndex:(viewControllers.count - 1) withObject:self.navigationObject.viewController];
[self setViewControllers:viewControllers]; [self setViewControllers:viewControllers];
} else { } else {
@ -262,8 +259,10 @@
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context { - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
if ([keyPath isEqualToString:@"interactiveTransitionCanceled"]) { if ([keyPath isEqualToString:@"interactiveTransitionCanceled"]) {
BOOL transitionStoped = ((NSNumber*)change[NSKeyValueChangeNewKey]).boolValue; BOOL transitionCanceled = ((NSNumber*)change[NSKeyValueChangeNewKey]).boolValue;
if (transitionStoped) { if (transitionCanceled) {
//When interactive transition canceled, the destination viewController should be removed from navigationController
[self.navigationObject.viewController removeFromParentViewController];
[self markAsFinished]; [self markAsFinished];
} }
} }