@onekeyfe/react-native-image 3.0.100 → 3.0.102

package/README.md

@@ -56,6 +56,12 @@ large lists conservative, and `autoplay={true}` on other native platforms. Pass
 `autoplay` explicitly whenever a screen needs the same behavior on both
 platforms.
 
+Animated-image canvas limits are intentionally platform-specific. Android caps
+the unavoidable decoded ARGB canvas at 4,194,304 pixels (16 MiB), while iOS
+allows metadata dimensions up to 16,000,000 pixels and separately caps its
+decoded animation frame buffer at 16 MiB. These limits reflect the native
+decoders' different allocation behavior.
+
 `recyclingKey` is available for recycled list cells. Changing it clears stale
 content before the next source is displayed.
 

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

@@ -38,6 +38,7 @@ private class OneKeyImageHostView(context: ThemedReactContext) : ImageView(conte
       syncPlayback()
     }
   var onReadyForRequest: (() -> Unit)? = null
+  var onAttachmentChanged: ((Boolean) -> Unit)? = null
 
   override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
     super.onSizeChanged(w, h, oldw, oldh)
@@ -58,11 +59,13 @@ private class OneKeyImageHostView(context: ThemedReactContext) : ImageView(conte
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
     syncPlayback()
+    onAttachmentChanged?.invoke(true)
   }
 
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
     syncPlayback()
+    onAttachmentChanged?.invoke(false)
   }
 
   override fun onVisibilityAggregated(isVisible: Boolean) {
@@ -120,6 +123,11 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
   private enum class DisplayState { LOADING, IMAGE, ERROR, FALLBACK }
 
   private val hostView = OneKeyImageHostView(context)
+  // Keep requests independent of ScreenStack Fragment teardown while React
+  // retains the view.
+  private val requestManager by lazy(LazyThreadSafetyMode.NONE) {
+    Glide.with(context.applicationContext)
+  }
   private var loadRunnable: Runnable? = null
   private var currentTarget: CustomViewTarget<OneKeyImageHostView, Drawable>? = null
   private var generation = 0L
@@ -129,6 +137,7 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
   private var requestActive = false
   private var displayState = DisplayState.LOADING
   private var displayRunnable: Runnable? = null
+  private var pendingDisplayGeneration: Long? = null
   private var fallbackRunnable: Runnable? = null
 
   override val view: View = hostView
@@ -202,6 +211,14 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
     OneKeyImageGlideRegistry.ensureRegistered(context)
     hostView.updateSkeletonStyle()
     hostView.onReadyForRequest = { scheduleLoad() }
+    hostView.onAttachmentChanged = { attached ->
+      if (attached) {
+        schedulePendingDisplayIfNeeded()
+      } else {
+        displayRunnable?.let(hostView::removeCallbacks)
+        displayRunnable = null
+      }
+    }
     applyContentFit()
     applyVariant()
   }
@@ -229,6 +246,7 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
     resetForReuse()
     disposed = true
     hostView.onReadyForRequest = null
+    hostView.onAttachmentChanged = null
     super.onDropView()
   }
 
@@ -236,6 +254,7 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
     disposed = true
     cancelCurrent(invalidateGeneration = true)
     hostView.onReadyForRequest = null
+    hostView.onAttachmentChanged = null
     super.dispose()
   }
 
@@ -432,7 +451,7 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
       }
     }
     currentTarget = target
-    Glide.with(hostView)
+    requestManager
       .asDrawable()
       .load(OneKeyImageModel.build(requestUrl, headersJson))
       .apply(requestOptions(policy))
@@ -495,6 +514,7 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
     loadRunnable = null
     displayRunnable?.let(hostView::removeCallbacks)
     displayRunnable = null
+    pendingDisplayGeneration = null
     fallbackRunnable?.let(hostView::removeCallbacks)
     fallbackRunnable = null
     clearCurrentTarget()
@@ -508,18 +528,30 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
     // Clear the field first so onResourceCleared from our own cancellation
     // cannot erase state belonging to the next generation/request.
     currentTarget = null
