@onekeyfe/react-native-pager-view 3.0.166 → 3.0.168

package/android/src/main/java/com/reactnativepagerview/NativeScrollerView.kt

@@ -695,13 +695,13 @@ private class NativeScrollerRefreshLayout(context: Context) : SwipeRefreshLayout
         ancestor = ancestor.parent as? View
       }
       intercepted = false
-    } else if (event.actionMasked == MotionEvent.ACTION_MOVE && (!smoothPagerGesture || !vertical)) {
+    } else if (event.actionMasked == MotionEvent.ACTION_MOVE && (!smoothPagerGesture || (!vertical && !horizontal))) {
       val dx = abs(event.x - downX)
       val dy = abs(event.y - downY)
       if (smoothPagerGesture && dy > slop && dy > dx) {
         vertical = true
         horizontal = false
-      } else if (dx > (if (smoothPagerGesture) 32f * resources.displayMetrics.density else slop.toFloat()) && dx > dy) {
+      } else if ((if (smoothPagerGesture) dx >= 32f * resources.displayMetrics.density else dx > slop) && dx > dy) {
         horizontal = true
       }
     }

package/docs/SPEC.md

@@ -244,9 +244,19 @@ of the refresh boundary. Dispatch MUST still observe child-owned movement; only
 a confirmed vertical Smooth Home gesture may release the viewport's child
 interception prohibition. Pending and horizontal movement MUST preserve it.
 
+In smooth-header mode, Android's NativeScroller refresh boundary MUST retain a
+confirmed horizontal or vertical direction until the touch sequence ends or is
+cancelled. It MUST classify MOVE direction only while neither direction is confirmed,
+and horizontal confirmation MUST include the 32 dp boundary, matching the
+viewport. Later vertical movement after confirmed horizontal intent MUST NOT
+start a refresh gesture. Non-smooth refresh direction behavior remains unchanged.
+
 iOS nested horizontal ownership MUST include enabled nonpaging horizontal-only
 ScrollViews, with content wider than bounds and no vertical content overflow.
 Both pan holding and failure dependencies MUST use the same eligibility. A
+failure dependency on the Pager guard MUST apply only to the horizontal pan;
+independent non-pan recognizers, including stationary native long presses, MUST
+remain able to recognize before finger-up while Pager intent is pending. A
 second touch in the pending Pager guard fails recognition; an already active
 Pager guard cancels and restores each held pan's original minimum touch count.
 

package/ios/RNCCollapsiblePagerViewComponentView.mm

@@ -199,9 +199,7 @@ static void RNCGuardNestedHorizontalPans(UIView *view, UIGestureRecognizer *guar
   if ([view isKindOfClass:UIScrollView.class]) {
     UIScrollView *scroll = (UIScrollView *)view;
     if (RNCIsEnabledHorizontalScrollOwner(scroll)) {
-      for (UIGestureRecognizer *gesture in scroll.gestureRecognizers) {
-        [gesture requireGestureRecognizerToFail:guard];
-      }
+      [scroll.panGestureRecognizer requireGestureRecognizerToFail:guard];
     }
   }
   for (UIView *child in view.subviews) RNCGuardNestedHorizontalPans(child, guard);

package/ios/tests/RNCCollapsiblePagerPressCancellationTests.mm

@@ -165,7 +165,9 @@ typedef struct __IOHIDEvent *RNCTestHIDEventRef;
   [_window sendEvent:_event];
   if (phase == UITouchPhaseEnded || phase == UITouchPhaseCancelled) {
     [_activeTouches removeObjectIdenticalTo:changed];
-    if (_activeTouches.count == 0) [_event _clearTouches];
+    // A finished finger must not be delivered again when another finger ends.
+    [_event _clearTouches];
+    for (UITouch *touch in _activeTouches) [_event _addTouch:touch forDelayedDelivery:NO];
   }
 }
 
@@ -621,6 +623,7 @@ typedef struct __IOHIDEvent *RNCTestHIDEventRef;
 @property (nonatomic, strong) RNCCollapsiblePagerViewComponentView *pager;
 @property (nonatomic, strong) RNCSynthesizedTouchDriver *driver;
 @property (nonatomic, strong) UIView *firstPage;
+@property (nonatomic) NSUInteger longPressBegins;
 @end
 
 @implementation RNCCollapsiblePagerPressCancellationDeliveryTests
@@ -809,4 +812,111 @@ typedef struct __IOHIDEvent *RNCTestHIDEventRef;
   XCTAssertEqualObjects(self.handler.events, (@[@"began", @"moved", @"ended"]));
 }
 
