fix(ios): resolve occasional index OOB when no items in ViewPager (#4208

)
Tencent · Mar 5, 2025 · aa45fc9 · aa45fc9
1 parent 26f645d
commit aa45fc9
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/renderer/native/ios/renderer/component/viewPager/HippyViewPager.mm b/renderer/native/ios/renderer/component/viewPager/HippyViewPager.mm
@@ -430,23 +430,24 @@ - (void)invokePageSelected:(NSUInteger)index {
 
 - (NSUInteger)targetPageIndexFromTargetContentOffsetX:(CGFloat)targetContentOffsetX {
     NSInteger thePage = -1;
-    if (fabs(targetContentOffsetX) < FLT_EPSILON) {
-        thePage = 0;
-    } else {
-        for (int i = 0; i < self.viewPagerItems.count; i++) {
-            UIView *pageItem = self.viewPagerItems[i];
-            CGPoint point = [self middlePointOfView:pageItem];
-            if (point.x > targetContentOffsetX) {
-                thePage = i;
-                break;
-            }
-        }
+    NSUInteger count = self.viewPagerItems.count;
+    if (count == 0) {
+        return 0;
     }
-    if (thePage == -1) {
-        thePage = 0;
-    } else if (thePage >= self.viewPagerItems.count) {
-        thePage = self.viewPagerItems.count - 1;
+
+    for (int i = 0; i < count; i++) {
+        UIView *pageItem = self.viewPagerItems[i];
+        CGPoint point = [self middlePointOfView:pageItem];
+        if (point.x > targetContentOffsetX) {
+            thePage = i;
+            break;
+        }
     }
+
+    // Make sure the index is within legal limits
+    thePage = MIN(MAX(thePage, 0), count - 1);
+
+    // Update cache and return result
     if (_lastPageIndex != thePage) {
         _lastPageIndex = thePage;
         _lastSelectedPageItem = self.viewPagerItems[thePage];