diff --git a/React/Views/RCTNavigator.m b/React/Views/RCTNavigator.m index 460a5fc6e..10e415ab0 100644 --- a/React/Views/RCTNavigator.m +++ b/React/Views/RCTNavigator.m @@ -361,6 +361,13 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)aDecoder) (RCTWrapperViewController *)[context viewControllerForKey:UITransitionContextFromViewControllerKey]; RCTWrapperViewController *toController = (RCTWrapperViewController *)[context viewControllerForKey:UITransitionContextToViewControllerKey]; + + // This may be triggered by a navigation controller unrelated to me: if so, ignore. + if (fromController.navigationController != _navigationController || + toController.navigationController != _navigationController) { + return; + } + NSUInteger indexOfFrom = [_currentViews indexOfObject:fromController.navItem]; NSUInteger indexOfTo = [_currentViews indexOfObject:toController.navItem]; CGFloat destination = indexOfFrom < indexOfTo ? 1.0 : -1.0;