@onekeyfe/react-native-native-list 6.7.0-alpha.405 → 6.7.0-alpha.407

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

@@ -16,7 +16,11 @@ internal class NativeListActivityDetailsView(private val reactContext: ThemedRea
   var onAction: ((String, View, String, Int) -> Unit)? = null
   private var sourceScale = false
   private val main = LinearLayout(context).apply { orientation = HORIZONTAL; gravity = Gravity.CENTER_VERTICAL }
+  private val identityColumn = LinearLayout(context).apply { orientation = HORIZONTAL; gravity = Gravity.CENTER_VERTICAL }
   private val visual = NativeListLeadingVisual(reactContext, fonts)
+  /** Whether the bound leading visual lays a badge past its frame; see [setClipping]. */
+  var leadingOverhangs = false
+    private set
   private val identity = LinearLayout(context).apply { orientation = VERTICAL }
   private val titleLine = LinearLayout(context).apply { orientation = HORIZONTAL; gravity = Gravity.CENTER_VERTICAL }
   private val title = NativeListTextView(context)
@@ -40,13 +44,26 @@ internal class NativeListActivityDetailsView(private val reactContext: ThemedRea
     identity.addView(status)
     feeLine.addView(feePrimary); feeLine.addView(feeSecondary)
     fee.addView(feeLabel); fee.addView(feeLine)
-    main.addView(visual)
-    main.addView(identity, LayoutParams(0, -2, 1f))
+    identityColumn.addView(visual)
+    identityColumn.addView(identity, LayoutParams(0, -2, 1f))
+    main.addView(identityColumn, LayoutParams(0, -2, 1f))
     main.addView(amounts)
     main.addView(fee)
     addView(main, LayoutParams(-1, -2))
     addView(actions, LayoutParams(-1, -2))
   }
+  /**
+   * Android clips a child to its own bounds while its parent clips children, so
+   * every view between the leading visual and the row host stops clipping when
+   * the visual's network badge overhangs its box (SPEC "Leading badge overhang",
+   * OK-66275); the host row applies the same policy to itself.
+   */
+  private fun setClipping(clips: Boolean) {
+    for (group in listOf(identityColumn, main, this)) {
+      group.clipChildren = clips
+      group.clipToPadding = clips
+    }
+  }
   private fun dp(value: Int) = if (sourceScale) (value * resources.displayMetrics.density).roundToInt() else NativeListScale.dp(resources, value)
   private fun px(value: Double) = (value * resources.displayMetrics.density).roundToInt()
   private fun color(tone: String, theme: JSONObject?): Int {
@@ -77,6 +94,8 @@ internal class NativeListActivityDetailsView(private val reactContext: ThemedRea
     visual.visibility = if (hideLeading) GONE else VISIBLE
     if (hideLeading) visual.recycle()
     else visual.bind(data.optJSONObject("leading") ?: JSONObject(), image, item.key, theme, false, sourceScale, data.optJSONObject("secondaryLeading"))
+    leadingOverhangs = !hideLeading && visual.requestsUnclippedHost
+    setClipping(nativeListActivityHostClips(leadingOverhangs))
     amounts.layoutParams = if (table) LayoutParams(0, -2, 1f).apply { marginStart = gap } else LayoutParams(-2, -2).apply { marginStart = gap }
     text(title, data.optString("title"), style.optJSONObject("title"), 16f, color("primary", theme), 24, "medium")
     text(description, data.optString("description"), style.optJSONObject("description"), 14f, color("secondary", theme), 20, lines = 2)
@@ -110,7 +129,9 @@ internal class NativeListActivityDetailsView(private val reactContext: ThemedRea
     val feeData = data.optJSONObject("fee")
     fee.visibility = if (feeData == null) GONE else VISIBLE
     fee.alpha = if (feeData?.optBoolean("hidden") == true) 0f else 1f
-    fee.layoutParams = LayoutParams(-2, -2).apply { marginStart = gap }
+    fee.layoutParams = (if (table) LayoutParams(0, -2, 0.6f) else LayoutParams(-2, -2)).apply { marginStart = gap }
+    feeLabel.layoutParams.width = if (table) LayoutParams.WRAP_CONTENT else LayoutParams.MATCH_PARENT
+    feeLine.layoutParams.width = if (table) LayoutParams.WRAP_CONTENT else LayoutParams.MATCH_PARENT
     text(feeLabel, feeData?.optString("label") ?: "", style.optJSONObject("secondaryAmount"), 12f, color("secondary", theme), 16)
     text(feePrimary, feeData?.optString("primary") ?: "", style.optJSONObject("secondaryAmount"), 14f, color("primary", theme), 20)
     text(feeSecondary, feeData?.optString("secondary") ?: "", style.optJSONObject("secondaryAmount"), 12f, color("secondary", theme), 16)
@@ -149,7 +170,11 @@ internal class NativeListActivityDetailsView(private val reactContext: ThemedRea
     }
     label.text = styled
   }
-  fun recycle() { visual.recycle(); visual.visibility = VISIBLE; amountViews.forEach { it.recycle() }; description.setOnClickListener(null); actions.removeAllViews() }
+  fun recycle() {
+    visual.recycle(); visual.visibility = VISIBLE; amountViews.forEach { it.recycle() }; description.setOnClickListener(null); actions.removeAllViews()
+    leadingOverhangs = false
+    setClipping(true)
+  }
   fun dispose() { recycle(); visual.dispose(); amountViews.forEach { it.dispose() } }
 
   private inner class AmountView : LinearLayout(context) {

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

@@ -83,10 +83,11 @@ internal class NativeListActivityRowView(context: ThemedReactContext, fonts: Nat
       setPadding(hp, vp, hp, vp)
       visual.recycle()
       details.bind(item, theme, sourceScale)
-      // This view may be reused from a legacy row whose overhanging badge
-      // switched clipping off; a rich row has no badge on the host, so restore
-      // the defaults before returning.
-      setHostClipping(nativeListActivityHostClips(rich = true, leadingOverhangs = false))
+      // The rich row's leading visual lives on the details view, where its
+      // network badge overhangs the box (OK-66275): this host must stop clipping
+      // as well, and a view reused from a badge row clips again when the bound
+      // row has no badge.
+      setHostClipping(nativeListActivityHostClips(details.leadingOverhangs))
       return
     }
     details.recycle()
@@ -174,12 +175,7 @@ internal class NativeListActivityRowView(context: ThemedReactContext, fonts: Nat
     // Stop clipping the content row and this row's padding exactly when the
     // bound visual reports such a badge (SPEC "Leading badge overhang"), as the
     // Identity renderer does.
-    setHostClipping(
-      nativeListActivityHostClips(
-        rich = false,
-        leadingOverhangs = !hideLeading && visual.requestsUnclippedHost,
-      )
-    )
+    setHostClipping(nativeListActivityHostClips(!hideLeading && visual.requestsUnclippedHost))
     bind(
       title,
       data.optString("title"),

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

@@ -240,9 +240,10 @@ internal class NativeListAdapter(
 
       private fun isMarketQuoteUpdate(oldItem: NativeListItem, newItem: NativeListItem): Boolean {
         if (oldItem.type != "market" || newItem.type != "market") return false
+        if (!hasSameMarketMetricStructure(oldItem, newItem)) return false
         fun stableContent(item: NativeListItem): String {
           val value = JSONObject(item.json.toString())
-          listOf("revision", "price", "priceSegments", "change", "accessibilityLabel")
+          listOf("revision", "price", "priceSegments", "change", "accessibilityLabel", "metrics")
             .forEach(value::remove)
           return value.toString()
         }
@@ -256,3 +257,18 @@ internal const val SELECTION_PAYLOAD = "selection"
 // OneKey patch: internal payload, never exposed through the serialized row contract.
 internal const val SELECTION_ECHO_PAYLOAD = "selectionEcho"
 internal const val MARKET_QUOTE_PAYLOAD = "marketQuote"
+
+internal fun hasSameMarketMetricStructure(before: NativeListItem, after: NativeListItem): Boolean {
+  val old = before.json.optJSONArray("metrics")
+  val next = after.json.optJSONArray("metrics")
+  val oldCount = old?.length() ?: 0
+  if (oldCount != (next?.length() ?: 0)) return false
+  for (index in 0 until oldCount) {
+    val previous = old?.optJSONObject(index) ?: return false
+    val current = next?.optJSONObject(index) ?: return false
+    if (previous.optString("key") != current.optString("key") ||
+      previous.optInt("weight", 1) != current.optInt("weight", 1) ||
+      previous.optString("alignment", "end") != current.optString("alignment", "end")) return false
+  }
+  return true
+}

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

@@ -292,12 +292,14 @@ private class NativeListTableColumnView(context: android.content.Context, privat
 
   fun reset() {
     primaryLine.gravity = Gravity.CENTER_VERTICAL
+    secondaryLine.gravity = Gravity.CENTER_VERTICAL
     for (icon in listOf(titleIcon, secondaryTitleIcon)) {
       icon.visibility = GONE
       icon.iconName = ""
       icon.contentDescription = null
       icon.setOnClickListener(null)
     }
+    (primaryLine.layoutParams as LayoutParams).gravity = -1
     primaryLine.layoutParams.width = LayoutParams.WRAP_CONTENT
     primaryLine.layoutParams.height = LayoutParams.WRAP_CONTENT
     secondaryLine.layoutParams.height = LayoutParams.WRAP_CONTENT
@@ -357,6 +359,17 @@ private class NativeListTableColumnView(context: android.content.Context, privat
         "end" -> Gravity.END
         else -> Gravity.START
       }
+    fun horizontalGravity(alignment: String) = when (alignment) {
+      "center" -> Gravity.CENTER_HORIZONTAL
+      "end" -> Gravity.END
+      else -> Gravity.START
+    }
+    val primaryAlignment = style.optJSONObject("columns")?.optString("alignment")
+      ?.takeIf(String::isNotEmpty) ?: column.optString("alignment", "start")
+    (primaryLine.layoutParams as LayoutParams).gravity = horizontalGravity(primaryAlignment)
+    val secondaryAlignment = style.optJSONObject("columnSecondary")?.optString("alignment")
+      ?.takeIf(String::isNotEmpty) ?: column.optString("alignment", "start")
+    secondaryLine.gravity = Gravity.CENTER_VERTICAL or horizontalGravity(secondaryAlignment)
     fun bindText(
       view: NativeListTextView,
       value: String,
@@ -433,6 +446,8 @@ private class NativeListTableColumnView(context: android.content.Context, privat
       secondaryLine.visibility = VISIBLE
     }
     if (!fixedTableGeometry) applyStyle(style)
+    (secondary.layoutParams as LayoutParams).marginStart =
+      if (secondaryLeading.visibility == VISIBLE) dp(4) else 0
     if (fixedTableGeometry) {
       // Legacy table lines: fixed 20dp primary and 16dp secondary/badge boxes.
       primaryLine.layoutParams.height = dp(20)

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

@@ -38,6 +38,9 @@ internal class NativeListMarketRowView(context: ThemedReactContext, fonts: Nativ
   private val marketSubtitleLine = PackedTitleLineLayout(context)
   private val trailingColumn = LinearLayout(context)
   private val trailingViews = List(2) { NativeListTextView(context) }
+  private val metricColumns = List(3) { LinearLayout(context) }
+  private val metricPrimaryViews = List(3) { NativeListTextView(context) }
+  private val metricSecondaryViews = List(3) { NativeListTextView(context) }
   private val marketBadgeViews = List(3) { LinearLayout(context) }
   private val marketBadgeLabels = List(3) { TextView(context) }
   private val badgeSlots = List(3) { NativeListImageSlot(context) }
@@ -88,6 +91,12 @@ internal class NativeListMarketRowView(context: ThemedReactContext, fonts: Nativ
     mainColumn.addView(subtitle)
     mainColumn.addView(tertiary)
     trailingViews.forEach(trailingColumn::addView)
+    metricColumns.forEachIndexed { index, column ->
+      column.orientation = VERTICAL
+      column.gravity = Gravity.CENTER_VERTICAL
+      column.addView(metricPrimaryViews[index])
+      column.addView(metricSecondaryViews[index])
+    }
     leadingActionIcon.useSourceScale = true
     marketBadgeViews.forEachIndexed { index, badge ->
       badge.orientation = HORIZONTAL
@@ -129,6 +138,50 @@ internal class NativeListMarketRowView(context: ThemedReactContext, fonts: Nativ
 
   private fun weighted() = LayoutParams(0, LayoutParams.WRAP_CONTENT, 1f)
 
+  private fun metricColor(theme: JSONObject?, tone: String): Int =
+    when (tone) {
+      "positive" -> color(theme, "positive", "#218358")
+      "negative" -> color(theme, "negative", "#CE2C31")
+      "secondary" -> color(theme, "secondaryText", "#646464")
+      else -> color(theme, "primaryText", "#202020")
+    }
+
+  private fun bindMetrics(metrics: JSONArray, theme: JSONObject?, gap: Int) {
+    updateMetricLabels(metrics, theme)
+    for (index in 0 until metrics.length()) {
+      val metric = metrics.getJSONObject(index)
+      addView(
+        metricColumns[index],
+        LayoutParams(0, LayoutParams.WRAP_CONTENT, metric.optInt("weight", 1).toFloat()).apply {
+          marginStart = dp(gap)
+        },
+      )
+    }
+  }
+
+  private fun updateMetricLabels(metrics: JSONArray, theme: JSONObject?) {
+    for (index in 0 until metrics.length()) {
+      val metric = metrics.getJSONObject(index)
+      val alignment = metric.optString("alignment", "end")
+      val primary = metricPrimaryViews[index]
+      val secondary = metricSecondaryViews[index]
+      applyMarketTextStyle(
+        primary, null, 14f, 20, "medium",
+        metricColor(theme, metric.optString("tone")), alignment,
+      )
+      primary.text = marketText(metric.optString("text"), metric.optJSONArray("textSegments"), 14f)
+      primary.visibility = VISIBLE
+      applyMarketTextStyle(
+        secondary, null, 12f, 16, "regular",
+        metricColor(theme, metric.optString("secondaryTone", "secondary")), alignment,
+      )
+      secondary.text = marketText(
+        metric.optString("secondaryText"), metric.optJSONArray("secondaryTextSegments"), 12f,
+      )
+      secondary.visibility = if (secondary.text.isEmpty()) GONE else VISIBLE
+    }
+  }
+
   private fun showText(view: TextView, text: String, lines: Int) {
     view.text = text
     view.maxLines = lines
@@ -146,18 +199,27 @@ internal class NativeListMarketRowView(context: ThemedReactContext, fonts: Nativ
     emitAction(key, view, source, slot, target)
   }
 
-  override fun accessibilityText(item: NativeListItem) =
-    item.json.optString(
-      "accessibilityLabel",
+  override fun accessibilityText(item: NativeListItem): String {
+    if (item.json.has("accessibilityLabel") && !item.json.isNull("accessibilityLabel")) {
+      return item.json.optString("accessibilityLabel")
+    }
+    val metrics = item.json.optJSONArray("metrics")?.takeIf { it.length() in 2..3 }
+    val values = if (metrics != null) {
+      (0 until metrics.length()).flatMap { index ->
+        listOf(metricPrimaryViews[index], metricSecondaryViews[index])
+          .filter { it.visibility == VISIBLE }
+          .map { it.text.toString() }
+      }
+    } else {
       listOf(
-          item.json.optString("title"),
-          item.json.optString("subtitle"),
-          item.json.optString("price"),
-          item.json.optJSONObject("change")?.optString("text") ?: "",
-        )
-        .filter(String::isNotEmpty)
-        .joinToString(", "),
-    )
+        item.json.optString("price"),
+        item.json.optJSONObject("change")?.optString("text") ?: "",
+      )
+    }
+    return (listOf(item.json.optString("title"), item.json.optString("subtitle")) + values)
+      .filter(String::isNotEmpty)
+      .joinToString(", ")
+  }
 
   override fun bindContent(
     item: NativeListItem,
@@ -183,7 +245,8 @@ internal class NativeListMarketRowView(context: ThemedReactContext, fonts: Nativ
       if (item.json.optJSONArray("badges")?.optJSONObject(index)?.optJSONObject("icon") == null)
         badgeSlots[index].recycle()
     }
-    for (view in listOf(title, subtitle, tertiary) + trailingViews) {
+    for (view in listOf(title, subtitle, tertiary) + trailingViews +
+      metricPrimaryViews + metricSecondaryViews) {
       view.text = ""
       view.visibility = GONE
       view.maxLines = 1
@@ -217,7 +280,13 @@ internal class NativeListMarketRowView(context: ThemedReactContext, fonts: Nativ
   }
 
   override fun bindMarketQuote(item: NativeListItem, theme: JSONObject?) {
-    if (retainBoundItem(item)) bindQuote(item, theme)
+    if (retainBoundItem(item)) {
+      item.json.optJSONArray("metrics")?.takeIf { it.length() in 2..3 }?.let {
+        updateMetricLabels(it, theme)
+      }
+      bindQuote(item, theme)
+      contentDescription = accessibilityText(item)
+    }
   }
 
   private fun cancelMarketHold() {
@@ -304,6 +373,7 @@ internal class NativeListMarketRowView(context: ThemedReactContext, fonts: Nativ
     longPressFired = false
     leadingFrame.recycle()
     badgeSlots.forEach { it.recycle() }
+    (metricPrimaryViews + metricSecondaryViews).forEach { it.text = "" }
     imageSignature = ""
   }
 
@@ -561,10 +631,12 @@ internal class NativeListMarketRowView(context: ThemedReactContext, fonts: Nativ
     )
     // OneKey patch: retain the source gap without changing other templates.
     // addView(mainColumn, weighted())
+    val metrics = item.json.optJSONArray("metrics")?.takeIf { it.length() in 2..3 }
     addView(
       mainColumn,
       weighted().apply {
-        marginEnd = dp(style?.optDouble("contentTrailingGap", 0.0)?.roundToInt() ?: 0)
+        if (metrics != null) weight = 2f
+        else marginEnd = dp(style?.optDouble("contentTrailingGap", 0.0)?.roundToInt() ?: 0)
       },
     )
     titleLine.packsChildrenAtStart = true
@@ -748,7 +820,11 @@ internal class NativeListMarketRowView(context: ThemedReactContext, fonts: Nativ
     }
     trailingColumn.orientation = HORIZONTAL
     trailingColumn.gravity = Gravity.END or Gravity.CENTER_VERTICAL
-    addView(trailingColumn, wrap())
+    if (metrics != null) {
+      bindMetrics(metrics, theme, style?.optDouble("trailingGap", 8.0)?.roundToInt() ?: 8)
+    } else {
+      addView(trailingColumn, wrap())
+    }
     bindQuote(item, theme)
     val nextImageSignature =
       nativeListCanonical(
@@ -861,18 +937,6 @@ internal class NativeListMarketRowView(context: ThemedReactContext, fonts: Nativ
         )
       }
     }
-    contentDescription =
-      item.json.optString(
-        "accessibilityLabel",
-        listOf(
-            item.json.optString("title"),
-            item.json.optString("subtitle"),
-            item.json.optString("price"),
-            changeData.optString("text"),
-          )
-          .filter(String::isNotEmpty)
-          .joinToString(", "),
-      )
   }
 
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
@@ -912,7 +976,7 @@ internal class NativeListMarketRowView(context: ThemedReactContext, fonts: Nativ
         ?.has("contentVerticalAlignment") == true
     if (item.type == "market" && item.json.optJSONObject("style") != null) {
       // OneKey patch: preserve Yoga's half-pixel centering for Market columns and badges.
-      for (column in listOf(leadingFrame, mainColumn, trailingColumn)) {
+      for (column in listOf(leadingFrame, mainColumn, trailingColumn) + metricColumns) {
         if (!hasContainerAlignment && column.parent === this && column.visibility != GONE) {
           column.offsetTopAndBottom((height - column.height + 1) / 2 - column.top)
         }

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

@@ -50,16 +50,17 @@ internal fun nativeListLeadingVisualOverhangsFrame(
 ): Boolean = kind == "token" && sourceCount > 1 || hasCornerIcon || overlayCount > 0
 
 /**
- * Whether an Activity row host clips its children and padding for this bind.
- * One row view serves both the legacy row and the rich (`amounts`) row and is
- * reused across binds, so clipping is derived from the bound item alone and
- * applied on every bind: only a legacy row whose leading visual lays a badge
- * past its frame ([nativeListLeadingVisualOverhangsFrame], OK-66071) opts out;
- * a rich row keeps Android's default clipping even when the view it reuses
- * last showed such a badge.
+ * Whether an Activity row host (and, for a rich `amounts` row, the details view
+ * with its nested columns) clips its children and padding for this bind. One
+ * row view serves both the legacy row and the rich row and is reused across
+ * binds, so clipping is derived from the bound item alone and applied on every
+ * bind: a row whose bound leading visual lays a badge past its frame
+ * ([nativeListLeadingVisualOverhangsFrame]) opts out, whether that visual sits
+ * on the host (legacy row, OK-66071) or on the details view (rich row,
+ * OK-66275); a row without such a badge clips again even when the view it
+ * reuses last showed one.
  */
-internal fun nativeListActivityHostClips(rich: Boolean, leadingOverhangs: Boolean): Boolean =
-  rich || !leadingOverhangs
+internal fun nativeListActivityHostClips(leadingOverhangs: Boolean): Boolean = !leadingOverhangs
 
 internal data class NativeListSlotFrame(val x: Int, val y: Int, val width: Int, val height: Int)
 

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

@@ -2943,6 +2943,7 @@ class NativeListView(
           previous.type == "market" &&
           changes.keys().asSequence().all(MARKET_QUOTE_FIELDS::contains)
         val merged = NativeListItem.parse(mergeRow(previous.json, changes))
+        marketQuoteOnly = marketQuoteOnly && hasSameMarketMetricStructure(previous, merged)
         nextItems[index] = merged
         if (changes.has("selected")) {
           if (changes.optBoolean("selected")) selected.add(merged.key) else selected.remove(merged.key)
@@ -4838,6 +4839,7 @@ class NativeListView(
       "priceSegments",
       "change",
       "accessibilityLabel",
+      "metrics",
     )
     private const val SECTION_INDEX_CONTENT_INSET_DP = 16
     private const val SECTION_INDEX_RAIL_WIDTH_DP = 32

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

@@ -5,10 +5,12 @@ import org.junit.Test
 
 class NativeListActivityHostClipPolicyTest {
   // One Activity row view serves legacy and rich rows and is reused across
-  // binds. A legacy row with an overhanging network badge switches the host's
-  // clipping off (OK-66071); the next bind must derive clipping afresh, so a
-  // rich row reusing that view clips again instead of drawing its details over
-  // a neighbouring row (PR #185 review).
+  // binds. A row with an overhanging network badge switches the host's
+  // clipping off, whether the badge sits on the host's visual (legacy row,
+  // OK-66071) or on the details view's visual (rich row, OK-66275); the next
+  // bind must derive clipping afresh, so a row without a badge reusing that
+  // view clips again instead of drawing over a neighbouring row (PR #185
+  // review).
   @Test
   fun rebindSequenceDerivesClippingFromEachBoundItem() {
     data class Bind(val name: String, val rich: Boolean, val leadingOverhangs: Boolean, val clips: Boolean)
@@ -17,13 +19,17 @@ class NativeListActivityHostClipPolicyTest {
       Bind("legacy row, plain token", rich = false, leadingOverhangs = false, clips = true),
       Bind("legacy row, network badge", rich = false, leadingOverhangs = true, clips = false),
       Bind("rich row reusing the badge row's view", rich = true, leadingOverhangs = false, clips = true),
+      // The app's history rows carry `amounts`, so their badge lives on the
+      // details view's leading visual: a rich row with such a badge must stop
+      // clipping too (OK-66275).
+      Bind("rich row, network badge in details", rich = true, leadingOverhangs = true, clips = false),
       Bind("legacy row, badge again", rich = false, leadingOverhangs = true, clips = false),
       Bind("legacy row, hidden leading", rich = false, leadingOverhangs = false, clips = true),
     )
 
     assertEquals(
       binds.map(Bind::clips),
-      binds.map { nativeListActivityHostClips(rich = it.rich, leadingOverhangs = it.leadingOverhangs) },
+      binds.map { nativeListActivityHostClips(leadingOverhangs = it.leadingOverhangs) },
     )
   }
 }

package/docs/ROW_TEMPLATES.md

@@ -182,8 +182,12 @@ separately from source implementation in STYLE_SPEC §9.
   with at most 32 unique keyed entries. Each entry supports a leading visual,
   tone, primary/secondary text and subscript segments. The title supports at
   most four keyed badges. `descriptionActionKey` emits a description action.
-  `presentation: 'table'` allocates equal identity/amount columns and an
-  optional fee column; `stacked` keeps right-aligned amounts beside identity.
+  `presentation: 'table'` allocates identity (including the leading visual and
+  its gap), amounts and optional fee in a stable `1:1:0.6` ratio after column
+  gaps. Without fee, identity and amounts have equal widths. Amount content
+  stays start-aligned; native fee content stays end-aligned, while Web retains its
+  existing start alignment. Fee text length and leading visibility do not move
+  the amount column. `stacked` keeps right-aligned amounts beside identity.
   `fee.hidden` reserves its column while hiding its content. The Web rich
   Activity renderer uses these fields and the same `hideLeading` visibility.
 

package/docs/SPEC.md

@@ -375,6 +375,33 @@ migration itself does not change any other protocol field.
 
 ## Lifecycle and concurrency
 
+### Updates before native host binding
+
+Status: implemented in local source, unreleased. The delayed-host regression fails
+on the previous wrapper and passes with this change; 438 package JS/Web tests and
+the package type check pass. This local JavaScript revision is verified with real
+iOS Fabric/UICollectionView rendering on an iPad simulator: delayed-ref,
+parent-layout-before-ref without an artificial delay, and host-ready control
+scenarios all retain the three complete rows after a later single-row update.
+The actual Home list also recovered all six rows after the task-specific Metro
+reload. Earlier natural re-entry evidence included development Metro bundle
+re-requests, so it does not establish a menu-only trigger or a Sui-specific natural
+reproduction. Android device acceptance remains unverified.
+
+Valid snapshots and row patches accepted before the native host is available MUST
+retain the latest owned logical state. When that host binds, its rows MUST reflect
+all accepted updates that are eligible for presentation, including updates to rows
+that do not change again afterward. Later single-row updates MUST NOT leave other
+rows at their initial placeholders. Existing disclosure measurement gates and
+snapshot replacement semantics still apply. Once the host is ready, ordinary row
+patches MUST remain incremental rather than requiring a complete snapshot for each
+patch. This contract does not add a public prop, method, or Nitro ABI field.
+
+Conformance covers multiple pre-bind patch batches, newer complete prop and
+imperative snapshots, rejected updates, equivalent prop clones after slot layout,
+selection state, repeated callbacks, distinct replacement hosts, and incremental
+single-row updates after binding.
+
 Full binding must work without a preceding recycle callback, including
 style set/change/clear and content A → B. A binding epoch invalidates stale
 image callbacks and action anchors. Recycling/disposal releases pending work
@@ -751,7 +778,14 @@ Host clipping is per-bind state. A row view that serves several row shapes
 (the Android Activity view serves the legacy row and the rich `amounts` row) is
 reused across binds, so each bind MUST derive clipping from the item it binds
 (`nativeListActivityHostClips`): a view that last showed an overhanging badge
-clips again when it is rebound to a row without one.
+clips again when it is rebound to a row without one. The rule follows the
+visual, not the row shape: the rich row renders its leading visual on the
+details view, so that view and every column between the visual and the host
+stop clipping too, and the host derives its own clipping from the details
+view's visual (`leadingOverhangs`, OK-66275). Before this rule the rich branch
+forced the host's clipping back on and left the details view at Android's
+defaults, so the app's history rows (which always carry `amounts`) still showed
+the badge cut at the bottom-right after the legacy branch had been fixed.
 
 The row's own shape still clips on every platform: iOS masks the cell to its
 corner radius (`masksToBounds`), Web keeps the row `overflow: hidden`, and
@@ -788,9 +822,10 @@ over the badge. The per-source geometry is one pure function on Android
 `NativeListLeadingVisual.layoutSubviews` on iOS; both restore the stacking
 order by role on every bind because slots are reused across roles.
 
-The Android Activity renderer also applies the badge-overhang rule above
-(`requestsUnclippedHost` stops the content row and the row padding clipping),
-so the history rows' network badges render whole instead of cut flat.
+The Android Activity renderer also applies the badge-overhang rule above on
+both of its branches (`requestsUnclippedHost` stops the legacy content row, the
+rich details view with its columns, and the row padding clipping), so the
+history rows' network badges render whole instead of cut flat.
 
 ## Failures, fallback and limits
 
@@ -1442,9 +1477,14 @@ secondary text and subscript text segments. Segments are caller-formatted and
 never interpreted as numbers by NativeList. Omission preserves the legacy tree.
 
 `presentation: stacked` places the amount lines after the identity column and
-right-aligns them; `table` uses equal identity/amount columns, left-aligns amount
-lines and adds an optional trailing fee column. Fee supports label, primary and
-secondary text with their own segments; `hidden` preserves its column width
+right-aligns them. In `table`, the identity column includes its leading visual
+and gap; identity, amounts and an optional fee use stable widths in the ratio
+`1:1:0.6` after inter-column gaps. Without fee, identity and amounts split the
+remaining width equally. Amount content stays start-aligned within its column;
+native fee content stays end-aligned; Web retains its existing start alignment.
+Fee text length and leading visibility cannot move the amount column. These
+native widths match the existing Web table layout. Fee supports label, primary
+and secondary text with their own segments; `hidden` preserves its column width
 while hiding its contents. Up to four uniquely keyed title badges use declared
 tones. `descriptionActionKey` makes only the description emit that action with
 source `description`; footer actions retain their existing source/keys and
@@ -1465,6 +1505,15 @@ baseline, matching NumberSizeableText), badge tone/clear, hidden fee, disabled
 actions, description anchors, dark/RTL/font scaling and explicit/automatic height.
 
 
+Table regression acceptance additionally measures amount-column start, width and
+center across short/long/hidden fee, leading visibility, 1/2/6/32 amount lines and
+table/stacked reuse. Android DataRow primary and secondary groups honor their
+resolved text-role alignment (role style first, then column alignment), including
+start/center/end and styled/unstyled reuse. The secondary-prefix gap is present
+only when that prefix is visible; legacy linear rendering is unchanged. The UIKit
+regression explicitly forces each renderer view's direction; React Native/Fabric
+host direction propagation and real App RTL remain unverified.
+
 ### Android ancestor scroll distance
 
 Threshold hysteresis combines the primary RecyclerView's actual consumed scroll
@@ -1642,6 +1691,51 @@ row/presentation recycling, strict validation, native dictionary safe-ignore,
 header/body geometry, 100 quote ticks preserving nodes with zero geometry reads,
 then a real complex Market table before expanding to all five families.
 
+### Native Market metric columns
+
+Status: implemented in local source, unreleased; native runtime verification
+pending. A `market` row may supply two or three ordered, uniquely
+keyed text columns through `metrics`, typed as a `Pick<DataColumn, ...>` of
+the supported text fields. Each column uses
+the text subset of `DataColumn`: key, primary text and segments, optional
+secondary text and segments, weight, alignment, and primary/secondary tone.
+Icon and secondary-leading fields are rejected in development and stripped by
+the existing production decoration sanitizer.
+Keys are nonempty and callers format all text. The row keeps its required
+`price` and `change` fields as compact fallbacks. When `metrics` is present,
+iOS and Android display the existing leading action, visual, title, subtitle,
+and Market badges, then the metric columns in place of the compact price and
+change block. The metrics are authoritative for this native presentation; the
+SDK does not infer their values from the fallback fields or product data.
+The default native accessibility label includes the title and subtitle followed
+by the displayed metric text, primary then secondary, in column order. It
+updates with each quote. An explicit row accessibility label takes precedence.
+The metrics use their own text tones and alignment, with both lines aligned
+the same way; omitted alignment defaults to `end`. Existing change block
+width, height, and corner radius do not
+apply to metric columns. The title content receives a relative weight of two;
+metric columns receive their declared `weight` (1...3, default one) after the
+row's existing action, visual, padding, and gaps take their space. The SDK
+does not choose a mode from screen width. Without `metrics`, all platforms
+retain their existing compact Market presentation. Web ignores `metrics` and
+continues using `webTable` when supplied.
+
+Metric values travel in the existing row snapshot JSON and do not change the
+Nitro ABI, row key, action keys, badge anchors, or scroll ownership. Full
+snapshots may add, replace, or omit `metrics`; omission restores compact mode.
+An explicit patch with a valid two- or three-column array replaces metrics,
+while an omitted patch field leaves them unchanged. A full snapshot is used
+to remove metrics from a wide row; this contract adds no null patch meaning.
+Binding and recycling clear inactive metric and compact views in both
+directions, including changes between two and three columns, so reused rows
+cannot show stale text or targets. Metric fields contain no new action target;
+Market badge, leading action, press, press-in, and long-press behavior remains
+owned by the existing Market row. Conformance requires validation and patch
+tests, native bind/reuse and action-anchor checks, then consuming App device
+checks at narrow and wide list widths. Source and unit tests alone do not
+establish native layout acceptance.
+
+
 
 ### Web grid fractional column geometry