From 93f5bb3b1f10cb6011f1770132067fc58df39f3b Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Sat, 23 Dec 2023 17:44:38 -0600 Subject: Bump react-native to 0.73.1, expo to 50 (#2214) * Bump to react-native@0.73, bump expo@next Includes bumps for all expo deps and dev dependencies. Updates react-native patch and others, and removes the babel-preset-expo patch. * Remove duplicate Splash ref * Bump more deps * Properly install expo-notifications * Bump webview dep * Bump packages according to expo fix; remove pager-view patch as it is no longer needed * Don't access expo-camera from Web * Fix crypto dep on web * Fix some type issues * Build esnext modules to support dynamic imports --------- Co-authored-by: Paul Frazee --- patches/react-native-pager-view+6.1.4.patch | 54 ----------------------------- 1 file changed, 54 deletions(-) delete mode 100644 patches/react-native-pager-view+6.1.4.patch (limited to 'patches/react-native-pager-view+6.1.4.patch') diff --git a/patches/react-native-pager-view+6.1.4.patch b/patches/react-native-pager-view+6.1.4.patch deleted file mode 100644 index d6b4178ab..000000000 --- a/patches/react-native-pager-view+6.1.4.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/node_modules/react-native-pager-view/ios/ReactNativePageView.m b/node_modules/react-native-pager-view/ios/ReactNativePageView.m -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 @@ - - #import "ReactNativePageView.h" --#import "React/RCTLog.h" -+#import - #import - - #import "UIViewController+CreateExtension.h" -@@ -9,7 +9,7 @@ - #import "RCTOnPageSelected.h" - #import - --@interface ReactNativePageView () -+@interface ReactNativePageView () - - @property(nonatomic, strong) UIPageViewController *reactPageViewController; - @property(nonatomic, strong) RCTEventDispatcher *eventDispatcher; -@@ -80,6 +80,10 @@ - (void)didMoveToWindow { - [self setupInitialController]; - } - -+ UIPanGestureRecognizer* panGestureRecognizer = [UIPanGestureRecognizer new]; -+ panGestureRecognizer.delegate = self; -+ [self addGestureRecognizer: panGestureRecognizer]; -+ - if (self.reactViewController.navigationController != nil && self.reactViewController.navigationController.interactivePopGestureRecognizer != nil) { - [self.scrollView.panGestureRecognizer requireGestureRecognizerToFail:self.reactViewController.navigationController.interactivePopGestureRecognizer]; - } -@@ -463,4 +467,21 @@ - (NSString *)determineScrollDirection:(UIScrollView *)scrollView { - - (BOOL)isLtrLayout { - return [_layoutDirection isEqualToString:@"ltr"]; - } -+ -+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { -+ if (!_overdrag && otherGestureRecognizer == self.scrollView.panGestureRecognizer) { -+ UIPanGestureRecognizer* p = (UIPanGestureRecognizer*) gestureRecognizer; -+ CGPoint velocity = [p velocityInView:self]; -+ if (self.currentIndex == 0 && velocity.x > 0) { -+ self.scrollView.panGestureRecognizer.enabled = false; -+ return NO; -+ } else { -+ self.scrollView.panGestureRecognizer.enabled = self.scrollEnabled; -+ } -+ } else { -+ self.scrollView.panGestureRecognizer.enabled = self.scrollEnabled; -+ } -+ -+ return YES; -+} - @end -- cgit 1.4.1