@onekeyfe/react-native-native-list 6.7.0-alpha.397 → 6.7.0-alpha.399

package/ios/Resources/NativeListIcons.xcassets/onekey_plus_large.imageset/Contents.json

@@ -0,0 +1 @@
+{"images":[{"filename":"icon.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true,"template-rendering-intent":"template"}}

package/ios/Resources/NativeListIcons.xcassets/onekey_plus_large.imageset/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000"><path d="M13 11h8v2h-8v8h-2v-8H3v-2h8V3h2z"/></svg>

package/ios/Resources/NativeListIcons.xcassets/onekey_ticket.imageset/Contents.json

@@ -0,0 +1 @@
+{"images":[{"filename":"icon.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true,"template-rendering-intent":"template"}}

package/ios/Resources/NativeListIcons.xcassets/onekey_ticket.imageset/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000"><path d="M16 17.01h-2V15h2zm0-4h-2V11h2zm0-4h-2V7h2z"/><path fill-rule="evenodd" clip-rule="evenodd" d="m22 9.927-.629.252c-1.661.665-1.661 2.977 0 3.642l.629.252V20H2v-5.927l.629-.252c1.661-.665 1.661-2.977 0-3.642L2 9.927V4h20zM4 8.636c2.5 1.52 2.499 5.207 0 6.727V18h16v-2.637c-2.499-1.52-2.5-5.208 0-6.727V6H4z"/></svg>

package/ios/Resources/NativeListIcons.xcassets/onekey_wallet.imageset/Contents.json

@@ -0,0 +1 @@
+{"images":[{"filename":"icon.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true,"template-rendering-intent":"template"}}

package/ios/Resources/NativeListIcons.xcassets/onekey_wallet.imageset/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000"><path d="M15.5 13.25a1.25 1.25 0 1 1 0 2.5 1.25 1.25 0 0 1 0-2.5"/><path fill-rule="evenodd" clip-rule="evenodd" d="M17 8h4v13H7a4 4 0 0 1-4-4V6.5A3.5 3.5 0 0 1 6.5 3H17zM5 17a2 2 0 0 0 2 2h12v-9H6.5c-.537 0-1.045-.12-1.5-.337zM6.5 5a1.5 1.5 0 1 0 0 3H15V5z"/></svg>

package/ios/tests/NativeListIdentityTitleIconLayoutTests.swift

@@ -0,0 +1,81 @@
+import UIKit
+import XCTest
+@testable import NativeListModule
+
+@MainActor
+final class NativeListIdentityTitleIconLayoutTests: 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)
+  }
+
+  // OK-66041: the Home native-token row carries a GasSolid `titleIcon`. The
+  // glyph must sit right after the title text (4pt gap), as Android's
+  // PackedTitleLineLayout and the Web flex row already do. iOS let the title
+  // label stretch across the whole title row, so the icon landed next to the
+  // trailing value column instead of beside "ETH".
+  func testTitleIconFollowsTheTitleTextInsteadOfTheRowEnd() throws {
+    let cell = NativeListIdentityCell(frame: CGRect(x: 0, y: 0, width: 390, height: 60))
+    let window = UIWindow(frame: CGRect(x: 0, y: 0, width: 390, height: 200))
+    window.addSubview(cell)
+    let titleIcon = try child(cell, "titleIconView", as: UIImageView.self)
+    let titleLabel = try child(cell, "titleLabel", as: UILabel.self)
+    let titleStack = try child(cell, "titleRowStack", as: UIStackView.self)
+    let item = try NativeListItem(data: [
+      "key": "eth", "type": "identity", "title": "ETH", "height": 60,
+      "leading": ["kind": "token", "fallbackIcon": ["name": "CryptoCoinOutline"]],
+      "titleIcon": ["name": "GasSolid"],
+      "subtitleSegments": [
+        ["text": "$2,330.23", "tone": "secondary"],
+        ["text": "+0.23%", "tone": "positive", "separatorBefore": true],
+      ],
+      "trailing": [["kind": "valuePair", "primary": "0.00001417", "secondary": "$0.03"]],
+    ])
+    cell.bind(item: item, theme: nil, layout: "linear", selected: false,
+      checkboxState: { _, _, fallback in fallback }, fonts: NativeListFontFamilies())
+    cell.layoutIfNeeded()
+
+    XCTAssertFalse(titleIcon.isHidden)
+    // The title keeps its intrinsic width; the slack goes to the end of the row.
+    XCTAssertEqual(
+      titleLabel.bounds.width, titleLabel.intrinsicContentSize.width, accuracy: 1,
+      "title label must not stretch across the title row")
+    let labelFrame = titleLabel.convert(titleLabel.bounds, to: cell)
+    let iconFrame = titleIcon.convert(titleIcon.bounds, to: cell)
+    XCTAssertEqual(iconFrame.minX, labelFrame.maxX + 4, accuracy: 1,
+      "gas icon must follow the title text with the 4pt gap")
+    let iconInRow = titleIcon.convert(titleIcon.bounds, to: titleStack)
+    XCTAssertLessThan(iconInRow.maxX, titleStack.bounds.width / 2,
+      "gas icon must stay in the leading half of the title row, not at the value column")
+  }
+
+  // A long title still truncates in front of the icon instead of pushing it
+  // out of the row, and the badge keeps following the icon.
+  func testLongTitleTruncatesAndKeepsIconAndBadgeAdjacent() 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 titleIcon = try child(cell, "titleIconView", as: UIImageView.self)
+    let titleLabel = try child(cell, "titleLabel", as: UILabel.self)
+    let badge = try child(cell, "badgeLabel", as: UILabel.self)
+    let item = try NativeListItem(data: [
+      "key": "long", "type": "identity",
+      "title": "A very long token name that cannot possibly fit on one line", "height": 60,
+      "leading": ["kind": "token", "fallbackIcon": ["name": "CryptoCoinOutline"]],
+      "titleIcon": ["name": "GasSolid"],
+      "badges": [["key": "native", "text": "Native"]],
+      "trailing": [["kind": "valuePair", "primary": "1.00", "secondary": "$1.00"]],
+    ])
+    cell.bind(item: item, theme: nil, layout: "linear", selected: false,
+      checkboxState: { _, _, fallback in fallback }, fonts: NativeListFontFamilies())
+    cell.layoutIfNeeded()
+
+    let labelFrame = titleLabel.convert(titleLabel.bounds, to: cell)
+    let iconFrame = titleIcon.convert(titleIcon.bounds, to: cell)
+    let badgeFrame = badge.convert(badge.bounds, to: cell)
+    XCTAssertEqual(titleIcon.bounds.width, 20, accuracy: 0.5)
+    XCTAssertEqual(iconFrame.minX, labelFrame.maxX + 4, accuracy: 1)
+    XCTAssertFalse(badge.isHidden)
+    XCTAssertGreaterThan(badgeFrame.minX, iconFrame.maxX)
+    XCTAssertLessThanOrEqual(badgeFrame.maxX, cell.bounds.width)
+  }
+}

package/ios/tests/NativeListLeadingVisualPairBackdropTests.swift

@@ -0,0 +1,50 @@
+import UIKit
+import XCTest
+@testable import NativeListModule
+
+@MainActor
+final class NativeListLeadingVisualPairBackdropTests: XCTestCase {
+  private func child<T>(_ visual: NativeListLeadingVisual, _ label: String, as type: T.Type) throws -> T {
+    try XCTUnwrap(Mirror(reflecting: visual).children.first { $0.label == label }?.value as? T)
+  }
+
+  private func token(_ uri: String) -> [String: Any] {
+    [
+      "kind": "token", "shape": "circle",
+      "image": ["uri": uri, "width": 40, "height": 40],
+      "fallbackIcon": ["name": "CryptoCoinOutline"],
+    ]
+  }
+
+  // PR #185 review: the pair ring sits above the primary token. While the
+  // secondary image has not loaded (or failed), its slot is hidden, so the ring
+  // must be hidden too; otherwise a blank row-background disc covers the
+  // primary's lower-right corner.
+  func testPairRingStaysHiddenWhileTheSecondaryImageIsNotDisplayed() throws {
+    let visual = NativeListLeadingVisual(frame: CGRect(x: 0, y: 0, width: 40, height: 40))
+    let ring = try child(visual, "pairBackdrop", as: UIView.self)
+    visual.bind(
+      token("https://example.invalid/primary.png"), style: [:], key: "pair", theme: nil,
+      isUnread: false, secondaryVisual: token("https://example.invalid/secondary.png"),
+      fonts: NativeListFontFamilies())
+    visual.layoutIfNeeded()
+    // `slots` is a value-type array: read it after bind has created the slots.
+    let slots = try child(visual, "slots", as: [NativeListImageSlot].self)
+    XCTAssertEqual(slots.count, 2)
+    XCTAssertTrue(slots[1].view.isHidden, "secondary slot is hidden until its image loads")
+    XCTAssertTrue(ring.isHidden, "ring must follow the hidden secondary slot")
+
+    visual.recycle()
+    XCTAssertTrue(ring.isHidden)
+  }
+
+  func testNoPairMeansNoRing() throws {
+    let visual = NativeListLeadingVisual(frame: CGRect(x: 0, y: 0, width: 40, height: 40))
+    let ring = try child(visual, "pairBackdrop", as: UIView.self)
+    visual.bind(
+      token("https://example.invalid/primary.png"), style: [:], key: "single", theme: nil,
+      isUnread: false, fonts: NativeListFontFamilies())
+    visual.layoutIfNeeded()
+    XCTAssertTrue(ring.isHidden)
+  }
+}

package/ios/tests/NativeListLifecycleTests.swift

@@ -4,6 +4,25 @@ import XCTest
 
 @MainActor
 final class NativeListLifecycleTests: XCTestCase {
+  func testCanonicalNullPatchRemovesStoredOptionalFields() throws {
+    let view = NativeListView(frame: CGRect(x: 0, y: 0, width: 320, height: 480))
+    let row: [String: Any] = ["key": "token", "type": "identity", "title": "Token",
+      "leading": ["kind": "token"], "subtitle": "Old",
+      "titleImage": ["image": ["uri": "data:image/png;base64,AA==", "width": 14, "height": 14]]]
+    let snapshot: [String: Any] = ["schemaVersion": 1, "generation": 1,
+      "layout": ["kind": "linear"], "rows": [row]]
+    view.applySnapshotJson(String(decoding: try JSONSerialization.data(withJSONObject: snapshot), as: UTF8.self))
+    let patches: [[String: Any]] = [["key": "token", "type": "identity",
+      "changes": ["title": "New", "subtitle": NSNull(), "titleImage": NSNull()]]]
+    view.applyPatchesJson(String(decoding: try JSONSerialization.data(withJSONObject: patches), as: UTF8.self))
+    let items = try XCTUnwrap(Mirror(reflecting: view).descendant("itemsByKey") as? [String: NativeListItem])
+    let accepted = try XCTUnwrap(items["token"])
+    XCTAssertEqual(accepted.data.string("title"), "New")
+    XCTAssertNil(accepted.data["subtitle"])
+    XCTAssertNil(accepted.data["titleImage"])
+    XCTAssertEqual(accepted.key, "token")
+  }
+
   func testAcceptedRowIndexReusesStableShapeAndRejectsLateInvalidPatch() throws {
     let view = NativeListView(frame: CGRect(x: 0, y: 0, width: 320, height: 480))
     func snapshot(_ keys: [String], generation: Int, title: String = "Old") throws -> String {
@@ -229,6 +248,47 @@ final class NativeListLifecycleTests: XCTestCase {
     XCTAssertNotEqual(cell.bindingEpoch, changedEpoch)
   }
 
+  func testIdentityTitleImageRetainsRequestAndClearsOnProductionCellReuse() 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)
+    func bind(_ descriptor: [String: Any]?, title: String = "STOCK") throws {
+      var data: [String: Any] = ["key": "stock", "type": "identity", "title": title,
+        "height": 60, "leading": ["kind": "token", "fallbackIcon": ["name": "CryptoCoinOutline"]]]
+      if let descriptor { data["titleImage"] = descriptor }
+      cell.bind(item: try NativeListItem(data: data), theme: nil, layout: "linear", selected: false,
+        checkboxState: { _, _, fallback in fallback }, fonts: NativeListFontFamilies())
+      cell.layoutIfNeeded()
+    }
+    let descriptor: [String: Any] = ["image": ["uri": "data:image/png;base64,AA==", "width": 14, "height": 14],
+      "accessibilityLabel": "Issuer", "hoverActionKey": "issuer-info"]
+    try bind(descriptor)
+    let slot = try XCTUnwrap(Mirror(reflecting: cell).children.first {
+      $0.label == "titleImageSlot"
+    }?.value as? NativeListImageSlot)
+    XCTAssertFalse(slot.view.isHidden)
+    XCTAssertEqual(slot.view.bounds.width, 14, accuracy: 0.5)
+    XCTAssertEqual(slot.view.bounds.height, 14, accuracy: 0.5)
+    XCTAssertEqual(slot.view.layer.cornerRadius, 7, accuracy: 0.1)
+    XCTAssertEqual(slot.view.accessibilityLabel, "Issuer")
+    let identity = Mirror(reflecting: slot).children.first { $0.label == "identity" }?.value as? String
+    XCTAssertNotNil(identity)
+    try bind(descriptor, title: "Changed title")
+    XCTAssertEqual(Mirror(reflecting: slot).children.first { $0.label == "identity" }?.value as? String, identity)
+    try bind(["image": ["uri": "data:image/png;base64,AQ==", "width": 20, "height": 20]])
+    XCTAssertEqual(slot.view.bounds.width, 20, accuracy: 0.5)
+    XCTAssertEqual(slot.view.layer.cornerRadius, 10, accuracy: 0.1)
+    XCTAssertNil(slot.view.accessibilityLabel)
+    XCTAssertNotEqual(Mirror(reflecting: slot).children.first { $0.label == "identity" }?.value as? String, identity)
+    try bind(nil)
+    XCTAssertTrue(slot.view.isHidden)
+    XCTAssertNil(Mirror(reflecting: slot).children.first { $0.label == "identity" }?.value as? String)
+    try bind(descriptor)
+    cell.prepareForReuse()
+    XCTAssertTrue(slot.view.isHidden)
+    XCTAssertNil(slot.view.accessibilityLabel)
+  }
+
   func testRiskIdentityTitleIconAndButtonResetOnProductionCellBind() throws {
     let cell = NativeListIdentityCell(frame: CGRect(x: 0, y: 0, width: 320, height: 56))
     let window = UIWindow(frame: CGRect(x: 0, y: 0, width: 320, height: 200))

package/lib/module/NativeList.web.js

@@ -4,7 +4,7 @@ import { useNativeListFontFamiliesJson } from "./fonts.js";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { View } from 'react-native';
 import { normalizeIndexScroll, normalizeKeyScroll, normalizePositionScroll, resolveLocationIndex, scrollFailure, validateOffset } from "./scrolling.js";
-import { applyRowPatches, containNativeListInput, emptyNativeListSnapshot, validatePatches, validateSnapshot } from "./validation.js";
+import { applyRowPatches, containNativeListInput, emptyNativeListSnapshot, validateSnapshot } from "./validation.js";
 import { NativeListWebEngine } from "./web/NativeListWebEngine.js";
 import { acquireNativeListAvatar, canonicalNativeListAvatarUri } from "./web/NativeListWebAvatarCache.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -255,18 +255,15 @@ export const NativeList = /*#__PURE__*/forwardRef(function NativeList({
       synchronizeSlots(next);
     },
     applyPatches(patches) {
-      const accepted = containNativeListInput(() => validatePatches(patches));
-      if (accepted && accepted.length > 0) {
-        const engine = engineRef.current;
-        if (engine) {
-          engine.applyPatches(accepted);
-          snapshotRef.current = engine.currentSnapshot();
-        } else {
-          const next = containNativeListInput(() => applyRowPatches(snapshotRef.current, accepted));
-          if (next) snapshotRef.current = next;
-        }
-        acceptedSnapshotRef.current = snapshotRef.current;
+      const engine = engineRef.current;
+      if (engine) {
+        engine.applyPatches(patches);
+        snapshotRef.current = engine.currentSnapshot();
+      } else {
+        const next = containNativeListInput(() => applyRowPatches(snapshotRef.current, patches));
+        if (next) snapshotRef.current = next;
       }
+      acceptedSnapshotRef.current = snapshotRef.current;
     },
     reconcileSelection(selectedKeys) {
       engineRef.current?.reconcileSelection(selectedKeys);

package/lib/module/models.js

@@ -54,4 +54,6 @@ export const ROW_BOX_STYLE_KEYS_BY_TYPE = {
 // type CommonPatchFields = 'revision' | 'disabled' | 'selected' | 'separator';
 // OneKey patch: balance patches also refresh the existing row's spoken content.
 // type CommonPatchFields = 'revision' | 'disabled' | 'selected' | 'separator' | 'height' | 'heightRounding' | 'opacity' | 'pressDisabled';
+
+/** Null removes optional fields; undefined leaves the existing value unchanged. */
 //# sourceMappingURL=models.js.map