@onekeyfe/react-native-native-list 3.0.117 → 3.0.119

package/README.md

@@ -240,6 +240,12 @@ const avatar = {
 } as const;
 ```
 
+NativeList defaults `loadingStrategy` to `none`, so source-backed images render
+without a loading background or terminal fallback. Set it to `static` or
+`skeleton` to opt into loading UI; a configured `fallbackText` or
+`fallbackIcon` is shown after a terminal load failure only when loading UI is
+enabled.
+
 Each cell owns a fixed pool of native `OneKeyImageReusableView` slots. On bind,
 NativeList forwards the URI, headers, content fit, cache policy, autoplay, TOS
 options, overscan, and loading strategy. A stable `rowKey:slot` recycling key

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

@@ -506,6 +506,7 @@ internal class NativeListRowView(
   private var checkboxUsesSelectorStyle = false
   private var iconSubduedColor = Color.rgb(141, 141, 141)
   private var visualBackdropColor = Color.WHITE
+  private var imagePlaceholderColor = "#0000000F"
   private val circleOutlineProvider = object : ViewOutlineProvider() {
     override fun getOutline(view: View, outline: Outline) {
       outline.setOval(0, 0, view.width, view.height)
@@ -914,6 +915,8 @@ internal class NativeListRowView(
     }
     iconSubduedColor = color(theme, "iconSubdued", "#00000072")
     visualBackdropColor = color(theme, "rowBackground", "#FFFFFF")
+    imagePlaceholderColor = theme?.optString("strongBackground", "#0000000F")
+      ?.takeIf(String::isNotEmpty) ?: "#0000000F"
     unreadDot.background = roundedFill(
       parseNativeListColor("#E5484D"),
       4f,
@@ -2492,11 +2495,12 @@ internal class NativeListRowView(
     mediaMetadataRow.gravity = Gravity.CENTER_VERTICAL
     mediaMetadataRow.addView(subtitle, weighted().apply { marginEnd = dp(8) })
     item.json.optJSONObject("networkImage")?.let { networkImage ->
-      mediaNetworkImage.visibility = VISIBLE
+      // OneKey patch: Preserve badge layout without exposing a loading/error tile.
+      // mediaNetworkImage.visibility = VISIBLE
       mediaNetworkImage.outlineProvider = circleOutlineProvider
       mediaNetworkImage.clipToOutline = true
       mediaMetadataRow.addView(mediaNetworkImage, LayoutParams(dp(14), dp(14)))
-      bindImage(networkImage, mediaNetworkImage, item.key, 2, "network")
+      bindImage(networkImage, mediaNetworkImage, item.key, 2, "network", hideUntilLoaded = true)
     }
     mainColumn.addView(mediaMetadataRow, 0)
     mainColumn.addView(titleLine, 1)
@@ -3184,11 +3188,19 @@ internal class NativeListRowView(
     val isIcon = kind == "icon"
     val cornerIconData = visual.optJSONObject("cornerIcon")
     val fallback = visual.optString("fallbackText").take(2)
-    leadingFallback.text = fallback
+    val fallbackIconData = visual.optJSONObject("fallbackIcon")
+    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
     leadingFallback.setTextColor(parseNativeListColor("#00000072"))
     val visualBackground = safeColor(
       visual.optString("backgroundColor"),
-      parseNativeListColor(if (isIcon) "#0000000F" else "#E0E0E0"),
+      // OneKey patch: source-backed visuals default to no placeholder/background.
+      if (!isIcon && sources.isNotEmpty()) Color.TRANSPARENT else parseNativeListColor(imagePlaceholderColor),
     )
     if (!isIcon && visual.optString("backgroundColor").isNotEmpty()) {
       leadingFrame.background = roundedFill(
@@ -3197,10 +3209,11 @@ internal class NativeListRowView(
       )
     }
     leadingFallback.background = roundedFill(
-      visualBackground,
+      if (handlesSourceFallback) parseNativeListColor(imagePlaceholderColor) else visualBackground,
       cornerRadiusDp ?: leadingCornerRadius(shape, minOf(sizeDp, heightDp)),
     )
-    leadingFallback.visibility = if (!isIcon && sources.isEmpty()) VISIBLE else GONE
+    leadingFallback.visibility =
+      if (!isIcon && (sources.isEmpty() || handlesSourceFallback)) VISIBLE else GONE
     if (isIcon) {
       leadingFrame.background = GradientDrawable().apply {
         setColor(visualBackground)
@@ -3213,6 +3226,14 @@ internal class NativeListRowView(
         parseNativeListColor("#0000009B"),
       )
       leadingIcon.visibility = VISIBLE
+    } else if (sources.isEmpty() && fallbackIconData != null) {
+      leadingFallback.visibility = GONE
+      leadingIcon.iconName = fallbackIconData.optString("name")
+      leadingIcon.tintColor = safeColor(
+        fallbackIconData.optString("tintColor"),
+        parseNativeListColor("#0000009B"),
+      )
+      leadingIcon.visibility = VISIBLE
     }
     val visibleSources = sources.take(leadingImages.size)
     val tokenPair = kind == "token" && visibleSources.size > 1
@@ -3265,7 +3286,10 @@ internal class NativeListRowView(
     }
     visibleSources.forEachIndexed { index, (source, variant) ->
       val image = leadingImages[index]
-      image.visibility = VISIBLE
+      // OneKey patch: Decorative badges and source-owned fallbacks stay hidden until loaded.
+      // image.visibility = VISIBLE
+      val ownsSourceFallback = index == 0 && handlesSourceFallback
+      image.visibility = if (index > 0 || ownsSourceFallback) INVISIBLE else VISIBLE
       image.layoutParams = leadingImageLayout(
         index = index,
         count = visibleSources.size,
@@ -3302,21 +3326,32 @@ internal class NativeListRowView(
         marketLeadingUsesSourceClip = true
         image.clipToOutline = false
       }
-      val fallbackIcon = if (index == 0) visual.optJSONObject("fallbackIcon") else null
+      val fallbackIcon = if (index == 0) fallbackIconData else null
       val expectedEpoch = bindingEpoch
       bindImage(source, image, boundKey ?: "", index, variant,
-        onLoad = if (fallbackIcon == null) null else ({
-          if (bindingEpoch == expectedEpoch) { image.visibility = VISIBLE; leadingIcon.visibility = GONE }
+        onLoad = if (!ownsSourceFallback) null else ({
+          if (bindingEpoch == expectedEpoch) {
+            image.visibility = VISIBLE
+            leadingFallback.visibility = GONE
+            leadingIcon.visibility = GONE
+          }
         }),
-        onError = if (fallbackIcon == null) null else ({
+        onError = if (!ownsSourceFallback) null else ({
           if (bindingEpoch == expectedEpoch) {
             image.visibility = GONE
-            leadingFallback.visibility = GONE
-            leadingIcon.iconName = fallbackIcon.optString("name")
-            leadingIcon.tintColor = safeColor(fallbackIcon.optString("tintColor"), parseNativeListColor("#0000009B"))
-            leadingIcon.visibility = VISIBLE
+            if (fallbackIcon != null) {
+              leadingFallback.visibility = GONE
+              leadingIcon.iconName = fallbackIcon.optString("name")
+              leadingIcon.tintColor = safeColor(fallbackIcon.optString("tintColor"), parseNativeListColor("#0000009B"))
+              leadingIcon.visibility = VISIBLE
+            } else {
+              leadingIcon.visibility = GONE
+              leadingFallback.text = fallback
+              leadingFallback.visibility = VISIBLE
+            }
           }
         }),
+        hideUntilLoaded = index > 0 || ownsSourceFallback,
       )
     }
     // OneKey patch: wallet overlays retain source images, provider colors and QR text.
@@ -3339,7 +3374,7 @@ internal class NativeListRowView(
         val image = overlay.optJSONObject("image")
         val view = when {
           image != null -> OneKeyImageReusableView(reactContext).also {
-            bindImage(image, it, boundKey ?: "", 10 + index, "generic")
+            bindImage(image, it, boundKey ?: "", 10 + index, "generic", hideUntilLoaded = true)
             selectorImages.add(it)
           }
           overlay.optString("text").isNotEmpty() -> TextView(context).apply {
@@ -4086,12 +4121,26 @@ internal class NativeListRowView(
     variant: String,
     onLoad: (() -> Unit)? = null,
     onError: (() -> Unit)? = null,
+    hideUntilLoaded: Boolean = false,
     retryAttempt: Int = 0,
   ) {
     selectorImageRetries.remove(imageView)?.let(imageView::removeCallbacks)
     val expectedEpoch = bindingEpoch
     val retryLimit = source.optInt("retryTimes", 0).coerceAtLeast(0)
     val uri = source.optString("uri").trim().takeIf(String::isNotEmpty)
+    if (hideUntilLoaded) imageView.visibility = INVISIBLE
+    val handleLoad: (() -> Unit)? = if (hideUntilLoaded) ({
+      if (bindingEpoch == expectedEpoch) {
+        imageView.visibility = VISIBLE
+        onLoad?.invoke()
+      }
+    }) else onLoad
+    val handleError: (() -> Unit)? = if (hideUntilLoaded) ({
+      if (bindingEpoch == expectedEpoch) {
+        imageView.visibility = INVISIBLE
+        onError?.invoke()
+      }
+    }) else onError
     imageView.configure(
       sourceUri = uri,
       sourceHeadersJson = source.optJSONObject("headers")?.toString(),
@@ -4102,21 +4151,22 @@ internal class NativeListRowView(
       recyclingKey = if (retryAttempt == 0) "$token:$slot" else "$token:$slot:retry:$retryAttempt",
       optimizeTos = retryAttempt == 0 && source.optBoolean("optimizeTos", true),
       overscan = source.optDouble("overscan", 1.1),
-      loadingStrategy = source.optString("loadingStrategy", "static"),
-      onLoad = if (retryLimit == 0) onLoad else ({
+      loadingStrategy = source.optString("loadingStrategy", "none"),
+      placeholderColor = imagePlaceholderColor,
+      onLoad = if (retryLimit == 0) handleLoad else ({
         if (bindingEpoch == expectedEpoch) {
           selectorImageRetries.remove(imageView)?.let(imageView::removeCallbacks)
-          onLoad?.invoke()
+          handleLoad?.invoke()
         }
       }),
-      onError = if (retryLimit == 0) onError else ({
+      onError = if (retryLimit == 0) handleError else ({
         if (bindingEpoch == expectedEpoch) {
-          if (retryAttempt >= retryLimit) onError?.invoke()
+          if (retryAttempt >= retryLimit) handleError?.invoke()
           else if (!selectorImageRetries.containsKey(imageView)) {
             val retry = Runnable {
               if (bindingEpoch == expectedEpoch) {
                 selectorImageRetries.remove(imageView)
-                bindImage(source, imageView, token, slot, variant, onLoad, onError, retryAttempt + 1)
+                bindImage(source, imageView, token, slot, variant, onLoad, onError, hideUntilLoaded, retryAttempt + 1)
               }
             }
             selectorImageRetries[imageView] = retry

package/ios/NativeListCell.swift

@@ -1835,7 +1835,13 @@ final class NativeListCell: UICollectionViewCell {
         let label = UILabel()
         label.font = nativeListFont(ofSize: 14)
         label.lineBreakMode = .byTruncatingTail
-        label.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+        // Match V1: the balance may shrink, but keep the shortened address intact.
+        label.setContentCompressionResistancePriority(
+          item.data.string("presentation") == "accountSelector" && segment.bool("separatorBefore")
+            ? .defaultHigh
+            : .defaultLow,
+          for: .horizontal
+        )
         label.textColor = dataTextColor(segment.string("tone", default: "secondary"), theme: theme)
         setLineHeight(label, text: segment.string("text"), lineHeight: 20)
         let runs = segment.dictionaries("textSegments")
@@ -2591,13 +2597,15 @@ final class NativeListCell: UICollectionViewCell {
     subtitleLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
     if let networkImage = item.data.dictionary("networkImage") {
       mediaMetadataStack.addArrangedSubview(mediaNetworkImage)
-      mediaNetworkImage.isHidden = false
+      // OneKey patch: Preserve badge layout without exposing a loading/error tile.
+      // mediaNetworkImage.isHidden = false
       bindImage(
         networkImage,
         into: mediaNetworkImage,
         token: item.key,
         slot: 2,
-        variant: "network"
+        variant: "network",
+        hideUntilLoaded: true
       )
     }
     mainStack.insertArrangedSubview(mediaMetadataStack, at: 0)
@@ -3367,14 +3375,28 @@ final class NativeListCell: UICollectionViewCell {
       default: kind == "image" || mediaHeight.isActive ? "rounded" : "circle"
     )
     let cornerIcon = visual.dictionary("cornerIcon")
-    fallbackLabel.text = String(visual.string("fallbackText").prefix(2))
-    leadingContainer.backgroundColor = UIColor(
-      nativeListHex: visual.string("backgroundColor", default: isIcon ? "#F0F0F0" : "#E0E0E0"),
-      fallback: .gray
+    let fallbackText = String(visual.string("fallbackText").prefix(2))
+    let fallbackIconData = visual.dictionary("fallbackIcon")
+    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 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.
+    let visualBackground = visual.string(
+      "backgroundColor",
+      default: !isIcon && !sources.isEmpty ? "#00000000" : sourceFallbackBackground
     )
+    let visualBackgroundColor = UIColor(nativeListHex: visualBackground, fallback: .clear)
+    leadingContainer.backgroundColor = handlesSourceFallback
+      ? UIColor(nativeListHex: sourceFallbackBackground, fallback: .clear)
+      : visualBackgroundColor
     leadingContainer.layer.cornerRadius = leadingCornerRadius(shape: shape)
     leadingContainer.clipsToBounds = true
-    fallbackLabel.isHidden = isIcon || !sources.isEmpty
+    fallbackLabel.isHidden = isIcon || (!sources.isEmpty && !handlesSourceFallback)
     if isIcon {
       leadingContainer.layer.borderWidth = 1 / UIScreen.main.scale
       leadingContainer.layer.borderColor = UIColor(
@@ -3388,6 +3410,15 @@ final class NativeListCell: UICollectionViewCell {
       )
       leadingIconImageView.image = nativeListIcon(named: visual.string("name"))
       leadingIconImageView.contentMode = .scaleAspectFit
+    } else if sources.isEmpty, let fallbackIconData {
+      fallbackLabel.isHidden = true
+      leadingIconImageView.isHidden = false
+      leadingIconImageView.tintColor = UIColor(
+        nativeListHex: fallbackIconData.string("tintColor", default: "#646464"),
+        fallback: .darkGray
+      )
+      leadingIconImageView.image = nativeListIcon(named: fallbackIconData.string("name"))
+      leadingIconImageView.contentMode = .scaleAspectFit
     }
     let visibleSources = Array(sources.prefix(leadingImages.count))
     let tokenPair = kind == "token" && visibleSources.count > 1
@@ -3422,7 +3453,10 @@ final class NativeListCell: UICollectionViewCell {
     }
     for (index, source) in visibleSources.enumerated() {
       let imageView = leadingImages[index]
-      imageView.isHidden = false
+      // OneKey patch: Decorative badges and source-owned fallbacks stay hidden until loaded.
+      // imageView.isHidden = false
+      let ownsSourceFallback = index == 0 && handlesSourceFallback
+      imageView.isHidden = index > 0 || ownsSourceFallback
       imageView.clipsToBounds = true
       leadingSlotConstraints.append(contentsOf: leadingConstraints(
         imageView,
@@ -3436,22 +3470,31 @@ final class NativeListCell: UICollectionViewCell {
         imageView.layer.cornerRadius = 0
         imageView.clipsToBounds = false
       }
-      let fallbackIcon = index == 0 ? visual.dictionary("fallbackIcon") : nil
+      let fallbackIcon = index == 0 ? fallbackIconData : nil
       let expectedEpoch = bindingEpoch
       bindImage(source.data, into: imageView, token: key, slot: index, variant: source.variant,
-        onLoad: fallbackIcon == nil ? nil : { [weak self, weak imageView] in
+        onLoad: !ownsSourceFallback ? nil : { [weak self, weak imageView] in
           guard let self, self.bindingEpoch == expectedEpoch else { return }
           imageView?.isHidden = false
+          self.fallbackLabel.isHidden = true
           self.leadingIconImageView.isHidden = true
+          self.leadingContainer.backgroundColor = visualBackgroundColor
         },
-        onError: fallbackIcon == nil ? nil : { [weak self, weak imageView] in
-          guard let self, self.bindingEpoch == expectedEpoch, let fallbackIcon else { return }
+        onError: !ownsSourceFallback ? nil : { [weak self, weak imageView] in
+          guard let self, self.bindingEpoch == expectedEpoch else { return }
           imageView?.isHidden = true
-          self.fallbackLabel.isHidden = true
-          self.leadingIconImageView.image = nativeListIcon(named: fallbackIcon.string("name"))
-          self.leadingIconImageView.tintColor = UIColor(nativeListHex: fallbackIcon.string("tintColor", default: "#646464"), fallback: .darkGray)
-          self.leadingIconImageView.isHidden = false
-        })
+          if let fallbackIcon {
+            self.fallbackLabel.isHidden = true
+            self.leadingIconImageView.image = nativeListIcon(named: fallbackIcon.string("name"))
+            self.leadingIconImageView.tintColor = UIColor(nativeListHex: fallbackIcon.string("tintColor", default: "#646464"), fallback: .darkGray)
+            self.leadingIconImageView.isHidden = false
+          } else {
+            self.leadingIconImageView.isHidden = true
+            self.fallbackLabel.text = fallbackText
+            self.fallbackLabel.isHidden = false
+          }
+        },
+        hideUntilLoaded: index > 0 || ownsSourceFallback)
     }
     // OneKey patch: source-derived wallet decorations may occupy both corners.
     let overlays = visual.dictionaries("overlays")
@@ -3468,7 +3511,15 @@ final class NativeListCell: UICollectionViewCell {
       let width = CGFloat(overlay.double("width", default: isWalletText ? Double(naturalTextWidth) : Double(size)))
       let frame = UIView()
       frame.translatesAutoresizingMaskIntoConstraints = false
-      frame.backgroundColor = UIColor(nativeListHex: overlay.string("backgroundColor", default: "#FFFFFF"), fallback: .clear)
+      // OneKey patch: The row theme, not a light-only white, owns badge backing.
+      // frame.backgroundColor = UIColor(nativeListHex: overlay.string("backgroundColor", default: "#FFFFFF"), fallback: .clear)
+      frame.backgroundColor = UIColor(
+        nativeListHex: overlay.string(
+          "backgroundColor",
+          default: currentTheme?["rowBackground"] as? String ?? "#00000000"
+        ),
+        fallback: .clear
+      )
       frame.layer.cornerRadius = min(width, height) / 2
       frame.clipsToBounds = true
       leadingContainer.addSubview(frame)
@@ -3483,7 +3534,14 @@ final class NativeListCell: UICollectionViewCell {
       let content: UIView
       if let image = overlay.dictionary("image") {
         let imageView = OneKeyImageReusableView(frame: .zero)
-        bindImage(image, into: imageView, token: key, slot: 10 + index, variant: "generic")
+        bindImage(
+          image,
+          into: imageView,
+          token: key,
+          slot: 10 + index,
+          variant: "generic",
+          hideUntilLoaded: true
+        )
         selectorImages.append(imageView)
         content = imageView
       } else if !overlay.string("text").isEmpty {
@@ -3943,6 +4001,7 @@ final class NativeListCell: UICollectionViewCell {
     variant: String,
     onLoad: (() -> Void)? = nil,
     onError: (() -> Void)? = nil,
+    hideUntilLoaded: Bool = false,
     retryAttempt: Int = 0
   ) {
     let imageID = ObjectIdentifier(imageView)
@@ -3957,6 +4016,17 @@ final class NativeListCell: UICollectionViewCell {
     } else {
       headersJson = nil
     }
+    if hideUntilLoaded { imageView.isHidden = true }
+    let handleLoad: (() -> Void)? = hideUntilLoaded ? { [weak self, weak imageView] in
+      guard let self, self.bindingEpoch == expectedEpoch else { return }
+      imageView?.isHidden = false
+      onLoad?()
+    } : onLoad
+    let handleError: (() -> Void)? = hideUntilLoaded ? { [weak self, weak imageView] in
+      guard let self, self.bindingEpoch == expectedEpoch else { return }
+      imageView?.isHidden = true
+      onError?()
+    } : onError
     imageView.configure(
       sourceUri: source.string("uri").trimmingCharacters(in: .whitespacesAndNewlines),
       sourceHeadersJson: headersJson,
@@ -3967,20 +4037,21 @@ final class NativeListCell: UICollectionViewCell {
       recyclingKey: retryAttempt == 0 ? "\(token):\(slot)" : "\(token):\(slot):retry:\(retryAttempt)",
       optimizeTos: retryAttempt == 0 && (source["optimizeTos"] == nil || source.bool("optimizeTos")),
       overscan: source["overscan"] == nil ? 1.1 : source.double("overscan"),
-      loadingStrategy: source.string("loadingStrategy", default: "static"),
-      onLoad: retryLimit == 0 ? onLoad : { [weak self] in
+      loadingStrategy: source.string("loadingStrategy", default: "none"),
+      placeholderColor: currentTheme?["strongBackground"] as? String ?? "#0000000F",
+      onLoad: retryLimit == 0 ? handleLoad : { [weak self] in
         guard let self, self.bindingEpoch == expectedEpoch else { return }
         self.selectorImageRetries.removeValue(forKey: imageID)?.cancel()
-        onLoad?()
+        handleLoad?()
       },
-      onError: retryLimit == 0 ? onError : { [weak self, weak imageView] in
+      onError: retryLimit == 0 ? handleError : { [weak self, weak imageView] in
         guard let self, self.bindingEpoch == expectedEpoch, let imageView else { return }
-        guard retryAttempt < retryLimit else { onError?(); return }
+        guard retryAttempt < retryLimit else { handleError?(); return }
         guard self.selectorImageRetries[imageID] == nil else { return }
         let retry = DispatchWorkItem { [weak self, weak imageView] in
           guard let self, self.bindingEpoch == expectedEpoch, let imageView else { return }
           self.selectorImageRetries.removeValue(forKey: imageID)
-          self.bindImage(source, into: imageView, token: token, slot: slot, variant: variant, onLoad: onLoad, onError: onError, retryAttempt: retryAttempt + 1)
+          self.bindImage(source, into: imageView, token: token, slot: slot, variant: variant, onLoad: onLoad, onError: onError, hideUntilLoaded: hideUntilLoaded, retryAttempt: retryAttempt + 1)
         }
         self.selectorImageRetries[imageID] = retry
         DispatchQueue.main.asyncAfter(deadline: .now() + Double(Int.random(in: 0...2)), execute: retry)