@onekeyfe/react-native-image 3.0.129 → 3.0.131

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

@@ -11,6 +11,7 @@ import android.graphics.Paint
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
 import android.os.Build
+import android.os.Looper
 import android.os.SystemClock
 import android.provider.Settings
 import android.view.View
@@ -175,6 +176,8 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
   private var pendingDisplayGeneration: Long? = null
   private var fallbackRunnable: Runnable? = null
   private var requestStartedAtMs: Long? = null
+  private var dropCleanupPending = false
+  private var dropCleanupFinished = false
 
   /**
    * Native reusable containers own their request cleanup explicitly, so their
@@ -268,10 +271,10 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
 
   init {
     OneKeyImageGlideRegistry.ensureRegistered(context)
-    hostView.onReadyForRequest = { scheduleLoad() }
+    hostView.onReadyForRequest = { loadForCurrentLayout() }
     hostView.onAttachmentChanged = { attached ->
       if (attached) {
-        scheduleLoad()
+        loadForCurrentLayout()
         schedulePendingDisplayIfNeeded()
       } else {
         displayRunnable?.let(hostView::removeCallbacks)
@@ -284,12 +287,12 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
 
   override fun afterUpdate() {
     super.afterUpdate()
-    scheduleLoad()
+    loadForCurrentLayout()
   }
 
   override fun reload() {
     lastSignature = null
-    scheduleLoad(force = true)
+    loadForCurrentLayout(force = true)
   }
 
   override fun cancel() {
@@ -302,21 +305,27 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
   }
 
   override fun onDropView() {
-    resetForReuse()
-    disposed = true
-    hostView.onReadyForRequest = null
-    hostView.onAttachmentChanged = null
+    beginDrop()
     super.onDropView()
   }
 
   override fun dispose() {
-    disposed = true
-    cancelCurrent(invalidateGeneration = true)
-    hostView.onReadyForRequest = null
-    hostView.onAttachmentChanged = null
+    beginDrop()
     super.dispose()
   }
 
+  internal fun isDisplaying(
+    sourceUri: String?,
+    sourceHeadersJson: String?,
+    recyclingKey: String,
+  ): Boolean =
+    !disposed &&
+      displayState == DisplayState.IMAGE &&
+      hostView.drawable != null &&
+      this.sourceUri == sourceUri &&
+      this.sourceHeadersJson == sourceHeadersJson &&
+      this.recyclingKey == recyclingKey
+
   private fun requestIdentityChanged() {
     if (suppressPropEffects || disposed) return
     lastSignature = null
@@ -361,11 +370,29 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
   private fun scheduleLoad(force: Boolean = false) {
     if (disposed) return
     loadRunnable?.let(hostView::removeCallbacks)
-    val runnable = Runnable { startLoad(force) }
+    val runnable = Runnable {
+      loadRunnable = null
+      startLoad(force)
+    }
     loadRunnable = runnable
     hostView.post(runnable)
   }
 
+  private fun loadForCurrentLayout(force: Boolean = false) {
+    if (disposed) return
+    loadRunnable?.let(hostView::removeCallbacks)
+    loadRunnable = null
+    if (
+      Looper.myLooper() == Looper.getMainLooper() &&
+      hostView.width > 0 &&
+      hostView.height > 0
+    ) {
+      startLoad(force)
+    } else {
+      scheduleLoad(force)
+    }
+  }
+
   private fun startLoad(force: Boolean) {
     if (disposed) return
     if (hostView.width <= 0 || hostView.height <= 0) {
@@ -662,6 +689,60 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
     hostView.invalidate()
   }
 
+  private fun beginDrop() {
+    if (dropCleanupPending || dropCleanupFinished) return
+    disposed = true
+    hostView.onReadyForRequest = null
+    cancelPendingCallbacksForDrop()
+    clearEventCallbacks()
+    hostView.autoplayEnabled = false
+    hostView.skeletonRequested = false
+    hostView.syncPlayback()
+    if (
+      !usesApplicationRequestManager &&
+      hostView.isAttachedToWindow &&
+      hostView.drawable != null
+    ) {
+      dropCleanupPending = true
+      hostView.onAttachmentChanged = { attached ->
+        if (!attached) finishDrop()
+      }
+    } else {
+      finishDrop()
+    }
+  }
+
+  private fun finishDrop() {
+    if (dropCleanupFinished) return
+    dropCleanupPending = false
+    dropCleanupFinished = true
+    resetForReuse()
+    hostView.onReadyForRequest = null
+    hostView.onAttachmentChanged = null
+  }
+
+  private fun cancelPendingCallbacksForDrop() {
+    loadRunnable?.let(hostView::removeCallbacks)
+    loadRunnable = null
+    displayRunnable?.let(hostView::removeCallbacks)
+    displayRunnable = null
+    pendingDisplayGeneration = null
+    fallbackRunnable?.let(hostView::removeCallbacks)
+    fallbackRunnable = null
+    requestActive = false
+    hostView.skeletonRequested = false
+    requestStartedAtMs = null
+    resetImageTransition()
+  }
+
+  private fun clearEventCallbacks() {
+    onLoadStart = null
+    onLoad = null
+    onDisplay = null
+    onError = null
+    onLoadEnd = null
+  }
+
   private fun applyVariant() {
     when (displayState) {
       DisplayState.IMAGE -> Unit

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

@@ -145,7 +145,8 @@ internal data class OneKeyImageDecodeDimensions(
 /**
  * Downsamples static bitmaps for the target while independently enforcing the
  * 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.
+ * or tall sources because Glide's default strategy follows target edges. Quality
+ * rounding keeps Glide's power-of-two sample from decoding below the target.
  */
 internal object OneKeyImageSafeDownsampleStrategy : DownsampleStrategy() {
   override fun getScaleFactor(
@@ -165,5 +166,5 @@ internal object OneKeyImageSafeDownsampleStrategy : DownsampleStrategy() {
     sourceHeight: Int,
     requestedWidth: Int,
     requestedHeight: Int,
-  ): SampleSizeRounding = SampleSizeRounding.MEMORY
+  ): SampleSizeRounding = SampleSizeRounding.QUALITY
 }

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

@@ -68,6 +68,12 @@ class OneKeyImageReusableView(context: ThemedReactContext) : FrameLayout(context
     image.afterUpdate()
   }
 
+  fun isDisplaying(
+    sourceUri: String?,
+    sourceHeadersJson: String?,
+    recyclingKey: String,
+  ): Boolean = image.isDisplaying(sourceUri, sourceHeadersJson, recyclingKey)
+
   fun prepareForReuse() {
     image.prepareForRecycle()
   }

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

@@ -1,5 +1,6 @@
 package com.margelo.nitro.onekeyimage
 
+import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy.SampleSizeRounding
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
@@ -69,6 +70,14 @@ class OneKeyImageDecodeDimensionsTest {
     assertTrue(decodedBytes <= OneKeyImageDecodeDimensions.MAX_DECODE_BYTES)
   }
 
+  @Test
+  fun safeDownsampleStrategyPrefersQualityOverUndersizedDecodes() {
+    assertEquals(
+      SampleSizeRounding.QUALITY,
+      OneKeyImageSafeDownsampleStrategy.getSampleSizeRounding(160, 160, 55, 55),
+    )
+  }
+
   @Test
   fun safeDownsampleStrategyIsSingletonForStableMemoryCacheIdentity() {
     val strategyClass = Class.forName(

package/package.json

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