@onekeyfe/react-native-image 3.0.99 → 3.0.100

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

@@ -466,7 +466,7 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
   private fun requestOptions(policy: OneKeyImageCachePolicy): RequestOptions {
     val options = RequestOptions()
       .dontTransform()
-      .downsample(OneKeyImageSafeDownsampleStrategy())
+      .downsample(OneKeyImageSafeDownsampleStrategy)
     return when (policy) {
       OneKeyImageCachePolicy.MEMORY_DISK -> options.diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
       OneKeyImageCachePolicy.MEMORY -> options.diskCacheStrategy(DiskCacheStrategy.NONE)

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

@@ -23,7 +23,7 @@ class HybridOneKeyImageCache : HybridOneKeyImageCacheSpec() {
       }
       val baseOptions = RequestOptions()
         .dontTransform()
-        .downsample(OneKeyImageSafeDownsampleStrategy())
+        .downsample(OneKeyImageSafeDownsampleStrategy)
       val options = when (source.cachePolicy ?: OneKeyImageCachePolicy.MEMORY_DISK) {
         OneKeyImageCachePolicy.MEMORY_DISK -> baseOptions
           .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)

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

@@ -147,7 +147,7 @@ internal data class OneKeyImageDecodeDimensions(
  * 16 MiB area cap. `override()` alone cannot enforce an area cap for very wide
  * or tall sources because Glide's default strategy follows target edges.
  */
-internal class OneKeyImageSafeDownsampleStrategy : DownsampleStrategy() {
+internal object OneKeyImageSafeDownsampleStrategy : DownsampleStrategy() {
   override fun getScaleFactor(
     sourceWidth: Int,
     sourceHeight: Int,

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

@@ -3,6 +3,7 @@ package com.margelo.nitro.onekeyimage
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
+import java.lang.reflect.Modifier
 
 class OneKeyImageDecodeDimensionsTest {
   @Test
@@ -67,4 +68,19 @@ class OneKeyImageDecodeDimensionsTest {
 
     assertTrue(decodedBytes <= OneKeyImageDecodeDimensions.MAX_DECODE_BYTES)
   }
+
+  @Test
+  fun safeDownsampleStrategyIsSingletonForStableMemoryCacheIdentity() {
+    val strategyClass = Class.forName(
+      "com.margelo.nitro.onekeyimage.OneKeyImageSafeDownsampleStrategy",
+      false,
+      javaClass.classLoader,
+    )
+
+    assertTrue(
+      strategyClass.declaredFields.any { field ->
+        field.name == "INSTANCE" && Modifier.isStatic(field.modifiers)
+      },
+    )
+  }
 }

package/lib/module/index.js

@@ -168,10 +168,13 @@ export function OneKeyImage({
     }) : undefined,
     onLoadEnd: needsLoadEnd ? callback(() => refs.current.onLoadEnd?.()) : undefined
   }), [hasOverlay, identity, needsDisplay, needsError, needsHybridRef, needsLoad, needsLoadEnd, needsLoadStart, normalized?.uri, placeholder]);
+  const flattenedStyle = StyleSheet.flatten(style);
+  const hasRoundedCorners = Boolean(flattenedStyle && [flattenedStyle.borderRadius, flattenedStyle.borderTopLeftRadius, flattenedStyle.borderTopRightRadius, flattenedStyle.borderBottomLeftRadius, flattenedStyle.borderBottomRightRadius, flattenedStyle.borderStartStartRadius, flattenedStyle.borderStartEndRadius, flattenedStyle.borderEndStartRadius, flattenedStyle.borderEndEndRadius].some(radius => typeof radius === 'number' && radius > 0));
+  const shouldWrapNative = hasOverlay || hasRoundedCorners;
   const native = /*#__PURE__*/createElement(NativeOneKeyImage, {
     ...viewProps,
     ...nativeCallbacks,
-    style: hasOverlay ? StyleSheet.absoluteFill : style,
+    style: shouldWrapNative ? StyleSheet.absoluteFill : style,
     sourceUri: normalized?.uri,
     sourceHeadersJson: normalized?.headers ? JSON.stringify(normalized.headers) : undefined,
     variant,
@@ -183,7 +186,7 @@ export function OneKeyImage({
     overscan,
     loadingStrategy: placeholder == null ? loadingStrategy : OneKeyImageLoadingStrategy.NONE
   });
-  if (!hasOverlay) return native;
+  if (!shouldWrapNative) return native;
   return /*#__PURE__*/_jsxs(View, {
     style: [style, styles.overlayContainer],
     collapsable: false,

package/package.json

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

package/src/index.tsx

@@ -307,10 +307,27 @@ export function OneKeyImage({
     ]
   );
 
+  const flattenedStyle = StyleSheet.flatten(style);
+  const hasRoundedCorners = Boolean(
+    flattenedStyle &&
+      [
+        flattenedStyle.borderRadius,
+        flattenedStyle.borderTopLeftRadius,
+        flattenedStyle.borderTopRightRadius,
+        flattenedStyle.borderBottomLeftRadius,
+        flattenedStyle.borderBottomRightRadius,
+        flattenedStyle.borderStartStartRadius,
+        flattenedStyle.borderStartEndRadius,
+        flattenedStyle.borderEndStartRadius,
+        flattenedStyle.borderEndEndRadius,
+      ].some((radius) => typeof radius === 'number' && radius > 0)
+  );
+  const shouldWrapNative = hasOverlay || hasRoundedCorners;
+
   const native = createElement(NativeOneKeyImage, {
     ...viewProps,
     ...nativeCallbacks,
-    style: hasOverlay ? StyleSheet.absoluteFill : style,
+    style: shouldWrapNative ? StyleSheet.absoluteFill : style,
     sourceUri: normalized?.uri,
     sourceHeadersJson: normalized?.headers
       ? JSON.stringify(normalized.headers)
@@ -326,7 +343,7 @@ export function OneKeyImage({
       placeholder == null ? loadingStrategy : OneKeyImageLoadingStrategy.NONE,
   });
 
-  if (!hasOverlay) return native;
+  if (!shouldWrapNative) return native;
 
   return (
     <View style={[style, styles.overlayContainer]} collapsable={false}>