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

package/src/web/templates/IdentityRowRenderer.ts

@@ -30,79 +30,6 @@ function toneColor(
   if (tone === 'secondary') return 'var(--nl-secondary)';
   return fallback === 'secondary' ? 'var(--nl-secondary)' : 'var(--nl-primary)';
 }
-// Hidden from sight, still read: the runs themselves are hidden from
-// assistive technology in favor of `title`.
-const VISUALLY_HIDDEN: Partial<CSSStyleDeclaration> = {
-  position: 'absolute',
-  width: '1px',
-  height: '1px',
-  overflow: 'hidden',
-  clip: 'rect(0 0 0 0)',
-  whiteSpace: 'nowrap',
-};
-function appendTitleRuns(
-  document: Document,
-  target: HTMLElement,
-  row: IdentityRow
-): void {
-  const runs = createElement(
-    document,
-    'span',
-    'ok-native-list-identity-title-runs'
-  );
-  runs.setAttribute('aria-hidden', 'true');
-  Object.assign(runs.style, {
-    display: 'flex',
-    flex: '1 1 auto',
-    minWidth: '0',
-    maxWidth: '100%',
-    overflow: 'hidden',
-  });
-  row.titleSegments?.forEach((segment) => {
-    const run = createElement(
-      document,
-      'span',
-      'ok-native-list-identity-title-run',
-      segment.text
-    );
-    // Only the shrinking run gives up width; a cap is a share of the line.
-    Object.assign(run.style, {
-      flex: segment.shrink ? '0 1 auto' : '0 0 auto',
-      minWidth: segment.shrink ? '0' : '',
-      maxWidth:
-        segment.maxWidthRatio === undefined
-          ? ''
-          : `${segment.maxWidthRatio * 100}%`,
-      overflow: 'hidden',
-      textOverflow: 'ellipsis',
-      whiteSpace: 'pre',
-    });
-    if (segment.tone)
-      run.style.color =
-        segment.tone === 'secondary'
-          ? 'var(--nl-secondary)'
-          : 'var(--nl-primary)';
-    if (segment.fontWeight === 'medium') {
-      run.style.fontWeight = '500';
-      run.style.fontFamily = 'var(--nl-font-medium)';
-    } else if (segment.fontWeight === 'regular') {
-      run.style.fontWeight = '400';
-      run.style.fontFamily = 'var(--nl-font-regular)';
-    }
-    setData(run, 'tone', segment.tone);
-    runs.appendChild(run);
-  });
-  const spoken = createElement(
-    document,
-    'span',
-    'ok-native-list-identity-title-spoken',
-    row.title
-  );
-  Object.assign(spoken.style, VISUALLY_HIDDEN);
-  target.replaceChildren(runs, spoken);
-  target.style.display = 'flex';
-  target.style.minWidth = '0';
-}
 function appendAccessories(
   parent: HTMLElement,
   document: Document,
@@ -268,18 +195,6 @@ function createIdentityRow(
       fragment.appendChild(document.createTextNode(row.title.slice(offset)));
       textTarget.prepend(fragment);
     }
-    // The runs replace the plain title, except where `title` itself is
-    // highlighted or shown in the wallet sidebar.
-    const hasTitleRuns =
-      !!row.titleSegments?.length &&
-      presentation !== 'walletSidebar' &&
-      !row.titleMatch?.length;
-    if (hasTitleRuns) {
-      const textTarget =
-        titleElement.querySelector<HTMLElement>('[data-nl-slot="title"]') ??
-        titleElement;
-      appendTitleRuns(document, textTarget, row);
-    }
     if (row.subtitleSegments?.length) {
       column.querySelector('.ok-native-list-secondary')?.remove();
       const segments = createElement(
@@ -476,58 +391,6 @@ function createIdentityRow(
         badges.style.minWidth = '0';
       }
     }
-    if (hasTitleRuns) {
-      // The runs fill what the title line leaves, so a ratio is a share of
-      // that width and title accessories sit at the line's end.
-      const runs = titleElement.querySelector<HTMLElement>(
-        '.ok-native-list-identity-title-runs'
-      );
-      for (
-        let node = runs?.parentElement;
-        node && node !== titleElement;
-        node = node.parentElement
-      ) {
-        node.style.display = 'flex';
-        node.style.flex = '1 1 auto';
-        node.style.minWidth = '0';
-      }
-      titleElement.style.display = 'flex';
-      titleElement.style.alignItems = 'center';
-    }
-    if (row.titleLeadingIcon && presentation !== 'walletSidebar') {
-      const descriptor = row.titleLeadingIcon;
-      if (titleElement.hasAttribute('data-nl-slot')) {
-        // Keep the glyph out of the title slot that text styles apply to.
-        const titleText = tagSlot(
-          createElement(document, 'span', 'ok-native-list-identity-title-text'),
-          'title'
-        );
-        while (titleElement.firstChild)
-          titleText.appendChild(titleElement.firstChild);
-        if (hasTitleRuns) {
-          titleText.style.display = 'flex';
-          titleText.style.minWidth = '0';
-        }
-        titleElement.removeAttribute('data-nl-slot');
-        titleElement.appendChild(titleText);
-      }
-      const icon = primitives.iconAction(
-        descriptor.name,
-        undefined,
-        undefined,
-        descriptor.tintColor
-      );
-      icon.className = 'ok-native-list-identity-title-leading-icon';
-      if (descriptor.accessibilityLabel)
-        icon.setAttribute('aria-label', descriptor.accessibilityLabel);
-      else icon.setAttribute('aria-hidden', 'true');
-      titleElement.style.display = 'flex';
-      titleElement.style.alignItems = 'center';
-      // 6px to the title, whatever gap the title line already has.
-      const lineGap = Number.parseFloat(titleElement.style.gap || '0') || 0;
-      icon.style.marginInlineEnd = `${Math.max(0, 6 - lineGap)}px`;
-      titleElement.prepend(icon);
-    }
     if (presentation === 'walletSidebar' && row.badges?.length) {
       const badges = createElement(
         document,
@@ -540,7 +403,6 @@ function createIdentityRow(
       column.appendChild(badges);
     }
     for (const key of ['title', 'subtitle'] as const) {
-      if (key === 'title' && hasTitleRuns) continue;
       const lines = row.style?.[key]?.lines ?? row[`${key}Lines`];
       if (lines !== undefined)
         column

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

@@ -1,38 +0,0 @@
-package com.margelo.nitro.nativelist
-
-/**
- * Widths for identity title runs (docs/SPEC.md, "Identity title segments and
- * leading title icon"). A run's base width is its natural width under its cap;
- * the one shrinking run takes what the others leave; runs that do not shrink
- * and still overflow are cut from the end of the line.
- */
-internal fun nativeListTitleSegmentWidths(
-  natural: List<Float>,
-  shrink: List<Boolean>,
-  maxWidthRatio: List<Float?>,
-  available: Float,
-): List<Float> {
-  val line = available.coerceAtLeast(0f)
-  val widths =
-    natural.indices
-      .map { index ->
-        val width = natural[index].coerceAtLeast(0f)
-        val ratio = maxWidthRatio.getOrNull(index)
-        if (ratio == null) width else minOf(width, ratio * line)
-      }
-      .toMutableList()
-  val shrinking = shrink.indexOf(true)
-  if (shrinking in widths.indices) {
-    val others = widths.indices.filter { it != shrinking }.sumOf { widths[it].toDouble() }.toFloat()
-    widths[shrinking] = minOf(widths[shrinking], line - others).coerceAtLeast(0f)
-  }
-  var overflow = widths.sum() - line
-  var index = widths.lastIndex
-  while (overflow > 0f && index >= 0) {
-    val cut = minOf(widths[index], overflow)
-    widths[index] -= cut
-    overflow -= cut
-    index -= 1
-  }
-  return widths
-}

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

@@ -1,105 +0,0 @@
-package com.margelo.nitro.nativelist
-
-import android.graphics.Typeface
-import android.text.SpannableStringBuilder
-import android.text.Spanned
-import android.text.TextPaint
-import android.text.TextUtils
-import android.text.style.ForegroundColorSpan
-import android.text.style.MetricAffectingSpan
-
-/**
- * Identity title runs on one line. The text is rebuilt for each measured width
- * from the widths `nativeListTitleSegmentWidths` allocates, so a run gives up
- * width without the others; accessibility reads the row's `title` instead.
- */
-internal class NativeListTitleSegmentsView(context: android.content.Context) :
-  NativeListTextView(context) {
-  class Run(
-    val text: String,
-    // Null keeps the view's typeface, which follows the title's.
-    val typeface: Typeface?,
-    val color: Int,
-    val shrink: Boolean,
-    val maxWidthRatio: Float?,
-  )
-
-  private var runs: List<Run> = emptyList()
-  private var builtForWidth = -1
-
-  fun setRuns(runs: List<Run>, spokenText: String) {
-    this.runs = runs
-    builtForWidth = -1
-    contentDescription = spokenText.takeIf(String::isNotEmpty)
-    text = runs.joinToString("") { it.text }
-    requestLayout()
-  }
-
-  fun clearRuns() {
-    runs = emptyList()
-    builtForWidth = -1
-    contentDescription = null
-    text = ""
-  }
-
-  override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-    if (runs.isEmpty()) {
-      super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-      return
-    }
-    var outer =
-      if (MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.UNSPECIFIED) Int.MAX_VALUE
-      else MeasureSpec.getSize(widthMeasureSpec)
-    if (maxWidth in 0 until outer) outer = maxWidth
-    val available =
-      if (outer == Int.MAX_VALUE) outer
-      else (outer - compoundPaddingLeft - compoundPaddingRight).coerceAtLeast(0)
-    if (available != builtForWidth) {
-      builtForWidth = available
-      // The same width rebuilds the same text, so the relayout this asks for
-      // measures once more and stops.
-      setText(build(available), BufferType.SPANNABLE)
-    }
-    super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-    // The runs fill what the title line leaves, so a ratio is a share of it.
-    if (outer != Int.MAX_VALUE) setMeasuredDimension(outer, measuredHeight)
-  }
-
-  private fun build(available: Int): CharSequence {
-    val paints = runs.map { run -> TextPaint(paint).apply { run.typeface?.let { typeface = it } } }
-    val natural = runs.mapIndexed { index, run -> paints[index].measureText(run.text) }
-    val widths =
-      nativeListTitleSegmentWidths(
-        natural,
-        runs.map { it.shrink },
-        runs.map { it.maxWidthRatio },
-        if (available == Int.MAX_VALUE) Float.MAX_VALUE else available.toFloat(),
-      )
-    val built = SpannableStringBuilder()
-    runs.forEachIndexed { index, run ->
-      val width = widths[index]
-      if (width <= 0f) return@forEachIndexed
-      val shown =
-        if (width >= natural[index]) run.text
-        else TextUtils.ellipsize(run.text, paints[index], width, TextUtils.TruncateAt.END)
-      if (shown.isEmpty()) return@forEachIndexed
-      val start = built.length
-      built.append(shown)
-      built.setSpan(ForegroundColorSpan(run.color), start, built.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-      run.typeface?.let {
-        built.setSpan(TypefaceRunSpan(it), start, built.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-      }
-    }
-    return built
-  }
-}
-
-private class TypefaceRunSpan(private val typeface: Typeface) : MetricAffectingSpan() {
-  override fun updateMeasureState(paint: TextPaint) {
-    paint.typeface = typeface
-  }
-
-  override fun updateDrawState(paint: TextPaint) {
-    paint.typeface = typeface
-  }
-}

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

@@ -1,65 +0,0 @@
-package com.margelo.nitro.nativelist
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-class NativeListTitleSegmentLayoutTest {
-  // Wallet / Account as recipient rows send it: the wallet shrinks, the
-  // account is capped at 70% of the line.
-  private fun walletFirst(wallet: Float, account: Float, line: Float) =
-    nativeListTitleSegmentWidths(
-      listOf(wallet, 20f, account),
-      listOf(true, false, false),
-      listOf(null, null, 0.7f),
-      line,
-    )
-
-  private fun assertWidths(expected: List<Float>, actual: List<Float>) {
-    assertEquals(expected.size, actual.size)
-    expected.zip(actual).forEach { (want, got) -> assertEquals(want, got, 0.001f) }
-  }
-
-  @Test
-  fun keepsNaturalWidthsWhenTheyFit() = assertWidths(listOf(80f, 20f, 90f), walletFirst(80f, 90f, 300f))
-
-  @Test
-  fun theShrinkingRunGivesWayFirst() = assertWidths(listOf(130f, 20f, 100f), walletFirst(200f, 100f, 250f))
-
-  @Test
-  fun aCappedRunStopsAtItsShareOfTheLine() = assertWidths(listOf(70f, 20f, 210f), walletFirst(100f, 400f, 300f))
-
-  @Test
-  fun theAccountShrinksWhenTheWalletMustStayWhole() =
-    assertWidths(
-      listOf(210f, 20f, 70f),
-      nativeListTitleSegmentWidths(
-        listOf(300f, 20f, 150f),
-        listOf(false, false, true),
-        listOf(0.7f, null, null),
-        300f,
-      ),
-    )
-
-  @Test
-  fun runsThatDoNotShrinkAreCutFromTheEnd() {
-    assertWidths(
-      listOf(100f, 50f, 0f),
-      nativeListTitleSegmentWidths(
-        listOf(100f, 100f, 100f),
-        listOf(false, false, true),
-        listOf(null, null, null),
-        150f,
-      ),
-    )
-    assertWidths(
-      listOf(100f, 20f),
-      nativeListTitleSegmentWidths(listOf(100f, 100f), listOf(false, false), listOf(null, null), 120f),
-    )
-  }
-
-  @Test
-  fun aNonPositiveLineLeavesNothing() {
-    assertWidths(listOf(0f, 0f, 0f), walletFirst(80f, 90f, 0f))
-    assertWidths(listOf(0f, 0f, 0f), walletFirst(80f, 90f, -10f))
-  }
-}

package/ios/NativeListTitleSegmentLayout.swift

@@ -1,32 +0,0 @@
-import Foundation
-
-/// Widths for identity title runs (docs/SPEC.md, "Identity title segments
-/// and leading title icon"). A run's base width is its natural width under
-/// its cap; the one shrinking run takes what the others leave; runs that do
-/// not shrink and still overflow are cut from the end of the line.
-func nativeListTitleSegmentWidths(
-  natural: [CGFloat],
-  shrink: [Bool],
-  maxWidthRatio: [CGFloat?],
-  available: CGFloat
-) -> [CGFloat] {
-  let line = max(0, available)
-  var widths = natural.indices.map { index -> CGFloat in
-    let width = max(0, natural[index])
-    guard index < maxWidthRatio.count, let ratio = maxWidthRatio[index] else { return width }
-    return min(width, ratio * line)
-  }
-  if let shrinking = shrink.firstIndex(of: true), shrinking < widths.count {
-    let others = widths.indices.reduce(CGFloat(0)) { $1 == shrinking ? $0 : $0 + widths[$1] }
-    widths[shrinking] = max(0, min(widths[shrinking], line - others))
-  }
-  var overflow = widths.reduce(0, +) - line
-  var index = widths.count - 1
-  while overflow > 0, index >= 0 {
-    let cut = min(widths[index], overflow)
-    widths[index] -= cut
-    overflow -= cut
-    index -= 1
-  }
-  return widths
-}

package/ios/NativeListTitleSegmentsLabel.swift

@@ -1,80 +0,0 @@
-import UIKit
-
-/// Draws identity title runs on one line, each at the width that
-/// `nativeListTitleSegmentWidths` allocates for the current bounds. Its
-/// intrinsic width is the runs' natural width, so the title row stack can
-/// give it less, and accessibility reads the row's `title` instead of runs.
-final class NativeListTitleSegmentsLabel: UIView {
-  struct Run {
-    let text: String
-    let font: UIFont
-    let color: UIColor
-    let shrink: Bool
-    let maxWidthRatio: CGFloat?
-  }
-
-  private var runs: [Run] = []
-  private var naturalWidths: [CGFloat] = []
-  var lineHeight: CGFloat = 24 {
-    didSet {
-      invalidateIntrinsicContentSize()
-      setNeedsDisplay()
-    }
-  }
-
-  override init(frame: CGRect) {
-    super.init(frame: frame)
-    isOpaque = false
-    backgroundColor = .clear
-    contentMode = .redraw
-    isAccessibilityElement = true
-    accessibilityTraits = .staticText
-  }
-
-  required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
-
-  func configure(_ runs: [Run], spokenText: String) {
-    self.runs = runs
-    naturalWidths = runs.map {
-      ceil(($0.text as NSString).size(withAttributes: [.font: $0.font]).width)
-    }
-    accessibilityLabel = spokenText.isEmpty ? nil : spokenText
-    invalidateIntrinsicContentSize()
-    setNeedsDisplay()
-  }
-
-  func reset() {
-    configure([], spokenText: "")
-  }
-
-  override var intrinsicContentSize: CGSize {
-    CGSize(width: naturalWidths.reduce(0, +), height: lineHeight)
-  }
-
-  override func layoutSubviews() {
-    super.layoutSubviews()
-    setNeedsDisplay()
-  }
-
-  override func draw(_ rect: CGRect) {
-    guard !runs.isEmpty else { return }
-    let widths = nativeListTitleSegmentWidths(
-      natural: naturalWidths, shrink: runs.map(\.shrink),
-      maxWidthRatio: runs.map(\.maxWidthRatio), available: bounds.width)
-    let isRightToLeft = effectiveUserInterfaceLayoutDirection == .rightToLeft
-    var x: CGFloat = isRightToLeft ? bounds.width : 0
-    for (run, width) in zip(runs, widths) where width > 0 {
-      let paragraph = NSMutableParagraphStyle()
-      paragraph.lineBreakMode = .byTruncatingTail
-      let text = NSAttributedString(
-        string: run.text,
-        attributes: [.font: run.font, .foregroundColor: run.color, .paragraphStyle: paragraph])
-      let height = ceil(run.font.lineHeight)
-      let originX = isRightToLeft ? x - width : x
-      text.draw(
-        with: CGRect(x: originX, y: (bounds.height - height) / 2, width: width, height: height),
-        options: [.usesLineFragmentOrigin, .truncatesLastVisibleLine], context: nil)
-      x += isRightToLeft ? -width : width
-    }
-  }
-}