@onekeyfe/react-native-native-list 3.0.135 → 3.0.136

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

@@ -395,6 +395,30 @@ private class NativeListTableColumnView(context: android.content.Context) : Line
   private fun sp(value: Float): Float = NativeListScale.font(resources, value)
 }
 
+private object NativeListSourceFallbackState {
+  private const val CACHE_LIMIT = 128
+  private val sources = LinkedHashMap<String, Unit>(CACHE_LIMIT, 0.75f, true)
+
+  fun has(key: String): Boolean = synchronized(sources) {
+    sources[key] != null
+  }
+
+  fun remember(key: String) {
+    synchronized(sources) {
+      sources[key] = Unit
+      while (sources.size > CACHE_LIMIT) {
+        sources.remove(sources.entries.first().key)
+      }
+    }
+  }
+
+  fun forget(key: String) {
+    synchronized(sources) {
+      sources.remove(key)
+    }
+  }
+}
+
 internal class NativeListRowView(
   private val reactContext: ThemedReactContext,
 ) : LinearLayout(reactContext) {
@@ -1372,6 +1396,7 @@ internal class NativeListRowView(
     leadingIcon.visibility = GONE
     leadingIcon.iconName = ""
     leadingIcon.layoutParams = FrameLayout.LayoutParams(dp(18), dp(18), Gravity.CENTER)
+    leadingIcon.glyphSizeDp = null
     favoriteIcon.visibility = GONE
     favoriteIcon.iconName = ""
     headerTitleIcon.visibility = GONE
@@ -3214,13 +3239,27 @@ internal class NativeListRowView(
     val cornerIconData = visual.optJSONObject("cornerIcon")
     val fallback = visual.optString("fallbackText").take(2)
     val fallbackIconData = visual.optJSONObject("fallbackIcon")
+    val fallbackIconSizeDp = fallbackIconData?.let {
+      val slotSizeDp = minOf(sizeDp, heightDp)
+      if (it.optString("name") == "GlobusOutline") {
+        (slotSizeDp * 1.2f).roundToInt()
+      } else {
+        slotSizeDp
+      }
+    }
     val sourceLoadingStrategy = sources.firstOrNull()?.first?.optString("loadingStrategy", "none") ?: "none"
     val showsSourcePlaceholder = !isIcon && sources.isNotEmpty() && sourceLoadingStrategy != "none"
     val handlesSourceFallback =
       !isIcon && sources.isNotEmpty() &&
         showsSourcePlaceholder &&
         (visual.has("fallbackText") || fallbackIconData != null)
-    leadingFallback.text = if (handlesSourceFallback) "" else fallback
+    val sourceFallbackKey = if (handlesSourceFallback) {
+      sources.firstOrNull()?.first?.let(::sourceFallbackStateKey)
+    } else null
+    val restoresSourceFallback =
+      sourceFallbackKey?.let(NativeListSourceFallbackState::has) == true
+    leadingFallback.text =
+      if (handlesSourceFallback && !restoresSourceFallback) "" else fallback
     leadingFallback.setTextColor(parseNativeListColor("#00000072"))
     val visualBackground = safeColor(
       visual.optString("backgroundColor"),
@@ -3239,6 +3278,23 @@ internal class NativeListRowView(
     )
     leadingFallback.visibility =
       if (!isIcon && (sources.isEmpty() || handlesSourceFallback)) VISIBLE else GONE
+    if (handlesSourceFallback && fallbackIconData != null) {
+      leadingIcon.iconName = fallbackIconData.optString("name")
+      leadingIcon.tintColor = safeColor(
+        fallbackIconData.optString("tintColor"),
+        parseNativeListColor("#0000009B"),
+      )
+      leadingIcon.layoutParams = FrameLayout.LayoutParams(
+        dp(fallbackIconSizeDp ?: sizeDp),
+        dp(fallbackIconSizeDp ?: heightDp),
+        Gravity.CENTER,
+      )
+      leadingIcon.glyphSizeDp = fallbackIconSizeDp
+      // Keep the fallback measured while the source loads so an asynchronous
+      // failure can reveal it without waiting for another RecyclerView layout.
+      leadingFallback.visibility = if (restoresSourceFallback) GONE else VISIBLE
+      leadingIcon.visibility = if (restoresSourceFallback) VISIBLE else INVISIBLE
+    }
     if (isIcon) {
       leadingFrame.background = GradientDrawable().apply {
         setColor(visualBackground)
@@ -3258,6 +3314,12 @@ internal class NativeListRowView(
         fallbackIconData.optString("tintColor"),
         parseNativeListColor("#0000009B"),
       )
+      leadingIcon.layoutParams = FrameLayout.LayoutParams(
+        dp(fallbackIconSizeDp ?: sizeDp),
+        dp(fallbackIconSizeDp ?: heightDp),
+        Gravity.CENTER,
+      )
+      leadingIcon.glyphSizeDp = fallbackIconSizeDp
       leadingIcon.visibility = VISIBLE
     }
     val visibleSources = sources.take(leadingImages.size)
@@ -3356,6 +3418,7 @@ internal class NativeListRowView(
       bindImage(source, image, boundKey ?: "", index, variant,
         onLoad = if (!ownsSourceFallback) null else ({
           if (bindingEpoch == expectedEpoch) {
+            sourceFallbackKey?.let(NativeListSourceFallbackState::forget)
             image.visibility = VISIBLE
             leadingFallback.visibility = GONE
             leadingIcon.visibility = GONE
@@ -3363,6 +3426,7 @@ internal class NativeListRowView(
         }),
         onError = if (!ownsSourceFallback) null else ({
           if (bindingEpoch == expectedEpoch) {
+            sourceFallbackKey?.let(NativeListSourceFallbackState::remember)
             image.visibility = GONE
             if (fallbackIcon != null) {
               leadingFallback.visibility = GONE
@@ -3473,6 +3537,11 @@ internal class NativeListRowView(
     }
   }
 
+  private fun sourceFallbackStateKey(source: JSONObject): String? =
+    source.optString("uri").trim().takeIf(String::isNotEmpty)?.let { uri ->
+      "$uri\u0000${source.optJSONObject("headers")?.toString().orEmpty()}"
+    }
+
   private fun leadingImageLayout(
     index: Int,
     count: Int,
@@ -4159,8 +4228,10 @@ internal class NativeListRowView(
     val uri = source.optString("uri").trim().takeIf(String::isNotEmpty)
     val sourceHeadersJson = source.optJSONObject("headers")?.toString()
     val recyclingKey = if (retryAttempt == 0) "$token:$slot" else "$token:$slot:retry:$retryAttempt"
-    if (hideUntilLoaded && !imageView.isDisplaying(uri, sourceHeadersJson, recyclingKey)) {
-      imageView.visibility = INVISIBLE
+    if (hideUntilLoaded) {
+      imageView.visibility = if (
+        imageView.isDisplaying(uri, sourceHeadersJson, recyclingKey)
+      ) VISIBLE else INVISIBLE
     }
     val handleLoad: (() -> Unit)? = if (hideUntilLoaded) ({
       if (bindingEpoch == expectedEpoch) {
@@ -4194,8 +4265,8 @@ internal class NativeListRowView(
       }),
       onError = if (retryLimit == 0) handleError else ({
         if (bindingEpoch == expectedEpoch) {
-          if (retryAttempt >= retryLimit) handleError?.invoke()
-          else if (!selectorImageRetries.containsKey(imageView)) {
+          handleError?.invoke()
+          if (retryAttempt < retryLimit && !selectorImageRetries.containsKey(imageView)) {
             val retry = Runnable {
               if (bindingEpoch == expectedEpoch) {
                 selectorImageRetries.remove(imageView)

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

@@ -53,6 +53,24 @@ import kotlin.math.roundToInt
 import kotlin.math.sin
 import kotlin.math.sqrt
 
+private class NativeListGridLayoutManager(
+  context: Context,
+  spanCount: Int,
+) : GridLayoutManager(context, spanCount) {
+  override fun removeAndRecycleViewAt(index: Int, recycler: RecyclerView.Recycler) {
+    val child = getChildAt(index) ?: return
+    removeViewAt(index)
+    // An index-based removal can leave the selected child attached during rapid
+    // nested scrolling. Detach that exact view before giving it to RecyclerView.
+    if (child.parent != null) removeView(child)
+    if (child.parent == null) {
+      recycler.recycleView(child)
+    } else {
+      requestLayout()
+    }
+  }
+}
+
 class NativeListView(
   private val reactContext: ThemedReactContext,
 ) : LinearLayout(reactContext) {
@@ -110,7 +128,7 @@ class NativeListView(
   private var refreshIndicatorOffsetPx = 0
   private val contentContainer = FrameLayout(context)
   private val adapter = NativeListAdapter(reactContext)
-  private val layoutManager = GridLayoutManager(context, 1)
+  private val layoutManager = NativeListGridLayoutManager(context, 1)
   // OneKey patch: vertical lists retain vertical drags and leave horizontal drags to a parent pager.
   private val pagerGestureTouchSlop = ViewConfiguration.get(context).scaledTouchSlop
   private var pagerGestureIsVertical = false

package/ios/NativeListCell.swift

@@ -4,6 +4,26 @@ import CoreText
 import OneKeyImage
 import UIKit
 
+private enum NativeListSourceFallbackState {
+  private static let sources: NSCache<NSString, NSNumber> = {
+    let cache = NSCache<NSString, NSNumber>()
+    cache.countLimit = 128
+    return cache
+  }()
+
+  static func has(_ key: String) -> Bool {
+    sources.object(forKey: key as NSString) != nil
+  }
+
+  static func remember(_ key: String) {
+    sources.setObject(NSNumber(value: true), forKey: key as NSString)
+  }
+
+  static func forget(_ key: String) {
+    sources.removeObject(forKey: key as NSString)
+  }
+}
+
 // Market/TokenListSkeleton: source geometry and the native Skeleton's 3s shimmer.
 private final class NativeListMarketSkeleton: UIView {
   private let marks = (0..<5).map { _ in UIView() }
@@ -3408,12 +3428,20 @@ final class NativeListCell: UICollectionViewCell {
     let cornerIcon = visual.dictionary("cornerIcon")
     let fallbackText = String(visual.string("fallbackText").prefix(2))
     let fallbackIconData = visual.dictionary("fallbackIcon")
+    let fallbackIconSize = fallbackIconData.map {
+      let slotSize = min(leadingWidth.constant, leadingHeight.constant)
+      return $0.string("name") == "GlobusOutline" ? slotSize * 1.2 : slotSize
+    }
     let sourceLoadingStrategy = sources.first?.data.string("loadingStrategy", default: "none") ?? "none"
     let showsSourcePlaceholder = !isIcon && !sources.isEmpty && sourceLoadingStrategy != "none"
     let handlesSourceFallback = !isIcon && !sources.isEmpty &&
       showsSourcePlaceholder &&
       (visual["fallbackText"] != nil || fallbackIconData != nil)
-    fallbackLabel.text = handlesSourceFallback ? nil : fallbackText
+    let sourceFallbackKey = handlesSourceFallback
+      ? sources.first.flatMap { sourceFallbackStateKey($0.data) }
+      : nil
+    let restoresSourceFallback = sourceFallbackKey.map(NativeListSourceFallbackState.has) ?? false
+    fallbackLabel.text = handlesSourceFallback && !restoresSourceFallback ? nil : fallbackText
     let sourceFallbackBackground = currentTheme?["strongBackground"] as? String ?? "#0000000F"
     // OneKey patch: source-backed visuals default to no placeholder/background.
     // A non-none image loadingStrategy opts back into the themed placeholder.
@@ -3451,6 +3479,20 @@ final class NativeListCell: UICollectionViewCell {
       leadingIconImageView.image = nativeListIcon(named: fallbackIconData.string("name"))
       leadingIconImageView.contentMode = .scaleAspectFit
     }
+    if handlesSourceFallback, let fallbackIconData {
+      fallbackLabel.isHidden = true
+      leadingIconImageView.image = nativeListIcon(named: fallbackIconData.string("name"))
+      leadingIconImageView.tintColor = UIColor(
+        nativeListHex: fallbackIconData.string("tintColor", default: "#646464"),
+        fallback: .darkGray
+      )
+      leadingIconImageView.contentMode = .scaleAspectFit
+      leadingIconWidth.constant = fallbackIconSize ?? leadingWidth.constant
+      leadingIconHeight.constant = fallbackIconSize ?? leadingHeight.constant
+      leadingIconImageView.isHidden = !restoresSourceFallback
+    } else if handlesSourceFallback {
+      fallbackLabel.isHidden = !restoresSourceFallback
+    }
     let visibleSources = Array(sources.prefix(leadingImages.count))
     let tokenPair = kind == "token" && visibleSources.count > 1
     leadingContainer.clipsToBounds = !tokenPair && cornerIcon == nil
@@ -3506,6 +3548,9 @@ final class NativeListCell: UICollectionViewCell {
       bindImage(source.data, into: imageView, token: key, slot: index, variant: source.variant,
         onLoad: !ownsSourceFallback ? nil : { [weak self, weak imageView] in
           guard let self, self.bindingEpoch == expectedEpoch else { return }
+          if let sourceFallbackKey {
+            NativeListSourceFallbackState.forget(sourceFallbackKey)
+          }
           imageView?.isHidden = false
           self.fallbackLabel.isHidden = true
           self.leadingIconImageView.isHidden = true
@@ -3513,6 +3558,9 @@ final class NativeListCell: UICollectionViewCell {
         },
         onError: !ownsSourceFallback ? nil : { [weak self, weak imageView] in
           guard let self, self.bindingEpoch == expectedEpoch else { return }
+          if let sourceFallbackKey {
+            NativeListSourceFallbackState.remember(sourceFallbackKey)
+          }
           imageView?.isHidden = true
           if let fallbackIcon {
             self.fallbackLabel.isHidden = true
@@ -3643,6 +3691,20 @@ final class NativeListCell: UICollectionViewCell {
     return sources
   }
 
+  private func sourceFallbackStateKey(_ source: [String: Any]) -> String? {
+    let uri = source.string("uri").trimmingCharacters(in: .whitespacesAndNewlines)
+    guard !uri.isEmpty else { return nil }
+    let headersJson: String
+    if let headers = source.dictionary("headers"),
+       JSONSerialization.isValidJSONObject(headers),
+       let data = try? JSONSerialization.data(withJSONObject: headers, options: [.sortedKeys]) {
+      headersJson = String(data: data, encoding: .utf8) ?? ""
+    } else {
+      headersJson = ""
+    }
+    return "\(uri)\u{0}\(headersJson)"
+  }
+
   private func leadingConstraints(
     _ imageView: UIView,
     index: Int,

package/lib/module/web/NativeListWebEngine.js

@@ -537,6 +537,10 @@ export const WEB_LIST_CSS = `
 .ok-native-list-account-row[data-native-list-selector="accountSelector"]>.ok-native-list-accessories[data-native-list-account-control="createAddress"]{position:absolute;top:18px;right:12px}
 .ok-native-list-account-row[data-native-list-selector="accountSelector"] .ok-native-list-accessories>[data-native-list-account-control="createAddress"]{flex-basis:36px;width:36px;height:36px;padding:6px;border-radius:8px}
 .ok-native-list-account-action-row{padding-left:12px;padding-right:12px}.ok-native-list-account-action-row .ok-native-list-action-title{font-size:16px;line-height:24px;font-weight:400}.ok-native-list-account-action-row .ok-native-list-action-title[data-tone="primary"]{color:var(--nl-primary)}
+/* OneKey patch: account selector wallets and accounts keep the default cursor instead of pointer or grab affordances. */
+.ok-native-list-root .ok-native-list-item>.ok-native-list-wallet-row,.ok-native-list-root .ok-native-list-wallet-member>.ok-native-list-wallet-row,.ok-native-list-root .ok-native-list-item>.ok-native-list-account-row,.ok-native-list-root .ok-native-list-item>.ok-native-list-account-action-row,.ok-native-list-wallet-member,.ok-native-list-wallet-row *,.ok-native-list-account-row *,.ok-native-list-account-action-row *{cursor:default}
+/* OneKey patch: Add account hover and pressed backgrounds keep the account row corner radius. */
+.ok-native-list-account-action-row{border-radius:12px}
 `;
 function createElement(document, tag, className, text) {
   const element = document.createElement(tag);

package/package.json

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

package/src/web/NativeListWebEngine.ts

@@ -965,6 +965,10 @@ export const WEB_LIST_CSS = `
 .ok-native-list-account-row[data-native-list-selector="accountSelector"]>.ok-native-list-accessories[data-native-list-account-control="createAddress"]{position:absolute;top:18px;right:12px}
 .ok-native-list-account-row[data-native-list-selector="accountSelector"] .ok-native-list-accessories>[data-native-list-account-control="createAddress"]{flex-basis:36px;width:36px;height:36px;padding:6px;border-radius:8px}
 .ok-native-list-account-action-row{padding-left:12px;padding-right:12px}.ok-native-list-account-action-row .ok-native-list-action-title{font-size:16px;line-height:24px;font-weight:400}.ok-native-list-account-action-row .ok-native-list-action-title[data-tone="primary"]{color:var(--nl-primary)}
+/* OneKey patch: account selector wallets and accounts keep the default cursor instead of pointer or grab affordances. */
+.ok-native-list-root .ok-native-list-item>.ok-native-list-wallet-row,.ok-native-list-root .ok-native-list-wallet-member>.ok-native-list-wallet-row,.ok-native-list-root .ok-native-list-item>.ok-native-list-account-row,.ok-native-list-root .ok-native-list-item>.ok-native-list-account-action-row,.ok-native-list-wallet-member,.ok-native-list-wallet-row *,.ok-native-list-account-row *,.ok-native-list-account-action-row *{cursor:default}
+/* OneKey patch: Add account hover and pressed backgrounds keep the account row corner radius. */
+.ok-native-list-account-action-row{border-radius:12px}
 `;
 
 function createElement(