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

package/docs/SPEC.md

@@ -242,7 +242,8 @@ titleSegments?: readonly {
 
 `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. The name comes from
+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
@@ -256,7 +257,7 @@ 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. | `UIImageView`, first in the title row stack. |
+| 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. |
 
@@ -265,7 +266,9 @@ Conformance: `src/validation.ts` (`assertTitleSegments`,
 `src/web/templates/IdentityRowRenderer.ts` with `IdentityTitleRunsWeb.test.ts`
 (run styles, flex behavior, accessibility, rebind);
 `ios/NativeListTitleSegmentLayout.swift` with the SwiftPM
-`NativeListTitleSegmentLayoutTests`; `NativeListTitleSegmentLayout.kt` with the
+`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

package/ios/NativeListIdentityRenderer.swift

@@ -722,6 +722,9 @@ final class NativeListIdentityCell: NativeListRendererCell {
       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 {

package/ios/tests/NativeListIdentityTitleIconLayoutTests.swift

@@ -78,4 +78,36 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-native-list",
-  "version": "6.7.0-alpha.428",
+  "version": "6.7.0-alpha.430",
   "description": "Template-driven native RecyclerView and UICollectionView for React Native",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",
@@ -89,8 +89,8 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "@onekeyfe/react-native-image": "6.7.0-alpha.428",
-    "@onekeyfe/react-native-native-logger": "6.7.0-alpha.428",
+    "@onekeyfe/react-native-image": "6.7.0-alpha.430",
+    "@onekeyfe/react-native-native-logger": "6.7.0-alpha.430",
     "react": "*",
     "react-native": "*",
     "react-native-nitro-modules": "0.37.0"