react-native-screens 4.10.0-beta.0 → 4.10.0-beta.1

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackFragment.kt

@@ -85,10 +85,7 @@ class ScreenStackFragment :
             return container
         }
 
-    private val dimmingDelegate =
-        lazy(LazyThreadSafetyMode.NONE) {
-            DimmingViewManager(screen.reactContext, screen)
-        }
+    private var dimmingDelegate: DimmingViewManager? = null
 
     private var sheetDelegate: SheetDelegate? = null
 
@@ -299,8 +296,9 @@ class ScreenStackFragment :
         sheetDelegate = SheetDelegate(screen)
 
         assert(view == coordinatorLayout)
-        dimmingDelegate.value.onViewHierarchyCreated(screen, coordinatorLayout)
-        dimmingDelegate.value.onBehaviourAttached(screen, screen.sheetBehavior!!)
+        val dimmingDelegate = requireDimmingDelegate(forceCreation = true)
+        dimmingDelegate.onViewHierarchyCreated(screen, coordinatorLayout)
+        dimmingDelegate.onBehaviourAttached(screen, screen.sheetBehavior!!)
 
         val container = screen.container!!
         coordinatorLayout.measure(
@@ -330,7 +328,7 @@ class ScreenStackFragment :
         }
 
         val animatorSet = AnimatorSet()
-        val dimmingDelegate = dimmingDelegate.value
+        val dimmingDelegate = requireDimmingDelegate()
 
         if (enter) {
             val alphaAnimator =
@@ -718,6 +716,14 @@ class ScreenStackFragment :
         screenStack.dismiss(this)
     }
 
+    private fun requireDimmingDelegate(forceCreation: Boolean = false): DimmingViewManager {
+        if (dimmingDelegate == null || forceCreation) {
+            dimmingDelegate?.invalidate(screen.sheetBehavior)
+            dimmingDelegate = DimmingViewManager(screen.reactContext, screen)
+        }
+        return dimmingDelegate!!
+    }
+
     private class ScreensCoordinatorLayout(
         context: Context,
         private val fragment: ScreenStackFragment,

package/android/src/main/java/com/swmansion/rnscreens/bottomsheet/DimmingViewManager.kt

@@ -42,7 +42,7 @@ class DimmingViewManager(
         screen: Screen,
         behavior: BottomSheetBehavior<Screen>,
     ) {
-        behavior.addBottomSheetCallback(requireBottomSheetCallback(screen))
+        behavior.addBottomSheetCallback(requireBottomSheetCallback(screen, forceCreation = true))
     }
 
     /**
@@ -50,6 +50,10 @@ class DimmingViewManager(
      */
     fun willDimForDetentIndex(screen: Screen, index: Int) = index > screen.sheetLargestUndimmedDetentIndex
 
+    fun invalidate(behavior: BottomSheetBehavior<Screen>?) {
+        dimmingViewCallback?.let { callback -> behavior?.removeBottomSheetCallback(callback) }
+    }
+
     /**
      * This bottom sheet callback is responsible for animating alpha of the dimming view.
      */
@@ -161,8 +165,8 @@ class DimmingViewManager(
             }
         }
 
-    private fun requireBottomSheetCallback(screen: Screen): BottomSheetCallback {
-        if (dimmingViewCallback == null) {
+    private fun requireBottomSheetCallback(screen: Screen, forceCreation: Boolean = false): BottomSheetCallback {
+        if (dimmingViewCallback == null || forceCreation) {
             dimmingViewCallback = AnimateDimmingViewCallback(screen, dimmingView, maxAlpha)
         }
         return dimmingViewCallback!!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screens",
-  "version": "4.10.0-beta.0",
+  "version": "4.10.0-beta.1",
   "description": "Native navigation primitives for your React Native app.",
   "scripts": {
     "submodules": "git submodule update --init --recursive && (cd react-navigation && yarn && yarn build && cd ../)",