@onekeyfe/react-native-native-list 3.0.157-alpha.254 → 3.0.157-alpha.258

package/ios/NativeListActivityRenderer.swift

@@ -4,9 +4,11 @@ final class NativeListActivityCell: NativeListRendererCell {
   override class func measure(
     _ item: NativeListItem, width: CGFloat, theme: [String: Any]?, layout: String
   ) -> CGFloat? {
+    if item.data["amounts"] != nil { return NativeListActivityDetailsView.measure(item.data, width: width) }
     return item.data.dictionaries("footerActions").isEmpty ? 60 : 100
   }
 
+  private let details = NativeListActivityDetailsView()
   private let visual = NativeListLeadingVisual()
   private let column = UIStackView()
   private let titleLine = UIStackView()
@@ -22,7 +24,7 @@ final class NativeListActivityCell: NativeListRendererCell {
   private let buttons = (0..<3).map { _ in UIButton(type: .system) }
   private var actionKeys: [String] = []
   private var dimensions: [NSLayoutConstraint] = []
-  override var assetFields: [String] { ["leading", "secondaryLeading"] }
+  override var assetFields: [String] { ["leading", "secondaryLeading", "amounts"] }
 
   override init(frame: CGRect) {
     super.init(frame: frame)
@@ -60,7 +62,11 @@ final class NativeListActivityCell: NativeListRendererCell {
       button.addTarget(self, action: #selector(pressed(_:)), for: .touchUpInside)
       actions.addArrangedSubview(button)
     }
-    [visual, column, amounts].forEach(root.addArrangedSubview)
+    [visual, column, amounts, details].forEach(root.addArrangedSubview)
+    details.isHidden = true
+    details.onAction = { [weak self] key, view, source, slot in
+      self?.emitAction(key, from: view, source: source, slot: slot)
+    }
   }
   required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
   override func bindContent(
@@ -68,6 +74,21 @@ final class NativeListActivityCell: NativeListRendererCell {
     checkboxState: (NativeListItem, NativeSelectionTarget?, String) -> String
   ) {
     let data = item.data
+    let rich = data["amounts"] != nil
+    details.isHidden = !rich
+    [visual, column, amounts].forEach { $0.isHidden = rich }
+    root.axis = rich ? .vertical : .horizontal
+    root.alignment = rich ? .fill : .center
+    if rich {
+      let style = data.dictionary("style") ?? [:]
+      let hp = CGFloat(style.double("horizontalPadding", default: data.string("presentation") == "table" ? 16 : 12))
+      let vp = CGFloat(style.double("verticalPadding", default: 8))
+      contentInsets = UIEdgeInsets(top: vp, left: hp, bottom: vp, right: hp)
+      visual.recycle()
+      details.bind(item, theme: theme)
+      return
+    }
+    details.recycle()
     let style = data.dictionary("style") ?? [:]
     let image = style.dictionary("image") ?? [:]
     root.spacing = 12
@@ -173,6 +194,7 @@ final class NativeListActivityCell: NativeListRendererCell {
   }
   override func recycleContent() {
     visual.recycle()
+    details.recycle()
     actionKeys = []
     buttons.forEach { $0.isHidden = true }
   }

package/ios/NativeListMediaPreviewSlot.swift

@@ -0,0 +1,199 @@
+import AVFoundation
+import UIKit
+
+private final class NativeListPausedVideoView: UIView {
+  var onWindowChanged: (() -> Void)?
+  var onLayoutChanged: (() -> Void)?
+  override class var layerClass: AnyClass { AVPlayerLayer.self }
+  var playerLayer: AVPlayerLayer { layer as! AVPlayerLayer }
+  override func didMoveToWindow() { super.didMoveToWindow(); onWindowChanged?() }
+  override func layoutSubviews() { super.layoutSubviews(); onLayoutChanged?() }
+}
+
+/// Uses the same AVPlayer source semantics as native Video, always paused and muted.
+final class NativeListMediaPreviewSlot {
+  let view = UIView()
+  private let image = NativeListImageSlot()
+  private let video = NativeListPausedVideoView()
+  private var identity: String?
+  private var epoch = 0
+  private var candidateGeneration = 0
+  private var playerGeneration = 0
+  private var result: Bool?
+  private var completion: ((Bool) -> Void)?
+  private var player: AVPlayer?
+  private var itemObservation: NSKeyValueObservation?
+  private var readyObservation: NSKeyValueObservation?
+  private var resumeVideo: (() -> Void)?
+  private var lifecycleObservers: [NSObjectProtocol] = []
+  private var viewportObservations: [NSKeyValueObservation] = []
+
+  init() {
+    view.isUserInteractionEnabled = false
+    for child in [image.view, video] {
+      child.frame = view.bounds
+      child.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+      view.addSubview(child)
+    }
+    video.clipsToBounds = true
+    video.isHidden = true
+    video.onWindowChanged = { [weak self] in self?.observeViewport(); self?.updateVisibility() }
+    video.onLayoutChanged = { [weak self] in self?.updateVisibility() }
+    lifecycleObservers = [
+      NotificationCenter.default.addObserver(forName: UIApplication.willResignActiveNotification, object: nil, queue: .main) { [weak self] _ in self?.releasePlayer() },
+      NotificationCenter.default.addObserver(forName: UIApplication.didBecomeActiveNotification, object: nil, queue: .main) { [weak self] _ in self?.updateVisibility() },
+    ]
+  }
+
+  func bind(
+    _ source: [String: Any], key: String, fit: String? = nil,
+    placeholder: String = "#0000000F", probeOrder: [String] = ["image"],
+    completion: ((Bool) -> Void)? = nil
+  ) {
+    let next = NativeListImageSlot.signature([
+      "source": source, "key": key, "fit": fit ?? "", "order": probeOrder,
+      "placeholder": placeholder,
+    ])
+    self.completion = completion
+    if identity == next {
+      if let result { completion?(result) }
+      updateVisibility()
+      return
+    }
+    recycle()
+    identity = next
+    self.completion = completion
+    video.playerLayer.videoGravity = (fit ?? source.string("contentFit")) == "cover" ? .resizeAspectFill : .resizeAspect
+    probe(source, key: key, fit: fit, placeholder: placeholder, order: probeOrder, attempt: 0, token: epoch)
+  }
+
+  private func probe(
+    _ source: [String: Any], key: String, fit: String?, placeholder: String,
+    order: [String], attempt: Int, token: Int
+  ) {
+    guard token == epoch else { return }
+    candidateGeneration &+= 1
+    let candidate = candidateGeneration
+    resumeVideo = nil
+    viewportObservations.removeAll()
+    releasePlayer()
+    guard attempt < order.count else {
+      result = false
+      completion?(false)
+      return
+    }
+    let finished: (Bool) -> Void = { [weak self] loaded in
+      guard let self, self.epoch == token, self.candidateGeneration == candidate else { return }
+      if loaded {
+        guard self.result != true else { return }
+        self.result = true
+        self.completion?(true)
+      } else {
+        self.probe(source, key: key, fit: fit, placeholder: placeholder, order: order, attempt: attempt + 1, token: token)
+      }
+    }
+    if order[attempt] == "image" {
+      video.isHidden = true
+      image.view.isHidden = false
+      image.bind(source, key: key, fit: fit, placeholder: placeholder, completion: finished)
+      return
+    }
+    image.recycle()
+    image.view.isHidden = true
+    video.isHidden = false
+    guard let url = URL(string: source.string("uri")), !source.string("uri").isEmpty else { finished(false); return }
+    resumeVideo = { [weak self] in
+      guard let self, self.epoch == token, self.candidateGeneration == candidate, self.player == nil else { return }
+      self.playerGeneration &+= 1
+      let generation = self.playerGeneration
+      let asset = AVURLAsset(url: url, options: ["AVURLAssetHTTPHeaderFieldsKey": source.dictionary("headers") ?? [:]])
+      let item = AVPlayerItem(asset: asset)
+      item.preferredForwardBufferDuration = 1
+      let player = AVPlayer(playerItem: item)
+      player.isMuted = true
+      player.pause()
+      self.player = player
+      self.video.playerLayer.player = player
+      self.itemObservation = item.observe(\.status, options: [.initial, .new]) { [weak self] item, _ in
+        DispatchQueue.main.async {
+          guard let self, self.playerGeneration == generation else { return }
+          if item.status == .failed { finished(false) }
+        }
+      }
+      self.readyObservation = self.video.playerLayer.observe(\.isReadyForDisplay, options: [.initial, .new]) { [weak self] layer, _ in
+        DispatchQueue.main.async {
+          guard let self, self.playerGeneration == generation else { return }
+          if layer.isReadyForDisplay { finished(true) }
+        }
+      }
+    }
+    observeViewport()
+    updateVisibility()
+  }
+
+  private func observeViewport() {
+    viewportObservations.removeAll()
+    guard resumeVideo != nil, video.window != nil else { return }
+    var ancestor = video.superview
+    while let current = ancestor {
+      if let scrollView = current as? UIScrollView {
+        viewportObservations.append(scrollView.observe(\.contentOffset, options: [.new]) { [weak self] _, _ in self?.updateVisibility() })
+        viewportObservations.append(scrollView.observe(\.bounds, options: [.new]) { [weak self] _, _ in self?.updateVisibility() })
+      }
+      // Pager or host layouts may translate a retained page without scrolling it.
+      viewportObservations.append(current.layer.observe(\.transform, options: [.new]) { [weak self] _, _ in self?.updateVisibility() })
+      viewportObservations.append(current.layer.observe(\.position, options: [.new]) { [weak self] _, _ in self?.updateVisibility() })
+      viewportObservations.append(current.layer.observe(\.isHidden, options: [.new]) { [weak self] _, _ in self?.updateVisibility() })
+      viewportObservations.append(current.layer.observe(\.opacity, options: [.new]) { [weak self] _, _ in self?.updateVisibility() })
+      ancestor = current.superview
+    }
+  }
+
+  /// Retained pager pages can have a window while lying outside its clipped viewport.
+  static func intersectsViewport(_ view: UIView) -> Bool {
+    guard let window = view.window, !view.bounds.isEmpty else { return false }
+    var visible = view.convert(view.bounds, to: window).intersection(window.bounds)
+    var ancestor: UIView? = view
+    while let current = ancestor {
+      if current.isHidden || current.alpha <= 0.01 { return false }
+      if current.clipsToBounds || current is UIScrollView {
+        visible = visible.intersection(current.convert(current.bounds, to: window))
+      }
+      if visible.isNull || visible.isEmpty { return false }
+      ancestor = current.superview
+    }
+    return true
+  }
+
+  private func updateVisibility() {
+    if Self.intersectsViewport(video) && UIApplication.shared.applicationState == .active { resumeVideo?() }
+    else { releasePlayer() }
+  }
+  private func releasePlayer() {
+    playerGeneration &+= 1
+    itemObservation = nil
+    readyObservation = nil
+    player?.pause()
+    video.playerLayer.player = nil
+    player?.replaceCurrentItem(with: nil)
+    player = nil
+  }
+  func recycle() {
+    epoch &+= 1
+    candidateGeneration &+= 1
+    resumeVideo = nil
+    viewportObservations.removeAll()
+    releasePlayer()
+    image.recycle()
+    image.view.isHidden = false
+    video.isHidden = true
+    identity = nil
+    result = nil
+    completion = nil
+  }
+  deinit {
+    lifecycleObservers.forEach(NotificationCenter.default.removeObserver)
+    player?.pause()
+    player?.replaceCurrentItem(with: nil)
+  }
+}

package/ios/NativeListMediaTileRenderer.swift

@@ -8,7 +8,7 @@ final class NativeListMediaTileCell: NativeListRendererCell {
   }
 
   private let picture = UIView()
-  private let image = NativeListImageSlot()
+  private let image = NativeListMediaPreviewSlot()
   private let network = NativeListImageSlot()
   private let errorIcon = UIImageView()
   private let title = NativeListTextLabel()
@@ -27,7 +27,7 @@ final class NativeListMediaTileCell: NativeListRendererCell {
   override var defaultCornerRadius: CGFloat { 16 }
   override var showsSelection: Bool { false }
   override var pressChangesBackground: Bool { false }
-  override var assetFields: [String] { ["image", "networkImage"] }
+  override var assetFields: [String] { ["image", "media", "networkImage"] }
   override var isHighlighted: Bool { didSet { picture.alpha = isHighlighted ? 0.8 : 1 } }
 
   override init(frame: CGRect) {
@@ -120,7 +120,8 @@ final class NativeListMediaTileCell: NativeListRendererCell {
     errorIcon.isHidden = state != "error"
     errorIcon.image = nativeListIcon(named: "ImageSquareWavesOutline")
     errorIcon.tintColor = UIColor(nativeListHex: "#00000044", fallback: .lightGray)
-    if state != "empty", state != "error", let source = item.data.dictionary("image") {
+    let media = item.data.dictionary("media")
+    if state != "empty", state != "error", let source = media?.dictionary("source") ?? item.data.dictionary("image") {
       // Legacy source-backed media had a transparent container. Clear only a fill this
       // renderer applied, so OneKeyImage keeps ownership of its own placeholder color.
       if ownsImageFill {
@@ -129,7 +130,12 @@ final class NativeListMediaTileCell: NativeListRendererCell {
       }
       image.bind(
         source, key: "\(item.key):media", fit: imageStyle["contentFit"] as? String,
-        placeholder: placeholder)
+        placeholder: placeholder, probeOrder: media?["probeOrder"] as? [String] ?? ["image"]
+      ) { [weak self] loaded in
+        self?.errorIcon.isHidden = loaded
+        self?.ownsImageFill = !loaded
+        self?.image.view.backgroundColor = loaded ? .clear : UIColor(nativeListHex: placeholder, fallback: .lightGray)
+      }
     } else {
       image.recycle()
       image.view.backgroundColor =

package/ios/NativeListModels.swift

@@ -93,6 +93,7 @@ struct NativeListConfig {
   var selectedKeys: Set<String>
   let reorderable: Bool
   let pullToRefresh: Bool
+  let refreshTriggerDistance: CGFloat?
   var refreshing: Bool
   let loadMore: Bool
   let endReachedThreshold: Double
@@ -144,7 +145,7 @@ struct NativeListConfig {
       generation: generation,
       layout: layout,
       orientation: layoutData["orientation"] as? String ?? "vertical",
-      gridColumns: min(4, max(1, layoutData["gridColumns"] as? Int ?? 1)),
+      gridColumns: min(7, max(1, layoutData["gridColumns"] as? Int ?? 1)),
       stickyHeaders: layoutData["stickyHeaders"] as? Bool ?? false,
       contentPadding: contentPadding,
       contentPaddingHorizontal: contentPaddingHorizontal,
@@ -156,6 +157,8 @@ struct NativeListConfig {
       selectedKeys: selectedKeys,
       reorderable: capabilities?["reorderable"] as? Bool ?? false,
       pullToRefresh: capabilities?["pullToRefresh"] as? Bool ?? false,
+      refreshTriggerDistance: (capabilities?["refreshTriggerDistance"] as? Double)
+        .flatMap { $0.isFinite && $0 > 0 ? CGFloat($0) : nil },
       refreshing: capabilities?["refreshing"] as? Bool ?? false,
       loadMore: capabilities?["loadMore"] as? Bool ?? false,
       endReachedThreshold: capabilities?["endReachedThreshold"] as? Double ?? 0.2,

package/ios/NativeListScrollPositionTracker.swift

@@ -0,0 +1,30 @@
+import Foundation
+
+/// A per-view hysteresis observer. A nil result means no bridge event is needed.
+struct NativeListScrollPositionTracker {
+  private var start: Double?
+  private var end: Double?
+  private var previous: Bool?
+
+  mutating func configure(json: String) {
+    start = nil
+    end = nil
+    previous = nil
+    guard let data = json.data(using: .utf8),
+          let values = try? JSONSerialization.jsonObject(with: data) as? [String: Double],
+          let start = values["start"], let end = values["end"],
+          start.isFinite, end.isFinite, start >= 0, end > start else { return }
+    self.start = start
+    self.end = end
+  }
+
+  mutating func resetDelivery() { previous = nil }
+
+  mutating func update(offset: Double) -> Bool? {
+    guard let start, let end, offset.isFinite else { return nil }
+    let next = previous == true ? offset > start : offset >= end
+    guard previous != next else { return nil }
+    previous = next
+    return next
+  }
+}

package/ios/NativeListSectionHeaderRenderer.swift

@@ -99,7 +99,7 @@ final class NativeListSectionHeaderCell: NativeListRendererCell {
     if layout == "table" { return 28 }
     if item.data.string("presentation") == "networkSelector" { return 47 }
     if item.data.string("variant") == "history" {
-      return 16
+      return item.data.bool("titleLoading") ? 20 : 16
     }
     if item.data.string("variant") == "summary" { return 68 }
     if item.data.string("variant") == "gallery" { return 32 }
@@ -110,6 +110,7 @@ final class NativeListSectionHeaderCell: NativeListRendererCell {
   private let mainStack = UIStackView()
   private let titleRowStack = UIStackView()
   private let titleLabel = NativeListDottedUnderlineLabel()
+  private let titleSpinner = UIActivityIndicatorView(style: .medium)
   private let subtitleLabel = NativeListTextLabel()
   private let trailingStack = UIStackView()
   private let accessoryButtons = [NativeListAccessoryButton(type: .system)]
@@ -132,6 +133,12 @@ final class NativeListSectionHeaderCell: NativeListRendererCell {
     root.axis = .horizontal
     root.alignment = .center
     root.spacing = 12
+    titleSpinner.translatesAutoresizingMaskIntoConstraints = false
+    titleSpinner.isAccessibilityElement = false
+    NSLayoutConstraint.activate([
+      titleSpinner.widthAnchor.constraint(equalToConstant: 20),
+      titleSpinner.heightAnchor.constraint(equalToConstant: 20),
+    ])
     mainStack.axis = .vertical
     mainStack.alignment = .fill
     mainStack.spacing = 2
@@ -174,6 +181,7 @@ final class NativeListSectionHeaderCell: NativeListRendererCell {
     selectorTypographyRestorers = []
     currentItem = item
     currentTheme = theme
+    titleSpinner.stopAnimating()
     NSLayoutConstraint.deactivate(selectorConstraints)
     selectorConstraints = []
     root.arrangedSubviews.forEach {
@@ -244,6 +252,8 @@ final class NativeListSectionHeaderCell: NativeListRendererCell {
     if style["lineGap"] != nil { mainStack.spacing = CGFloat(style.double("lineGap")) }
     if style["trailingGap"] != nil { trailingStack.spacing = CGFloat(style.double("trailingGap")) }
     applyTextStyle(item)
+    titleSpinner.color = titleLabel.textColor
+    updateTitleSpinner()
     contentInsets = UIEdgeInsets(
       top: topInset, left: leftInset, bottom: -bottomInset, right: -rightInset)
     root.alignment =
@@ -301,6 +311,18 @@ final class NativeListSectionHeaderCell: NativeListRendererCell {
   override func recycleContent() {
     checkboxControl.reset()
     currentItem = nil
+    titleSpinner.stopAnimating()
+  }
+  override func didMoveToWindow() {
+    super.didMoveToWindow()
+    updateTitleSpinner()
+  }
+  private func updateTitleSpinner() {
+    if window != nil, currentItem?.data.bool("titleLoading") == true {
+      titleSpinner.startAnimating()
+    } else {
+      titleSpinner.stopAnimating()
+    }
   }
   @objc private func titlePressed() {
     if let item = currentItem {
@@ -324,6 +346,10 @@ final class NativeListSectionHeaderCell: NativeListRendererCell {
     layout: String,
     _ checkboxState: (NativeListItem, NativeSelectionTarget?, String) -> String
   ) {
+    if item.data.bool("titleLoading") {
+      root.addArrangedSubview(titleSpinner)
+      root.setCustomSpacing(8, after: titleSpinner)
+    }
     root.addArrangedSubview(mainStack)
     let variant = item.data.string("variant")
     // OneKey patch: title help is a separate target from checkbox and value actions.