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

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

@@ -1,8 +1,6 @@
 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
@@ -12,7 +10,6 @@ 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
@@ -191,13 +188,17 @@ class ReactNativeBlurView : BlurViewGroup {
 
   /**
    * Finds the optimal view to use as blur capture root.
-   * 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.
+   * Returns the nearest react-native-screens Screen ancestor if found, which scopes
+   * the blur to the current screen and prevents capturing navigation transitions.
+   *
+   * Returns null when no Screen ancestor exists (e.g. modals, standalone usage).
+   * A null return means swapBlurRootToScreenAncestor() is a no-op and QmBlurView
+   * keeps its default decor view as the blur root — this is correct for modals
+   * because they need to blur the content behind them (in the main activity window).
    */
   private fun findOptimalBlurRoot(): ViewGroup? {
-    return findNearestScreenAncestor() ?: getAppRootFallback()
+    return findNearestScreenAncestor()
   }
 
   /**
@@ -215,46 +216,6 @@ class ReactNativeBlurView : BlurViewGroup {
     return null
   }
 
-  /**
-   * 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 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 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

@@ -1,8 +1,6 @@
 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
@@ -16,7 +14,6 @@ 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
 
@@ -207,13 +204,17 @@ class ReactNativeProgressiveBlurView : FrameLayout {
 
   /**
    * Finds the optimal view to use as blur capture root.
-   * 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.
+   * Returns the nearest react-native-screens Screen ancestor if found, which scopes
+   * the blur to the current screen and prevents capturing navigation transitions.
+   *
+   * Returns null when no Screen ancestor exists (e.g. modals, standalone usage).
+   * A null return means swapBlurRootToScreenAncestor() is a no-op and QmBlurView
+   * keeps its default decor view as the blur root — this is correct for modals
+   * because they need to blur the content behind them (in the main activity window).
    */
   private fun findOptimalBlurRoot(): ViewGroup? {
-    return findNearestScreenAncestor() ?: getAppRootFallback()
+    return findNearestScreenAncestor()
   }
 
   /**
@@ -230,48 +231,6 @@ class ReactNativeProgressiveBlurView : FrameLayout {
     return null
   }
 
-  /**
-   * 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 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 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? {
-    // 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)

package/package.json

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