@onekeyfe/react-native-native-list 3.0.174 → 3.0.176

package/docs/SPEC.md

@@ -86,6 +86,9 @@ and scrollbar estimates MUST NOT be mistaken for data-row reading anchors.
 
 An accepted imperative command owns its request, execution, pending-layout and
 posted-alignment work. Invalid commands MUST NOT cancel a valid request.
+On iOS, known-configuration validation MUST precede changing accepted, pending
+or animated-command state; invalid input MUST preserve the existing terminal
+notification, while configuration-unavailable requests retain deferred validation.
 Completion on Android requires the current request to have finished dispatch,
 its own pending layout/alignment barriers to have completed, and native scrolling
 to be idle without an active layout-manager animation. A true animated top

package/ios/RNCNativeListView.swift

@@ -657,28 +657,35 @@ final class NativeListView: UIView {
     requestScroll(.end(animated))
   }
 
-  private func acceptScrollCommand(_ request: ScrollRequest) {
-    guard !commandAcceptedForPendingScroll, let config else { return }
+  private func explicitTopForScrollCommand(_ request: ScrollRequest) -> Bool? {
+    guard let config else { return nil }
     let explicitTop: Bool
     switch request {
     case let .key(key, _, alignment, viewPosition, viewOffset):
-      guard config.items.contains(where: { $0.key == key }), viewPosition.isFinite, viewOffset.isFinite else { return }
+      guard config.items.contains(where: { $0.key == key }), viewPosition.isFinite, viewOffset.isFinite else { return nil }
       explicitTop = config.items.first?.key == key && alignment == "start" && viewPosition == 0 && viewOffset == 0
     case let .index(index, _, alignment, viewPosition, viewOffset):
-      guard index >= 0, index < config.items.count, viewPosition.isFinite, viewOffset.isFinite else { return }
+      guard index >= 0, index < config.items.count, viewPosition.isFinite, viewOffset.isFinite else { return nil }
       explicitTop = index == 0 && alignment == "start" && viewPosition == 0 && viewOffset == 0
     case let .offset(offset, _):
-      guard offset.isFinite else { return }
+      guard offset.isFinite else { return nil }
       explicitTop = offset <= 0
     case .end:
       explicitTop = false
     }
+    return explicitTop
+  }
+
+  private func acceptScrollCommand(_ request: ScrollRequest) {
+    guard !commandAcceptedForPendingScroll,
+          let explicitTop = explicitTopForScrollCommand(request) else { return }
     commandAcceptedForPendingScroll = true
     NotificationCenter.default.post(name: Notification.Name("OneKeyNativeListScrollCommandAccepted"),
       object: collectionView, userInfo: ["explicitTop": explicitTop, "phase": 0])
   }
 
   private func requestScroll(_ request: ScrollRequest) {
+    if config != nil && explicitTopForScrollCommand(request) == nil { return }
     animatedExplicitScrollCommand = false
     commandAcceptedForPendingScroll = false
     acceptScrollCommand(request)

package/ios/tests/NativeListLifecycleTests.swift

@@ -4,6 +4,63 @@ import XCTest
 
 @MainActor
 final class NativeListLifecycleTests: XCTestCase {
+  func testInvalidCommandsPreserveAcceptedAnimationCompletion() throws {
+    for invalid in 0..<3 {
+      let view = try makeScrollingList()
+      let window = UIWindow(frame: view.frame)
+      let controller = UIViewController()
+      window.rootViewController = controller
+      controller.view.addSubview(view)
+      window.isHidden = false
+      defer { window.isHidden = true }
+      window.layoutIfNeeded()
+      view.layoutIfNeeded()
+      drainMainQueue()
+      let list = try XCTUnwrap(view.subviews.compactMap { $0 as? UICollectionView }.first)
+      XCTAssertNotNil(view.window)
+      XCTAssertGreaterThan(list.contentSize.height - list.bounds.height +
+        list.adjustedContentInset.top + list.adjustedContentInset.bottom, 800)
+      let phases = NSMutableArray()
+      let observer = NotificationCenter.default.addObserver(
+        forName: Notification.Name("OneKeyNativeListScrollCommandAccepted"),
+        object: list, queue: nil
+      ) { notification in
+        if let phase = notification.userInfo?["phase"] as? Int { phases.add(phase) }
+      }
+      defer { NotificationCenter.default.removeObserver(observer) }
+      view.scrollToOffset(800, animated: true)
+      XCTAssertEqual(phases as? [Int], [0, 1])
+      switch invalid {
+      case 0: view.scrollToKey("missing-fixture-key", animated: true, alignment: "start")
+      case 1: view.scrollToIndex(-1, animated: true, alignment: "start")
+      default: view.scrollToOffset(.nan, animated: true)
+      }
+      XCTAssertEqual(phases as? [Int], [0, 1], "Invalid input must not accept or end another command")
+      // Exercise the actual delegate terminal callback, not a copied state helper.
+      view.scrollViewDidEndScrollingAnimation(list)
+      XCTAssertEqual(phases as? [Int], [0, 1, 2])
+      view.scrollViewDidEndScrollingAnimation(list)
+      XCTAssertEqual(phases as? [Int], [0, 1, 2], "Completion is emitted once")
+    }
+  }
+
+  func testInvalidKeyPreservesValidPendingScrollUntilGeometryArrives() throws {
+    let view = try makeScrollingList()
+    let list = try XCTUnwrap(view.subviews.compactMap { $0 as? UICollectionView }.first)
+    view.frame.size.height = 0
+    view.setNeedsLayout()
+    view.layoutIfNeeded()
+    XCTAssertEqual(list.bounds.height, 0)
+    view.scrollToOffset(500, animated: false)
+    view.scrollToKey("missing-fixture-key", animated: true, alignment: "start")
+    view.frame.size.height = 708
+    view.setNeedsLayout()
+    view.layoutIfNeeded()
+    list.layoutIfNeeded()
+    drainMainQueue()
+    XCTAssertEqual(list.contentOffset.y, 500 - list.adjustedContentInset.top, accuracy: 0.5)
+  }
+
   func testSectionLoadingStopsOnRebindReuseAndDetach() throws {
     let window = UIWindow(frame: CGRect(x: 0, y: 0, width: 320, height: 480))
     let controller = UIViewController()

package/package.json

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