@onekeyfe/react-native-image 3.0.153 → 3.0.155

package/ios/OneKeyImage.swift

@@ -243,7 +243,11 @@ final class HybridOneKeyImage: HybridOneKeyImageSpec, RecyclableView {
     guard !hostView.bounds.isEmpty else {
       cancelCurrentRequest(invalidateGeneration: true)
       lastRequestSignature = nil
-      showLoading(requestIsActive: false, letLibraryStartIndicator: false)
+      // A memory-cached image shown from `identityDidChange` before layout
+      // stays up; layout re-runs this load with real bounds and confirms it.
+      if displayState != .image {
+        showLoading(requestIsActive: false, letLibraryStartIndicator: false)
+      }
       return
     }
     guard let rawString = sourceUri, !rawString.isEmpty else {
@@ -545,7 +549,13 @@ final class HybridOneKeyImage: HybridOneKeyImageSpec, RecyclableView {
   }
 
   private func showMemoryCachedImageIfAvailable(requestIsActive: Bool) -> Bool {
-    guard cachePolicy == .memory || cachePolicy == .memoryDisk,
+    // JS leaves `cachePolicy` unset for the common case and Fabric then hands
+    // Nitro a nil, which the request path already treats as memory-disk; the
+    // probe must agree, otherwise a nil policy skips the memory lookup entirely
+    // and every mount pays the async pipeline round trip (an icon skeleton
+    // frame) for an image that is already decoded in memory.
+    let effectivePolicy = cachePolicy ?? .memoryDisk
+    guard effectivePolicy == .memory || effectivePolicy == .memoryDisk,
           let sourceUri,
           let rawURL = URL(string: sourceUri) else {
       return false
@@ -565,11 +575,19 @@ final class HybridOneKeyImage: HybridOneKeyImageSpec, RecyclableView {
         hasCustomIdentity: hasCustomIdentity
       )
       : rawURL
-    let thumbnailPixelSize = OneKeyImageDecodeSizing.thumbnailPixelSize(
-      viewSize: hostView.bounds.size,
-      scale: screenScale,
-      contentFit: contentFit ?? .cover
-    )
+    // Before layout the bounds are empty; fall back to the `resizeWidth` hint so
+    // the probe key matches the prewarm / post-layout request instead of
+    // missing on every mount frame.
+    let thumbnailPixelSize = OneKeyImageDecodeSizing.probeViewSize(
+      bounds: hostView.bounds.size,
+      resizeWidth: resizeWidth
+    ).flatMap {
+      OneKeyImageDecodeSizing.thumbnailPixelSize(
+        viewSize: $0,
+        scale: screenScale,
+        contentFit: contentFit ?? .cover
+      )
+    }
     func memoryCachedImage(for url: URL) -> UIImage? {
       let context = OneKeyImageRequestContext.make(
         headersJson: sourceHeadersJson,

package/ios/OneKeyImageRequestContext.swift

@@ -610,6 +610,19 @@ enum OneKeyImageDecodeSizing {
     }
   }
 
+  /// The logical size to probe the memory cache with. Before the first layout
+  /// the host view has no bounds, but the JS side already knows the display
+  /// size through `resizeWidth` (the same hint the prewarm used), so a square
+  /// from it yields the decode-thumbnail key the laid-out view will ask for.
+  /// A cached image can then show on the mount frame instead of a skeleton
+  /// until layout re-probes.
+  static func probeViewSize(bounds: CGSize, resizeWidth: Double?) -> CGSize? {
+    if bounds.width.isFinite, bounds.height.isFinite, bounds.width > 0, bounds.height > 0 {
+      return bounds
+    }
+    return logicalViewSize(width: resizeWidth, height: nil)
+  }
+
   static func thumbnailPixelSize(
     viewSize: CGSize,
     scale: CGFloat,

package/ios/tests/OneKeyImageInfrastructureTests.swift

@@ -310,6 +310,33 @@ final class OneKeyImageInfrastructureTests: XCTestCase {
     )
   }
 
+  func testMemoryProbeFallsBackToResizeWidthBeforeLayout() throws {
+    // Laid out: the real bounds win, even with a hint.
+    XCTAssertEqual(
+      OneKeyImageDecodeSizing.probeViewSize(
+        bounds: CGSize(width: 40, height: 64),
+        resizeWidth: 32
+      ),
+      CGSize(width: 40, height: 64)
+    )
+    // Not laid out yet: a square from the hint, matching the prewarm key.
+    let probe = try XCTUnwrap(
+      OneKeyImageDecodeSizing.probeViewSize(bounds: .zero, resizeWidth: 40)
+    )
+    XCTAssertEqual(probe, CGSize(width: 40, height: 40))
+    XCTAssertEqual(
+      OneKeyImageDecodeSizing.thumbnailPixelSize(viewSize: probe, scale: 3, contentFit: .cover),
+      OneKeyImageDecodeSizing.thumbnailPixelSize(
+        viewSize: try XCTUnwrap(OneKeyImageDecodeSizing.logicalViewSize(width: 40, height: nil)),
+        scale: 3,
+        contentFit: .cover
+      )
+    )
+    // No bounds and no usable hint: nothing to probe with.
+    XCTAssertNil(OneKeyImageDecodeSizing.probeViewSize(bounds: .zero, resizeWidth: nil))
+    XCTAssertNil(OneKeyImageDecodeSizing.probeViewSize(bounds: .zero, resizeWidth: 0))
+  }
+
   func testNoSizePreloadUsesCappedDecodeTarget() {
     XCTAssertEqual(HybridOneKeyImageCache.maximumConcurrentPreloads, 4)
     XCTAssertEqual(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-image",
-  "version": "3.0.153",
+  "version": "3.0.155",
   "description": "High-performance native image view for OneKey",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -81,7 +81,7 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "@onekeyfe/react-native-skeleton": "3.0.153",
+    "@onekeyfe/react-native-skeleton": "3.0.155",
     "react": "*",
     "react-native": "*",
     "react-native-nitro-modules": "0.37.0"