fix(ios): on tab selection scroll when rtl enabled (#613)

callstack · Oct 4, 2022 · ce17576 · ce17576
1 parent bfad9a3
commit ce17576
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/ios/ReactNativePageView.m b/ios/ReactNativePageView.m
@@ -247,14 +247,20 @@ - (void)goTo:(NSInteger)index animated:(BOOL)animated {
         return;
     }
 
-    BOOL isForward = (index > self.currentIndex && [self isLtrLayout]) || (index < self.currentIndex && ![self isLtrLayout]);
+    BOOL isRTL = ![self isLtrLayout];
+
+    BOOL isForward = (index > self.currentIndex && !isRTL) || (index < self.currentIndex && isRTL);
+
+
     UIPageViewControllerNavigationDirection direction = isForward ? UIPageViewControllerNavigationDirectionForward : UIPageViewControllerNavigationDirectionReverse;
 
     self.reactPageIndicatorView.numberOfPages = numberOfPages;
     self.reactPageIndicatorView.currentPage = index;
     long diff = labs(index - _currentIndex);
 
-    if (isForward && diff > 0) {
+    BOOL shouldGoForward = isRTL ? !isForward : isForward;
+
+    if (shouldGoForward && diff > 0) {
         for (NSInteger i=_currentIndex; i<=index; i++) {
             if (i == _currentIndex) {
                 continue;
@@ -263,7 +269,7 @@ - (void)goTo:(NSInteger)index animated:(BOOL)animated {
         }
     }
 
-    if (!isForward && diff > 0) {
+    if (!shouldGoForward && diff > 0) {
         for (NSInteger i=_currentIndex; i>=index; i--) {
             // Prevent removal of one or many pages at a time
             if (i == _currentIndex || i >= numberOfPages) {