@sbaiahmed1/react-native-blur 4.5.5-beta.1 → 4.5.5-beta.3

package/android/src/main/java/com/sbaiahmed1/reactnativeblur/ReactNativeProgressiveBlurView.kt

@@ -1,6 +1,8 @@
 package com.sbaiahmed1.reactnativeblur
 
+import android.app.Activity
 import android.content.Context
+import android.content.ContextWrapper
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.LinearGradient
@@ -14,6 +16,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.view.View.MeasureSpec
+import com.facebook.react.bridge.ReactContext
 import com.qmdeve.blurview.widget.BlurView
 import kotlin.math.max
 
@@ -35,6 +38,8 @@ class ReactNativeProgressiveBlurView : FrameLayout {
   private var currentStartOffset = 0.0f
   private var hasExplicitBackground: Boolean = false
   private var isBlurInitialized: Boolean = false
+  private var initRunnable: Runnable? = null
+  private var swapRootRunnable: Runnable? = null
 
   companion object {
     private const val TAG = "ReactNativeProgressiveBlur"
@@ -102,9 +107,12 @@ class ReactNativeProgressiveBlurView : FrameLayout {
     super.onAttachedToWindow()
 
     if (!isBlurInitialized) {
-      post {
+      val runnable = Runnable {
+        initRunnable = null
         initializeBlurChild()
       }
+      initRunnable = runnable
+      post(runnable)
     }
   }
 
@@ -132,9 +140,12 @@ class ReactNativeProgressiveBlurView : FrameLayout {
       }
 
       // Swap blur root after BlurView is attached (deferred to let it attach first)
-      blurView?.post {
+      val swapRunnable = Runnable {
+        swapRootRunnable = null
         swapBlurRootToScreenAncestor()
       }
+      swapRootRunnable = swapRunnable
+      blurView?.post(swapRunnable)
 
       isBlurInitialized = true
       logDebug("Initialized progressive blur with blur + gradient approach")
@@ -207,10 +218,11 @@ class ReactNativeProgressiveBlurView : FrameLayout {
 
   /**
    * Falls back to android.R.id.content or the activity root view.
+   * Tries ReactContext.currentActivity first, then unwraps ContextWrapper chain.
    */
   private fun getContentViewFallback(): ViewGroup? {
     try {
-      val activity = context as? android.app.Activity
+      val activity = getActivityFromContext()
       activity?.findViewById<ViewGroup>(android.R.id.content)?.let { return it }
     } catch (e: Exception) {
       logDebug("Could not access activity content view: ${e.message}")
@@ -218,6 +230,23 @@ class ReactNativeProgressiveBlurView : FrameLayout {
     return this.parent as? ViewGroup
   }
 
+  /**
+   * Resolves an Activity from the view's context.
+   * Priority: ReactContext.currentActivity > ContextWrapper unwrap chain.
+   */
+  private fun getActivityFromContext(): Activity? {
+    // Try ReactContext first (most common in React Native)
+    (context as? ReactContext)?.currentActivity?.let { return it }
+
+    // Unwrap ContextWrapper chain to find an Activity
+    var ctx: Context? = context
+    while (ctx != null) {
+      if (ctx is Activity) return ctx
+      ctx = (ctx as? ContextWrapper)?.baseContext
+    }
+    return null
+  }
+
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
     val width = MeasureSpec.getSize(widthMeasureSpec)
     val height = MeasureSpec.getSize(heightMeasureSpec)
@@ -365,7 +394,29 @@ class ReactNativeProgressiveBlurView : FrameLayout {
   fun cleanup() {
     hasExplicitBackground = false
     isBlurInitialized = false
-    removeCallbacks(null)
+    initRunnable?.let { removeCallbacks(it) }
+    initRunnable = null
+    swapRootRunnable?.let { runnable ->
+      blurView?.removeCallbacks(runnable)
+    }
+    swapRootRunnable = null
+
+    // Unregister the OnPreDrawListener from whatever root it was moved to,
+    // preventing callbacks into a detached BlurView and avoiding leaks.
+    blurView?.let { bv ->
+      val listener = bv.preDrawListener
+      val decor = bv.mDecorView
+      if (listener != null && decor != null) {
+        try {
+          decor.viewTreeObserver.removeOnPreDrawListener(listener)
+        } catch (e: Exception) {
+          logDebug("Could not remove pre-draw listener during cleanup: ${e.message}")
+        }
+      }
+      bv.mDecorView = null
+      bv.mDifferentRoot = false
+    }
+
     logDebug("View cleaned up")
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sbaiahmed1/react-native-blur",
-  "version": "4.5.5-beta.1",
+  "version": "4.5.5-beta.3",
   "description": "React native modern blur view",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",