@onekeyfe/react-native-native-list 3.0.134 → 3.0.135

package/android/build.gradle

@@ -103,4 +103,5 @@ dependencies {
   implementation project(":react-native-nitro-modules")
   implementation project(":onekeyfe_react-native-native-logger")
   implementation project(":onekeyfe_react-native-image")
+  testImplementation "junit:junit:4.13.2"
 }

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

@@ -3,6 +3,25 @@ package com.margelo.nitro.nativelist
 import org.json.JSONArray
 import org.json.JSONObject
 
+internal fun isNativeListRowPressEnabled(
+  type: String,
+  variant: String,
+  disabled: Boolean,
+  pressDisabled: Boolean,
+): Boolean = !disabled && !pressDisabled && (type != "system" || variant == "retry")
+
+internal fun isNativeListWholeRowInteractive(
+  type: String,
+  variant: String,
+  disabled: Boolean,
+  pressDisabled: Boolean,
+): Boolean = type != "walletGroup" && isNativeListRowPressEnabled(
+  type = type,
+  variant = variant,
+  disabled = disabled,
+  pressDisabled = pressDisabled,
+)
+
 internal data class NativeListItem(
   val key: String,
   val type: String,
@@ -22,9 +41,20 @@ internal data class NativeListItem(
     get() = !json.optBoolean("disabled", false) && type in SELECTABLE_TYPES
 
   val isRowPressEnabled: Boolean
-    get() = !json.optBoolean("disabled", false) &&
-      !json.optBoolean("pressDisabled", false) &&
-      (type != "system" || json.optString("variant") == "retry")
+    get() = isNativeListRowPressEnabled(
+      type = type,
+      variant = json.optString("variant"),
+      disabled = json.optBoolean("disabled", false),
+      pressDisabled = json.optBoolean("pressDisabled", false),
+    )
+
+  val isWholeRowInteractive: Boolean
+    get() = isNativeListWholeRowInteractive(
+      type = type,
+      variant = json.optString("variant"),
+      disabled = json.optBoolean("disabled", false),
+      pressDisabled = json.optBoolean("pressDisabled", false),
+    )
 
   val isReorderable: Boolean
     get() {

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

@@ -985,6 +985,11 @@ internal class NativeListRowView(
       "action" -> bindAction(item, theme, checkboxState)
       "system" -> bindSystem(item, theme)
     }
+    // Keep passive rows out of accessibility and keyboard focus while allowing
+    // their independently bound accessory controls to remain interactive.
+    val wholeRowPressEnabled = item.isWholeRowInteractive
+    isClickable = wholeRowPressEnabled
+    isFocusable = wholeRowPressEnabled
     applySize(item)
     if (item.type == "system" && item.json.optString("variant") == "warning") {
       title.typeface = NativeListFonts.medium(context)

package/android/src/test/java/com/margelo/nitro/nativelist/NativeListPressPolicyTest.kt

@@ -0,0 +1,43 @@
+package com.margelo.nitro.nativelist
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class NativeListPressPolicyTest {
+  @Test
+  fun wholeRowInteractionMatchesPassiveAndAccessoryOnlyRows() {
+    data class Case(
+      val type: String,
+      val variant: String = "",
+      val disabled: Boolean = false,
+      val pressDisabled: Boolean = false,
+      val expected: Boolean,
+    )
+
+    val cases = listOf(
+      Case(type = "identity", expected = true),
+      Case(type = "identity", pressDisabled = true, expected = false),
+      Case(type = "identity", disabled = true, expected = false),
+      Case(type = "system", variant = "retry", expected = true),
+      Case(type = "system", variant = "retry", pressDisabled = true, expected = false),
+      Case(type = "system", variant = "loading", expected = false),
+      Case(type = "system", variant = "noMatch", expected = false),
+      Case(type = "system", variant = "warning", expected = false),
+      Case(type = "system", variant = "end", expected = false),
+      Case(type = "system", variant = "spacer", expected = false),
+      Case(type = "walletGroup", expected = false),
+    )
+
+    assertEquals(
+      cases.map(Case::expected),
+      cases.map { case ->
+        isNativeListWholeRowInteractive(
+          type = case.type,
+          variant = case.variant,
+          disabled = case.disabled,
+          pressDisabled = case.pressDisabled,
+        )
+      },
+    )
+  }
+}

package/ios/RNCNativeListView.swift

@@ -115,6 +115,7 @@ final class NativeListView: UIView {
   private let reorderStartFeedback = UIImpactFeedbackGenerator(style: .medium)
   private let reorderMoveFeedback = UISelectionFeedbackGenerator()
   private var interactiveReorderFeedbackIndex: Int?
+  private var interactiveMovementKeys: [String]?
   private var actionAnchor: ActionAnchorRecord?
   private let actionAnchorInstanceID = UUID().uuidString
   private var actionAnchorCounter = 0
@@ -731,6 +732,9 @@ final class NativeListView: UIView {
         collectionView.layoutIfNeeded()
         return
       }
+      if !interactiveReorderUsesAtomicTargeting {
+        interactiveMovementKeys = dataSource.snapshot().itemIdentifiers
+      }
       interactiveReorderFeedbackIndex = indexPath.item
       reorderStartFeedback.impactOccurred(intensity: 0.7)
       reorderStartFeedback.prepare()
@@ -838,9 +842,11 @@ final class NativeListView: UIView {
     interactiveReorderAnimator?.stopAnimation(true)
     interactiveReorderFeedbackIndex = nil
     if cancelled {
+      interactiveMovementKeys = nil
       collectionView.cancelInteractiveMovement()
     } else {
       collectionView.endInteractiveMovement()
+      interactiveMovementKeys = nil
     }
     let animator = UIViewPropertyAnimator(
       duration: ReorderAnimation.duration,
@@ -874,6 +880,7 @@ final class NativeListView: UIView {
     guard interactiveReorderSource != nil else { return }
     interactiveReorderAnimator?.stopAnimation(true)
     interactiveReorderAnimator = nil
+    interactiveMovementKeys = nil
     collectionView.cancelInteractiveMovement()
     interactiveReorderCell?.setPressed(false)
     if interactiveReorderCompactKey != nil {
@@ -978,6 +985,23 @@ final class NativeListView: UIView {
     return collectionView.cellForItem(at: IndexPath(item: index, section: 0)) as? NativeListCell
   }
 
+  // OneKey patch: flow layout sizes an interactive move in UIKit's in-flight order,
+  // while the diffable snapshot and cell index paths keep the pre-drag order until
+  // the move commits. Resolving sizes from the snapshot swaps row heights.
+  private func layoutItem(at indexPath: IndexPath) -> NativeListItem? {
+    guard let keys = interactiveMovementKeys else { return item(at: indexPath) }
+    return keys[safe: indexPath.item].flatMap { itemsByKey[$0] }
+  }
+
+  private func updateInteractiveMovementKeys(movingFrom source: IndexPath, to target: IndexPath) {
+    guard interactiveMovementKeys != nil else { return }
+    var keys = dataSource.snapshot().itemIdentifiers
+    guard keys.indices.contains(source.item) else { return }
+    let key = keys.remove(at: source.item)
+    keys.insert(key, at: min(max(target.item, 0), keys.count))
+    interactiveMovementKeys = keys
+  }
+
   private func item(at indexPath: IndexPath) -> NativeListItem? {
     if let key = dataSource.itemIdentifier(for: indexPath), let item = itemsByKey[key] {
       return item
@@ -2049,7 +2073,9 @@ extension NativeListView: UICollectionViewDelegateFlowLayout {
     atCurrentIndexPath currentIndexPath: IndexPath,
     toProposedIndexPath proposedIndexPath: IndexPath
   ) -> IndexPath {
-    interactiveReorderUsesAtomicTargeting ? currentIndexPath : proposedIndexPath
+    guard !interactiveReorderUsesAtomicTargeting else { return currentIndexPath }
+    updateInteractiveMovementKeys(movingFrom: originalIndexPath, to: proposedIndexPath)
+    return proposedIndexPath
   }
 
   func collectionView(
@@ -2057,7 +2083,9 @@ extension NativeListView: UICollectionViewDelegateFlowLayout {
     targetIndexPathForMoveFromItemAt originalIndexPath: IndexPath,
     toProposedIndexPath proposedIndexPath: IndexPath
   ) -> IndexPath {
-    interactiveReorderUsesAtomicTargeting ? originalIndexPath : proposedIndexPath
+    guard !interactiveReorderUsesAtomicTargeting else { return originalIndexPath }
+    updateInteractiveMovementKeys(movingFrom: originalIndexPath, to: proposedIndexPath)
+    return proposedIndexPath
   }
 
   func collectionView(
@@ -2065,7 +2093,7 @@ extension NativeListView: UICollectionViewDelegateFlowLayout {
     layout collectionViewLayout: UICollectionViewLayout,
     sizeForItemAt indexPath: IndexPath
   ) -> CGSize {
-    guard let config, let item = item(at: indexPath) else { return .zero }
+    guard let config, let item = layoutItem(at: indexPath) else { return .zero }
     let insets = flowLayout.sectionInset
     if config.orientation == "horizontal" {
       let width: CGFloat = item.type == "rail" ? railWidth(item) : item.type == "mediaTile" ? 200 : 280

package/package.json

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