Merge branch 'master' into feat/old-new-arch-example

# Conflicts: # .gitignore # README.md
callstack · Aug 29, 2023 · b9e2988 · b9e2988
2 parents f019bd7 + 25aa3fc
commit b9e2988
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -66,14 +66,13 @@ example/vendor
 #Example
 example/ios/Pods
 example/vendor
-example/android/app/.cxx
 .lefthookrc
 lefthook.yml
 
 
 # Temporary files created by Metro to check the health of the file watcher
 .metro-health-check*
-example/android/app/.cxx
 
 # testing
-/coverage
+/coverage
+.cxx
diff --git a/README.md b/README.md
@@ -19,16 +19,10 @@ This component allows the user to swipe left and right through pages of data. Un
 
 ## Versions
 
-| 4.x        | 5.x         |
-| ---------- | ----------- |
-| iOS        | iOS support |
-| ViewPager1 | ViewPager2  |
-
-## New architecture support (Fabric)
-
-This library supports both architectures (Paper and Fabric). If you would like enable new architecture, please run below command:
-
-`yarn add react-native-pager-view@newarch`
+| 4.x        | 5.x and above |
+| ---------- | ------------- |
+| iOS        | iOS support   |
+| ViewPager1 | ViewPager2    |
 
 ## Migration
 

diff --git a/ios/Fabric/RNCPagerViewComponentView.mm b/ios/Fabric/RNCPagerViewComponentView.mm
@@ -192,6 +192,10 @@ - (void)enableSwipe {
 - (void)goTo:(NSInteger)index animated:(BOOL)animated {
     NSInteger numberOfPages = _nativeChildrenViewControllers.count;
 
+    if (index == _currentIndex) {
+        return;
+    }
+
     [self disableSwipe];
 
     _destinationIndex = index;

diff --git a/ios/ReactNativePageView.m b/ios/ReactNativePageView.m
@@ -243,6 +243,10 @@ - (void)enableSwipe {
 - (void)goTo:(NSInteger)index animated:(BOOL)animated {
     NSInteger numberOfPages = self.reactSubviews.count;
 
+    if (index == _currentIndex) {
+        return;
+    }
+
     [self disableSwipe];
 
     _destinationIndex = index;

diff --git a/ios/ReactViewPagerManager.m b/ios/ReactViewPagerManager.m
@@ -63,7 +63,7 @@ - (void) changeScrollEnabled
     [self goToPage:reactTag index:index animated:false];
 }
 
-RCT_EXPORT_METHOD(setScrollEnabled
+RCT_EXPORT_METHOD(setScrollEnabledImperatively
                   : (nonnull NSNumber *)reactTag enabled
                   : (nonnull NSNumber *)enabled) {
     BOOL isEnabled = [enabled boolValue];

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-pager-view",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "React Native wrapper for Android and iOS ViewPager",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",