@onekeyfe/react-native-image 3.0.103 → 3.0.105

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.
-  private val requestManager by lazy(LazyThreadSafetyMode.NONE) {
-    Glide.with(context.applicationContext)
+  // The Activity outlives ScreenStack Fragments but still provides bounded
+  // background and destruction lifecycle handling for image requests.
+  private val activityRequestManager by lazy(LazyThreadSafetyMode.NONE) {
+    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
@@ -140,6 +156,18 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
   private var pendingDisplayGeneration: Long? = null
   private var fallbackRunnable: Runnable? = null
 
+  /**
+   * Native reusable containers own their request cleanup explicitly, so their
+   * requests must not inherit a transient React Native screen Fragment lifecycle.
+   */
+  internal var usesApplicationRequestManager = false
+
+  private fun requestManager() = if (usesApplicationRequestManager) {
+    Glide.with(context.applicationContext)
+  } else {
+    activityRequestManager
+  }
+
   override val view: View = hostView
 
   override var sourceUri: String? = null
@@ -213,6 +241,7 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
     hostView.onReadyForRequest = { scheduleLoad() }
     hostView.onAttachmentChanged = { attached ->
       if (attached) {
+        scheduleLoad()
         schedulePendingDisplayIfNeeded()
       } else {
         displayRunnable?.let(hostView::removeCallbacks)
@@ -411,6 +440,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)
@@ -451,7 +482,7 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
       }
     }
     currentTarget = target
-    requestManager
+    requestManager()
       .asDrawable()
       .load(OneKeyImageModel.build(requestUrl, headersJson))
       .apply(requestOptions(policy))
@@ -528,7 +559,7 @@ 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
-    requestManager.clear(target)
+    requestManager().clear(target)
   }
 
   private fun scheduleOnDisplay(requestGeneration: Long) {

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

@@ -0,0 +1,71 @@
+package com.margelo.nitro.onekeyimage
+
+import android.widget.FrameLayout
+import com.facebook.react.uimanager.ThemedReactContext
+
+/** A native-only OneKeyImage host for reusable container views such as list cells. */
+class OneKeyImageReusableView(context: ThemedReactContext) : FrameLayout(context) {
+  private val image = HybridOneKeyImage(context).apply {
+    usesApplicationRequestManager = true
+  }
+
+  init {
+    addView(
+      image.view,
+      LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT),
+    )
+    clipChildren = true
+  }
+
+  fun configure(
+    sourceUri: String?,
+    sourceHeadersJson: String?,
+    variant: String,
+    contentFit: String,
+    cachePolicy: String,
+    autoplay: Boolean,
+    recyclingKey: String,
+    optimizeTos: Boolean,
+    overscan: Double,
+    loadingStrategy: String,
+  ) {
+    image.sourceHeadersJson = sourceHeadersJson
+    image.variant = when (variant) {
+      "token" -> OneKeyImageVariant.TOKEN
+      "network" -> OneKeyImageVariant.NETWORK
+      "avatar" -> OneKeyImageVariant.AVATAR
+      else -> OneKeyImageVariant.GENERIC
+    }
+    image.contentFit = when (contentFit) {
+      "contain" -> OneKeyImageContentFit.CONTAIN
+      "fill" -> OneKeyImageContentFit.FILL
+      "center" -> OneKeyImageContentFit.CENTER
+      else -> OneKeyImageContentFit.COVER
+    }
+    image.cachePolicy = when (cachePolicy) {
+      "memory" -> OneKeyImageCachePolicy.MEMORY
+      "disk" -> OneKeyImageCachePolicy.DISK
+      "none" -> OneKeyImageCachePolicy.NONE
+      else -> OneKeyImageCachePolicy.MEMORY_DISK
+    }
+    image.autoplay = autoplay
+    image.recyclingKey = recyclingKey
+    image.optimizeTos = optimizeTos
+    image.overscan = overscan
+    image.loadingStrategy = when (loadingStrategy) {
+      "skeleton" -> OneKeyImageLoadingStrategy.SKELETON
+      "none" -> OneKeyImageLoadingStrategy.NONE
+      else -> OneKeyImageLoadingStrategy.STATIC
+    }
+    image.sourceUri = sourceUri
+    image.afterUpdate()
+  }
+
+  fun prepareForReuse() {
+    image.prepareForRecycle()
+  }
+
+  fun dispose() {
+    image.onDropView()
+  }
+}

package/ios/OneKeyImageReusableView.swift

@@ -0,0 +1,52 @@
+import UIKit
+
+/// A native-only OneKeyImage host for reusable container views such as list cells.
+public final class OneKeyImageReusableView: UIView {
+  private let image = HybridOneKeyImage()
+
+  public override init(frame: CGRect) {
+    super.init(frame: frame)
+    let imageView = image.view
+    imageView.frame = bounds
+    imageView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+    addSubview(imageView)
+    clipsToBounds = true
+  }
+
+  public required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+
+  public func configure(
+    sourceUri: String?,
+    sourceHeadersJson: String?,
+    variant: String,
+    contentFit: String,
+    cachePolicy: String,
+    autoplay: Bool,
+    recyclingKey: String,
+    optimizeTos: Bool,
+    overscan: Double,
+    loadingStrategy: String
+  ) {
+    image.sourceHeadersJson = sourceHeadersJson
+    image.variant = OneKeyImageVariant(fromString: variant) ?? .generic
+    image.contentFit = OneKeyImageContentFit(fromString: contentFit) ?? .cover
+    image.cachePolicy = OneKeyImageCachePolicy(fromString: cachePolicy) ?? .memoryDisk
+    image.autoplay = autoplay
+    image.recyclingKey = recyclingKey
+    image.optimizeTos = optimizeTos
+    image.overscan = overscan
+    image.loadingStrategy = OneKeyImageLoadingStrategy(fromString: loadingStrategy) ?? .static
+    image.sourceUri = sourceUri
+    image.afterUpdate()
+  }
+
+  public func prepareForReuse() {
+    image.prepareForRecycle()
+  }
+
+  deinit {
+    image.onDropView()
+  }
+}

package/package.json

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