@onekeyfe/react-native-native-list 3.0.153 → 3.0.156

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

@@ -3417,6 +3417,7 @@ internal class NativeListRowView(
       val fallbackIcon = if (index == 0) fallbackIconData else null
       val expectedEpoch = bindingEpoch
       bindImage(source, image, boundKey ?: "", index, variant,
+        round = shape == "circle",
         onLoad = if (!ownsSourceFallback) null else ({
           if (bindingEpoch == expectedEpoch) {
             sourceFallbackKey?.let(NativeListSourceFallbackState::forget)
@@ -4226,6 +4227,7 @@ internal class NativeListRowView(
     token: String,
     slot: Int,
     variant: String,
+    round: Boolean = false,
     onLoad: (() -> Unit)? = null,
     onError: (() -> Unit)? = null,
     hideUntilLoaded: Boolean = false,
@@ -4263,6 +4265,7 @@ internal class NativeListRowView(
       autoplay = source.optBoolean("autoplay", false),
       recyclingKey = recyclingKey,
       optimizeTos = retryAttempt == 0 && source.optBoolean("optimizeTos", true),
+      round = round,
       overscan = source.optDouble("overscan", 1.1),
       loadingStrategy = source.optString("loadingStrategy", "none"),
       placeholderColor = imagePlaceholderColor,
@@ -4279,7 +4282,18 @@ internal class NativeListRowView(
             val retry = Runnable {
               if (bindingEpoch == expectedEpoch) {
                 selectorImageRetries.remove(imageView)
-                bindImage(source, imageView, token, slot, variant, onLoad, onError, hideUntilLoaded, retryAttempt + 1)
+                bindImage(
+                  source = source,
+                  imageView = imageView,
+                  token = token,
+                  slot = slot,
+                  variant = variant,
+                  round = round,
+                  onLoad = onLoad,
+                  onError = onError,
+                  hideUntilLoaded = hideUntilLoaded,
+                  retryAttempt = retryAttempt + 1,
+                )
               }
             }
             selectorImageRetries[imageView] = retry

package/ios/HybridNativeList.swift

@@ -2,16 +2,17 @@ import Foundation
 import UIKit
 
 final class HybridNativeList: HybridNativeListSpec {
-  private let hostView = NativeListView(frame: .zero)
+  private var hostView: NativeListView? = NativeListView(frame: .zero)
+  private let disposedView = UIView(frame: .zero)
 
-  var view: UIView { hostView }
+  var view: UIView { hostView ?? disposedView }
 
   var snapshotJson: String = "" {
     didSet {
       guard snapshotJson != oldValue else { return }
       runOnMain { [weak self] in
         guard let self else { return }
-        self.hostView.applySnapshotJson(self.snapshotJson)
+        self.hostView?.applySnapshotJson(self.snapshotJson)
       }
     }
   }
@@ -21,7 +22,7 @@ final class HybridNativeList: HybridNativeListSpec {
       guard keyboardDismissMode != oldValue else { return }
       runOnMain { [weak self] in
         guard let self else { return }
-        self.hostView.setKeyboardDismissMode(self.keyboardDismissMode)
+        self.hostView?.setKeyboardDismissMode(self.keyboardDismissMode)
       }
     }
   }
@@ -31,7 +32,7 @@ final class HybridNativeList: HybridNativeListSpec {
       guard keyboardShouldPersistTaps != oldValue else { return }
       runOnMain { [weak self] in
         guard let self else { return }
-        self.hostView.setKeyboardShouldPersistTaps(self.keyboardShouldPersistTaps)
+        self.hostView?.setKeyboardShouldPersistTaps(self.keyboardShouldPersistTaps)
       }
     }
   }
@@ -45,30 +46,30 @@ final class HybridNativeList: HybridNativeListSpec {
     didSet {
       runOnMain { [weak self] in
         guard let self else { return }
-        self.hostView.onVisibleRangeChanged = self.onVisibleRangeChanged
+        self.hostView?.onVisibleRangeChanged = self.onVisibleRangeChanged
       }
     }
   }
 
   override init() {
     super.init()
-    hostView.onRowAction = { [weak self] in self?.onRowAction?($0) }
-    hostView.onActionAnchorInvalidated = { [weak self] in self?.onActionAnchorInvalidated?($0) }
-    hostView.onSelectionDelta = { [weak self] in self?.onSelectionDelta?($0) }
-    hostView.onReorder = { [weak self] in self?.onReorder?($0) }
-    hostView.onEndReached = { [weak self] in self?.onEndReached?($0) }
+    hostView?.onRowAction = { [weak self] in self?.onRowAction?($0) }
+    hostView?.onActionAnchorInvalidated = { [weak self] in self?.onActionAnchorInvalidated?($0) }
+    hostView?.onSelectionDelta = { [weak self] in self?.onSelectionDelta?($0) }
+    hostView?.onReorder = { [weak self] in self?.onReorder?($0) }
+    hostView?.onEndReached = { [weak self] in self?.onEndReached?($0) }
   }
 
   func applySnapshot(snapshotJson: String) throws {
-    runOnMain { [weak self] in self?.hostView.applySnapshotJson(snapshotJson) }
+    runOnMain { [weak self] in self?.hostView?.applySnapshotJson(snapshotJson) }
   }
 
   func applyPatches(patchesJson: String) throws {
-    runOnMain { [weak self] in self?.hostView.applyPatchesJson(patchesJson) }
+    runOnMain { [weak self] in self?.hostView?.applyPatchesJson(patchesJson) }
   }
 
   func reconcileSelection(selectedKeysJson: String) throws {
-    runOnMain { [weak self] in self?.hostView.reconcileSelectionJson(selectedKeysJson) }
+    runOnMain { [weak self] in self?.hostView?.reconcileSelectionJson(selectedKeysJson) }
   }
 
   func scrollToKey(
@@ -79,7 +80,7 @@ final class HybridNativeList: HybridNativeListSpec {
     viewOffset: Double
   ) throws {
     runOnMain { [weak self] in
-      self?.hostView.scrollToKey(
+      self?.hostView?.scrollToKey(
         key,
         animated: animated,
         alignment: alignment.stringValue,
@@ -101,7 +102,7 @@ final class HybridNativeList: HybridNativeListSpec {
           index.rounded(.towardZero) == index,
           index <= Double(Int.max) else { return }
     runOnMain { [weak self] in
-      self?.hostView.scrollToIndex(
+      self?.hostView?.scrollToIndex(
         Int(index),
         animated: animated,
         alignment: alignment.stringValue,
@@ -114,39 +115,52 @@ final class HybridNativeList: HybridNativeListSpec {
   func scrollToOffset(offset: Double, animated: Bool) throws {
     guard offset.isFinite, offset >= 0 else { return }
     runOnMain { [weak self] in
-      self?.hostView.scrollToOffset(offset, animated: animated)
+      self?.hostView?.scrollToOffset(offset, animated: animated)
     }
   }
 
   func scrollToEnd(animated: Bool) throws {
-    runOnMain { [weak self] in self?.hostView.scrollToEnd(animated: animated) }
+    runOnMain { [weak self] in self?.hostView?.scrollToEnd(animated: animated) }
   }
 
   func setActionAnchorState(stateJson: String) throws {
-    runOnMain { [weak self] in self?.hostView.setActionAnchorStateJson(stateJson) }
+    runOnMain { [weak self] in self?.hostView?.setActionAnchorStateJson(stateJson) }
   }
 
   func setRefreshing(refreshing: Bool) throws {
-    runOnMain { [weak self] in self?.hostView.setRefreshing(refreshing) }
+    runOnMain { [weak self] in self?.hostView?.setRefreshing(refreshing) }
   }
 
   func onDropView() {
-    runOnMain { [weak self] in self?.hostView.disposeActionAnchor() }
+    runOnMain { [weak self] in self?.disposeHostView() }
   }
 
   func dispose() {
-    runOnMain { [weak self] in self?.hostView.disposeActionAnchor() }
+    runOnMain { [weak self] in self?.disposeHostView() }
   }
 
   deinit {
+    guard let hostView else { return }
     if Thread.isMainThread {
-      hostView.disposeActionAnchor()
+      hostView.dispose()
     } else {
-      let view = hostView
-      DispatchQueue.main.async { view.disposeActionAnchor() }
+      DispatchQueue.main.async { hostView.dispose() }
     }
   }
 
+  private func disposeHostView() {
+    guard let hostView else { return }
+    onRowAction = nil
+    onActionAnchorInvalidated = nil
+    onSelectionDelta = nil
+    onReorder = nil
+    onEndReached = nil
+    onVisibleRangeChanged = nil
+    hostView.dispose()
+    self.hostView = nil
+    snapshotJson = ""
+  }
+
   private func runOnMain(_ work: @escaping () -> Void) {
     if Thread.isMainThread {
       work()

package/ios/RNCNativeListView.swift

@@ -119,6 +119,7 @@ final class NativeListView: UIView {
   private var actionAnchor: ActionAnchorRecord?
   private let actionAnchorInstanceID = UUID().uuidString
   private var actionAnchorCounter = 0
+  private var disposed = false
 
   private static let sectionIndexContentInset: CGFloat = 16
   private static let sectionIndexRailWidth: CGFloat = 32
@@ -1858,6 +1859,65 @@ final class NativeListView: UIView {
     actionAnchor = nil
   }
 
+  func dispose() {
+    guard !disposed else { return }
+    disposed = true
+
+    disposeActionAnchor()
+    interactiveReorderAnimator?.stopAnimation(true)
+    interactiveReorderAnimator = nil
+    if interactiveReorderSource != nil {
+      collectionView.cancelInteractiveMovement()
+    }
+    resetAtomicReorderTransforms()
+    interactiveReorderSource = nil
+    interactiveReorderCell = nil
+    interactiveMovementKeys = nil
+    deferredReorderReconfigureKeys.removeAll()
+
+    finishSectionIndexInteraction(immediately: true)
+    sectionIndexView.onSelect = nil
+    sectionIndexView.onInteractionEnded = nil
+    NSLayoutConstraint.deactivate(sectionIndexLayoutConstraints)
+    sectionIndexLayoutConstraints.removeAll()
+    sectionIndexHostHeightConstraint = nil
+    sectionIndexView.removeFromSuperview()
+
+    collectionView.refreshControl?.removeTarget(nil, action: nil, for: .allEvents)
+    collectionView.refreshControl = nil
+    collectionView.delegate = nil
+    collectionView.dragDelegate = nil
+    collectionView.dropDelegate = nil
+    keyboardTapRecognizer.delegate = nil
+    keyboardDragRecognizer.delegate = nil
+    listBodyGestureGuard.delegate = nil
+    reorderLongPress.delegate = nil
+    marketLongPress.delegate = nil
+
+    for case let cell as NativeListCell in collectionView.visibleCells {
+      cell.onAction = nil
+      cell.onBindingInvalidated = nil
+      cell.prepareForReuse()
+    }
+    footerCell.onAction = nil
+    footerCell.onBindingInvalidated = nil
+    footerCell.prepareForReuse()
+    collectionView.dataSource = nil
+    dataSource = nil
+
+    config = nil
+    itemsByKey.removeAll()
+    sectionIndexEntries.removeAll()
+    pendingScrollRequest = nil
+    lastVisibleRange = nil
+    onRowAction = nil
+    onActionAnchorInvalidated = nil
+    onSelectionDelta = nil
+    onReorder = nil
+    onEndReached = nil
+    onVisibleRangeChanged = nil
+  }
+
   private func createActionAnchor(origin: NativeListActionOrigin) -> [String: Any]? {
     guard let sourceView = origin.sourceView,
           let ownerCell = origin.ownerCell,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-native-list",
-  "version": "3.0.153",
+  "version": "3.0.156",
   "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.153",
-    "@onekeyfe/react-native-native-logger": "3.0.153",
+    "@onekeyfe/react-native-image": "3.0.156",
+    "@onekeyfe/react-native-native-logger": "3.0.156",
     "react": "*",
     "react-native": "*",
     "react-native-nitro-modules": "0.37.0"