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

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

@@ -1,6 +1,8 @@
 package com.sbaiahmed1.reactnativeblur
 
+import android.app.Activity
 import android.content.Context
+import android.content.ContextWrapper
 import android.graphics.Color
 import android.graphics.Outline
 import android.util.AttributeSet
@@ -10,6 +12,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewOutlineProvider
 import android.view.ViewTreeObserver
+import com.facebook.react.bridge.ReactContext
 import com.qmdeve.blurview.widget.BlurViewGroup
 import com.qmdeve.blurview.base.BaseBlurViewGroup
 import androidx.core.graphics.toColorInt
@@ -188,10 +191,13 @@ class ReactNativeBlurView : BlurViewGroup {
 
   /**
    * Finds the optimal view to use as blur capture root.
-   * Priority: nearest react-native-screens Screen > android.R.id.content > parent
+   * Priority: nearest react-native-screens Screen > android.R.id.content in parent chain > activity content > parent
+   *
+   * This handles both regular screens and modals — modals have their own window/view tree,
+   * so we walk up the parent chain for android.R.id.content before falling back to the activity.
    */
   private fun findOptimalBlurRoot(): ViewGroup? {
-    return findNearestScreenAncestor() ?: getContentViewFallback()
+    return findNearestScreenAncestor() ?: getAppRootFallback()
   }
 
   /**
@@ -210,18 +216,45 @@ class ReactNativeBlurView : BlurViewGroup {
   }
 
   /**
-   * Falls back to android.R.id.content or the activity root view.
+   * Walks up the view parent chain looking for android.R.id.content (works in modals
+   * which have their own content root), then falls back to the activity's content view.
    */
-  private fun getContentViewFallback(): ViewGroup? {
+  private fun getAppRootFallback(): ViewGroup? {
+    // Walk up the parent chain — catches modals which have their own android.R.id.content
+    var parent = this.parent
+    while (parent != null) {
+      if (parent is ViewGroup && parent.id == android.R.id.content) {
+        return parent
+      }
+      parent = parent.parent
+    }
+
+    // Fall back to the activity's content view
     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}")
+      logDebug("Could not access activity root view: ${e.message}")
     }
+
     return this.parent as? ViewGroup
   }
 
+  /**
+   * Resolves an Activity from the view's context.
+   * Priority: ReactContext.currentActivity > ContextWrapper unwrap chain.
+   */
+  private fun getActivityFromContext(): Activity? {
+    (context as? ReactContext)?.currentActivity?.let { return it }
+
+    var ctx: Context? = context
+    while (ctx != null) {
+      if (ctx is Activity) return ctx
+      ctx = (ctx as? ContextWrapper)?.baseContext
+    }
+    return null
+  }
+
   /**
    * Initialize the blur view with current settings.
    * Called after the view is attached and the blur root has been swapped.

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

@@ -160,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
@@ -178,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) {
@@ -196,10 +207,13 @@ class ReactNativeProgressiveBlurView : FrameLayout {
 
   /**
    * Finds the optimal view to use as blur capture root.
-   * Priority: nearest react-native-screens Screen > android.R.id.content > parent
+   * Priority: nearest react-native-screens Screen > android.R.id.content in parent chain > activity content > parent
+   *
+   * This handles both regular screens and modals — modals have their own window/view tree,
+   * so we walk up the parent chain for android.R.id.content before falling back to the activity.
    */
   private fun findOptimalBlurRoot(): ViewGroup? {
-    return findNearestScreenAncestor() ?: getContentViewFallback()
+    return findNearestScreenAncestor() ?: getAppRootFallback()
   }
 
   /**
@@ -217,16 +231,27 @@ class ReactNativeProgressiveBlurView : FrameLayout {
   }
 
   /**
-   * Falls back to android.R.id.content or the activity root view.
-   * Tries ReactContext.currentActivity first, then unwraps ContextWrapper chain.
+   * Walks up the view parent chain looking for android.R.id.content (works in modals
+   * which have their own content root), then falls back to the activity's content view.
    */
-  private fun getContentViewFallback(): ViewGroup? {
+  private fun getAppRootFallback(): ViewGroup? {
+    // Walk up the parent chain — catches modals which have their own android.R.id.content
+    var parent = this.parent
+    while (parent != null) {
+      if (parent is ViewGroup && parent.id == android.R.id.content) {
+        return parent
+      }
+      parent = parent.parent
+    }
+
+    // Fall back to the activity's content view
     try {
       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}")
+      logDebug("Could not access activity root view: ${e.message}")
     }
+
     return this.parent as? ViewGroup
   }
 

package/package.json

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