@onekeyfe/react-native-image 3.0.106 → 3.0.107

package/android/src/main/java/com/margelo/nitro/onekeyimage/OneKeyImage.kt

@@ -118,6 +118,7 @@ internal fun oneKeyImageRequestSignature(
   width: Int,
   height: Int,
   density: Float,
+  resizeWidth: Double? = null,
 ): String = listOf(
   rawUrl,
   sourceHeadersJson.orEmpty(),
@@ -126,6 +127,7 @@ internal fun oneKeyImageRequestSignature(
   (contentFit ?: OneKeyImageContentFit.COVER).name,
   optimizeTos.toString(),
   overscan.toString(),
+  resizeWidth.toString(),
   width.toString(),
   height.toString(),
   density.toString(),
@@ -223,6 +225,12 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
       field = value
       requestIdentityChanged()
     }
+  override var resizeWidth: Double? = null
+    set(value) {
+      if (field == value) return
+      field = value
+      requestIdentityChanged()
+    }
   override var loadingStrategy: OneKeyImageLoadingStrategy? = OneKeyImageLoadingStrategy.STATIC
     set(value) {
       field = value
@@ -306,6 +314,7 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
     autoplay = false
     recyclingKey = null
     optimizeTos = true
+    resizeWidth = null
     overscan = 1.1
     loadingStrategy = OneKeyImageLoadingStrategy.STATIC
     onLoadStart = null
@@ -359,6 +368,7 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
       width = hostView.width,
       height = hostView.height,
       density = hostView.resources.displayMetrics.density,
+      resizeWidth = resizeWidth,
     )
     if (!force && signature == lastSignature) return
     lastSignature = signature
@@ -370,9 +380,11 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
     val customIdentity = OneKeyImageModel.headers(sourceHeadersJson).isNotEmpty()
     val optimizedUrl = if (optimizeTos != false) {
       val density = hostView.resources.displayMetrics.density.coerceAtLeast(1f)
+      val displaySize = resizeWidth?.takeIf { it.isFinite() && it > 0.0 }
+        ?: (maxOf(hostView.width, hostView.height) / density.toDouble())
       OneKeyTosUrl.optimized(
         rawUrl,
-        ceil(maxOf(hostView.width, hostView.height) / density.toDouble()).toInt(),
+        ceil(displaySize).toInt(),
         density,
         overscan ?: 1.1,
         customIdentity,

package/android/src/main/java/com/margelo/nitro/onekeyimage/OneKeyTosUrl.kt

@@ -3,11 +3,12 @@ package com.margelo.nitro.onekeyimage
 import java.net.URI
 import java.net.URLDecoder
 import java.nio.charset.StandardCharsets
-import kotlin.math.ceil
 
 internal object OneKeyTosUrl {
-  internal val widthBuckets = intArrayOf(
-    32, 40, 48, 64, 96, 128, 160, 200, 256, 320, 480, 640, 960, 1280,
+  // Select by layout size first. Density can only choose between this tier's renditions.
+  private val sizeTiers = arrayOf(
+    Triple(48, 96, 160), Triple(96, 192, 320), Triple(192, 384, 640),
+    Triple(384, 768, 1280), Triple(Int.MAX_VALUE, 1280, 1280),
   )
 
   fun optimized(
@@ -41,14 +42,12 @@ internal object OneKeyTosUrl {
   }
 
   internal fun selectWidthBucket(displaySize: Int, density: Float, overscan: Double): Int {
-    val normalizedDensity = if (density.isFinite()) density.coerceIn(1f, MAX_DPR) else 1f
-    val normalizedOverscan = if (overscan.isFinite()) overscan.coerceAtLeast(1.0) else 1.0
-    val requestedPixels = ceil(displaySize * normalizedDensity * normalizedOverscan)
-    if (!requestedPixels.isFinite() || requestedPixels >= widthBuckets.last()) {
-      return widthBuckets.last()
-    }
-    val requested = requestedPixels.toInt()
-    return widthBuckets.firstOrNull { it >= requested } ?: widthBuckets.last()
+    val tier = sizeTiers.first { displaySize <= it.first }
+    val normalizedDensity = if (density.isFinite()) density.coerceIn(1f, MAX_DPR).toDouble() else 1.0
+    val normalizedOverscan = if (overscan.isFinite()) overscan.coerceAtLeast(1.0) else 1.1
+    // Fixed renditions already account for the default margin. Custom margins stay within the tier.
+    val requestedDensity = normalizedDensity * (normalizedOverscan / 1.1)
+    return if (requestedDensity > 2) tier.third else tier.second
   }
 
   private fun unsupportedExtension(path: String): Boolean {

package/android/src/test/java/com/margelo/nitro/onekeyimage/OneKeyImageRequestSignatureTest.kt

@@ -18,7 +18,15 @@ class OneKeyImageRequestSignatureTest {
     assertEquals(signature(OneKeyImageContentFit.COVER), signature(null))
   }
 
-  private fun signature(contentFit: OneKeyImageContentFit?): String = oneKeyImageRequestSignature(
+  @Test
+  fun resizeWidthParticipatesInRequestIdentity() {
+    assertNotEquals(
+      signature(OneKeyImageContentFit.COVER, 32.0),
+      signature(OneKeyImageContentFit.COVER, 64.0),
+    )
+  }
+
+  private fun signature(contentFit: OneKeyImageContentFit?, resizeWidth: Double? = null): String = oneKeyImageRequestSignature(
     rawUrl = "https://example.com/image.png",
     sourceHeadersJson = null,
     recyclingKey = null,
@@ -29,5 +37,6 @@ class OneKeyImageRequestSignatureTest {
     width = 200,
     height = 100,
     density = 2f,
+    resizeWidth = resizeWidth,
   )
 }

package/android/src/test/java/com/margelo/nitro/onekeyimage/OneKeyTosUrlTest.kt

@@ -6,24 +6,56 @@ import org.junit.Test
 
 class OneKeyTosUrlTest {
   @Test
-  fun selectsFirstBucketCoveringPhysicalOverscannedWidth() {
-    assertEquals(256, OneKeyTosUrl.selectWidthBucket(100, 2f, 1.1))
-    assertEquals(160, OneKeyTosUrl.selectWidthBucket(160, 1f, 1.0))
+  fun commonIconsShareRenditionsAfterApplyingScreenDensity() {
+    for (size in listOf(32, 40, 48)) {
+      for (density in listOf(1f, 2f)) {
+        assertEquals(96, OneKeyTosUrl.selectWidthBucket(size, density, 1.1))
+      }
+      for (density in listOf(2.625f, 3f)) {
+        assertEquals(160, OneKeyTosUrl.selectWidthBucket(size, density, 1.1))
+      }
+    }
+    assertEquals(192, OneKeyTosUrl.selectWidthBucket(64, 2f, 1.1))
+    assertEquals(320, OneKeyTosUrl.selectWidthBucket(64, 3f, 1.1))
+  }
+
+  @Test
+  fun emitsTheCanonicalEncodedURLAndPreservesSourceQuery() {
+    assertEquals(
+      "https://common.onekey-asset.com/token.png?foo=a%20b&x-tos-process=image%2Fresize%2Cw_160#preview",
+      OneKeyTosUrl.optimized(
+        "https://common.onekey-asset.com/token.png?foo=a%20b#preview", 32, 3f, 1.1, false,
+      ),
+    )
+  }
+
+  @Test
+  fun selectsLayoutTierBeforeDensityAndKeepsOverscanWithinIt() {
+    for ((size, standard, highDensity) in listOf(
+      Triple(48, 96, 160), Triple(49, 192, 320), Triple(96, 192, 320),
+      Triple(97, 384, 640), Triple(192, 384, 640), Triple(193, 768, 1280),
+      Triple(384, 768, 1280), Triple(385, 1280, 1280),
+    )) {
+      assertEquals(standard, OneKeyTosUrl.selectWidthBucket(size, 2f, 1.1))
+      assertEquals(highDensity, OneKeyTosUrl.selectWidthBucket(size, 2.625f, 1.1))
+    }
+    assertEquals(160, OneKeyTosUrl.selectWidthBucket(48, 2f, 2.0))
+    assertEquals(384, OneKeyTosUrl.selectWidthBucket(160, 1f, 1.0))
   }
 
   @Test
   fun capsDprAndSelectionAtLargestBucket() {
-    assertEquals(480, OneKeyTosUrl.selectWidthBucket(100, 5f, 1.1))
+    assertEquals(640, OneKeyTosUrl.selectWidthBucket(100, 5f, 1.1))
     assertEquals(1280, OneKeyTosUrl.selectWidthBucket(2000, 3f, 1.1))
   }
 
   @Test
   fun normalizesNonFiniteDensityAndOverscan() {
-    assertEquals(128, OneKeyTosUrl.selectWidthBucket(100, Float.NaN, 1.1))
-    assertEquals(128, OneKeyTosUrl.selectWidthBucket(100, Float.POSITIVE_INFINITY, 1.1))
-    assertEquals(200, OneKeyTosUrl.selectWidthBucket(100, 2f, Double.NaN))
-    assertEquals(200, OneKeyTosUrl.selectWidthBucket(100, 2f, Double.POSITIVE_INFINITY))
-    assertEquals(1280, OneKeyTosUrl.selectWidthBucket(100, 2f, Double.MAX_VALUE))
+    assertEquals(384, OneKeyTosUrl.selectWidthBucket(100, Float.NaN, 1.1))
+    assertEquals(384, OneKeyTosUrl.selectWidthBucket(100, Float.POSITIVE_INFINITY, 1.1))
+    assertEquals(384, OneKeyTosUrl.selectWidthBucket(100, 2f, Double.NaN))
+    assertEquals(384, OneKeyTosUrl.selectWidthBucket(100, 2f, Double.POSITIVE_INFINITY))
+    assertEquals(640, OneKeyTosUrl.selectWidthBucket(100, 2f, Double.MAX_VALUE))
   }
 
   @Test
@@ -44,7 +76,7 @@ class OneKeyTosUrlTest {
         false,
       )
       assertTrue(result.contains("x-tos-process="))
-      assertTrue(result.contains("w_256"))
+      assertTrue(result.contains("w_384"))
     }
     assertEquals(
       "https://web.onekey-asset.com/token.png",

package/ios/OneKeyImage.swift

@@ -121,6 +121,11 @@ final class HybridOneKeyImage: HybridOneKeyImageSpec, RecyclableView {
   var optimizeTos: Bool? = true {
     didSet { if optimizeTos != oldValue { identityDidChange() } }
   }
+  var resizeWidth: Double? {
+    didSet {
+      if !Self.equalOptionalDouble(resizeWidth, oldValue) { identityDidChange() }
+    }
+  }
   var overscan: Double? = 1.1 {
     didSet {
       if !Self.equalOptionalDouble(overscan, oldValue) { identityDidChange() }
@@ -241,6 +246,7 @@ final class HybridOneKeyImage: HybridOneKeyImageSpec, RecyclableView {
       cachePolicy?.stringValue ?? "memory-disk",
       contentFit?.stringValue ?? "cover",
       String(optimizeTos ?? true),
+      resizeWidth.map(String.init(describing:)) ?? "",
       String(overscan ?? 1.1),
       String(Int(hostView.bounds.width.rounded())),
       String(Int(hostView.bounds.height.rounded())),
@@ -270,11 +276,13 @@ final class HybridOneKeyImage: HybridOneKeyImageSpec, RecyclableView {
     }
 
     let hasCustomIdentity = OneKeyImageRequestContext.headers(from: sourceHeadersJson) != nil
+    let displaySize = resizeWidth.flatMap { $0.isFinite && $0 > 0 ? CGFloat($0) : nil }
+      ?? max(hostView.bounds.width, hostView.bounds.height)
     let requestURL =
       (optimizeTos ?? true)
       ? OneKeyTosURL.optimized(
         rawURL: rawURL,
-        displaySize: max(hostView.bounds.width, hostView.bounds.height),
+        displaySize: displaySize,
         scale: screenScale,
         overscan: overscan ?? 1.1,
         hasCustomIdentity: hasCustomIdentity
@@ -463,6 +471,7 @@ final class HybridOneKeyImage: HybridOneKeyImageSpec, RecyclableView {
     autoplay = true
     recyclingKey = nil
     optimizeTos = true
+    resizeWidth = nil
     overscan = 1.1
     loadingStrategy = .static
     onLoadStart = nil

package/ios/OneKeyTosURL.swift

@@ -1,8 +1,10 @@
 import Foundation
 
 enum OneKeyTosURL {
-  static let widthBuckets = [
-    32, 40, 48, 64, 96, 128, 160, 200, 256, 320, 480, 640, 960, 1280,
+  // Select by layout size first. Density can only choose between this tier's renditions.
+  static let sizeTiers: [(maxDisplaySize: CGFloat, standard: Int, highDensity: Int)] = [
+    (48, 96, 160), (96, 192, 320), (192, 384, 640),
+    (384, 768, 1280), (.infinity, 1280, 1280),
   ]
 
   static func optimized(
@@ -24,19 +26,16 @@ enum OneKeyTosURL {
       return rawURL
     }
 
+    let tier = sizeTiers.first(where: { displaySize <= $0.maxDisplaySize })!
     let normalizedScale = scale.isFinite ? min(max(scale, 1), 3) : 1
-    let normalizedOverscan = overscan.isFinite ? max(overscan, 1) : 1
-    let requestedPixels = ceil(displaySize * normalizedScale * normalizedOverscan)
-    let bucket: Int
-    if !requestedPixels.isFinite || requestedPixels >= CGFloat(widthBuckets.last!) {
-      bucket = widthBuckets.last!
-    } else {
-      let requested = Int(requestedPixels)
-      bucket = widthBuckets.first(where: { $0 >= requested }) ?? widthBuckets.last!
-    }
-    var queryItems = components.queryItems ?? []
-    queryItems.append(URLQueryItem(name: "x-tos-process", value: "image/resize,w_\(bucket)"))
-    components.queryItems = queryItems
+    let normalizedOverscan = overscan.isFinite ? max(overscan, 1) : 1.1
+    // Fixed renditions already account for the default margin. Custom margins stay within the tier.
+    let density = normalizedScale * CGFloat(normalizedOverscan / 1.1)
+    let pixelWidth = density > 2 ? tier.highDensity : tier.standard
+    // Match Android and Web without rewriting the source URL's existing query.
+    let query = components.percentEncodedQuery ?? ""
+    let separator = query.isEmpty || query.hasSuffix("&") ? "" : "&"
+    components.percentEncodedQuery = "\(query)\(separator)x-tos-process=image%2Fresize%2Cw_\(pixelWidth)"
     return components.url ?? rawURL
   }
 

package/ios/tests/OneKeyTosURLTests.swift

@@ -3,6 +3,46 @@ import XCTest
 @testable import OneKeyImage
 
 final class OneKeyTosURLTests: XCTestCase {
+  func testCommonIconsShareRenditionsAfterApplyingScreenDensity() throws {
+    let raw = try XCTUnwrap(URL(string: "https://common.onekey-asset.com/token.png"))
+    for size: CGFloat in [32, 40, 48] {
+      for scale: CGFloat in [1, 2, 2.625, 3] {
+        let result = OneKeyTosURL.optimized(
+          rawURL: raw, displaySize: size, scale: scale, overscan: 1.1, hasCustomIdentity: false
+        )
+        let width = scale <= 2 ? 96 : 160
+        XCTAssertEqual(result.absoluteString, "\(raw.absoluteString)?x-tos-process=image%2Fresize%2Cw_\(width)")
+      }
+    }
+    for (size, standard, highDensity): (CGFloat, Int, Int) in [
+      (48, 96, 160), (48.1, 192, 320), (96, 192, 320),
+      (96.1, 384, 640), (192, 384, 640), (192.1, 768, 1280),
+      (384, 768, 1280), (384.1, 1280, 1280),
+    ] {
+      for (scale, width): (CGFloat, Int) in [(2, standard), (2.625, highDensity)] {
+        let result = OneKeyTosURL.optimized(
+          rawURL: raw, displaySize: size, scale: scale, overscan: 1.1, hasCustomIdentity: false
+        )
+        XCTAssertTrue(result.absoluteString.hasSuffix("w_\(width)"))
+      }
+    }
+    let overscanned = OneKeyTosURL.optimized(
+      rawURL: raw, displaySize: 48, scale: 2, overscan: 2, hasCustomIdentity: false
+    )
+    XCTAssertTrue(overscanned.absoluteString.hasSuffix("w_160"))
+  }
+
+  func testPreservesSourceQueryAndFragment() throws {
+    let raw = try XCTUnwrap(URL(string: "https://common.onekey-asset.com/token.png?foo=a%20b#preview"))
+    let result = OneKeyTosURL.optimized(
+      rawURL: raw, displaySize: 32, scale: 3, overscan: 1.1, hasCustomIdentity: false
+    )
+    XCTAssertEqual(
+      result.absoluteString,
+      "https://common.onekey-asset.com/token.png?foo=a%20b&x-tos-process=image%2Fresize%2Cw_160#preview"
+    )
+  }
+
   func testOptimizesAllowedOneKeyAssetURL() throws {
     let raw = try XCTUnwrap(URL(string: "https://common.onekey-asset.com/tokens/btc.png"))
     let result = OneKeyTosURL.optimized(
@@ -13,7 +53,7 @@ final class OneKeyTosURLTests: XCTestCase {
       hasCustomIdentity: false
     )
     XCTAssertTrue(result.absoluteString.contains("x-tos-process="))
-    XCTAssertTrue(result.absoluteString.contains("w_256"))
+    XCTAssertTrue(result.absoluteString.contains("w_384"))
   }
 
   func testDoesNotRewriteSignedOrCustomIdentityURL() throws {
@@ -84,7 +124,7 @@ final class OneKeyTosURLTests: XCTestCase {
         overscan: 1.1,
         hasCustomIdentity: false
       )
-      XCTAssertTrue(result.absoluteString.contains("w_480"))
+      XCTAssertTrue(result.absoluteString.contains("w_640"))
     }
   }
 
@@ -97,7 +137,7 @@ final class OneKeyTosURLTests: XCTestCase {
       overscan: .infinity,
       hasCustomIdentity: false
     )
-    XCTAssertTrue(result.absoluteString.contains("w_128"))
+    XCTAssertTrue(result.absoluteString.contains("w_384"))
     XCTAssertEqual(
       OneKeyTosURL.optimized(
         rawURL: raw,

package/lib/module/index.js

@@ -44,6 +44,7 @@ export function OneKeyImage({
   autoplay,
   recyclingKey,
   optimizeTos = true,
+  resizeWidth,
   overscan = 1.1,
   loadingStrategy = OneKeyImageLoadingStrategy.STATIC,
   hybridRef,
@@ -57,7 +58,7 @@ export function OneKeyImage({
 }) {
   const normalized = useMemo(() => normalizeSource(source), [source]);
   const resolvedCachePolicy = cachePolicy ?? normalized?.cachePolicy ?? OneKeyImageCachePolicy.MEMORY_DISK;
-  const identity = `${normalized?.uri ?? ''}|${JSON.stringify(normalized?.headers ?? {})}|${resolvedCachePolicy}|${recyclingKey ?? ''}|${contentFit}|${optimizeTos ? '1' : '0'}|${overscan}`;
+  const identity = `${normalized?.uri ?? ''}|${JSON.stringify(normalized?.headers ?? {})}|${resolvedCachePolicy}|${recyclingKey ?? ''}|${contentFit}|${optimizeTos ? '1' : '0'}|${resizeWidth ?? ''}|${overscan}`;
   const hasSource = normalized != null;
   const hasOverlay = placeholder != null || fallback != null;
   const [loadState, setLoadState] = useState({
@@ -183,6 +184,7 @@ export function OneKeyImage({
     autoplay: autoplay ?? Platform.OS !== 'android',
     recyclingKey,
     optimizeTos,
+    resizeWidth,
     overscan,
     loadingStrategy: placeholder == null ? loadingStrategy : OneKeyImageLoadingStrategy.NONE
   });

package/lib/nitrogen/generated/android/c++/JHybridOneKeyImageSpec.cpp

@@ -138,6 +138,15 @@ namespace margelo::nitro::onekeyimage {
     static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JBoolean> /* optimizeTos */)>("setOptimizeTos");
     method(_javaPart, optimizeTos.has_value() ? jni::JBoolean::valueOf(optimizeTos.value()) : nullptr);
   }
+  std::optional<double> JHybridOneKeyImageSpec::getResizeWidth() {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JDouble>()>("getResizeWidth");
+    auto __result = method(_javaPart);
+    return __result != nullptr ? std::make_optional(__result->value()) : std::nullopt;
+  }
+  void JHybridOneKeyImageSpec::setResizeWidth(std::optional<double> resizeWidth) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JDouble> /* resizeWidth */)>("setResizeWidth");
+    method(_javaPart, resizeWidth.has_value() ? jni::JDouble::valueOf(resizeWidth.value()) : nullptr);
+  }
   std::optional<double> JHybridOneKeyImageSpec::getOverscan() {
     static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JDouble>()>("getOverscan");
     auto __result = method(_javaPart);

package/lib/nitrogen/generated/android/c++/JHybridOneKeyImageSpec.hpp

@@ -66,6 +66,8 @@ namespace margelo::nitro::onekeyimage {
     void setRecyclingKey(const std::optional<std::string>& recyclingKey) override;
     std::optional<bool> getOptimizeTos() override;
     void setOptimizeTos(std::optional<bool> optimizeTos) override;
+    std::optional<double> getResizeWidth() override;
+    void setResizeWidth(std::optional<double> resizeWidth) override;
     std::optional<double> getOverscan() override;
     void setOverscan(std::optional<double> overscan) override;
     std::optional<OneKeyImageLoadingStrategy> getLoadingStrategy() override;

package/lib/nitrogen/generated/android/c++/views/JHybridOneKeyImageStateUpdater.cpp

@@ -93,6 +93,11 @@ void JHybridOneKeyImageStateUpdater::updateViewProps(jni::alias_ref<jni::JClass>
         : !newProps->optimizeTos.hasSameValue(oldProps->optimizeTos)) {
     hybridView->setOptimizeTos(newProps->optimizeTos.get());
   }
+  if (oldProps == nullptr
+        ? newProps->resizeWidth.isProvided()
+        : !newProps->resizeWidth.hasSameValue(oldProps->resizeWidth)) {
+    hybridView->setResizeWidth(newProps->resizeWidth.get());
+  }
   if (oldProps == nullptr
         ? newProps->overscan.isProvided()
         : !newProps->overscan.hasSameValue(oldProps->overscan)) {

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/onekeyimage/HybridOneKeyImageSpec.kt

@@ -75,6 +75,12 @@ abstract class HybridOneKeyImageSpec: HybridView() {
   @set:Keep
   abstract var optimizeTos: Boolean?
   
+  @get:DoNotStrip
+  @get:Keep
+  @set:DoNotStrip
+  @set:Keep
+  abstract var resizeWidth: Double?
+  
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip

package/lib/nitrogen/generated/ios/c++/HybridOneKeyImageSpecSwift.hpp

@@ -134,6 +134,13 @@ namespace margelo::nitro::onekeyimage {
     inline void setOptimizeTos(std::optional<bool> optimizeTos) noexcept override {
       _swiftPart.setOptimizeTos(optimizeTos);
     }
+    inline std::optional<double> getResizeWidth() noexcept override {
+      auto __result = _swiftPart.getResizeWidth();
+      return __result;
+    }
+    inline void setResizeWidth(std::optional<double> resizeWidth) noexcept override {
+      _swiftPart.setResizeWidth(resizeWidth);
+    }
     inline std::optional<double> getOverscan() noexcept override {
       auto __result = _swiftPart.getOverscan();
       return __result;

package/lib/nitrogen/generated/ios/c++/views/HybridOneKeyImageComponent.mm

@@ -146,6 +146,12 @@ using namespace margelo::nitro::onekeyimage::views;
           : !newViewProps.optimizeTos.hasSameValue(oldViewProps->optimizeTos)) {
       swiftPart.setOptimizeTos(newViewProps.optimizeTos.get());
     }
+    // resizeWidth: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.resizeWidth.isProvided()
+          : !newViewProps.resizeWidth.hasSameValue(oldViewProps->resizeWidth)) {
+      swiftPart.setResizeWidth(newViewProps.resizeWidth.get());
+    }
     // overscan: optional
     if (oldViewProps == nullptr
           ? newViewProps.overscan.isProvided()

package/lib/nitrogen/generated/ios/swift/HybridOneKeyImageSpec.swift

@@ -18,6 +18,7 @@ public protocol HybridOneKeyImageSpec_protocol: HybridObject, HybridView {
   var autoplay: Bool? { get set }
   var recyclingKey: String? { get set }
   var optimizeTos: Bool? { get set }
+  var resizeWidth: Double? { get set }
   var overscan: Double? { get set }
   var loadingStrategy: OneKeyImageLoadingStrategy? { get set }
   var onLoadStart: (() -> Void)? { get set }

package/lib/nitrogen/generated/ios/swift/HybridOneKeyImageSpec_cxx.swift

@@ -292,6 +292,30 @@ open class HybridOneKeyImageSpec_cxx {
     }
   }
   
+  public final var resizeWidth: bridge.std__optional_double_ {
+    @inline(__always)
+    get {
+      return { () -> bridge.std__optional_double_ in
+        if let __unwrappedValue = self.__implementation.resizeWidth {
+          return bridge.create_std__optional_double_(__unwrappedValue)
+        } else {
+          return .init()
+        }
+      }()
+    }
+    @inline(__always)
+    set {
+      self.__implementation.resizeWidth = { () -> Double? in
+        if bridge.has_value_std__optional_double_(newValue) {
+          let __unwrapped = bridge.get_std__optional_double_(newValue)
+          return __unwrapped
+        } else {
+          return nil
+        }
+      }()
+    }
+  }
+  
   public final var overscan: bridge.std__optional_double_ {
     @inline(__always)
     get {

package/lib/nitrogen/generated/shared/c++/HybridOneKeyImageSpec.cpp

@@ -30,6 +30,8 @@ namespace margelo::nitro::onekeyimage {
       prototype.registerHybridSetter("recyclingKey", &HybridOneKeyImageSpec::setRecyclingKey);
       prototype.registerHybridGetter("optimizeTos", &HybridOneKeyImageSpec::getOptimizeTos);
       prototype.registerHybridSetter("optimizeTos", &HybridOneKeyImageSpec::setOptimizeTos);
+      prototype.registerHybridGetter("resizeWidth", &HybridOneKeyImageSpec::getResizeWidth);
+      prototype.registerHybridSetter("resizeWidth", &HybridOneKeyImageSpec::setResizeWidth);
       prototype.registerHybridGetter("overscan", &HybridOneKeyImageSpec::getOverscan);
       prototype.registerHybridSetter("overscan", &HybridOneKeyImageSpec::setOverscan);
       prototype.registerHybridGetter("loadingStrategy", &HybridOneKeyImageSpec::getLoadingStrategy);

package/lib/nitrogen/generated/shared/c++/HybridOneKeyImageSpec.hpp

@@ -76,6 +76,8 @@ namespace margelo::nitro::onekeyimage {
       virtual void setRecyclingKey(const std::optional<std::string>& recyclingKey) = 0;
       virtual std::optional<bool> getOptimizeTos() = 0;
       virtual void setOptimizeTos(std::optional<bool> optimizeTos) = 0;
+      virtual std::optional<double> getResizeWidth() = 0;
+      virtual void setResizeWidth(std::optional<double> resizeWidth) = 0;
       virtual std::optional<double> getOverscan() = 0;
       virtual void setOverscan(std::optional<double> overscan) = 0;
       virtual std::optional<OneKeyImageLoadingStrategy> getLoadingStrategy() = 0;

package/lib/nitrogen/generated/shared/c++/views/HybridOneKeyImageComponent.cpp

@@ -28,6 +28,7 @@ namespace margelo::nitro::onekeyimage::views {
     autoplay(nitro::ReactProp<std::optional<bool>>::fromRawValue("OneKeyImage", "autoplay", rawProps, sourceProps.autoplay)),
     recyclingKey(nitro::ReactProp<std::optional<std::string>>::fromRawValue("OneKeyImage", "recyclingKey", rawProps, sourceProps.recyclingKey)),
     optimizeTos(nitro::ReactProp<std::optional<bool>>::fromRawValue("OneKeyImage", "optimizeTos", rawProps, sourceProps.optimizeTos)),
+    resizeWidth(nitro::ReactProp<std::optional<double>>::fromRawValue("OneKeyImage", "resizeWidth", rawProps, sourceProps.resizeWidth)),
     overscan(nitro::ReactProp<std::optional<double>>::fromRawValue("OneKeyImage", "overscan", rawProps, sourceProps.overscan)),
     loadingStrategy(nitro::ReactProp<std::optional<OneKeyImageLoadingStrategy>>::fromRawValue("OneKeyImage", "loadingStrategy", rawProps, sourceProps.loadingStrategy)),
     onLoadStart(nitro::ReactProp<std::optional<std::function<void()>>>::fromRawValue("OneKeyImage", "onLoadStart", rawProps, sourceProps.onLoadStart)),
@@ -47,6 +48,7 @@ namespace margelo::nitro::onekeyimage::views {
       case hashString("autoplay"): return true;
       case hashString("recyclingKey"): return true;
       case hashString("optimizeTos"): return true;
+      case hashString("resizeWidth"): return true;
       case hashString("overscan"): return true;
       case hashString("loadingStrategy"): return true;
       case hashString("onLoadStart"): return true;

package/lib/nitrogen/generated/shared/c++/views/HybridOneKeyImageComponent.hpp

@@ -56,6 +56,7 @@ namespace margelo::nitro::onekeyimage::views {
     nitro::ReactProp<std::optional<bool>> autoplay;
     nitro::ReactProp<std::optional<std::string>> recyclingKey;
     nitro::ReactProp<std::optional<bool>> optimizeTos;
+    nitro::ReactProp<std::optional<double>> resizeWidth;
     nitro::ReactProp<std::optional<double>> overscan;
     nitro::ReactProp<std::optional<OneKeyImageLoadingStrategy>> loadingStrategy;
     nitro::ReactProp<std::optional<std::function<void()>>> onLoadStart;
@@ -75,6 +76,7 @@ namespace margelo::nitro::onekeyimage::views {
              autoplay.hasSameValue(other.autoplay) &&
              recyclingKey.hasSameValue(other.recyclingKey) &&
              optimizeTos.hasSameValue(other.optimizeTos) &&
+             resizeWidth.hasSameValue(other.resizeWidth) &&
              overscan.hasSameValue(other.overscan) &&
              loadingStrategy.hasSameValue(other.loadingStrategy) &&
              onLoadStart.hasSameValue(other.onLoadStart) &&
@@ -95,6 +97,7 @@ namespace margelo::nitro::onekeyimage::views {
              autoplay.isProvided() ||
              recyclingKey.isProvided() ||
              optimizeTos.isProvided() ||
+             resizeWidth.isProvided() ||
              overscan.isProvided() ||
              loadingStrategy.isProvided() ||
              onLoadStart.isProvided() ||

package/lib/nitrogen/generated/shared/json/OneKeyImageConfig.json

@@ -12,6 +12,7 @@
     "autoplay": true,
     "recyclingKey": true,
     "optimizeTos": true,
+    "resizeWidth": true,
     "overscan": true,
     "loadingStrategy": true,
     "onLoadStart": true,

package/lib/typescript/src/OneKeyImage.nitro.d.ts

@@ -32,6 +32,8 @@ export interface OneKeyImageNativeProps extends HybridViewProps {
     autoplay?: boolean;
     recyclingKey?: string;
     optimizeTos?: boolean;
+    /** Display width hint in layout units. Native applies the screen density. */
+    resizeWidth?: number;
     overscan?: number;
     loadingStrategy?: OneKeyImageLoadingStrategy;
     onLoadStart?: () => void;

package/lib/typescript/src/index.d.ts

@@ -45,7 +45,7 @@ export interface OneKeyImageProps extends Omit<OneKeyImageNativeProps, 'sourceUr
     onError?: MaybeWrappedCallback<(event: OneKeyImageErrorEvent) => void>;
     onLoadEnd?: MaybeWrappedCallback<() => void>;
 }
-export declare function OneKeyImage({ source, placeholder, fallback, variant, contentFit, cachePolicy, autoplay, recyclingKey, optimizeTos, overscan, loadingStrategy, hybridRef, onLoadStart, onLoad, onDisplay, onError, onLoadEnd, style, ...viewProps }: OneKeyImageProps): import("react/jsx-runtime").JSX.Element;
+export declare function OneKeyImage({ source, placeholder, fallback, variant, contentFit, cachePolicy, autoplay, recyclingKey, optimizeTos, resizeWidth, overscan, loadingStrategy, hybridRef, onLoadStart, onLoad, onDisplay, onError, onLoadEnd, style, ...viewProps }: OneKeyImageProps): import("react/jsx-runtime").JSX.Element;
 export declare const OneKeyImageCache: {
     preload(sources: OneKeyImagePreloadInput[]): Promise<boolean>;
     clearMemory: () => Promise<void>;

package/nitrogen/generated/android/c++/JHybridOneKeyImageSpec.cpp

@@ -138,6 +138,15 @@ namespace margelo::nitro::onekeyimage {
     static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JBoolean> /* optimizeTos */)>("setOptimizeTos");
     method(_javaPart, optimizeTos.has_value() ? jni::JBoolean::valueOf(optimizeTos.value()) : nullptr);
   }
+  std::optional<double> JHybridOneKeyImageSpec::getResizeWidth() {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JDouble>()>("getResizeWidth");
+    auto __result = method(_javaPart);
+    return __result != nullptr ? std::make_optional(__result->value()) : std::nullopt;
+  }
+  void JHybridOneKeyImageSpec::setResizeWidth(std::optional<double> resizeWidth) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JDouble> /* resizeWidth */)>("setResizeWidth");
+    method(_javaPart, resizeWidth.has_value() ? jni::JDouble::valueOf(resizeWidth.value()) : nullptr);
+  }
   std::optional<double> JHybridOneKeyImageSpec::getOverscan() {
     static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JDouble>()>("getOverscan");
     auto __result = method(_javaPart);

package/nitrogen/generated/android/c++/JHybridOneKeyImageSpec.hpp

@@ -66,6 +66,8 @@ namespace margelo::nitro::onekeyimage {
     void setRecyclingKey(const std::optional<std::string>& recyclingKey) override;
     std::optional<bool> getOptimizeTos() override;
     void setOptimizeTos(std::optional<bool> optimizeTos) override;
+    std::optional<double> getResizeWidth() override;
+    void setResizeWidth(std::optional<double> resizeWidth) override;
     std::optional<double> getOverscan() override;
     void setOverscan(std::optional<double> overscan) override;
     std::optional<OneKeyImageLoadingStrategy> getLoadingStrategy() override;

package/nitrogen/generated/android/c++/views/JHybridOneKeyImageStateUpdater.cpp

@@ -93,6 +93,11 @@ void JHybridOneKeyImageStateUpdater::updateViewProps(jni::alias_ref<jni::JClass>
         : !newProps->optimizeTos.hasSameValue(oldProps->optimizeTos)) {
     hybridView->setOptimizeTos(newProps->optimizeTos.get());
   }
+  if (oldProps == nullptr
+        ? newProps->resizeWidth.isProvided()
+        : !newProps->resizeWidth.hasSameValue(oldProps->resizeWidth)) {
+    hybridView->setResizeWidth(newProps->resizeWidth.get());
+  }
   if (oldProps == nullptr
         ? newProps->overscan.isProvided()
         : !newProps->overscan.hasSameValue(oldProps->overscan)) {

package/nitrogen/generated/android/kotlin/com/margelo/nitro/onekeyimage/HybridOneKeyImageSpec.kt

@@ -75,6 +75,12 @@ abstract class HybridOneKeyImageSpec: HybridView() {
   @set:Keep
   abstract var optimizeTos: Boolean?
   
+  @get:DoNotStrip
+  @get:Keep
+  @set:DoNotStrip
+  @set:Keep
+  abstract var resizeWidth: Double?
+  
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip

package/nitrogen/generated/ios/c++/HybridOneKeyImageSpecSwift.hpp

@@ -134,6 +134,13 @@ namespace margelo::nitro::onekeyimage {
     inline void setOptimizeTos(std::optional<bool> optimizeTos) noexcept override {
       _swiftPart.setOptimizeTos(optimizeTos);
     }
+    inline std::optional<double> getResizeWidth() noexcept override {
+      auto __result = _swiftPart.getResizeWidth();
+      return __result;
+    }
+    inline void setResizeWidth(std::optional<double> resizeWidth) noexcept override {
+      _swiftPart.setResizeWidth(resizeWidth);
+    }
     inline std::optional<double> getOverscan() noexcept override {
       auto __result = _swiftPart.getOverscan();
       return __result;

package/nitrogen/generated/ios/c++/views/HybridOneKeyImageComponent.mm

@@ -146,6 +146,12 @@ using namespace margelo::nitro::onekeyimage::views;
           : !newViewProps.optimizeTos.hasSameValue(oldViewProps->optimizeTos)) {
       swiftPart.setOptimizeTos(newViewProps.optimizeTos.get());
     }
+    // resizeWidth: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.resizeWidth.isProvided()
+          : !newViewProps.resizeWidth.hasSameValue(oldViewProps->resizeWidth)) {
+      swiftPart.setResizeWidth(newViewProps.resizeWidth.get());
+    }
     // overscan: optional
     if (oldViewProps == nullptr
           ? newViewProps.overscan.isProvided()

package/nitrogen/generated/ios/swift/HybridOneKeyImageSpec.swift

@@ -18,6 +18,7 @@ public protocol HybridOneKeyImageSpec_protocol: HybridObject, HybridView {
   var autoplay: Bool? { get set }
   var recyclingKey: String? { get set }
   var optimizeTos: Bool? { get set }
+  var resizeWidth: Double? { get set }
   var overscan: Double? { get set }
   var loadingStrategy: OneKeyImageLoadingStrategy? { get set }
   var onLoadStart: (() -> Void)? { get set }

package/nitrogen/generated/ios/swift/HybridOneKeyImageSpec_cxx.swift

@@ -292,6 +292,30 @@ open class HybridOneKeyImageSpec_cxx {
     }
   }
   
+  public final var resizeWidth: bridge.std__optional_double_ {
+    @inline(__always)
+    get {
+      return { () -> bridge.std__optional_double_ in
+        if let __unwrappedValue = self.__implementation.resizeWidth {
+          return bridge.create_std__optional_double_(__unwrappedValue)
+        } else {
+          return .init()
+        }
+      }()
+    }
+    @inline(__always)
+    set {
+      self.__implementation.resizeWidth = { () -> Double? in
+        if bridge.has_value_std__optional_double_(newValue) {
+          let __unwrapped = bridge.get_std__optional_double_(newValue)
+          return __unwrapped
+        } else {
+          return nil
+        }
+      }()
+    }
+  }
+  
   public final var overscan: bridge.std__optional_double_ {
     @inline(__always)
     get {

package/nitrogen/generated/shared/c++/HybridOneKeyImageSpec.cpp

@@ -30,6 +30,8 @@ namespace margelo::nitro::onekeyimage {
       prototype.registerHybridSetter("recyclingKey", &HybridOneKeyImageSpec::setRecyclingKey);
       prototype.registerHybridGetter("optimizeTos", &HybridOneKeyImageSpec::getOptimizeTos);
       prototype.registerHybridSetter("optimizeTos", &HybridOneKeyImageSpec::setOptimizeTos);
+      prototype.registerHybridGetter("resizeWidth", &HybridOneKeyImageSpec::getResizeWidth);
+      prototype.registerHybridSetter("resizeWidth", &HybridOneKeyImageSpec::setResizeWidth);
       prototype.registerHybridGetter("overscan", &HybridOneKeyImageSpec::getOverscan);
       prototype.registerHybridSetter("overscan", &HybridOneKeyImageSpec::setOverscan);
       prototype.registerHybridGetter("loadingStrategy", &HybridOneKeyImageSpec::getLoadingStrategy);

package/nitrogen/generated/shared/c++/HybridOneKeyImageSpec.hpp

@@ -76,6 +76,8 @@ namespace margelo::nitro::onekeyimage {
       virtual void setRecyclingKey(const std::optional<std::string>& recyclingKey) = 0;
       virtual std::optional<bool> getOptimizeTos() = 0;
       virtual void setOptimizeTos(std::optional<bool> optimizeTos) = 0;
+      virtual std::optional<double> getResizeWidth() = 0;
+      virtual void setResizeWidth(std::optional<double> resizeWidth) = 0;
       virtual std::optional<double> getOverscan() = 0;
       virtual void setOverscan(std::optional<double> overscan) = 0;
       virtual std::optional<OneKeyImageLoadingStrategy> getLoadingStrategy() = 0;

package/nitrogen/generated/shared/c++/views/HybridOneKeyImageComponent.cpp

@@ -28,6 +28,7 @@ namespace margelo::nitro::onekeyimage::views {
     autoplay(nitro::ReactProp<std::optional<bool>>::fromRawValue("OneKeyImage", "autoplay", rawProps, sourceProps.autoplay)),
     recyclingKey(nitro::ReactProp<std::optional<std::string>>::fromRawValue("OneKeyImage", "recyclingKey", rawProps, sourceProps.recyclingKey)),
     optimizeTos(nitro::ReactProp<std::optional<bool>>::fromRawValue("OneKeyImage", "optimizeTos", rawProps, sourceProps.optimizeTos)),
+    resizeWidth(nitro::ReactProp<std::optional<double>>::fromRawValue("OneKeyImage", "resizeWidth", rawProps, sourceProps.resizeWidth)),
     overscan(nitro::ReactProp<std::optional<double>>::fromRawValue("OneKeyImage", "overscan", rawProps, sourceProps.overscan)),
     loadingStrategy(nitro::ReactProp<std::optional<OneKeyImageLoadingStrategy>>::fromRawValue("OneKeyImage", "loadingStrategy", rawProps, sourceProps.loadingStrategy)),
     onLoadStart(nitro::ReactProp<std::optional<std::function<void()>>>::fromRawValue("OneKeyImage", "onLoadStart", rawProps, sourceProps.onLoadStart)),
@@ -47,6 +48,7 @@ namespace margelo::nitro::onekeyimage::views {
       case hashString("autoplay"): return true;
       case hashString("recyclingKey"): return true;
       case hashString("optimizeTos"): return true;
+      case hashString("resizeWidth"): return true;
       case hashString("overscan"): return true;
       case hashString("loadingStrategy"): return true;
       case hashString("onLoadStart"): return true;

package/nitrogen/generated/shared/c++/views/HybridOneKeyImageComponent.hpp

@@ -56,6 +56,7 @@ namespace margelo::nitro::onekeyimage::views {
     nitro::ReactProp<std::optional<bool>> autoplay;
     nitro::ReactProp<std::optional<std::string>> recyclingKey;
     nitro::ReactProp<std::optional<bool>> optimizeTos;
+    nitro::ReactProp<std::optional<double>> resizeWidth;
     nitro::ReactProp<std::optional<double>> overscan;
     nitro::ReactProp<std::optional<OneKeyImageLoadingStrategy>> loadingStrategy;
     nitro::ReactProp<std::optional<std::function<void()>>> onLoadStart;
@@ -75,6 +76,7 @@ namespace margelo::nitro::onekeyimage::views {
              autoplay.hasSameValue(other.autoplay) &&
              recyclingKey.hasSameValue(other.recyclingKey) &&
              optimizeTos.hasSameValue(other.optimizeTos) &&
+             resizeWidth.hasSameValue(other.resizeWidth) &&
              overscan.hasSameValue(other.overscan) &&
              loadingStrategy.hasSameValue(other.loadingStrategy) &&
              onLoadStart.hasSameValue(other.onLoadStart) &&
@@ -95,6 +97,7 @@ namespace margelo::nitro::onekeyimage::views {
              autoplay.isProvided() ||
              recyclingKey.isProvided() ||
              optimizeTos.isProvided() ||
+             resizeWidth.isProvided() ||
              overscan.isProvided() ||
              loadingStrategy.isProvided() ||
              onLoadStart.isProvided() ||

package/nitrogen/generated/shared/json/OneKeyImageConfig.json

@@ -12,6 +12,7 @@
     "autoplay": true,
     "recyclingKey": true,
     "optimizeTos": true,
+    "resizeWidth": true,
     "overscan": true,
     "loadingStrategy": true,
     "onLoadStart": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-image",
-  "version": "3.0.106",
+  "version": "3.0.107",
   "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.106",
+    "@onekeyfe/react-native-skeleton": "3.0.107",
     "react": "*",
     "react-native": "*",
     "react-native-nitro-modules": "0.37.0"

package/src/OneKeyImage.nitro.ts

@@ -43,6 +43,8 @@ export interface OneKeyImageNativeProps extends HybridViewProps {
   autoplay?: boolean;
   recyclingKey?: string;
   optimizeTos?: boolean;
+  /** Display width hint in layout units. Native applies the screen density. */
+  resizeWidth?: number;
   overscan?: number;
   loadingStrategy?: OneKeyImageLoadingStrategy;
   onLoadStart?: () => void;

package/src/index.tsx

@@ -153,6 +153,7 @@ export function OneKeyImage({
   autoplay,
   recyclingKey,
   optimizeTos = true,
+  resizeWidth,
   overscan = 1.1,
   loadingStrategy = OneKeyImageLoadingStrategy.STATIC,
   hybridRef,
@@ -173,7 +174,7 @@ export function OneKeyImage({
     normalized?.headers ?? {}
   )}|${resolvedCachePolicy}|${recyclingKey ?? ''}|${contentFit}|${
     optimizeTos ? '1' : '0'
-  }|${overscan}`;
+  }|${resizeWidth ?? ''}|${overscan}`;
   const hasSource = normalized != null;
   const hasOverlay = placeholder != null || fallback != null;
   type LoadState = {
@@ -338,6 +339,7 @@ export function OneKeyImage({
     autoplay: autoplay ?? Platform.OS !== 'android',
     recyclingKey,
     optimizeTos,
+    resizeWidth,
     overscan,
     loadingStrategy:
       placeholder == null ? loadingStrategy : OneKeyImageLoadingStrategy.NONE,