-    Glide.with(hostView).clear(target)
+    requestManager.clear(target)
   }
 
   private fun scheduleOnDisplay(requestGeneration: Long) {
+    pendingDisplayGeneration = requestGeneration
+    schedulePendingDisplayIfNeeded()
+  }
+
+  private fun schedulePendingDisplayIfNeeded() {
+    val requestGeneration = pendingDisplayGeneration ?: return
     displayRunnable?.let(hostView::removeCallbacks)
+    displayRunnable = null
+    if (!hostView.isAttachedToWindow) return
     val runnable = Runnable {
       displayRunnable = null
       if (
+        pendingDisplayGeneration == requestGeneration &&
         requestGeneration == generation &&
         !disposed &&
-        displayState == DisplayState.IMAGE
+        displayState == DisplayState.IMAGE &&
+        hostView.drawable != null &&
+        hostView.isAttachedToWindow
       ) {
+        pendingDisplayGeneration = null
         onDisplay?.invoke()
       }
     }

package/lib/module/index.js

@@ -21,7 +21,7 @@ function unwrap(value) {
 function normalizeSource(source) {
   if (source == null) return undefined;
   const resolved = Image.resolveAssetSource(source);
-  if (resolved?.uri) {
+  if (resolved?.uri?.trim()) {
     const original = typeof source === 'object' && !Array.isArray(source) ? source : undefined;
     return {
       uri: resolved.uri,
@@ -203,7 +203,10 @@ export function OneKeyImage({
 }
 export const OneKeyImageCache = {
   preload(sources) {
-    return nativeCache.preload(sources.filter(source => Boolean(source.uri)).map(source => ({
+    const hasInvalidSource = sources.some(source => !source.uri?.trim());
+    const validSources = sources.filter(source => Boolean(source.uri?.trim()));
+    if (validSources.length === 0) return Promise.resolve(false);
+    return nativeCache.preload(validSources.map(source => ({
       uri: source.uri,
       headersJson: source.headers ? JSON.stringify(source.headers) : undefined,
       cachePolicy: source.cachePolicy ?? OneKeyImageCachePolicy.MEMORY_DISK,
@@ -212,7 +215,7 @@ export const OneKeyImageCache = {
       pixelRatio: source.pixelRatio,
       overscan: source.overscan,
       optimizeTos: source.optimizeTos
-    })));
+    }))).then(success => success && !hasInvalidSource);
   },
   clearMemory: () => nativeCache.clearMemory(),
   clearDisk: () => nativeCache.clearDisk(),

package/package.json

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

package/src/index.tsx

@@ -126,7 +126,7 @@ function normalizeSource(
 ): OneKeyImageSource | undefined {
   if (source == null) return undefined;
   const resolved = Image.resolveAssetSource(source as ImageSourcePropType);
-  if (resolved?.uri) {
+  if (resolved?.uri?.trim()) {
     const original =
       typeof source === 'object' && !Array.isArray(source)
         ? (source as OneKeyImageSource)
@@ -364,11 +364,17 @@ export function OneKeyImage({
 
 export const OneKeyImageCache = {
   preload(sources: OneKeyImagePreloadInput[]) {
-    return nativeCache.preload(
-      sources
-        .filter((source) => Boolean(source.uri))
-        .map((source) => ({
-          uri: source.uri!,
+    const hasInvalidSource = sources.some((source) => !source.uri?.trim());
+    const validSources = sources.filter(
+      (source): source is OneKeyImagePreloadInput & { uri: string } =>
+        Boolean(source.uri?.trim())
+    );
+    if (validSources.length === 0) return Promise.resolve(false);
+
+    return nativeCache
+      .preload(
+        validSources.map((source) => ({
+          uri: source.uri,
           headersJson: source.headers
             ? JSON.stringify(source.headers)
             : undefined,
@@ -379,7 +385,8 @@ export const OneKeyImageCache = {
           overscan: source.overscan,
           optimizeTos: source.optimizeTos,
         }))
-    );
+      )
+      .then((success) => success && !hasInvalidSource);
   },
   clearMemory: () => nativeCache.clearMemory(),
   clearDisk: () => nativeCache.clearDisk(),