From 9042f503c2533deff535de75b190c26ed1ae59ec Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 13 Oct 2023 23:15:36 +0100 Subject: [PATCH] Scope drawer drag workaround to feed pagers (#1694) --- patches/react-native-pager-view+6.1.4.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/react-native-pager-view+6.1.4.patch b/patches/react-native-pager-view+6.1.4.patch index adee2533..d6b4178a 100644 --- a/patches/react-native-pager-view+6.1.4.patch +++ b/patches/react-native-pager-view+6.1.4.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/react-native-pager-view/ios/ReactNativePageView.m b/node_modules/react-native-pager-view/ios/ReactNativePageView.m -index ab0fc7f..fbbf19f 100644 +index ab0fc7f..1ace752 100644 --- a/node_modules/react-native-pager-view/ios/ReactNativePageView.m +++ b/node_modules/react-native-pager-view/ios/ReactNativePageView.m @@ -1,6 +1,6 @@ @@ -19,7 +19,7 @@ index ab0fc7f..fbbf19f 100644 @property(nonatomic, strong) UIPageViewController *reactPageViewController; @property(nonatomic, strong) RCTEventDispatcher *eventDispatcher; -@@ -80,6 +80,10 @@ +@@ -80,6 +80,10 @@ - (void)didMoveToWindow { [self setupInitialController]; } @@ -30,13 +30,13 @@ index ab0fc7f..fbbf19f 100644 if (self.reactViewController.navigationController != nil && self.reactViewController.navigationController.interactivePopGestureRecognizer != nil) { [self.scrollView.panGestureRecognizer requireGestureRecognizerToFail:self.reactViewController.navigationController.interactivePopGestureRecognizer]; } -@@ -463,4 +467,21 @@ +@@ -463,4 +467,21 @@ - (NSString *)determineScrollDirection:(UIScrollView *)scrollView { - (BOOL)isLtrLayout { return [_layoutDirection isEqualToString:@"ltr"]; } + +- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { -+ if (otherGestureRecognizer == self.scrollView.panGestureRecognizer) { ++ if (!_overdrag && otherGestureRecognizer == self.scrollView.panGestureRecognizer) { + UIPanGestureRecognizer* p = (UIPanGestureRecognizer*) gestureRecognizer; + CGPoint velocity = [p velocityInView:self]; + if (self.currentIndex == 0 && velocity.x > 0) {