+- (UIScrollView *)mountNestedHorizontalScrollView
+{
+  UIScrollView *vertical = [[UIScrollView alloc] initWithFrame:self.firstPage.bounds];
+  vertical.contentSize = CGSizeMake(CGRectGetWidth(vertical.bounds), 1800);
+  [self.firstPage addSubview:vertical];
+  UIScrollView *horizontal = [[UIScrollView alloc] initWithFrame:CGRectMake(40, 350, 300, 120)];
+  horizontal.contentSize = CGSizeMake(900, 120);
+  horizontal.contentOffset = CGPointMake(200, 0);
+  [vertical addSubview:horizontal];
+  UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc]
+    initWithTarget:self action:@selector(nestedLongPress:)];
+  longPress.minimumPressDuration = 0.1;
+  [horizontal addGestureRecognizer:longPress];
+  // Re-run the production attachment path after the descendant mounts.
+  ((void (*)(id, SEL))objc_msgSend)(self.pager, NSSelectorFromString(@"attachScrollObserverForCurrentPage"));
+  [self.window layoutIfNeeded];
+  [self drainMainQueue];
+  XCTAssertEqual([self.pager valueForKey:@"observedScrollView"], vertical);
+  return horizontal;
+}
+
+- (void)nestedLongPress:(UILongPressGestureRecognizer *)recognizer
+{
+  if (recognizer.state == UIGestureRecognizerStateBegan) self.longPressBegins += 1;
+}
+
+- (CGPoint)pressPointInNestedScrollView:(UIScrollView *)scroll
+{
+  CGPoint point = [scroll convertPoint:CGPointMake(scroll.contentOffset.x + 150, 60) toView:self.window];
+  XCTAssertEqual([self.window hitTest:point withEvent:nil], scroll);
+  return point;
+}
+
+- (void)testNestedStationaryNativeLongPressRecognizesBeforeFingerUp
+{
+  UIScrollView *scroll = [self mountNestedHorizontalScrollView];
+  UITouch *touch = [self.driver beginAt:[self pressPointInNestedScrollView:scroll]];
+  UIGestureRecognizer *guard = [self.pager valueForKey:@"verticalPagerGesture"];
+  XCTAssertEqual(guard.state, UIGestureRecognizerStatePossible);
+  XCTAssertEqual(scroll.panGestureRecognizer.minimumNumberOfTouches, 2);
+  XCTestExpectation *hold = [self expectationWithDescription:@"stationary finger held"];
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)),
+                 dispatch_get_main_queue(), ^{ [hold fulfill]; });
+  [self waitForExpectations:@[hold] timeout:2];
+  // The real UIKit target action must arrive while the finger is still down.
+  XCTAssertEqual(self.longPressBegins, 1);
+  XCTAssertEqual(touch.phase, UITouchPhaseBegan);
+  XCTAssertEqual(guard.state, UIGestureRecognizerStatePossible);
+  [self.driver end:touch];
+  XCTAssertEqual(scroll.panGestureRecognizer.minimumNumberOfTouches, 1);
+}
+
+- (void)testNestedHorizontalPanConsumesConfirmedHorizontalDrag
+{
+  UIScrollView *scroll = [self mountNestedHorizontalScrollView];
+  CGPoint point = [self pressPointInNestedScrollView:scroll];
+  CGFloat originalOffset = scroll.contentOffset.x;
+  UITouch *touch = [self.driver beginAt:point];
+  for (NSInteger step = 1; step <= 10; ++step) {
+    [self.driver move:touch to:CGPointMake(point.x - 12 * step, point.y)];
+  }
+  XCTAssertTrue(scroll.isDragging);
+  XCTAssertGreaterThan(scroll.contentOffset.x, originalOffset);
+  UIScrollView *pager = [self.pager valueForKey:@"pagerScrollView"];
+  XCTAssertFalse(pager.isDragging);
+  XCTAssertEqual(self.longPressBegins, 0);
+  [self.driver end:touch];
+  XCTAssertEqual(scroll.panGestureRecognizer.minimumNumberOfTouches, 1);
+}
+
+- (void)testNestedPendingHorizontalStartCanBecomeVertical
+{
+  UIScrollView *scroll = [self mountNestedHorizontalScrollView];
+  CGPoint point = [self pressPointInNestedScrollView:scroll];
+  UITouch *touch = [self.driver beginAt:point];
+  [self.driver move:touch to:CGPointMake(point.x - 8, point.y)];
+  UIGestureRecognizer *guard = [self.pager valueForKey:@"verticalPagerGesture"];
+  XCTAssertEqual(guard.state, UIGestureRecognizerStatePossible);
+  for (NSInteger step = 1; step <= 8; ++step) {
+    [self.driver move:touch to:CGPointMake(point.x - 8, point.y - 12 * step)];
+  }
+  UIScrollView *vertical = [self.pager valueForKey:@"observedScrollView"];
+  UIScrollView *pager = [self.pager valueForKey:@"pagerScrollView"];
+  XCTAssertTrue(vertical.isDragging);
+  XCTAssertFalse(scroll.isDragging);
+  XCTAssertFalse(pager.isDragging);
+  XCTAssertEqual(self.longPressBegins, 0);
+  [self.driver end:touch];
+  XCTAssertEqual(scroll.panGestureRecognizer.minimumNumberOfTouches, 1);
+  XCTAssertEqual(pager.panGestureRecognizer.minimumNumberOfTouches, 1);
+}
+
+- (void)testNestedHeldPanTouchCountRestoresOnSecondTouch
+{
+  UIScrollView *scroll = [self mountNestedHorizontalScrollView];
+  CGPoint point = [self pressPointInNestedScrollView:scroll];
+  UITouch *first = [self.driver beginAt:point];
+  XCTAssertEqual(scroll.panGestureRecognizer.minimumNumberOfTouches, 2);
+  UITouch *second = [self.driver beginAt:CGPointMake(point.x + 20, point.y)];
+  UIScrollView *pager = [self.pager valueForKey:@"pagerScrollView"];
+  XCTAssertEqual(scroll.panGestureRecognizer.minimumNumberOfTouches, 1);
+  XCTAssertEqual(pager.panGestureRecognizer.minimumNumberOfTouches, 1);
+  [self.driver end:second];
+  [self.driver end:first];
+  XCTAssertEqual(scroll.panGestureRecognizer.minimumNumberOfTouches, 1);
+}
+
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-pager-view",
-  "version": "3.0.166",
+  "version": "3.0.168",
   "description": "React Native wrapper for Android and iOS ViewPager",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",
@@ -72,7 +72,7 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "@onekeyfe/react-native-native-logger": "3.0.166",
+    "@onekeyfe/react-native-native-logger": "3.0.168",
     "react": "*",
     "react-native": "*"
   },