Fix stack with gestureEnabled=false on iOS (#283)

#254 without breaking changes Instead of moving gestureEnabled to the screen we find the header config subview.
react-navigation · Jan 14, 2020 · 27ef6dc · 27ef6dc
1 parent ce819f6
commit 27ef6dc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ios/RNSScreenStack.m b/ios/RNSScreenStack.m
@@ -102,7 +102,16 @@ - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
   RCTRootContentView *rootView = (RCTRootContentView *)parent;
   [rootView.touchHandler cancel];
 
-  return _controller.viewControllers.count > 1;
+  UIView *topView = _controller.viewControllers.lastObject.view;
+  RNSScreenStackHeaderConfig *config = nil;
+  for (UIView *subview in topView.reactSubviews) {
+    if ([subview isKindOfClass:[RNSScreenStackHeaderConfig class]]) {
+      config = (RNSScreenStackHeaderConfig*) subview;
+      break;
+    }
+  }
+
+  return _controller.viewControllers.count > 1 && (config == nil || config.gestureEnabled);
 }
 
 - (void)markChildUpdated

diff --git a/ios/RNSScreenStackHeaderConfig.m b/ios/RNSScreenStackHeaderConfig.m
@@ -267,7 +267,6 @@ + (void)updateViewController:(UIViewController *)vc withConfig:(RNSScreenStackHe
   }
 
   [navctr setNavigationBarHidden:shouldHide animated:YES];
-  navctr.interactivePopGestureRecognizer.enabled = config.gestureEnabled;
 #ifdef __IPHONE_13_0
   if (@available(iOS 13.0, *)) {
     vc.modalInPresentation = !config.gestureEnabled;