@onekeyfe/react-native-native-list 6.7.0-alpha.399 → 6.7.0-alpha.401

package/android/src/main/java/com/onekey/nativelist/NativeListView.kt

@@ -46,6 +46,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ReactPointerEventsView
+import com.facebook.react.uimanager.events.NativeGestureUtil
 import com.margelo.nitro.nativelogger.OneKeyLog
 import org.json.JSONArray
 import org.json.JSONObject
@@ -221,6 +222,14 @@ class NativeListView(
       if (isLayoutSuppressed) return
       super.onLayout(changed, left, top, right, bottom)
     }
+
+    override fun dispatchTouchEvent(event: MotionEvent): Boolean {
+      val handled = super.dispatchTouchEvent(event)
+      if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) {
+        finishPagerNativeGesture(event)
+      }
+      return handled
+    }
   }
   private var configuredTopPaddingPx = 0
   private var slotInsetPx = 0
@@ -1843,6 +1852,7 @@ class NativeListView(
   // OneKey patch: vertical lists retain vertical drags and leave horizontal drags to a parent pager.
   private val pagerGestureTouchSlop = ViewConfiguration.get(context).scaledTouchSlop
   private var pagerGestureIsVertical = false
+  private var pagerNativeGestureStarted = false
   private val pagerGestureTouchListener = object : RecyclerView.SimpleOnItemTouchListener() {
     private var downX = 0f
     private var downY = 0f
@@ -1856,30 +1866,43 @@ class NativeListView(
           downY = event.y
           directionResolved = false
           pagerGestureIsVertical = false
+          pagerNativeGestureStarted = false
         }
-        MotionEvent.ACTION_MOVE -> if (!directionResolved) {
+        MotionEvent.ACTION_MOVE -> {
           val deltaX = abs(event.x - downX)
           val deltaY = abs(event.y - downY)
-          if (max(deltaX, deltaY) > pagerGestureTouchSlop) {
+          if (!directionResolved && max(deltaX, deltaY) > pagerGestureTouchSlop) {
             directionResolved = true
             pagerGestureIsVertical = deltaY >= deltaX
             recyclerView.parent?.requestDisallowInterceptTouchEvent(pagerGestureIsVertical)
-            if (
-              pagerGestureIsVertical &&
-              keyboardDismissMode == NativeListKeyboardDismissMode.ON_DRAG
-            ) {
+          } else if (!pagerGestureIsVertical && deltaY > pagerGestureTouchSlop && deltaY >= deltaX) {
+            pagerGestureIsVertical = true
+            recyclerView.parent?.requestDisallowInterceptTouchEvent(true)
+          }
+          if (pagerGestureIsVertical && !pagerNativeGestureStarted) {
+            NativeGestureUtil.notifyNativeGestureStarted(this@NativeListView, event)
+            pagerNativeGestureStarted = true
+            if (keyboardDismissMode == NativeListKeyboardDismissMode.ON_DRAG) {
               dismissKeyboard()
             }
           }
         }
         MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
-          recyclerView.parent?.requestDisallowInterceptTouchEvent(false)
-          pagerGestureIsVertical = false
+          finishPagerNativeGesture(event)
         }
       }
       return false
     }
   }
+
+  private fun finishPagerNativeGesture(event: MotionEvent) {
+    if (pagerNativeGestureStarted) {
+      NativeGestureUtil.notifyNativeGestureEnded(this, event)
+      pagerNativeGestureStarted = false
+    }
+    recyclerView.parent?.requestDisallowInterceptTouchEvent(false)
+    pagerGestureIsVertical = false
+  }
   // Intercept only a completed tap so RecyclerView keeps drag and reorder ownership.
   private val keyboardTapTouchListener = object : RecyclerView.SimpleOnItemTouchListener() {
     private var downX = 0f

package/docs/SPEC.md

@@ -384,6 +384,46 @@ image that already loaded. Common container styling clears what it wrote on the
 next bind, including properties it set on template children. UI mutation remains on the platform
 UI thread; [DESIGN.md](DESIGN.md) describes update and event ownership.
 
+### Android vertical-drag React touch cancellation
+
+Status: implemented; four real Android MotionEvent/JSTouchDispatcher regressions
+passed on a dedicated API 34 emulator on 2026-10-30. The focused regression is
+in `native-tests/android/NativeListTouchDeliveryTest.kt`; build and run
+instructions are in that directory's README. Physical-device press/scroll
+acceptance remains separate.
+
+This behavior applies to every vertical NativeList, including standalone lists
+outside a CollapsiblePager and touches beginning on React container slots.
+On the UI thread, movement exceeding Android touch slop with vertical
+displacement at least equal to horizontal displacement confirms a vertical
+drag. An initially horizontal movement may become vertical while the list still
+receives the stream; once vertical, ownership stays vertical until release or
+cancellation. Horizontal lists retain their existing touch behavior.
+
+The list notifies its React root of native gesture ownership once per confirmed
+drag, cancelling the active React touch before finger-up. Later MOVE events MUST
+NOT repeat that notification. The listener does not consume the stream: native
+RecyclerView scrolling continues. A stationary tap or movement below touch slop
+MUST retain ordinary React touch-end delivery without native-gesture start/end
+notifications. The existing `keyboardDismissMode: 'on-drag'` behavior shares the
+confirmed-drag boundary.
+
+ACTION_UP and ACTION_CANCEL finish a started native gesture exactly once and
+release the parent's interception restriction, even after RecyclerView has
+intercepted its child and stops invoking the item-touch interception listener.
+They clear vertical ownership; the next ACTION_DOWN resets direction and
+gesture tracking. Android's touch-target removal cancellation must finish the
+old stream before a retained list is reattached or its slots are reused, so the
+next tap is not suppressed by the previous drag. Disposal releases the listener
+through the existing detached-resource cleanup. This change adds no prop or
+callback and changes neither iOS nor Web touch handling.
+
+Conformance uses real MotionEvent dispatch through NativeListView/RecyclerView
+and React Native's JSTouchDispatcher: vertical drag produces one touch-cancel
+and one native end, a tap produces touch-end, and cancellation/removal followed
+by reuse leaves the next tap functional. This proves native touch delivery, not
+execution of a JavaScript press handler or physical-device gesture feel.
+
 ### Android reorder cancellation
 
 Status: implemented; three real Android View/callback regressions verified on

package/ios/tests/NativeListLifecycleTests.swift

@@ -1619,12 +1619,15 @@ final class NativeListLifecycleTests: XCTestCase {
     let thousandCells = try sampleCells(count: 1000)
     print("NativeList 100 visible/attached first/mid/tail: \(hundredCells)")
     print("NativeList 1000 visible/attached first/mid/tail: \(thousandCells)")
+    let visibleCellLimit = Int(ceil(list.bounds.height / 60)) + 2
     XCTAssertTrue(hundredCells.allSatisfy {
-      $0.visible > 0 && $0.visible <= 24 && $0.attached > 0 && $0.attached <= 24
+      $0.visible > 0 && $0.visible <= visibleCellLimit && $0.attached >= $0.visible
     })
     XCTAssertTrue(thousandCells.allSatisfy {
-      $0.visible > 0 && $0.visible <= 24 && $0.attached > 0 && $0.attached <= 24
+      $0.visible > 0 && $0.visible <= visibleCellLimit && $0.attached >= $0.visible
     })
+    // UIKit also retains offscreen cells in subviews. Their count may exceed
+    // the visible budget, but must remain bounded as the data grows tenfold.
     XCTAssertLessThanOrEqual(thousandCells.map(\.attached).max() ?? 0,
       (hundredCells.map(\.attached).max() ?? 0) + 4)
   }
@@ -1941,6 +1944,7 @@ final class NativeListLifecycleTests: XCTestCase {
     for (index, slot) in slots.enumerated() { view.mountContainerSlot(slot, atIndex: index) }
     view.setContainerSlotHeightsJson("[0,0,140,0,100,40]")
     var settlements: [(String, String, Bool)] = []
+    let latestSettled = expectation(description: "Latest disclosure transition settled")
     view.onStructuralTransitionSettled = { payload in
       guard let data = payload.data(using: .utf8),
             let object = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
@@ -1948,6 +1952,7 @@ final class NativeListLifecycleTests: XCTestCase {
             let status = object["status"] as? String,
             let expanded = object["settledExpanded"] as? Bool else { return }
       settlements.append((id, status, expanded))
+      if id == "collapse-latest" { latestSettled.fulfill() }
     }
     view.applySnapshotJson(try structuralRowsSnapshot(count: 6, generation: 1,
       disclosureExpanded: false))
@@ -1968,11 +1973,15 @@ final class NativeListLifecycleTests: XCTestCase {
     view.applySnapshotJson(try structuralRowsSnapshot(count: 50, generation: 4,
       transitionID: "expand-superseded", durationMs: 400,
       disclosureExpanded: true))
-    waitForStructuralFrames(0.08)
+    // Supersede on the same main-thread turn: a timed wait can outlast the
+    // expansion on a busy simulator and legitimately deliver its settlement.
+    XCTAssertNotNil(Mirror(reflecting: view).descendant("structuralDisplayLink")
+      as? CADisplayLink)
+    XCTAssertEqual(settlements.map(\.0), ["same-rows"])
     view.applySnapshotJson(try structuralRowsSnapshot(count: 6, generation: 5,
       transitionID: "collapse-latest", durationMs: 400,
       disclosureExpanded: false))
-    waitForStructuralFrames(0.5)
+    wait(for: [latestSettled], timeout: 2)
     XCTAssertEqual(settlements.map(\.0), ["same-rows", "collapse-latest"])
     XCTAssertEqual(settlements.last?.1, "completed")
     XCTAssertEqual(settlements.last?.2, false)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-native-list",
-  "version": "6.7.0-alpha.399",
+  "version": "6.7.0-alpha.401",
   "description": "Template-driven native RecyclerView and UICollectionView for React Native",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",
@@ -86,8 +86,8 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "@onekeyfe/react-native-image": "6.7.0-alpha.399",
-    "@onekeyfe/react-native-native-logger": "6.7.0-alpha.399",
+    "@onekeyfe/react-native-image": "6.7.0-alpha.401",
+    "@onekeyfe/react-native-native-logger": "6.7.0-alpha.401",
     "react": "*",
     "react-native": "*",
     "react-native-nitro-modules": "0.37.0"