@onekeyfe/react-native-image 3.0.102 → 3.0.104

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

@@ -1,5 +1,7 @@
 package com.margelo.nitro.onekeyimage
 
+import android.content.Context
+import android.content.ContextWrapper
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
@@ -7,6 +9,7 @@ import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
 import android.view.View
 import android.widget.ImageView
+import androidx.fragment.app.FragmentActivity
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.DiskCacheStrategy
@@ -22,6 +25,17 @@ import com.margelo.nitro.skeleton.OneKeySkeletonRenderer
 import com.margelo.nitro.views.RecyclableView
 import kotlin.math.ceil
 
+private fun Context.findFragmentActivity(): FragmentActivity? {
+  var currentContext: Context? = this
+  while (currentContext is ContextWrapper) {
+    if (currentContext is FragmentActivity) return currentContext
+    val baseContext = currentContext.baseContext
+    if (baseContext === currentContext) return null
+    currentContext = baseContext
+  }
+  return currentContext as? FragmentActivity
+}
+
 private class OneKeyImageHostView(context: ThemedReactContext) : ImageView(context) {
   private val fallbackPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
     color = Color.rgb(110, 110, 120)
@@ -123,10 +137,12 @@ 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.
+  // The Activity outlives ScreenStack Fragments but still provides bounded
+  // background and destruction lifecycle handling for image requests.
   private val requestManager by lazy(LazyThreadSafetyMode.NONE) {
-    Glide.with(context.applicationContext)
+    val activity = context.findFragmentActivity()
+      ?: (context.currentActivity as? FragmentActivity)
+    Glide.with(requireNotNull(activity) { "A FragmentActivity is required to load images" })
   }
   private var loadRunnable: Runnable? = null
   private var currentTarget: CustomViewTarget<OneKeyImageHostView, Drawable>? = null
@@ -213,6 +229,7 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
     hostView.onReadyForRequest = { scheduleLoad() }
     hostView.onAttachmentChanged = { attached ->
       if (attached) {
+        scheduleLoad()
         schedulePendingDisplayIfNeeded()
       } else {
         displayRunnable?.let(hostView::removeCallbacks)
@@ -411,6 +428,8 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
 
       override fun onResourceCleared(placeholder: Drawable?) {
         if (requestGeneration == generation && currentTarget === this) {
+          currentTarget = null
+          lastSignature = null
           requestActive = false
           hostView.skeletonRequested = false
           hostView.setImageDrawable(null)

package/package.json

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