@sbaiahmed1/react-native-blur 4.5.5-beta.2 → 4.5.5-beta.4

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
 
@@ -157,7 +160,9 @@ class ReactNativeProgressiveBlurView : FrameLayout {
    * Redirects the internal BlurView's blur capture root from the activity decor view
    * to the nearest react-native-screens Screen ancestor.
    *
-   * BaseBlurView has public mDecorView and preDrawListener fields, so no reflection needed.
+   * BaseBlurView (QmBlurView 1.1.4) field visibility:
+   *   public  — mDecorView, mDifferentRoot, preDrawListener (direct access)
+   *   private — mForceRedraw (requires reflection)
    */
   private fun swapBlurRootToScreenAncestor() {
     val bv = blurView ?: return
@@ -175,15 +180,24 @@ class ReactNativeProgressiveBlurView : FrameLayout {
           logDebug("Could not remove old pre-draw listener: ${e.message}")
         }
 
-        // Set new root
+        // Set new root (public field)
         bv.mDecorView = newRoot
 
         // Add listener to new root
         newRoot.viewTreeObserver.addOnPreDrawListener(listener)
 
-        // Update mDifferentRoot flag
+        // Update mDifferentRoot flag (public field)
         bv.mDifferentRoot = newRoot.rootView != bv.rootView
 
+        // Force a redraw (private field — requires reflection)
+        try {
+          val forceRedrawField = bv.javaClass.superclass.getDeclaredField("mForceRedraw")
+          forceRedrawField.isAccessible = true
+          forceRedrawField.setBoolean(bv, true)
+        } catch (e: NoSuchFieldException) {
+          logWarning("Could not set mForceRedraw via reflection: ${e.message}")
+        }
+
         logDebug("Progressive blur: swapped root to ${newRoot.javaClass.simpleName}")
       }
     } catch (e: Exception) {
@@ -215,10 +229,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}")
@@ -226,6 +241,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)
@@ -379,6 +411,23 @@ class ReactNativeProgressiveBlurView : FrameLayout {
       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.2",
+  "version": "4.5.5-beta.4",
   "description": "React native modern blur view",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",