Merge pull request #830 from callstack/fix/builds

fix: fabric builds

Author: okwasniewski

ios/Fabric/RNCPagerViewComponentView.h

@@ -9,8 +9,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface RNCPagerViewComponentView : RCTViewComponentView <UIScrollViewDelegate>
 
-@property(nonatomic) BOOL overdrag;
-
 - (void)setPage:(NSInteger)number;
 - (void)setPageWithoutAnimation:(NSInteger)number;
 

ios/Fabric/RNCPagerViewComponentView.mm

@@ -15,17 +15,14 @@
 
 using namespace facebook::react;
 
-@interface RNCPagerViewComponentView () <RCTRNCViewPagerViewProtocol, UIPageViewControllerDataSource, UIPageViewControllerDelegate, UIScrollViewDelegate, UIGestureRecognizerDelegate>
-
-@property(nonatomic, assign) UIPanGestureRecognizer* panGestureRecognizer;
-
+@interface RNCPagerViewComponentView () <RCTRNCViewPagerViewProtocol, UIScrollViewDelegate>
 @end
 
 @implementation RNCPagerViewComponentView {
     RNCViewPagerShadowNode::ConcreteState::Shared _state;
     UIScrollView *_scrollView;
     UIView *_containerView;
-
+    
     CGSize _contentSize;
     NSInteger _initialPage;
 }
@@ -35,73 +32,29 @@ - (instancetype)initWithFrame:(CGRect)frame
     if (self = [super initWithFrame:frame]) {
         static const auto defaultProps = std::make_shared<const RNCViewPagerProps>();
         _props = defaultProps;
-        _nativeChildrenViewControllers = [[NSMutableArray alloc] init];
-        _currentIndex = -1;
-        _destinationIndex = -1;
-        _layoutDirection = @"ltr";
-        _overdrag = NO;
-        UIPanGestureRecognizer* panGestureRecognizer = [UIPanGestureRecognizer new];
-        self.panGestureRecognizer = panGestureRecognizer;
-        panGestureRecognizer.delegate = self;
-        [self addGestureRecognizer: panGestureRecognizer];
-
+        _initialPage = -1;
+        
+        _scrollView = [[UIScrollView alloc] initWithFrame:self.bounds];
+        
+        _scrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+        _scrollView.delaysContentTouches = NO;
+        _scrollView.delegate = self;
+        _scrollView.pagingEnabled = YES;
+        _scrollView.showsHorizontalScrollIndicator = NO;
+        _scrollView.showsVerticalScrollIndicator = NO;
+        
+        [self addSubview:_scrollView];
+        
+        _containerView = [[UIView alloc] initWithFrame:CGRectZero];
+        
+        [_scrollView addSubview:_containerView];
     }
 
     return self;
 }
 
-#pragma mark - React API
-
-- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
-    UIViewController *wrapper = [[UIViewController alloc] initWithView:childComponentView];
-    [_nativeChildrenViewControllers insertObject:wrapper atIndex:index];
-}
-
-- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
-    [[_nativeChildrenViewControllers objectAtIndex:index].view removeFromSuperview];
-    [_nativeChildrenViewControllers objectAtIndex:index].view = nil;
-    [_nativeChildrenViewControllers removeObjectAtIndex:index];
- 
-    NSInteger maxPage = _nativeChildrenViewControllers.count - 1;
-    
-    if (self.currentIndex >= maxPage) {
-        [self goTo:maxPage animated:NO];
-    }
-}
-
-
--(void)updateLayoutMetrics:(const facebook::react::LayoutMetrics &)layoutMetrics oldLayoutMetrics:(const facebook::react::LayoutMetrics &)oldLayoutMetrics {
-    [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:_layoutMetrics];
-    self.contentView.frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
-    _layoutMetrics = layoutMetrics;
-}
-
-
--(void)prepareForRecycle {
-    [super prepareForRecycle];
-    
-    _nativeChildrenViewControllers = [[NSMutableArray alloc] init];
-    [_nativePageViewController.view removeFromSuperview];
-    _nativePageViewController = nil;
-    
-    _currentIndex = -1;
-}
-
-- (void)shouldDismissKeyboard:(RNCViewPagerKeyboardDismissMode)dismissKeyboard {
-#if !TARGET_OS_VISION
-    UIScrollViewKeyboardDismissMode dismissKeyboardMode = UIScrollViewKeyboardDismissModeNone;
-    switch (dismissKeyboard) {
-        case RNCViewPagerKeyboardDismissMode::None:
-            dismissKeyboardMode = UIScrollViewKeyboardDismissModeNone;
-            break;
-        case RNCViewPagerKeyboardDismissMode::OnDrag:
-            dismissKeyboardMode = UIScrollViewKeyboardDismissModeOnDrag;
-            break;
-    }
-    scrollView.keyboardDismissMode = dismissKeyboardMode;
-#endif
-}
 
