@onekeyfe/react-native-native-list 3.0.115 → 3.0.117

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

@@ -94,6 +94,8 @@ class NativeListView(
   private var configuredTopPaddingPx = 0
   private var configuredBottomPaddingPx = 0
   private val refreshLayout = SwipeRefreshLayout(context)
+  private val refreshIndicatorTravelPx = refreshLayout.progressViewEndOffset
+  private var refreshIndicatorOffsetPx = 0
   private val contentContainer = FrameLayout(context)
   private val adapter = NativeListAdapter(reactContext)
   private val layoutManager = GridLayoutManager(context, 1)
@@ -251,6 +253,11 @@ class NativeListView(
         JSONObject().put("actionKey", "nativeList.refresh"),
       )
     }
+    recyclerView.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+      // OneKey patch: a collapsible pager owns the extra padding above the rows.
+      // Keep the refresh control below that header without moving ordinary lists.
+      updateRefreshIndicatorOffset((recyclerView.paddingTop - configuredTopPaddingPx).coerceAtLeast(0))
+    }
 
     recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
       override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
@@ -274,6 +281,12 @@ class NativeListView(
 
   override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
     super.onLayout(changed, left, top, right, bottom)
+    val first = config?.items?.firstOrNull()
+    if (recyclerView.isLayoutRequested && (first?.type == "market" || first?.json?.optString("presentation") == "market")) {
+      // A retained Market page can keep cached parent measurements after its diff.
+      // Drain the child's pending layout so its committed rows replace the old cells.
+      relayoutRecyclerViewImmediately()
+    }
     val nextWidth = right - left
     val nextHeight = bottom - top
     if (
@@ -288,6 +301,28 @@ class NativeListView(
     performPendingScrollIfNeeded()
   }
 
+  private fun updateRefreshIndicatorOffset(offset: Int) {
+    if (refreshIndicatorOffsetPx == offset) return
+    refreshIndicatorOffsetPx = offset
+    val refreshing = refreshLayout.isRefreshing
+    val start = offset - refreshLayout.progressCircleDiameter
+    refreshLayout.setProgressViewOffset(false, start, start + refreshIndicatorTravelPx)
+    refreshLayout.isRefreshing = refreshing
+  }
+
+  override fun onAttachedToWindow() {
+    super.onAttachedToWindow()
+    val first = config?.items?.firstOrNull()
+    if (recyclerView.isLayoutRequested && (first?.type == "market" || first?.json?.optString("presentation") == "market")) {
+      relayoutContents()
+    }
+  }
+
+  override fun onDetachedFromWindow() {
+    updateRefreshIndicatorOffset(0)
+    super.onDetachedFromWindow()
+  }
+
   fun applySnapshot(snapshotJson: String) {
     val next = try {
       NativeListConfig.parse(snapshotJson)
@@ -1121,7 +1156,12 @@ class NativeListView(
       .put("source", origin.source)
       .put("generation", generation)
       .put("layoutDirection", if (origin.sourceView.layoutDirection == LAYOUT_DIRECTION_RTL) "rtl" else "ltr")
-      .also { anchor -> origin.slot?.let { anchor.put("slot", it) } }
+      .also { anchor ->
+        origin.slot?.let { anchor.put("slot", it) }
+        origin.windowPointPixels?.let { point ->
+          anchor.put("windowPoint", JSONObject().put("x", point.x / density).put("y", point.y / density))
+        }
+      }
   }
 
   private fun isOriginValid(origin: NativeListActionOrigin): Boolean =

package/ios/NativeListCell.swift

@@ -79,6 +79,7 @@ final class NativeListActionOrigin {
   let slot: Int?
   // OneKey patch: expose the layout slot while preserving the larger hit target.
   let anchorInset: CGFloat
+  var windowPoint: CGPoint?
 
   init(
     sourceView: UIView,
@@ -443,12 +444,17 @@ final class NativeListCell: UICollectionViewCell {
   private let titleRowStack = UIStackView()
   private let titleLabel = NativeListDottedUnderlineLabel()
   private let subtitleLabel = UILabel()
+  // OneKey patch: keep Market name and volume in independent line boxes.
+  private let marketSubtitleStack = UIStackView()
+  private let marketSubtitleSpacer = UIView()
   private let tertiaryLabel = UILabel()
   private let statusLabel = NativeListInsetLabel()
   private let metricSubtitleLabel = UILabel()
   private let metricCompositeStack = UIStackView()
   private let badgeLabel = NativeListInsetLabel()
-  private let marketBadgeButtons = (0..<3).map { _ in UIButton(type: .system) }
+  // OneKey patch: reuse the existing explicit line-box layout for styled Market badges.
+  // private let marketBadgeButtons = (0..<3).map { _ in UIButton(type: .system) }
+  private let marketBadgeButtons = (0..<3).map { _ in NativeListAccessoryButton(type: .system) }
   private let marketBadgeImages = (0..<3).map { _ in OneKeyImageReusableView(frame: .zero) }
   private let actionStack = UIStackView()
   private let actionButtons = (0..<3).map { _ in UIButton(type: .system) }
@@ -797,6 +803,19 @@ final class NativeListCell: UICollectionViewCell {
 
   override func layoutSubviews() {
     super.layoutSubviews()
+    if let item = currentItem, item.type == "system", item.data.string("presentation") == "market",
+       ["noMatch", "retry"].contains(item.data.string("variant")), !titleLabel.isHidden {
+      // The cell content view owns the root constraints and must settle before reading descendants.
+      contentView.layoutIfNeeded()
+      // React Native floors text origins to physical pixels after centering the line box.
+      titleLabel.transform = .identity
+      let scale = max(1, window?.screen.scale ?? traitCollection.displayScale)
+      let origin = titleLabel.convert(titleLabel.bounds, to: contentView).origin
+      let x = floor((contentView.bounds.width - titleLabel.bounds.width) / 2 * scale) / scale
+      let contentHeight: CGFloat = item.data.string("variant") == "retry" ? 56 : 24
+      let y = floor(max(32, (contentView.bounds.height - contentHeight) / 2) * scale) / scale
+      titleLabel.transform = CGAffineTransform(translationX: x - origin.x, y: y - origin.y)
+    }
     // OneKey patch: extend only the background across the section list outer inset.
     if currentItem?.data.bool("backgroundFullWidth") == true {
       selectorFullWidthBackground.frame = CGRect(x: -frame.minX, y: 0, width: superview?.bounds.width ?? bounds.width, height: bounds.height)
@@ -1140,6 +1159,7 @@ final class NativeListCell: UICollectionViewCell {
   }
 
   private func reset() {
+    titleLabel.transform = .identity
     restoreSelectorTypography()
     // OneKey patch: remove selector decorations before rebinding recycled cells.
     selectorViews.forEach { $0.removeFromSuperview() }
@@ -1202,6 +1222,15 @@ final class NativeListCell: UICollectionViewCell {
     headerValueIconImageView.removeFromSuperview()
     headerValueIconImageView.image = nil
     headerValueIconImageView.isHidden = true
+    // OneKey patch: restore the shared labels before any recycled row binds.
+    marketSubtitleStack.arrangedSubviews.forEach {
+      marketSubtitleStack.removeArrangedSubview($0)
+      $0.removeFromSuperview()
+    }
+    mainStack.removeArrangedSubview(marketSubtitleStack)
+    marketSubtitleStack.removeFromSuperview()
+    mainStack.removeArrangedSubview(tertiaryLabel)
+    tertiaryLabel.removeFromSuperview()
     mediaMetadataStack.removeArrangedSubview(subtitleLabel)
     mediaMetadataStack.removeArrangedSubview(mediaNetworkImage)
     mediaMetadataStack.removeFromSuperview()
@@ -1211,6 +1240,7 @@ final class NativeListCell: UICollectionViewCell {
     subtitleLabel.removeFromSuperview()
     mainStack.insertArrangedSubview(titleRowStack, at: 0)
     mainStack.insertArrangedSubview(subtitleLabel, at: 1)
+    mainStack.insertArrangedSubview(tertiaryLabel, at: 2)
     leadingWidth.constant = 40
     leadingHeight.constant = 40
     leadingIconWidth.constant = 18
@@ -1246,6 +1276,8 @@ final class NativeListCell: UICollectionViewCell {
     leadingActionButton.isHidden = true
     leadingActionButton.setImage(nil, for: .normal)
     leadingActionButton.setImage(nil, for: .disabled)
+    leadingActionButton.accessibilityIdentifier = nil
+    leadingActionButton.accessibilityLabel = nil
     unreadDot.isHidden = true
     mediaBadgeLabel.isHidden = true
     mediaBadgeLabel.text = nil
@@ -1265,6 +1297,13 @@ final class NativeListCell: UICollectionViewCell {
     titleLabel.textAlignment = .natural
     subtitleLabel.text = nil
     subtitleLabel.lineBreakMode = .byTruncatingTail
+    subtitleLabel.attributedText = nil
+    subtitleLabel.setContentHuggingPriority(.defaultLow, for: .horizontal)
+    subtitleLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
+    tertiaryLabel.attributedText = nil
+    tertiaryLabel.lineBreakMode = .byTruncatingTail
+    tertiaryLabel.setContentHuggingPriority(.defaultLow, for: .horizontal)
+    tertiaryLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
     tertiaryLabel.text = nil
     statusLabel.text = nil
     statusLabel.topInset = 0
@@ -1291,6 +1330,15 @@ final class NativeListCell: UICollectionViewCell {
       $0.isHidden = true
       $0.isEnabled = true
       $0.isUserInteractionEnabled = false
+      // OneKey patch: a recycled badge must not retain an attributed title or font.
+      $0.setAttributedTitle(nil, for: .normal)
+      $0.marketLineHeight = nil
+      $0.selectorSummaryLineHeight = nil
+      $0.titleLabel?.font = nativeListFont(ofSize: 11, weight: .medium)
+      $0.titleLabel?.numberOfLines = 1
+      $0.contentHorizontalAlignment = .center
+      $0.accessibilityLabel = nil
+      $0.accessibilityTraits = .staticText
       $0.setTitle(nil, for: .normal)
       $0.setImage(nil, for: .normal)
       $0.setTitleColor(nil, for: .normal)
@@ -2266,6 +2314,28 @@ final class NativeListCell: UICollectionViewCell {
     rootTopConstraint.constant = verticalPadding
     rootBottomConstraint.constant = -verticalPadding
     rootStack.spacing = CGFloat(style?.double("leadingGap", default: variant == "perp" ? 8 : 14) ?? (variant == "perp" ? 8 : 14))
+    if let leadingAction = item.data.dictionary("leadingAction") {
+      leadingActionButton.isHidden = false
+      let tintColor = UIColor(
+        nativeListHex: leadingAction.string("tintColor", default: "#646464"),
+        fallback: .darkGray
+      )
+      leadingActionButton.tintColor = tintColor
+      if let image = nativeListIcon(named: leadingAction.string("name")) {
+        leadingActionButton.setImage(image, for: .normal)
+        leadingActionButton.setImage(
+          image.withTintColor(tintColor, renderingMode: .alwaysOriginal),
+          for: .disabled
+        )
+      }
+      leadingActionButton.isEnabled = !leadingAction.bool("disabled")
+      leadingActionButton.alpha = leadingActionButton.isEnabled ? 1 : 0.4
+      leadingActionButton.accessibilityIdentifier = leadingAction["testID"] as? String
+      leadingActionButton.accessibilityLabel = leadingAction["accessibilityLabel"] as? String
+      leadingActionKey = leadingAction.string("actionKey")
+      rootStack.addArrangedSubview(leadingActionButton)
+      rootStack.setCustomSpacing(5, after: leadingActionButton)
+    }
     leadingWidth.constant = imageWidth
     leadingHeight.constant = imageHeight
     if let visual = marketLeading(item, style: style) {
@@ -2295,15 +2365,29 @@ final class NativeListCell: UICollectionViewCell {
       }
     }
     rootStack.addArrangedSubview(mainStack)
-    rootStack.setCustomSpacing(0, after: mainStack)
+    // OneKey patch: opt in to the source Market row's content gap.
+    // rootStack.setCustomSpacing(0, after: mainStack)
+    rootStack.setCustomSpacing(CGFloat(style?.double("contentTrailingGap", default: 0) ?? 0), after: mainStack)
     mainStack.spacing = CGFloat(style?.double("lineGap", default: 0) ?? 0)
     titleRowStack.spacing = CGFloat(style?.double("titleBadgeGap", default: 4) ?? 4)
+    // OneKey patch: opt in without changing the other row templates' filled layout.
+    if style?.string("titleBadgeLayout") == "inline" {
+      mainStack.alignment = .leading
+      titleRowStack.setContentHuggingPriority(.required, for: .horizontal)
+    }
     show(titleLabel, item.data.string("title"), lines: style?.dictionary("title")?.int("lines", default: 1) ?? 1)
     applyMarketTextStyle(titleLabel, data: style?.dictionary("title"), theme: theme, defaultSize: 16, defaultLineHeight: 24, defaultWeight: .medium, defaultColor: nativeListColor(theme, "primaryText", "#202020"))
     let badges = Array(item.data.dictionaries("badges").prefix(marketBadgeButtons.count))
     marketBadgeActionKeys = badges.map { $0["actionKey"] as? String }
     for (index, badge) in badges.enumerated() {
       let button = marketBadgeButtons[index]
+      let badgeStyle = badge.dictionary("style")
+      let badgeFontSize = CGFloat(badgeStyle?.double("fontSize", default: 11) ?? 11)
+      let badgeFontWeight = marketFontWeight(badgeStyle?.string("fontWeight") ?? "", fallback: .medium)
+      // OneKey patch: SizableText supplies tabular numerals for explicit Market metrics.
+      let badgeFont = badgeStyle == nil
+        ? nativeListFont(ofSize: badgeFontSize, weight: badgeFontWeight)
+        : nativeListTabularFont(ofSize: badgeFontSize, weight: badgeFontWeight)
       let hasBuiltInIcon = badge.string("iconName") == "verified"
       let hasRemoteIcon = badge.dictionary("icon") != nil
       let hasIcon = hasBuiltInIcon || hasRemoteIcon
@@ -2326,6 +2410,12 @@ final class NativeListCell: UICollectionViewCell {
       button.accessibilityTraits = button.isUserInteractionEnabled ? .button : .staticText
       button.setTitle(text, for: .normal)
       button.setTitleColor(foreground, for: .normal)
+      button.titleLabel?.font = badgeFont
+      if let lineHeight = badgeStyle?["lineHeight"] as? Double {
+        setButtonLine(button, text: text, font: badgeFont, color: foreground, lineHeight: CGFloat(lineHeight))
+        // The explicit text-only line box must not cover an adjacent icon.
+        if hasIcon { button.marketLineHeight = nil }
+      }
       button.tintColor = foreground
       button.backgroundColor = UIColor(
         nativeListHex: badge.string("backgroundColor", default: ""),
@@ -2335,7 +2425,12 @@ final class NativeListCell: UICollectionViewCell {
       )
       let iconOnly = hasIcon && text.isEmpty
       let iconSize: CGFloat = hasBuiltInIcon ? 16 : 14
-      button.contentEdgeInsets = UIEdgeInsets(top: 0, left: iconOnly ? 0 : hasRemoteIcon ? 20 : hasIcon ? 3 : 5, bottom: 0, right: iconOnly ? 0 : 5)
+      // OneKey patch: preserve the native defaults unless the caller supplies padding.
+      let padding = CGFloat(badgeStyle?.double("horizontalPadding", default: 5) ?? 5)
+      let hasCustomPadding = badgeStyle?["horizontalPadding"] != nil
+      let leftPadding = hasCustomPadding ? padding + (hasRemoteIcon ? iconSize + 2 : 0) : hasRemoteIcon ? 20 : hasIcon ? 3 : 5
+      // button.contentEdgeInsets = UIEdgeInsets(top: 0, left: iconOnly ? 0 : hasRemoteIcon ? 20 : hasIcon ? 3 : 5, bottom: 0, right: iconOnly ? 0 : 5)
+      button.contentEdgeInsets = UIEdgeInsets(top: 0, left: iconOnly ? 0 : leftPadding, bottom: 0, right: iconOnly ? 0 : padding)
       button.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: text.isEmpty ? 0 : 3)
       button.titleEdgeInsets = .zero
       button.imageView?.contentMode = .scaleAspectFit
@@ -2345,11 +2440,15 @@ final class NativeListCell: UICollectionViewCell {
           for: .normal
         )
       }
-      let height = button.heightAnchor.constraint(equalToConstant: 18)
-      let textWidth = (text as NSString).size(
-        withAttributes: [.font: nativeListFont(ofSize: 11, weight: .medium)]
-      ).width
-      let width = button.widthAnchor.constraint(equalToConstant: iconOnly ? iconSize : ceil(textWidth) + (hasIcon ? iconSize + 11 : 10))
+      // OneKey patch: match source badge metrics at physical-pixel precision.
+      // let height = button.heightAnchor.constraint(equalToConstant: 18)
+      let height = button.heightAnchor.constraint(equalToConstant: CGFloat(badgeStyle?.double("height", default: 18) ?? 18))
+      let textWidth = (text as NSString).size(withAttributes: [.font: badgeFont]).width
+      let scale = max(1, traitCollection.displayScale)
+      let roundedTextWidth = badgeStyle == nil ? ceil(textWidth) : ceil(textWidth * scale) / scale
+      let extraWidth = hasCustomPadding ? padding * 2 + (hasIcon ? iconSize + 2 : 0) : hasIcon ? iconSize + 11 : 10
+      // let width = button.widthAnchor.constraint(equalToConstant: iconOnly ? iconSize : ceil(textWidth) + (hasIcon ? iconSize + 11 : 10))
+      let width = button.widthAnchor.constraint(equalToConstant: iconOnly ? iconSize : roundedTextWidth + extraWidth)
       NSLayoutConstraint.activate([width, height])
       selectorConstraints.append(contentsOf: [width, height])
       if let icon = badge.dictionary("icon") {
@@ -2370,6 +2469,41 @@ final class NativeListCell: UICollectionViewCell {
         subtitleLabel.attributedText = marketAttributedText(item.data.string("subtitle"), segments: item.data.dictionaries("subtitleSegments"), style: style?.dictionary("subtitle"), defaultSize: 14, defaultLineHeight: 20, defaultWeight: .regular, color: nativeListColor(theme, "secondaryText", "#646464"), defaultAlignment: .natural)
       }
     }
+    // OneKey patch: preserve volume width while the localized name truncates.
+    let subtitlePrefix = item.data.dictionary("subtitlePrefix")
+    let subtitlePadding = CGFloat(style?.double("subtitleTrailingPadding", default: 0) ?? 0)
+    if subtitlePrefix != nil || subtitlePadding > 0 {
+      mainStack.removeArrangedSubview(subtitleLabel)
+      subtitleLabel.removeFromSuperview()
+      mainStack.removeArrangedSubview(tertiaryLabel)
+      tertiaryLabel.removeFromSuperview()
+      marketSubtitleStack.axis = .horizontal
+      marketSubtitleStack.alignment = .center
+      marketSubtitleStack.spacing = 0
+      marketSubtitleStack.clipsToBounds = true
+      show(tertiaryLabel, subtitlePrefix?.string("text") ?? "", lines: 1)
+      applyMarketTextStyle(tertiaryLabel, data: subtitlePrefix?.dictionary("style"), theme: theme, defaultSize: 12, defaultLineHeight: 16, defaultWeight: .regular, defaultColor: nativeListColor(theme, "secondaryText", "#646464"))
+      tertiaryLabel.setContentHuggingPriority(.required, for: .horizontal)
+      tertiaryLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+      subtitleLabel.setContentHuggingPriority(.required, for: .horizontal)
+      subtitleLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
+      marketSubtitleStack.addArrangedSubview(tertiaryLabel)
+      marketSubtitleStack.addArrangedSubview(subtitleLabel)
+      marketSubtitleStack.addArrangedSubview(marketSubtitleSpacer)
+      if !tertiaryLabel.isHidden && !subtitleLabel.isHidden {
+        marketSubtitleStack.setCustomSpacing(CGFloat(subtitlePrefix?.double("gap", default: 4) ?? 4), after: tertiaryLabel)
+      }
+      mainStack.insertArrangedSubview(marketSubtitleStack, at: 1)
+      let width = marketSubtitleStack.widthAnchor.constraint(equalTo: mainStack.widthAnchor, constant: -subtitlePadding)
+      width.isActive = true
+      selectorConstraints.append(width)
+      if let maxWidth = subtitlePrefix?["maxWidth"] as? Double {
+        let limit = tertiaryLabel.widthAnchor.constraint(lessThanOrEqualToConstant: CGFloat(maxWidth))
+        limit.isActive = true
+        selectorConstraints.append(limit)
+      }
+      marketSubtitleStack.isHidden = tertiaryLabel.isHidden && subtitleLabel.isHidden
+    }
     rootStack.addArrangedSubview(trailingStack)
     trailingStack.axis = .horizontal
     trailingStack.alignment = .center
@@ -3039,6 +3173,41 @@ final class NativeListCell: UICollectionViewCell {
       rootTopConstraint.constant = 12
       rootBottomConstraint.constant = -12
     }
+    if isMarket && variant == "retry" {
+      let message = item.data.string("message")
+      let text = item.data.string("actionText", default: "Retry")
+      rootStack.axis = .vertical
+      // The source tertiary Button has -5 vertical margins around its 30pt frame.
+      rootStack.spacing = 7
+      rootLeadingConstraint.constant = 32
+      rootTrailingConstraint.constant = -32
+      let height = CGFloat(item.data.double("height", default: message.isEmpty ? 52 : 120))
+      let top = message.isEmpty ? 11 : max(32, (height - 56) / 2)
+      rootTopConstraint.constant = top
+      rootBottomConstraint.constant = -(height - top - (message.isEmpty ? 30 : 61))
+      if !message.isEmpty {
+        show(titleLabel, message, lines: 2)
+        titleLabel.font = nativeListTabularFont(ofSize: 16)
+        titleLabel.textColor = nativeListColor(theme, "secondaryText", "#646464")
+        titleLabel.textAlignment = .center
+        setLineHeight(titleLabel, text: message, lineHeight: 24)
+        rootStack.addArrangedSubview(mainStack)
+      }
+      showAccessory(0, text, action: (item.data.string("actionKey"), nil))
+      let button = accessoryButtons[0]
+      button.backgroundColor = .clear
+      button.layer.cornerRadius = 15
+      setButtonLine(button, text: text, font: nativeListTabularFont(ofSize: 14, weight: .medium),
+                    color: nativeListColor(theme, "secondaryText", "#646464"), lineHeight: 20)
+      let textWidth = button.intrinsicContentSize.width
+      selectorConstraints.append(contentsOf: [
+        button.widthAnchor.constraint(equalToConstant: textWidth + 18),
+        button.heightAnchor.constraint(equalToConstant: 30),
+      ])
+      NSLayoutConstraint.activate(selectorConstraints)
+      rootStack.addArrangedSubview(trailingStack)
+      return
+    }
     if variant == "loading" && item.data.string("loadingStyle") == "skeleton" {
       rootLeadingConstraint.constant = 20
       rootTrailingConstraint.constant = -20
@@ -3065,12 +3234,13 @@ final class NativeListCell: UICollectionViewCell {
       return
     }
     if isMarket && variant == "noMatch" {
-      rootTopConstraint.constant = 32
-      rootBottomConstraint.constant = -32
+      let padding = max(32, (CGFloat(item.data.double("height", default: 88)) - 24) / 2)
+      rootTopConstraint.constant = padding
+      rootBottomConstraint.constant = -padding
       rootStack.addArrangedSubview(mainStack)
       mainStack.alignment = .center
       mainStack.setContentHuggingPriority(.defaultLow, for: .horizontal)
-      titleLabel.font = nativeListFont(ofSize: 16)
+      titleLabel.font = nativeListTabularFont(ofSize: 16)
       titleLabel.textColor = nativeListColor(theme, "secondaryText", "#646464")
       titleLabel.textAlignment = .center
       show(titleLabel, item.data.string("message"), lines: 1)
@@ -3080,6 +3250,8 @@ final class NativeListCell: UICollectionViewCell {
     if isMarket && variant == "end" {
       rootTopConstraint.constant = 16
       rootBottomConstraint.constant = -16
+      // OneKey patch: an empty title stack must not consume the dot's line height.
+      titleRowStack.isHidden = true
       rootStack.addArrangedSubview(mainStack)
       mainStack.alignment = .center
       mainStack.setContentHuggingPriority(.defaultLow, for: .horizontal)
@@ -3558,7 +3730,7 @@ final class NativeListCell: UICollectionViewCell {
       .foregroundColor: label.textColor as Any,
       .paragraphStyle: paragraphStyle,
     ]
-    if currentItem?.type == "market" || (currentItem?.data["height"] != nil && (["accountSelector", "walletSidebar"].contains(currentItem?.data.string("presentation") ?? "") || currentItem?.type == "sectionHeader" && currentItem?.data.string("presentation") == "networkSelector")) || currentItem?.type == "system" && currentItem?.data.string("variant") == "warning" {
+    if currentItem?.type == "market" || currentItem?.type == "system" && currentItem?.data.string("presentation") == "market" && currentItem?.data.string("variant") == "noMatch" || (currentItem?.data["height"] != nil && (["accountSelector", "walletSidebar"].contains(currentItem?.data.string("presentation") ?? "") || currentItem?.type == "sectionHeader" && currentItem?.data.string("presentation") == "networkSelector")) || currentItem?.type == "system" && currentItem?.data.string("variant") == "warning" {
       // OneKey patch: React Native centers font metrics inside explicit line heights.
       let baselineOffset = max(0, (lineHeight - label.font.lineHeight) / 2)
       // OneKey patch: TextKit's 14/20 headings align their baseline to the upper physical pixel.
@@ -3566,7 +3738,7 @@ final class NativeListCell: UICollectionViewCell {
       let scale = window?.screen.scale ?? traitCollection.displayScale
       attributes[.baselineOffset] = isSelectorHeading && scale > 0 ? ceil(baselineOffset * scale) / scale : baselineOffset
     }
-    if letterSpacing != 0 || currentItem?.type == "market" { attributes[.kern] = letterSpacing }
+    if letterSpacing != 0 || currentItem?.type == "market" || currentItem?.data.string("presentation") == "market" { attributes[.kern] = letterSpacing }
     label.attributedText = NSAttributedString(string: text, attributes: attributes)
   }
 
@@ -3581,13 +3753,14 @@ final class NativeListCell: UICollectionViewCell {
     let paragraphStyle = NSMutableParagraphStyle()
     paragraphStyle.minimumLineHeight = lineHeight
     paragraphStyle.maximumLineHeight = lineHeight
+    let isMarketText = currentItem?.type == "market" || currentItem?.type == "system" && currentItem?.data.string("presentation") == "market" && currentItem?.data.string("variant") == "retry"
     let isSelectorValue = currentItem?.data.string("presentation") == "networkSelector" && currentItem?.data["height"] != nil && currentItem?.data.string("variant") != "summary"
     let isSelectorSummary = currentItem?.type == "sectionHeader" && currentItem?.data.string("presentation") == "networkSelector" && currentItem?.data["height"] != nil && currentItem?.data.string("variant") == "summary"
     (button as? NativeListAccessoryButton)?.selectorSummaryLineHeight = isSelectorSummary ? lineHeight : nil
-    (button as? NativeListAccessoryButton)?.marketLineHeight = currentItem?.type == "market" ? lineHeight : nil
+    (button as? NativeListAccessoryButton)?.marketLineHeight = isMarketText ? lineHeight : nil
     // OneKey patch: summary text uses its source line box; currency retains trailing alignment.
     // Market's line box already handles alignment; source text starts at its origin.
-    paragraphStyle.alignment = isSelectorValue ? .right : isSelectorSummary || currentItem?.type == "market" ? .natural : .center
+    paragraphStyle.alignment = isSelectorValue ? .right : isSelectorSummary || isMarketText ? .natural : .center
     if isSelectorSummary {
       button.contentHorizontalAlignment = .leading
       button.titleLabel?.textAlignment = .natural
@@ -3596,14 +3769,14 @@ final class NativeListCell: UICollectionViewCell {
       button.contentHorizontalAlignment = .trailing
       button.titleLabel?.textAlignment = .right
     }
-    let baselineOffset: CGFloat = currentItem?.type == "market" || currentItem?.type == "sectionHeader" && currentItem?.data.string("presentation") == "networkSelector" && currentItem?.data["height"] != nil ? max(0, (lineHeight - font.lineHeight) / 2) : 0
+    let baselineOffset: CGFloat = isMarketText || currentItem?.type == "sectionHeader" && currentItem?.data.string("presentation") == "networkSelector" && currentItem?.data["height"] != nil ? max(0, (lineHeight - font.lineHeight) / 2) : 0
     var attributes: [NSAttributedString.Key: Any] = [
       .font: font,
       .foregroundColor: color,
       .paragraphStyle: paragraphStyle,
-      .baselineOffset: currentItem?.type == "market" && lineHeight == 20 && font.pointSize == 14 ? ceil(baselineOffset * max(1, traitCollection.displayScale)) / max(1, traitCollection.displayScale) : baselineOffset,
+      .baselineOffset: isMarketText && lineHeight == 20 && font.pointSize == 14 ? ceil(baselineOffset * max(1, traitCollection.displayScale)) / max(1, traitCollection.displayScale) : baselineOffset,
     ]
-    if currentItem?.type == "market" { attributes[.kern] = 0 }
+    if isMarketText { attributes[.kern] = 0 }
     button.setAttributedTitle(
       NSAttributedString(string: text, attributes: attributes),
       for: .normal

package/ios/RNCNativeListView.swift

@@ -1052,6 +1052,7 @@ final class NativeListView: UIView {
     let actionKey = item.data.string("longPressActionKey")
     guard !actionKey.isEmpty else { return }
     let origin = (collectionView.cellForItem(at: indexPath) as? NativeListCell)?.rowActionOrigin()
+    origin?.windowPoint = gesture.location(in: window)
     handleAction(item: item, actionKey: actionKey, target: nil, origin: origin)
   }
 
@@ -1478,6 +1479,9 @@ final class NativeListView: UIView {
         ? "rtl"
         : "ltr",
     ]
+    if let point = origin.windowPoint {
+      anchor["windowPoint"] = ["x": point.x, "y": point.y]
+    }
     if let slot = origin.slot { anchor["slot"] = slot }
     return anchor
   }

package/lib/module/validation.js

@@ -84,9 +84,13 @@ function assertMarketTextStyle(style, path) {
 }
 function assertMarketStyle(style, path) {
   if (!style) return;
-  for (const field of ['horizontalPadding', 'verticalPadding', 'leadingGap', 'titleBadgeGap', 'trailingGap']) {
+  for (const field of ['horizontalPadding', 'verticalPadding', 'leadingGap', 'titleBadgeGap', 'trailingGap', 'contentTrailingGap', 'subtitleTrailingPadding']) {
     assertBoundedStyleNumber(style[field], `${path}.${field}`, 0, 64);
   }
+  // OneKey patch: validate the opt-in Market badge layout.
+  if (style.titleBadgeLayout !== undefined && style.titleBadgeLayout !== 'inline') {
+    fail(`${path}.titleBadgeLayout`, 'must be inline when provided');
+  }
   assertBoundedStyleNumber(style.lineGap, `${path}.lineGap`, 0, 16);
   assertBoundedStyleNumber(style.changeWidth, `${path}.changeWidth`, 1, 160);
   assertBoundedStyleNumber(style.changeHeight, `${path}.changeHeight`, 1, 160);
@@ -111,8 +115,22 @@ function assertMarketRow(row, path) {
   }
   assertText(row.title, `${path}.title`);
   assertText(row.subtitle, `${path}.subtitle`);
+  // OneKey patch: validate the independently laid out Market name.
+  if (row.subtitlePrefix) {
+    assertText(row.subtitlePrefix.text, `${path}.subtitlePrefix.text`);
+    assertBoundedStyleNumber(row.subtitlePrefix.gap, `${path}.subtitlePrefix.gap`, 0, 64);
+    assertBoundedStyleNumber(row.subtitlePrefix.maxWidth, `${path}.subtitlePrefix.maxWidth`, 1, 320);
+    assertMarketTextStyle(row.subtitlePrefix.style, `${path}.subtitlePrefix.style`);
+  }
   assertText(row.price, `${path}.price`);
   assertText(row.change.text, `${path}.change.text`);
+  assertTrailingAccessories(row.leadingAction ? [row.leadingAction] : undefined, `${path}.leadingAction`);
+  if (row.leadingAction) {
+    assertText(row.leadingAction.name, `${path}.leadingAction.name`);
+    if (row.leadingAction.actionKey !== undefined) {
+      assertKey(row.leadingAction.actionKey, `${path}.leadingAction.actionKey`);
+    }
+  }
   assertLeadingVisual(row.leading, `${path}.leading`);
   const assertSegments = (segments, segmentPath) => {
     segments?.forEach((segment, index) => {
@@ -140,6 +158,10 @@ function assertMarketRow(row, path) {
     }
     badgeKeys.add(badge.key);
     assertText(badge.text, `${badgePath}.text`);
+    // OneKey patch: share typography bounds with Market text styles.
+    assertMarketTextStyle(badge.style, `${badgePath}.style`);
+    assertBoundedStyleNumber(badge.style?.height, `${badgePath}.style.height`, 1, 64);
+    assertBoundedStyleNumber(badge.style?.horizontalPadding, `${badgePath}.style.horizontalPadding`, 0, 32);
     if (badge.iconName !== undefined && badge.iconName !== 'verified') {
       fail(`${badgePath}.iconName`, 'must be verified when provided');
     }
@@ -451,6 +473,7 @@ function assertRow(row, index, path = `rows[${index}]`) {
       }
       if (row.variant === 'retry') {
         assertKey(row.actionKey, `${path}.actionKey`);
+        assertText(row.actionText, `${path}.actionText`);
       }
       break;
   }

package/lib/module/web/NativeListWebEngine.js

@@ -1747,6 +1747,17 @@ function createMarketRow(context, row) {
   const layoutStyle = resolveWebMarketLayoutStyle(row);
   body.style.padding = String(layoutStyle.verticalPadding) + 'px ' + String(layoutStyle.horizontalPadding) + 'px';
   body.style.gap = '0px';
+  if (row.leadingAction) {
+    const action = createIconAction(context, row.leadingAction.name, row.leadingAction.actionKey, row.leadingAction.disabled, row.leadingAction.tintColor);
+    action.style.flex = '0 0 36px';
+    action.style.width = '36px';
+    action.style.height = '36px';
+    action.style.marginRight = '5px';
+    setData(action, 'testid', row.leadingAction.testID);
+    if (row.leadingAction.accessibilityLabel) action.setAttribute('aria-label', row.leadingAction.accessibilityLabel);
+    markActionAnchorSource(action, 'leadingAction');
+    body.appendChild(action);
+  }
   const visual = createVisual(context, row.leading);
   if (visual) {
     const width = layoutStyle.imageWidth;

package/lib/typescript/src/models.d.ts

@@ -50,7 +50,12 @@ export type MarketRowStyle = Readonly<{
     /** Space between title and subtitle; 0 by default, bounded to 0..16. */
     lineGap?: number;
     titleBadgeGap?: number;
+    /** OneKey patch: keep badges next to the intrinsic title width. */
+    titleBadgeLayout?: 'inline';
     trailingGap?: number;
+    /** OneKey patch: preserve separate Market content and subtitle insets. */
+    contentTrailingGap?: number;
+    subtitleTrailingPadding?: number;
     image?: MarketImageStyle;
     title?: MarketTextStyle;
     subtitle?: MarketTextStyle;
@@ -71,6 +76,14 @@ export type MarketBadgeModel = Readonly<{
     backgroundColor?: string;
     actionKey?: string;
     accessibilityLabel?: string;
+    /** OneKey patch: optional Market badge metrics; legacy native defaults remain unchanged. */
+    style?: Readonly<{
+        fontSize?: number;
+        fontWeight?: MarketTextStyle['fontWeight'];
+        lineHeight?: number;
+        height?: number;
+        horizontalPadding?: number;
+    }>;
 }>;
 export type MarketChangeModel = Readonly<{
     text: string;
@@ -316,9 +329,19 @@ export type DataRow = RowBase & Readonly<{
 export type MarketRow = RowBase & Readonly<{
     type: 'market';
     variant: 'token' | 'stock' | 'perp';
+    leadingAction?: Extract<TrailingAccessory, {
+        kind: 'icon';
+    }>;
     leading: LeadingVisual;
     title: string;
     subtitle?: string;
+    /** OneKey patch: localized name shrinks independently of the volume. */
+    subtitlePrefix?: Readonly<{
+        text: string;
+        gap?: number;
+        maxWidth?: number;
+        style?: MarketTextStyle;
+    }>;
     subtitleSegments?: readonly ValueTextSegment[];
     price: string;
     priceSegments?: readonly ValueTextSegment[];
@@ -415,6 +438,7 @@ export type SystemRow = RowBase & (Readonly<{
     presentation?: 'market';
     message: string;
     actionKey: string;
+    actionText?: string;
 }> | Readonly<{
     type: 'system';
     variant: 'warning';
@@ -524,7 +548,7 @@ export type RowPatch = Readonly<{
 }> | Readonly<{
     type: 'market';
     key: string;
-    changes: Partial<Pick<MarketRow, CommonPatchFields | 'leading' | 'title' | 'subtitle' | 'subtitleSegments' | 'price' | 'priceSegments' | 'change' | 'badges' | 'pressActionKey' | 'pressInActionKey' | 'longPressActionKey' | 'diagnostics' | 'style'>>;
+    changes: Partial<Pick<MarketRow, CommonPatchFields | 'leadingAction' | 'leading' | 'title' | 'subtitle' | 'subtitleSegments' | 'price' | 'priceSegments' | 'change' | 'badges' | 'pressActionKey' | 'pressInActionKey' | 'longPressActionKey' | 'diagnostics' | 'style'>>;
 }> | Readonly<{
     type: 'mediaTile';
     key: string;
@@ -562,6 +586,11 @@ export type NativeListActionAnchor = Readonly<{
     token: string;
     /** Window-relative logical units: CSS px on Web, points on iOS, dp on Android. */
     windowRect: NativeListWindowRect;
+    /** Actual long-press point, in the same logical units as windowRect. */
+    windowPoint?: Readonly<{
+        x: number;
+        y: number;
+    }>;
     source: NativeListActionSource;
     slot?: number;
     generation: number;

package/package.json

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