@onekeyfe/react-native-native-list 6.7.0-alpha.430 → 6.7.0-alpha.435

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

@@ -31,8 +31,6 @@ internal class NativeListIdentityRowView(context: ThemedReactContext, fonts: Nat
   private val titleLine = PackedTitleLineLayout(context)
   private val title = NativeListTextView(context)
   private val titleIcon = OneKeyIconView(context)
-  private val titleLeadingIcon = OneKeyIconView(context)
-  private val titleSegments = NativeListTitleSegmentsView(context)
   private var titleImage: NativeListImageSlot? = null
   private val subtitle = NativeListTextView(context)
   private val tertiary = NativeListTextView(context)
@@ -111,13 +109,8 @@ internal class NativeListIdentityRowView(context: ThemedReactContext, fonts: Nat
     mainColumn.gravity = Gravity.CENTER_VERTICAL
     titleLine.orientation = HORIZONTAL
     titleLine.gravity = Gravity.CENTER_VERTICAL
-    titleLine.addView(titleLeadingIcon, LayoutParams(dp(16), dp(16)).apply { marginEnd = dp(6) })
     titleLine.addView(title, LayoutParams(0, LayoutParams.WRAP_CONTENT, 1f))
-    titleLine.addView(titleSegments, LayoutParams(0, LayoutParams.WRAP_CONTENT, 1f))
     titleLine.addView(titleIcon, LayoutParams(dp(20), dp(20)).apply { marginStart = dp(4) })
-    titleLine.titleChild = title
-    titleLeadingIcon.visibility = GONE
-    titleSegments.visibility = GONE
     titleLine.addView(badgeLine)
     trailingColumn.onAction = { key, view, slot, target ->
       emitAction(key, view, "trailingAccessory", slot, target, trailingColumn.anchorInset(view))
@@ -230,12 +223,6 @@ internal class NativeListIdentityRowView(context: ThemedReactContext, fonts: Nat
     titleIcon.visibility = GONE
     titleIcon.contentDescription = null
     titleIcon.setOnClickListener(null)
-    titleLeadingIcon.visibility = GONE
-    titleLeadingIcon.contentDescription = null
-    titleSegments.visibility = GONE
-    titleSegments.clearRuns()
-    titleSegments.layoutParams = LayoutParams(0, LayoutParams.WRAP_CONTENT, 1f)
-    titleLine.titleChild = title
     for (view in listOf(title, subtitle, tertiary, badgeLine)) {
       view.text = ""
       view.visibility = GONE
@@ -356,46 +343,6 @@ internal class NativeListIdentityRowView(context: ThemedReactContext, fonts: Nat
     }
     // Legacy: overhanging selector icons/checkboxes must not be clipped by row padding.
     if (trailingColumn.parent === this && trailingColumn.requestsUnclippedHost) clipToPadding = false
-    if (titleSegments.visibility == VISIBLE) bindTitleRuns(item, theme)
-  }
-
-  // Runs take the title's final text appearance and color unless they set
-  // their own tone or weight.
-  private fun bindTitleRuns(item: NativeListItem, theme: JSONObject?) {
-    titleSegments.typeface = title.typeface
-    titleSegments.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, title.textSize)
-    titleSegments.includeFontPadding = title.includeFontPadding
-    titleSegments.letterSpacing = title.letterSpacing
-    titleSegments.opticalOffsetY = title.opticalOffsetY
-    titleSegments.maxLines = 1
-    titleSegments.ellipsize = TextUtils.TruncateAt.END
-    TextViewCompat.setLineHeight(titleSegments, title.lineHeight)
-    val baseColor = title.currentTextColor
-    titleSegments.setTextColor(baseColor)
-    val segments = item.json.optJSONArray("titleSegments") ?: return
-    val runs =
-      (0 until segments.length()).mapNotNull { index ->
-        val segment = segments.optJSONObject(index) ?: return@mapNotNull null
-        NativeListTitleSegmentsView.Run(
-          text = segment.optString("text"),
-          typeface =
-            when (segment.optString("fontWeight")) {
-              "medium" -> fonts.medium(context)
-              "regular" -> fonts.regular(context)
-              else -> null
-            },
-          color =
-            when (segment.optString("tone")) {
-              "secondary" -> color(theme, "secondaryText", "#0000009B")
-              "primary" -> color(theme, "primaryText", "#000000DF")
-              else -> baseColor
-            },
-          shrink = segment.optBoolean("shrink", false),
-          maxWidthRatio =
-            if (segment.has("maxWidthRatio")) segment.optDouble("maxWidthRatio").toFloat() else null,
-        )
-      }
-    titleSegments.setRuns(runs, item.json.optString("title"))
   }
 
   private fun styleGap(column: LinearLayout, gap: Int) {
@@ -529,8 +476,7 @@ internal class NativeListIdentityRowView(context: ThemedReactContext, fonts: Nat
         val imageWidth = titleImage?.view?.takeIf { it.visibility == VISIBLE }?.let {
           it.layoutParams.width + dp(4)
         } ?: 0
-        val icon = (if (titleIcon.visibility == VISIBLE) dp(24) else 0) + imageWidth +
-          (if (titleLeadingIcon.visibility == VISIBLE) dp(22) else 0)
+        val icon = (if (titleIcon.visibility == VISIBLE) dp(24) else 0) + imageWidth
         (inner * ratio).roundToInt()
           .minus(leading.width + leading.marginEnd + icon)
           .coerceAtLeast(0)
@@ -541,10 +487,9 @@ internal class NativeListIdentityRowView(context: ThemedReactContext, fonts: Nat
     super.onMeasure(widthMeasureSpec, heightMeasureSpec)
     if (titleSuffixLabels.isNotEmpty()) {
       val fixedWidth =
-        (0 until titleLine.childCount).sumOf { index ->
+        (1 until titleLine.childCount).sumOf { index ->
           val view = titleLine.getChildAt(index)
-          if (view.visibility == GONE || view === titleLine.titleChild ||
-            titleSuffixLabels.any { it === view }) 0
+          if (view.visibility == GONE || titleSuffixLabels.any { it === view }) 0
           else {
             val margins = view.layoutParams as MarginLayoutParams
             view.measuredWidth + margins.leftMargin + margins.rightMargin
@@ -808,30 +753,6 @@ internal class NativeListIdentityRowView(context: ThemedReactContext, fonts: Nat
     titleLine.packsChildrenAtStart = true
     title.ellipsize = TextUtils.TruncateAt.END
     showText(title, item.json.optString("title"), item.json.optInt("titleLines", 1))
-    // Runs replace the drawn title except where `title` itself is highlighted;
-    // their content is bound once the title style is final.
-    if ((item.json.optJSONArray("titleSegments")?.length() ?: 0) > 0 &&
-      (item.json.optJSONArray("titleMatch")?.length() ?: 0) == 0
-    ) {
-      title.visibility = GONE
-      titleSegments.visibility = VISIBLE
-      titleLine.titleChild = titleSegments
-    }
-    item.json.optJSONObject("titleLeadingIcon")?.let { icon ->
-      titleLeadingIcon.iconName = icon.optString("name")
-      titleLeadingIcon.glyphSizeDp = 16
-      titleLeadingIcon.useSourceScale = sourceScale
-      titleLeadingIcon.tintColor = safeColor(
-        icon.optString("tintColor").takeIf(String::isNotEmpty),
-        color(theme, "iconSubdued", "#00000072"),
-      )
-      titleLeadingIcon.contentDescription =
-        icon.optString("accessibilityLabel").takeIf(String::isNotEmpty)
-      titleLeadingIcon.importantForAccessibility =
-        if (titleLeadingIcon.contentDescription == null) View.IMPORTANT_FOR_ACCESSIBILITY_NO
-        else View.IMPORTANT_FOR_ACCESSIBILITY_YES
-      titleLeadingIcon.visibility = VISIBLE
-    }
     item.json.optJSONArray("titleSuffixes")?.let { suffixes ->
       for (index in 0 until suffixes.length()) {
         val suffix = suffixes.optJSONObject(index) ?: continue

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

@@ -109,9 +109,6 @@ internal class PackedTitleLineLayout(context: android.content.Context) : LinearL
   var packsChildrenAtStart = false
   // OneKey patch: optional cap for the Market subtitle's localized name.
   var leadingTextMaxWidth = Int.MAX_VALUE
-  // The text view that takes what the other children leave; the first child
-  // when unset, so a glyph may precede the title once this names it.
-  var titleChild: TextView? = null
 
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
     if (!packsChildrenAtStart || childCount < 2) {
@@ -119,13 +116,13 @@ internal class PackedTitleLineLayout(context: android.content.Context) : LinearL
       return
     }
 
-    val title = titleChild?.takeIf { it.parent === this } ?: getChildAt(0)
+    val title = getChildAt(0)
     val widthMode = MeasureSpec.getMode(widthMeasureSpec)
     val widthSize = MeasureSpec.getSize(widthMeasureSpec)
     var accessoryWidth = 0
-    for (index in 0 until childCount) {
+    for (index in 1 until childCount) {
       val child = getChildAt(index)
-      if (child === title || child.visibility == GONE) continue
+      if (child.visibility == GONE) continue
       measureChildWithMargins(
         child,
         widthMeasureSpec,

package/docs/ROW_TEMPLATES.md

@@ -54,14 +54,7 @@ separately from source implementation in STYLE_SPEC §9.
 
 - **Use:** an identifiable asset, account, wallet, network or setting.
 - **Required data:** `leading`, `title`; optional `subtitle`, `tertiary`, `badges`,
-  `trailing`, `leadingAction`, `titleIcon`, Web-only `secondaryTitleIcon`, `titleSegments`,
-  `titleLeadingIcon`, match ranges and structured subtitle segments.
-- **Title runs:** optional `titleSegments` draw 1...4 runs with their own tone and
-  weight in place of `title`, on one line. One run may shrink; the others keep
-  their width under an optional `maxWidthRatio` cap. `title` stays the spoken
-  text. See SPEC.md.
-- **Leading title icon:** optional `titleLeadingIcon` draws a 16-point glyph 6
-  points before the title; it is decorative unless labelled.
+  `trailing`, `leadingAction`, `titleIcon`, Web-only `secondaryTitleIcon`, match ranges and structured subtitle segments.
 - **Static title icon:** optional 20-point icon immediately after the title with
   a 4-point gap. It has no click action; an optional Web `hoverActionKey`
   emits an icon-anchored tooltip request on hover or touch. A trailing `button` is the fixed small

package/docs/SPEC.md

@@ -188,93 +188,6 @@ and Web acceptance must cover narrow addresses, dynamic type/fonts, long press
 versus tap, keyboard interaction, and the horizontal warning border. Source or
 build success alone is not runtime evidence.
 
-### Identity title segments and leading title icon
-
-Status: implemented in source for iOS, Android and Web; device and Web runtime
-acceptance is pending. These fields travel in snapshot/patch JSON and do not
-change the Nitro ABI. They serve recipient rows whose title is a wallet and an
-account name in two styles, and address book rows marked by an icon before the
-name.
-
-`identity.titleSegments` is an optional list of 1...4 runs drawn on the title
-line in place of `title`:
-
-```ts
-titleSegments?: readonly {
-  text: string;
-  tone?: 'primary' | 'secondary';
-  fontWeight?: 'regular' | 'medium';
-  shrink?: boolean;
-  maxWidthRatio?: number; // (0, 1]
-}[];
-```
-
-- `title` stays required. It is the spoken label and the fallback text, so it
-  carries the same words as the runs; every renderer exposes `title`, not the
-  runs, to accessibility.
-- Each run uses the title's font family, size and line height, including
-  `style.title` and the configured fonts. `tone` picks the primary or secondary
-  text color and defaults to the title color; `fontWeight` picks the weight and
-  defaults to the title weight.
-- The runs share one line. `titleLines` and `style.title.lines` do not apply.
-- Layout. The runs take the whole width the title line leaves after the
-  leading title icon and the title accessories (title icon, title image,
-  suffixes, badges), so those accessories sit at the line's end rather than
-  right after the text. W is that width:
-  1. A run's base width is its natural width, capped at `maxWidthRatio x W`
-     when given. A run longer than its cap truncates at the cap with a tail
-     ellipsis.
-  2. At most one run sets `shrink: true`. Every other run keeps its base width.
-  3. The shrinking run gets `min(base, W - sum of the other runs)` and
-     truncates with a tail ellipsis; it may shrink to zero width.
-  4. When the runs that do not shrink exceed W on their own, the line is cut at
-     its end. Native renderers end the last visible run with an ellipsis; Web
-     clips it. This divergence is accepted: callers avoid the case with
-     `maxWidthRatio`.
-- Development validation rejects an empty or oversized list, blank or
-  oversized text (the 4096-code-unit text bound), unknown keys, tones or
-  weights, a ratio outside `(0, 1]`, more than one shrinking run, `titleMatch`
-  on the same row (its ranges index `title`), and
-  `presentation: 'walletSidebar'`. Production treats the runs as decoration:
-  an invalid list is dropped and the row shows `title`. Renderers draw `title`
-  instead of runs on a row that also has `titleMatch`, and ignore runs and the
-  leading icon with `presentation: 'walletSidebar'`.
-
-`identity.titleLeadingIcon` is an optional `{ name, tintColor?,
-accessibilityLabel? }`: a 16-point glyph before the title text or its runs,
-with a 6-point gap, vertically centered on the title line. It keeps its 16
-points: a long title, or its shrinking run, truncates first. The name comes from
-the same closed icon set as `titleIcon`; an unmapped name leaves an empty
-16-point slot. `tintColor` is a hex `#RRGGBB` or `#RRGGBBAA` color and defaults
-to the theme's `iconSubdued`. Without `accessibilityLabel` the glyph is hidden
-from accessibility. It has no action of its own. Development validation
-rejects unknown keys, a blank name, a malformed color and
-`presentation: 'walletSidebar'`; production drops an invalid icon.
-
-Both fields are identity patch fields. Omission in a full snapshot removes
-them; omission in a patch keeps the current value. Rebind and recycle remove the
-previous runs and glyph, so a row without them never shows another row's.
-
-| Platform | Title runs | Leading icon |
-| --- | --- | --- |
-| iOS | `NativeListTitleSegmentsLabel` draws the runs at the widths that `NativeListTitleSegmentLayout.swift` allocates for its bounds; it fills the title row in place of the row's filler. | `NativeListIconImageView`, first in the title row stack. A plain title beside it drops below required horizontal compression resistance, as beside `titleIcon`, so the title truncates before the glyph narrows. |
-| Android | `NativeListTitleSegmentsView`, a `TextView` whose text is rebuilt for each measured width from `NativeListTitleSegmentLayout.kt` and which measures to the width it is offered. `PackedTitleLineLayout.titleChild` names the flexible title view, so a view may precede it. | `OneKeyIconView`, first in the title line. |
-| Web | A flex line that fills the title line: the shrinking run is `flex: 0 1 auto; min-width: 0`, the others `flex: 0 0 auto` with a `max-width` percentage for a cap. | An icon element before the title text. |
-
-Conformance: `src/validation.ts` (`assertTitleSegments`,
-`assertTitleLeadingIcon`, production sanitizing) with `validation.test.ts`;
-`src/web/templates/IdentityRowRenderer.ts` with `IdentityTitleRunsWeb.test.ts`
-(run styles, flex behavior, accessibility, rebind);
-`ios/NativeListTitleSegmentLayout.swift` with the SwiftPM
-`NativeListTitleSegmentLayoutTests`; the iOS leading glyph beside a long plain
-title with the XCTest `NativeListIdentityTitleIconLayoutTests`;
-`NativeListTitleSegmentLayout.kt` with the
-JVM `NativeListTitleSegmentLayoutTest`. iOS, Android and Web runtime acceptance is pending: recipient rows
-with long wallet and account names in both truncation directions, narrow rows,
-dark mode, dynamic type and configured fonts, and recycling between rows with
-and without runs or a leading icon. Source and build success alone are not
-runtime evidence.
-
 ### DeFi position row controls
 
 Status: implemented in local source, unreleased. Focused validation and Web
@@ -852,6 +765,26 @@ Existing geometry/typography differences are recorded in
 them. iOS uses UICollectionView, Android RecyclerView, and Web a windowed DOM
 engine. See [DESIGN.md](DESIGN.md) for their current ownership boundaries.
 
+### iOS account-selector trailing width (OK-65638)
+
+Status: implemented. Manual consuming-app verification on an iOS Simulator
+reported normal balance rendering after a local native rebuild. Automated
+XCTest execution and broader device acceptance are tracked separately.
+
+For an `identity` row with `presentation: 'accountSelector'`, an empty trailing
+collection or a spinner-only accessory MUST leave the remaining horizontal
+space available to the title and subtitle column. A short title MUST NOT cause
+the balance subtitle to collapse while unused row width remains. The existing
+gap before the trailing column and the shortened address's compression priority
+remain unchanged; content may still truncate when the row is actually too narrow.
+Visible controls keep their intrinsic width without introducing required-width
+conflicts. Rebinding between empty, spinner and single-icon states MUST release
+the previous row's width constraint.
+
+`NativeListAccountSelectorLayoutTests` covers balance/address geometry and
+control widths on production UIKit cells, including rebinds. Android and Web
+keep their existing layout and public interfaces.
+
 ### Android section-index attachment
 
 When `sectionIndex.centeredInWindow` is enabled, the Android index rail moves

package/ios/NativeListIdentityRenderer.swift

@@ -81,8 +81,7 @@ final class NativeListIdentityCell: NativeListRendererCell {
       let title = NativeListResolvedText(
         item.data.string("title"), style: style.dictionary("title"), size: 16,
         weight: .medium, color: .black, lineHeight: 24,
-        lines: item.data.dictionaries("titleSegments").isEmpty
-          ? item.data.int("titleLines", default: 1) : 1, fonts: fonts)
+        lines: item.data.int("titleLines", default: 1), fonts: fonts)
       let subtitle = NativeListResolvedText(
         item.data.string("subtitle"), style: style.dictionary("subtitle"), size: 14,
         color: .black, lineHeight: 20,
@@ -111,12 +110,6 @@ final class NativeListIdentityCell: NativeListRendererCell {
   private let titleRowStack = UIStackView()
   private let titleLabel = NativeListTextLabel()
   private let titleIconView = NativeListIconImageView()
-  private let titleLeadingIconView = NativeListIconImageView()
-  private let titleSegmentsLabel = NativeListTitleSegmentsLabel()
-  // Runs, when shown, take the title's place in the title row.
-  private var visibleTitleView: UIView {
-    titleSegmentsLabel.isHidden ? titleLabel : titleSegmentsLabel
-  }
   private var titleImageSlot: NativeListImageSlot?
   private var titleImageConstraints: [NSLayoutConstraint] = []
   // Absorbs the title row's slack so the title keeps its intrinsic width and the
@@ -177,9 +170,7 @@ final class NativeListIdentityCell: NativeListRendererCell {
     mainStack.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
     titleRowStack.axis = .horizontal
     titleRowStack.alignment = .center
-    titleRowStack.addArrangedSubview(titleLeadingIconView)
     titleRowStack.addArrangedSubview(titleLabel)
-    titleRowStack.addArrangedSubview(titleSegmentsLabel)
     titleRowStack.addArrangedSubview(titleIconView)
     titleRowStack.addArrangedSubview(badgeLabel)
     titleRowStack.addArrangedSubview(titleRowFiller)
@@ -194,18 +185,6 @@ final class NativeListIdentityCell: NativeListRendererCell {
     ])
     titleIconView.contentMode = .scaleAspectFit
     titleIconView.setContentHuggingPriority(.required, for: .horizontal)
-    titleLeadingIconView.translatesAutoresizingMaskIntoConstraints = false
-    let leadingIconWidth = titleLeadingIconView.widthAnchor.constraint(equalToConstant: 16)
-    leadingIconWidth.priority = UILayoutPriority(999)
-    NSLayoutConstraint.activate([
-      leadingIconWidth,
-      titleLeadingIconView.heightAnchor.constraint(equalToConstant: 16),
-    ])
-    titleLeadingIconView.contentMode = .scaleAspectFit
-    titleLeadingIconView.setContentHuggingPriority(.required, for: .horizontal)
-    titleLeadingIconView.setContentCompressionResistancePriority(.required, for: .horizontal)
-    titleLeadingIconView.isHidden = true
-    titleSegmentsLabel.isHidden = true
     [titleRowStack, subtitleLabel, tertiaryLabel].forEach(mainStack.addArrangedSubview)
     visual.translatesAutoresizingMaskIntoConstraints = false
     leadingWidth = visual.widthAnchor.constraint(equalToConstant: 40)
@@ -270,15 +249,6 @@ final class NativeListIdentityCell: NativeListRendererCell {
     titleIconView.isHidden = true
     titleIconView.accessibilityLabel = nil
     titleIconView.isAccessibilityElement = false
-    titleLeadingIconView.image = nil
-    titleLeadingIconView.isHidden = true
-    titleLeadingIconView.accessibilityLabel = nil
-    titleLeadingIconView.isAccessibilityElement = false
-    titleSegmentsLabel.isHidden = true
-    titleSegmentsLabel.reset()
-    titleRowFiller.isHidden = false
-    titleSegmentsLabel.setContentHuggingPriority(.defaultLow, for: .horizontal)
-    titleSegmentsLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
     titleImageSlot?.view.isHidden = true
     titleImageSlot?.view.accessibilityLabel = nil
     titleImageSlot?.view.isAccessibilityElement = false
@@ -340,7 +310,7 @@ final class NativeListIdentityCell: NativeListRendererCell {
       let label = titleIcon.string("accessibilityLabel")
       titleIconView.accessibilityLabel = label.isEmpty ? nil : label
       titleIconView.isAccessibilityElement = !label.isEmpty
-      titleRowStack.setCustomSpacing(4, after: visibleTitleView)
+      titleRowStack.setCustomSpacing(4, after: titleLabel)
       // A long title truncates ahead of the 20pt glyph (Android caps the title
       // at row width minus accessories, Web shrinks the title first); with the
       // title at `.required` the icon's 999 width constraint collapsed to 0.
@@ -372,7 +342,7 @@ final class NativeListIdentityCell: NativeListRendererCell {
       ]
       titleImageConstraints.forEach { $0.priority = UILayoutPriority(999) }
       NSLayoutConstraint.activate(titleImageConstraints)
-      titleRowStack.setCustomSpacing(4, after: titleIconView.isHidden ? visibleTitleView : titleIconView)
+      titleRowStack.setCustomSpacing(4, after: titleIconView.isHidden ? titleLabel : titleIconView)
       titleLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
       slot.bind(image, key: "\(item.key):titleImage", placeholder: "#00000000")
     } else {
@@ -415,7 +385,7 @@ final class NativeListIdentityCell: NativeListRendererCell {
         titleRowStack.setCustomSpacing(
           CGFloat(style.double("titleBadgeGap")),
           after: titleImageSlot?.view.isHidden == false ? titleImageSlot!.view
-            : titleIconView.isHidden ? visibleTitleView : titleIconView)
+            : titleIconView.isHidden ? titleLabel : titleIconView)
       }
     }
     if style["trailingGap"] != nil { trailingStack.spacing = CGFloat(style.double("trailingGap")) }
@@ -429,7 +399,6 @@ final class NativeListIdentityCell: NativeListRendererCell {
         labels.forEach { NativeListTextStyles.applyStyledText($0, text, fonts: fonts) }
       }
     }
-    if !titleSegmentsLabel.isHidden { bindTitleRuns(item, theme: theme, style: style) }
     contentInsets = UIEdgeInsets(
       top: topInset, left: leftInset, bottom: -bottomInset, right: -rightInset)
     if root.axis == .horizontal {
@@ -495,8 +464,6 @@ final class NativeListIdentityCell: NativeListRendererCell {
   }
   override func recycleContent() {
     visual.recycle()
-    titleSegmentsLabel.reset()
-    titleLeadingIconView.image = nil
     titleImageSlot?.recycle()
     titleImageSlot?.view.isHidden = true
     titleImageSlot?.view.accessibilityLabel = nil
@@ -545,30 +512,6 @@ final class NativeListIdentityCell: NativeListRendererCell {
     visual.bind(
       descriptor, style: image, key: key, theme: currentTheme, isUnread: false, fonts: fonts)
   }
-  // Runs take the title's font, size and color unless they set their own tone
-  // or weight; the title label holds the final style by now.
-  private func bindTitleRuns(_ item: NativeListItem, theme: [String: Any]?, style: [String: Any]) {
-    let baseFont = titleLabel.font ?? nativeListFont(ofSize: 16, weight: .medium, fonts: fonts)
-    let baseColor = titleLabel.textColor ?? nativeListColor(theme, "primaryText", "#202020")
-    let runs = item.data.dictionaries("titleSegments").map { segment in
-      let weight = segment.string("fontWeight")
-      let tone = segment.string("tone")
-      return NativeListTitleSegmentsLabel.Run(
-        text: segment.string("text"),
-        font: weight.isEmpty
-          ? baseFont
-          : nativeListFont(
-            ofSize: baseFont.pointSize, weight: weight == "medium" ? .medium : .regular, fonts: fonts),
-        color: tone == "secondary"
-          ? nativeListColor(theme, "secondaryText", "#646464")
-          : tone == "primary" ? nativeListColor(theme, "primaryText", "#202020") : baseColor,
-        shrink: segment.bool("shrink"),
-        maxWidthRatio: (segment["maxWidthRatio"] as? NSNumber).map { CGFloat(truncating: $0) })
-    }
-    titleSegmentsLabel.lineHeight = CGFloat(
-      style.dictionary("title")?.double("lineHeight", default: 24) ?? 24)
-    titleSegmentsLabel.configure(runs, spokenText: item.data.string("title"))
-  }
   private func bindIdentity(
     _ item: NativeListItem,
     theme: [String: Any]?,
@@ -700,36 +643,10 @@ final class NativeListIdentityCell: NativeListRendererCell {
     }
     root.addArrangedSubview(mainStack)
     show(titleLabel, item.data.string("title"), lines: item.data.int("titleLines", default: 1))
-    // Runs replace the drawn title except where `title` itself is highlighted;
-    // their content is bound once the title style is final.
-    if !item.data.dictionaries("titleSegments").isEmpty,
-      item.data.dictionaries("titleMatch").isEmpty
-    {
-      titleLabel.isHidden = true
-      titleSegmentsLabel.isHidden = false
-      // The runs fill what the title row leaves, so a ratio is a share of it.
-      titleRowFiller.isHidden = true
-      titleSegmentsLabel.setContentHuggingPriority(UILayoutPriority(1), for: .horizontal)
-    }
-    if let icon = item.data.dictionary("titleLeadingIcon") {
-      titleLeadingIconView.bindIcon(icon.string("name"))
-      titleLeadingIconView.tintColor = UIColor(
-        nativeListHex: icon.string("tintColor",
-          default: theme?["iconSubdued"] as? String ?? "#8D8D8D"),
-        fallback: .gray)
-      titleLeadingIconView.isHidden = false
-      let label = icon.string("accessibilityLabel")
-      titleLeadingIconView.accessibilityLabel = label.isEmpty ? nil : label
-      titleLeadingIconView.isAccessibilityElement = !label.isEmpty
-      titleRowStack.setCustomSpacing(6, after: titleLeadingIconView)
-      // As beside `titleIcon`: a plain title left at `.required` collapses the
-      // glyph's 999 width constraint instead of truncating.
-      titleLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
-    }
     let titleSuffixes = item.data.dictionaries("titleSuffixes")
     if !titleSuffixes.isEmpty {
-      visibleTitleView.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
-      let minimumTitleWidth = visibleTitleView.widthAnchor.constraint(greaterThanOrEqualToConstant: 80)
+      titleLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+      let minimumTitleWidth = titleLabel.widthAnchor.constraint(greaterThanOrEqualToConstant: 80)
       minimumTitleWidth.priority = UILayoutPriority(751)
       minimumTitleWidth.isActive = true
       selectorConstraints.append(minimumTitleWidth)
@@ -892,6 +809,13 @@ final class NativeListIdentityCell: NativeListRendererCell {
       let width = trailingStack.widthAnchor.constraint(equalTo: accessory.widthAnchor)
       width.isActive = true
       selectorConstraints.append(width)
+    } else if item.data.string("presentation") == "accountSelector" {
+      // Keep flexible space in the text column when there is no accessory button.
+      // Stay below visible controls' compression resistance and the hidden checkbox's width.
+      let width = trailingStack.widthAnchor.constraint(equalToConstant: 0)
+      width.priority = UILayoutPriority(749)
+      width.isActive = true
+      selectorConstraints.append(width)
     }
   }
   private func dataTextColor(_ tone: String, theme: [String: Any]?) -> UIColor {

package/ios/tests/NativeListAccountSelectorLayoutTests.swift

@@ -0,0 +1,96 @@
+import UIKit
+import XCTest
+@testable import NativeListModule
+
+@MainActor
+final class NativeListAccountSelectorLayoutTests: XCTestCase {
+  private func child<T>(_ cell: NativeListIdentityCell, _ label: String, as type: T.Type) throws -> T {
+    try XCTUnwrap(Mirror(reflecting: cell).children.first { $0.label == label }?.value as? T)
+  }
+
+  private func bind(
+    _ cell: NativeListIdentityCell, title: String = "A", balance: String = "$16.30",
+    trailing: [[String: Any]] = []
+  ) throws {
+    let item = try NativeListItem(data: [
+      "key": "account", "type": "identity", "presentation": "accountSelector",
+      "title": title, "height": 60,
+      "leading": ["kind": "account", "fallbackText": "A"],
+      "subtitleSegments": [
+        ["text": balance, "tone": "secondary"],
+        ["text": "0x1234...5678", "tone": "secondary", "separatorBefore": true],
+      ],
+      "trailing": trailing,
+    ])
+    cell.bind(item: item, theme: nil, layout: "linear", selected: false,
+      checkboxState: { _, _, fallback in fallback }, fonts: NativeListFontFamilies())
+    cell.setNeedsLayout()
+    cell.layoutIfNeeded()
+  }
+
+  private func assertSubtitleFits(
+    _ cell: NativeListIdentityCell, file: StaticString = #filePath, line: UInt = #line
+  ) throws {
+    let labels = try child(cell, "semanticSubtitleLabels", as: [UILabel].self)
+    XCTAssertEqual(labels.count, 2, file: file, line: line)
+    for label in labels {
+      XCTAssertGreaterThanOrEqual(
+        label.bounds.width + 0.5, label.intrinsicContentSize.width,
+        "The balance and address must fit when the row has spare width", file: file, line: line)
+    }
+  }
+
+  func testEmptyTrailingDoesNotCollapseBalanceToShortTitleWidth() throws {
+    for width: CGFloat in [320, 390] {
+      let cell = NativeListIdentityCell(frame: CGRect(x: 0, y: 0, width: width, height: 60))
+      let window = UIWindow(frame: CGRect(x: 0, y: 0, width: width, height: 200))
+      window.addSubview(cell)
+      for title in ["A", "返佣5", "Pendle account"] {
+        for balance in ["$16.30", "$0", "****"] {
+          try bind(cell, title: title, balance: balance)
+          window.layoutIfNeeded()
+          try assertSubtitleFits(cell)
+        }
+      }
+    }
+  }
+
+  func testSpinnerPreservesItsIntrinsicWidthAndSubtitleSpace() throws {
+    let cell = NativeListIdentityCell(frame: CGRect(x: 0, y: 0, width: 320, height: 60))
+    let window = UIWindow(frame: CGRect(x: 0, y: 0, width: 320, height: 200))
+    window.addSubview(cell)
+    try bind(cell, trailing: [["kind": "spinner"]])
+    window.layoutIfNeeded()
+
+    try assertSubtitleFits(cell)
+    let trailing = try child(cell, "trailingStack", as: NativeListAccessoryStack.self)
+    let spinner = try XCTUnwrap(trailing.arrangedSubviews.compactMap { $0 as? UIActivityIndicatorView }.first)
+    XCTAssertTrue(spinner.isAnimating)
+    XCTAssertFalse(spinner.isHidden)
+    XCTAssertGreaterThanOrEqual(spinner.bounds.width + 0.5, spinner.intrinsicContentSize.width)
+    XCTAssertGreaterThanOrEqual(trailing.bounds.width + 0.5, spinner.bounds.width)
+  }
+
+  func testRebindingBetweenIconEmptyAndSpinnerKeepsControlAndSubtitleWidths() throws {
+    let cell = NativeListIdentityCell(frame: CGRect(x: 0, y: 0, width: 320, height: 60))
+    let window = UIWindow(frame: CGRect(x: 0, y: 0, width: 320, height: 200))
+    window.addSubview(cell)
+    for icon in ["DotHorOutline", "PlusSmallOutline"] {
+      let descriptor: [String: Any] = ["kind": "icon", "name": icon, "actionKey": "action"]
+      let states: [[[String: Any]]] = [[descriptor], [], [["kind": "spinner"]], [descriptor], []]
+      for accessories in states {
+        try bind(cell, trailing: accessories)
+        window.layoutIfNeeded()
+        try assertSubtitleFits(cell)
+        let trailing = try child(cell, "trailingStack", as: NativeListAccessoryStack.self)
+        if accessories.first?["kind"] as? String == "icon" {
+          let control = try XCTUnwrap(trailing.firstVisibleControl)
+          XCTAssertGreaterThan(control.bounds.width, 0)
+          XCTAssertEqual(trailing.bounds.width, control.bounds.width, accuracy: 0.5)
+        } else {
+          XCTAssertNil(trailing.firstVisibleControl)
+        }
+      }
+    }
+  }
+}

package/ios/tests/NativeListIdentityTitleIconLayoutTests.swift

@@ -78,36 +78,4 @@ final class NativeListIdentityTitleIconLayoutTests: XCTestCase {
     XCTAssertGreaterThan(badgeFrame.minX, iconFrame.maxX)
     XCTAssertLessThanOrEqual(badgeFrame.maxX, cell.bounds.width)
   }
-
-  // An address book row: a plain title after the 16pt `titleLeadingIcon`. A
-  // long name truncates after the glyph instead of squeezing it to nothing.
-  func testLongPlainTitleTruncatesAfterTheLeadingIcon() throws {
-    let cell = NativeListIdentityCell(frame: CGRect(x: 0, y: 0, width: 320, height: 60))
-    let window = UIWindow(frame: CGRect(x: 0, y: 0, width: 320, height: 200))
-    window.addSubview(cell)
-    let leadingIcon = try child(cell, "titleLeadingIconView", as: UIImageView.self)
-    let titleLabel = try child(cell, "titleLabel", as: UILabel.self)
-    let item = try NativeListItem(data: [
-      "key": "book", "type": "identity",
-      "title": "A very long address book name that cannot possibly fit on one line",
-      "height": 60,
-      "leading": ["kind": "token", "fallbackIcon": ["name": "CryptoCoinOutline"]],
-      "titleLeadingIcon": ["name": "BookOpenOutline"],
-      "subtitle": "0x1234...abcd",
-    ])
-    cell.bind(item: item, theme: nil, layout: "linear", selected: false,
-      checkboxState: { _, _, fallback in fallback }, fonts: NativeListFontFamilies())
-    cell.layoutIfNeeded()
-
-    let iconFrame = leadingIcon.convert(leadingIcon.bounds, to: cell)
-    let labelFrame = titleLabel.convert(titleLabel.bounds, to: cell)
-    XCTAssertFalse(leadingIcon.isHidden)
-    XCTAssertEqual(leadingIcon.bounds.width, 16, accuracy: 0.5,
-      "the leading glyph keeps its 16pt width")
-    XCTAssertEqual(labelFrame.minX, iconFrame.maxX + 6, accuracy: 1,
-      "the title follows the glyph with the 6pt gap")
-    XCTAssertLessThan(titleLabel.bounds.width, titleLabel.intrinsicContentSize.width,
-      "the title truncates instead of the glyph")
-    XCTAssertLessThanOrEqual(labelFrame.maxX, cell.bounds.width)
-  }
 }

package/lib/module/models.js

@@ -39,8 +39,6 @@ export const ROW_BOX_STYLE_KEYS_BY_TYPE = {
 
 // OneKey patch: preserve compact very-small-balance digit runs.
 
-/** One run of an identity title line; see docs/SPEC.md. */
-
 /** Native Market quote row. All values are already localized/formatted strings. */
 
 /** Compact KPI card for dashboards and grids. */