+#pragma mark - React API
 
 - (void)updateProps:(const facebook::react::Props::Shared &)props oldProps:(const facebook::react::Props::Shared &)oldProps{
     const auto &oldScreenProps = *std::static_pointer_cast<const RNCViewPagerProps>(_props);
@@ -206,23 +159,6 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoi
 
     const auto strongEventEmitter = *std::dynamic_pointer_cast<const RNCViewPagerEventEmitter>(_eventEmitter);
     strongEventEmitter.onPageScrollStateChanged(RNCViewPagerEventEmitter::OnPageScrollStateChanged{.pageScrollState =  RNCViewPagerEventEmitter::OnPageScrollStateChangedPageScrollState::Settling });
-    
-    if (!_overdrag) {
-        NSInteger maxIndex = _nativeChildrenViewControllers.count - 1;
-        BOOL isFirstPage = [self isLtrLayout] ? _currentIndex == 0 : _currentIndex == maxIndex;
-        BOOL isLastPage = [self isLtrLayout] ? _currentIndex == maxIndex : _currentIndex == 0;
-        CGFloat contentOffset = [self isHorizontal] ? scrollView.contentOffset.x : scrollView.contentOffset.y;
-        CGFloat topBound = [self isHorizontal] ? scrollView.bounds.size.width : scrollView.bounds.size.height;
-        
-        if ((isFirstPage && contentOffset <= topBound) || (isLastPage && contentOffset >= topBound)) {
-            CGPoint croppedOffset = [self isHorizontal] ? CGPointMake(topBound, 0) : CGPointMake(0, topBound);
-            *targetContentOffset = croppedOffset;
-            
-            strongEventEmitter.onPageScrollStateChanged(RNCViewPagerEventEmitter::OnPageScrollStateChanged{.pageScrollState =  RNCViewPagerEventEmitter::OnPageScrollStateChangedPageScrollState::Idle });
-        }
-    }
-    
-   
 }
 
 - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView {
@@ -300,29 +236,6 @@ + (ComponentDescriptorProvider)componentDescriptorProvider
 }
 
 
-- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer {
-
-    // Recognize simultaneously only if the other gesture is RN Screen's pan gesture (one that is used to perform fullScreenGestureEnabled)
-    if (gestureRecognizer == self.panGestureRecognizer && [NSStringFromClass([otherGestureRecognizer class]) isEqual: @"RNSPanGestureRecognizer"]) {
-        UIPanGestureRecognizer* panGestureRecognizer = (UIPanGestureRecognizer*) gestureRecognizer;
-        CGPoint velocity = [panGestureRecognizer velocityInView:self];
-        BOOL isLTR = [self isLtrLayout];
-        BOOL isBackGesture = (isLTR && velocity.x > 0) || (!isLTR && velocity.x < 0);
-        
-        if (self.currentIndex == 0 && isBackGesture) {
-            scrollView.panGestureRecognizer.enabled = false;
-        } else {
-            const auto &viewProps = *std::static_pointer_cast<const RNCViewPagerProps>(_props);
-            scrollView.panGestureRecognizer.enabled = viewProps.scrollEnabled;
-        }
-        
-        return YES;
-    }
-    const auto &viewProps = *std::static_pointer_cast<const RNCViewPagerProps>(_props);
-    scrollView.panGestureRecognizer.enabled = viewProps.scrollEnabled;
-    return NO;
-}
-
 @end
 
 Class<RCTComponentViewProtocol> RNCViewPagerCls(void)

package.json

@@ -12,7 +12,7 @@
     "lib",
     "android",
     "ios",
-    "cpp",
+    "common",
     "react-native-pager-view.podspec",
     "!lib/typescript/example",
     "!android/build",
@@ -55,6 +55,7 @@
   "devDependencies": {
     "@babel/eslint-parser": "^7.18.2",
     "@react-native/eslint-config": "^0.72.2",
+    "@react-native/metro-config": "^0.72.11",
     "@release-it/conventional-changelog": "^2.0.0",
     "@tsconfig/react-native": "^3.0.0",
     "@types/jest": "^28.1.2",
@@ -72,8 +73,7 @@
     "react-native": "0.72.5",
     "react-native-builder-bob": "^0.18.3",
     "release-it": "^14.2.2",
-    "typescript": "^4.5.2",
-    "@react-native/metro-config": "^0.72.11"
+    "typescript": "^4.5.2"
   },
   "resolutions": {
     "@types/react": "18.0.29"

react-native-pager-view.podspec

@@ -2,6 +2,7 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 
 Pod::Spec.new do |s|
   s.name         = "react-native-pager-view"
@@ -16,6 +17,14 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm}"
 
+  if new_arch_enabled
+    s.subspec "common" do |ss|
+      ss.source_files         = "common/cpp/**/*.{cpp,h}"
+      ss.header_dir           = "RNCViewPager"
+      ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/common/cpp\"" }
+    end
+  end
+
   # install_modules_dependencies has been defined in RN 0.70
   # This check ensure that the library can work on older versions of RN
   if defined?(install_modules_dependencies)
@@ -24,7 +33,7 @@ Pod::Spec.new do |s|
     s.dependency "React-Core"
 
     # Don't install the dependencies when we run `pod install` in the old architecture.
-    if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+    if new_arch_enabled then
       s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
       s.pod_target_xcconfig    = {
         "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",