@lodev09/react-native-true-sheet 3.6.10 → 3.7.0-beta.0

package/README.md

@@ -31,6 +31,7 @@ The true native bottom sheet experience for your React Native Apps. 💩
 
 - React Native >= 0.76 (Expo SDK 52+)
 - New Architecture enabled (default in RN 0.76+)
+- Xcode 26.2 (strongly recommended for better library functionality)
 
 ### Expo
 
@@ -45,6 +46,27 @@ yarn add @lodev09/react-native-true-sheet
 cd ios && pod install
 ```
 
+### EAS Build (iOS)
+
+When using [EAS Build](https://docs.expo.dev/build/introduction/) to build your iOS app, you must configure your `eas.json` to use a build image that includes Xcode 26.2. Use `"image": "latest"` or choose from the [available build images](https://docs.expo.dev/build-reference/infrastructure/#ios-server-images):
+
+```json
+{
+  "build": {
+    "production": {
+      "ios": {
+        "image": "latest"
+      }
+    },
+    "development": {
+      "ios": {
+        "image": "latest"
+      }
+    }
+  }
+}
+```
+
 ## Documentation
 
 - [Example](example)

package/android/src/main/java/com/lodev09/truesheet/TrueSheetContainerView.kt

@@ -3,9 +3,11 @@ package com.lodev09.truesheet
 import android.annotation.SuppressLint
 import android.view.View
 import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.views.view.ReactViewGroup
 
 interface TrueSheetContainerViewDelegate {
+  val eventDispatcher: EventDispatcher?
   fun containerViewContentDidChangeSize(width: Int, height: Int)
   fun containerViewHeaderDidChangeSize(width: Int, height: Int)
   fun containerViewFooterDidChangeSize(width: Int, height: Int)
@@ -32,6 +34,9 @@ class TrueSheetContainerView(reactContext: ThemedReactContext) :
   var headerHeight: Int = 0
   var footerHeight: Int = 0
 
+  override val eventDispatcher: EventDispatcher?
+    get() = delegate?.eventDispatcher
+
   init {
     // Allow footer to position outside container bounds
     clipChildren = false

package/android/src/main/java/com/lodev09/truesheet/TrueSheetFooterView.kt

@@ -11,10 +11,11 @@ import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.views.view.ReactViewGroup
 
 /**
- * Delegate interface for footer view size changes
+ * Delegate interface for footer view size changes and event dispatching
  */
 interface TrueSheetFooterViewDelegate {
   fun footerViewDidChangeSize(width: Int, height: Int)
+  val eventDispatcher: EventDispatcher?
 }
 
 /**
@@ -30,7 +31,9 @@ class TrueSheetFooterView(private val reactContext: ThemedReactContext) :
   RootView {
 
   var delegate: TrueSheetFooterViewDelegate? = null
-  var eventDispatcher: EventDispatcher? = null
+
+  private val eventDispatcher: EventDispatcher?
+    get() = delegate?.eventDispatcher
 
   private var lastWidth = 0
   private var lastHeight = 0

package/android/src/main/java/com/lodev09/truesheet/TrueSheetView.kt

@@ -42,7 +42,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   private val containerView: TrueSheetContainerView?
     get() = viewController.getChildAt(0) as? TrueSheetContainerView
 
-  var eventDispatcher: EventDispatcher? = null
+  override var eventDispatcher: EventDispatcher? = null
 
   // Initial present configuration (set by ViewManager before mount)
   var initialDetentIndex: Int = -1
@@ -66,7 +66,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   private var isSheetUpdatePending: Boolean = false
 
   // Root container for the coordinator layout (activity or Modal dialog content view)
-  private var rootContainerView: ViewGroup? = null
+  internal var rootContainerView: ViewGroup? = null
 
   // ==================== Initialization ====================
 
@@ -151,7 +151,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   // ==================== Lifecycle ====================
 
   override fun onHostResume() {
-    viewController.reapplyHiddenState()
     finalizeUpdates()
   }
 
@@ -278,7 +277,10 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     if (!viewController.isPresented) {
       // Attach coordinator to the root container
       rootContainerView = findRootContainerView()
-      viewController.coordinatorLayout?.let { rootContainerView?.addView(it) }
+      viewController.coordinatorLayout?.let { coordinator ->
+        rootContainerView?.addView(coordinator)
+        coordinator.post { measureCoordinatorLayout() }
+      }
 
       // Register with observer to track sheet stack hierarchy
       viewController.parentSheetView = TrueSheetStackManager.onSheetWillPresent(this, detentIndex)
@@ -384,10 +386,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   override fun viewControllerWillPresent(index: Int, position: Float, detent: Float) {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
     eventDispatcher?.dispatchEvent(WillPresentEvent(surfaceId, id, index, position, detent))
-
-    // Enable touch event dispatching to React Native while sheet is visible
-    viewController.eventDispatcher = eventDispatcher
-    containerView?.footerView?.eventDispatcher = eventDispatcher
   }
 
   override fun viewControllerDidPresent(index: Int, position: Float, detent: Float) {
@@ -398,10 +396,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   override fun viewControllerWillDismiss() {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
     eventDispatcher?.dispatchEvent(WillDismissEvent(surfaceId, id))
-
-    // Disable touch event dispatching when sheet is dismissing
-    viewController.eventDispatcher = null
-    containerView?.footerView?.eventDispatcher = null
   }
 
   override fun viewControllerDidDismiss(hadParent: Boolean) {
@@ -442,6 +436,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   override fun viewControllerDidChangeSize(width: Int, height: Int) {
     updateState(width, height)
+    measureCoordinatorLayout()
   }
 
   override fun viewControllerWillFocus() {
@@ -486,6 +481,19 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   // ==================== Private Helpers ====================
 
+  private fun measureCoordinatorLayout() {
+    val coordinator = viewController.coordinatorLayout ?: return
+    val width = viewController.screenWidth
+    val height = viewController.realScreenHeight
+
+    if (width > 0 && height > 0) {
+      val widthSpec = View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY)
+      val heightSpec = View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY)
+      coordinator.measure(widthSpec, heightSpec)
+      coordinator.layout(0, 0, width, height)
+    }
+  }
+
   /**
    * Find the root container view for presenting the sheet.
    * This traverses up the view hierarchy to find the content view (android.R.id.content)
@@ -494,14 +502,20 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
    */
   private fun findRootContainerView(): ViewGroup? {
     var current: android.view.ViewParent? = parent
+    var contentView: ViewGroup? = null
 
     while (current != null) {
-      if (current is ViewGroup && current.id == android.R.id.content) {
-        return current
+      if (current is ViewGroup) {
+        if (current.javaClass.name == "com.swmansion.rnscreens.Screen") {
+          return current
+        }
+        if (contentView == null && current.id == android.R.id.content) {
+          contentView = current
+        }
       }
       current = current.parent
     }
 
-    return reactContext.currentActivity?.findViewById(android.R.id.content)
+    return contentView ?: reactContext.currentActivity?.findViewById(android.R.id.content)
   }
 }

package/android/src/main/java/com/lodev09/truesheet/TrueSheetViewController.kt

@@ -23,7 +23,6 @@ import com.facebook.react.util.RNLog
 import com.facebook.react.views.view.ReactViewGroup
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.lodev09.truesheet.core.GrabberOptions
-import com.lodev09.truesheet.core.RNScreensFragmentObserver
 import com.lodev09.truesheet.core.TrueSheetBottomSheetView
 import com.lodev09.truesheet.core.TrueSheetBottomSheetViewDelegate
 import com.lodev09.truesheet.core.TrueSheetCoordinatorLayout
@@ -45,6 +44,7 @@ import com.lodev09.truesheet.utils.ScreenUtils
 data class DetentInfo(val index: Int, val position: Float)
 
 interface TrueSheetViewControllerDelegate {
+  val eventDispatcher: EventDispatcher?
   fun viewControllerWillPresent(index: Int, position: Float, detent: Float)
   fun viewControllerDidPresent(index: Int, position: Float, detent: Float)
   fun viewControllerWillDismiss()
@@ -89,7 +89,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     private const val DEFAULT_CORNER_RADIUS = 16 // dp
     private const val TRANSLATE_ANIMATION_DURATION = 200L
     private const val DISMISS_DURATION = 200L
-    private const val MODAL_FADE_DURATION = 150L
   }
 
   // =============================================================================
@@ -129,7 +128,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   private var interactionState: InteractionState = InteractionState.Idle
   private var isDismissing = false
-  private var wasHiddenByModal = false
   private var shouldAnimatePresent = false
   private var isPresentAnimating = false
 
@@ -149,15 +147,16 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   // Helper Objects
   private var keyboardObserver: TrueSheetKeyboardObserver? = null
-  private var rnScreensObserver: RNScreensFragmentObserver? = null
   internal val detentCalculator = TrueSheetDetentCalculator(reactContext).apply {
     delegate = this@TrueSheetViewController
   }
 
   // Touch Dispatchers
-  internal var eventDispatcher: EventDispatcher? = null
   private val jsTouchDispatcher = JSTouchDispatcher(this)
-  private var jsPointerDispatcher: JSPointerDispatcher? = null
+  private val jsPointerDispatcher = JSPointerDispatcher(this)
+
+  private val eventDispatcher
+    get() = delegate?.eventDispatcher
 
   // Detent Configuration
   override var maxSheetHeight: Int? = null
@@ -284,14 +283,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private val dimViews: List<TrueSheetDimView>
     get() = listOfNotNull(dimView, parentDimView)
 
-  // =============================================================================
-  // MARK: - Initialization
-  // =============================================================================
-
-  init {
-    jsPointerDispatcher = JSPointerDispatcher(this)
-  }
-
   // =============================================================================
   // MARK: - Sheet Creation & Cleanup
   // =============================================================================
@@ -312,7 +303,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   private fun cleanupSheet() {
     cleanupKeyboardObserver()
-    cleanupModalObserver()
     cleanupBackCallback()
     sheetView?.animate()?.cancel()
 
@@ -332,7 +322,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     isDismissing = false
     isPresented = false
     isSheetVisible = false
-    wasHiddenByModal = false
     isPresentAnimating = false
     lastEmittedPositionPx = -1
     detentIndexBeforeKeyboard = -1
@@ -372,6 +361,13 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
   }
 
+  override fun coordinatorLayoutDidChangeConfiguration() {
+    if (!isPresented) return
+
+    updateStateDimensions()
+    sheetView?.let { emitChangePositionDelegate(it.top, realtime = false) }
+  }
+
   // =============================================================================
   // MARK: - TrueSheetDimViewDelegate
   // =============================================================================
@@ -502,84 +498,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
   }
 
-  // =============================================================================
-  // MARK: - Modal Observer (react-native-screens)
-  // =============================================================================
-
-  private fun setupModalObserver() {
-    rnScreensObserver = RNScreensFragmentObserver(
-      reactContext = reactContext,
-      onModalPresented = {
-        if (isPresented && isSheetVisible && isTopmostSheet) {
-          hideForModal()
-        }
-      },
-      onModalWillDismiss = {
-        if (isPresented && wasHiddenByModal && isTopmostSheet) {
-          showAfterModal()
-        }
-      },
-      onModalDidDismiss = {
-        if (isPresented && wasHiddenByModal) {
-          wasHiddenByModal = false
-          // Restore parent sheet after this sheet is restored
-          parentSheetView?.viewController?.let { parent ->
-            post { parent.showAfterModal() }
-          }
-        }
-      }
-    )
-    rnScreensObserver?.start()
-  }
-
-  private fun cleanupModalObserver() {
-    rnScreensObserver?.stop()
-    rnScreensObserver = null
-  }
-
-  private fun setSheetVisibility(visible: Boolean) {
-    coordinatorLayout?.visibility = if (visible) VISIBLE else GONE
-    dimViews.forEach { it.visibility = if (visible) VISIBLE else INVISIBLE }
-  }
-
-  private fun hideForModal() {
-    val sheet = sheetView ?: run {
-      RNLog.e(reactContext, "TrueSheet: sheetView is null in hideForModal")
-      return
-    }
-
-    isSheetVisible = false
-    wasHiddenByModal = true
-
-    dimViews.forEach { it.animate().alpha(0f).setDuration(MODAL_FADE_DURATION).start() }
-    sheet.animate()
-      .alpha(0f)
-      .setDuration(MODAL_FADE_DURATION)
-      .withEndAction {
-        setSheetVisibility(false)
-      }
-      .start()
-
-    // This will hide parent sheets first
-    parentSheetView?.viewController?.hideForModal()
-  }
-
-  private fun showAfterModal() {
-    isSheetVisible = true
-    setSheetVisibility(true)
-    sheetView?.alpha = 1f
-    updateDimAmount(animated = true)
-  }
-
-  /**
-   * Re-applies hidden state after returning from background.
-   * Android may restore visibility on activity resume, so we need to hide it again.
-   */
-  fun reapplyHiddenState() {
-    if (!wasHiddenByModal) return
-    setSheetVisibility(false)
-  }
-
   // =============================================================================
   // MARK: - Presentation
   // =============================================================================
@@ -611,7 +529,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       setupSheetDetents()
       setupDimmedBackground(currentDetentIndex)
       setupKeyboardObserver()
-      setupModalObserver()
       setupBackCallback()
 
       sheet.setupBackground()
@@ -754,15 +671,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       animate = isPresented
     )
 
-    val offset = if (expandedOffset == 0) topInset else 0
-    val newHeight = realScreenHeight - expandedOffset - offset
-    val newWidth = minOf(screenWidth, DEFAULT_MAX_WIDTH.dpToPx().toInt())
-
-    if (lastStateWidth != newWidth || lastStateHeight != newHeight) {
-      lastStateWidth = newWidth
-      lastStateHeight = newHeight
-      delegate?.viewControllerDidChangeSize(newWidth, newHeight)
-    }
+    updateStateDimensions(expandedOffset)
 
     if (isPresented) {
       setStateForDetentIndex(currentDetentIndex)
@@ -885,7 +794,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // =============================================================================
 
   private fun shouldHandleKeyboard(checkFocus: Boolean = true): Boolean {
-    if (wasHiddenByModal) return false
     if (!isTopmostSheet) return false
     if (checkFocus && !isFocusedViewWithinSheet()) return false
     return true
@@ -912,14 +820,19 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
           setupSheetDetents()
           if (!isDismissing && detentIndexBeforeKeyboard >= 0) {
             setStateForDetentIndex(detentIndexBeforeKeyboard)
-            detentIndexBeforeKeyboard = -1
           }
         }
 
-        override fun keyboardDidHide() {}
+        override fun keyboardDidHide() {
+          if (!shouldHandleKeyboard(checkFocus = false)) return
+          detentIndexBeforeKeyboard = -1
+          positionFooter()
+        }
 
         override fun keyboardDidChangeHeight(height: Int) {
-          if (!shouldHandleKeyboard()) return
+          // Skip focus check if already handling keyboard (focus may be lost during hide)
+          val isHandlingKeyboard = detentIndexBeforeKeyboard >= 0
+          if (!shouldHandleKeyboard(checkFocus = !isHandlingKeyboard)) return
           positionFooter()
         }
       }
@@ -1008,6 +921,19 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // MARK: - Detent Helpers
   // =============================================================================
 
+  private fun updateStateDimensions(expandedOffset: Int? = null) {
+    val offset = expandedOffset ?: (realScreenHeight - detentCalculator.getDetentHeight(detents.last()))
+    val topOffset = if (offset == 0) topInset else 0
+    val newHeight = realScreenHeight - offset - topOffset
+    val newWidth = minOf(screenWidth, DEFAULT_MAX_WIDTH.dpToPx().toInt())
+
+    if (lastStateWidth != newWidth || lastStateHeight != newHeight) {
+      lastStateWidth = newWidth
+      lastStateHeight = newHeight
+      delegate?.viewControllerDidChangeSize(newWidth, newHeight)
+    }
+  }
+
   fun translateSheet(translationY: Int) {
     val sheet = sheetView ?: return
 
@@ -1052,48 +978,26 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     (getTag(R.id.react_test_id) as? String)?.let { info.viewIdResourceName = it }
   }
 
-  override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
-    super.onSizeChanged(w, h, oldw, oldh)
-
-    if (w == oldw && h == oldh) return
-    if (!isPresented) return
-
-    // Skip reconfiguration if expanded and only height changed (e.g., keyboard)
-    if (h + topInset >= screenHeight && isExpanded && oldw == w) return
-
-    post {
-      setupSheetDetents()
-      positionFooter()
-      sheetView?.let { emitChangePositionDelegate(it.top, realtime = false) }
-    }
-  }
-
-  override fun handleException(t: Throwable) {
-    reactContext.reactApplicationContext.handleException(RuntimeException(t))
-  }
-
   // =============================================================================
-  // MARK: - Touch Event Handling
+  // MARK: - RootView Touch Handling
   // =============================================================================
 
   override fun dispatchTouchEvent(event: MotionEvent): Boolean {
-    // Footer needs special handling since it's positioned absolutely
     val footer = containerView?.footerView
-    if (footer != null && footer.isVisible) {
+    if (footer != null && footer.isShown) {
       val footerLocation = ScreenUtils.getScreenLocation(footer)
-      val touchScreenX = event.rawX.toInt()
-      val touchScreenY = event.rawY.toInt()
-
-      // Check if touch is within footer bounds
-      if (touchScreenX >= footerLocation[0] &&
-        touchScreenX <= footerLocation[0] + footer.width &&
-        touchScreenY >= footerLocation[1] &&
-        touchScreenY <= footerLocation[1] + footer.height
+      val touchX = event.rawX.toInt()
+      val touchY = event.rawY.toInt()
+
+      if (touchX >= footerLocation[0] &&
+        touchX <= footerLocation[0] + footer.width &&
+        touchY >= footerLocation[1] &&
+        touchY <= footerLocation[1] + footer.height
       ) {
         val localEvent = MotionEvent.obtain(event)
         localEvent.setLocation(
-          (touchScreenX - footerLocation[0]).toFloat(),
-          (touchScreenY - footerLocation[1]).toFloat()
+          (touchX - footerLocation[0]).toFloat(),
+          (touchY - footerLocation[1]).toFloat()
         )
         val handled = footer.dispatchTouchEvent(localEvent)
         localEvent.recycle()
@@ -1106,7 +1010,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
     eventDispatcher?.let {
       jsTouchDispatcher.handleTouchEvent(event, it, reactContext)
-      jsPointerDispatcher?.handleMotionEvent(event, it, true)
+      jsPointerDispatcher.handleMotionEvent(event, it, true)
     }
     return super.onInterceptTouchEvent(event)
   }
@@ -1114,35 +1018,35 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   override fun onTouchEvent(event: MotionEvent): Boolean {
     eventDispatcher?.let {
       jsTouchDispatcher.handleTouchEvent(event, it, reactContext)
-      jsPointerDispatcher?.handleMotionEvent(event, it, false)
+      jsPointerDispatcher.handleMotionEvent(event, it, false)
     }
     super.onTouchEvent(event)
     return true
   }
 
   override fun onInterceptHoverEvent(event: MotionEvent): Boolean {
-    eventDispatcher?.let { jsPointerDispatcher?.handleMotionEvent(event, it, true) }
+    eventDispatcher?.let { jsPointerDispatcher.handleMotionEvent(event, it, true) }
     return super.onHoverEvent(event)
   }
 
   override fun onHoverEvent(event: MotionEvent): Boolean {
-    eventDispatcher?.let { jsPointerDispatcher?.handleMotionEvent(event, it, false) }
+    eventDispatcher?.let { jsPointerDispatcher.handleMotionEvent(event, it, false) }
     return super.onHoverEvent(event)
   }
 
   override fun onChildStartedNativeGesture(childView: View?, ev: MotionEvent) {
     eventDispatcher?.let {
       jsTouchDispatcher.onChildStartedNativeGesture(ev, it)
-      jsPointerDispatcher?.onChildStartedNativeGesture(childView, ev, it)
+      jsPointerDispatcher.onChildStartedNativeGesture(childView, ev, it)
     }
   }
 
   override fun onChildEndedNativeGesture(childView: View, ev: MotionEvent) {
     eventDispatcher?.let { jsTouchDispatcher.onChildEndedNativeGesture(ev, it) }
-    jsPointerDispatcher?.onChildEndedNativeGesture()
+    jsPointerDispatcher.onChildEndedNativeGesture()
   }
 
-  override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
-    super.requestDisallowInterceptTouchEvent(disallowIntercept)
+  override fun handleException(t: Throwable) {
+    reactContext.reactApplicationContext.handleException(RuntimeException(t))
   }
 }

package/android/src/main/java/com/lodev09/truesheet/core/TrueSheetCoordinatorLayout.kt

@@ -2,6 +2,7 @@ package com.lodev09.truesheet.core
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.res.Configuration
 import android.view.MotionEvent
 import android.view.ViewConfiguration
 import android.view.ViewGroup
@@ -12,6 +13,7 @@ import com.facebook.react.uimanager.ReactPointerEventsView
 
 interface TrueSheetCoordinatorLayoutDelegate {
   fun coordinatorLayoutDidLayout(changed: Boolean)
+  fun coordinatorLayoutDidChangeConfiguration()
 }
 
 /**
@@ -53,6 +55,11 @@ class TrueSheetCoordinatorLayout(context: Context) :
     delegate?.coordinatorLayoutDidLayout(changed)
   }
 
+  override fun onConfigurationChanged(newConfig: Configuration?) {
+    super.onConfigurationChanged(newConfig)
+    delegate?.coordinatorLayoutDidChangeConfiguration()
+  }
+
   override val pointerEvents: PointerEvents
     get() = PointerEvents.BOX_NONE
 

package/android/src/main/java/com/lodev09/truesheet/core/TrueSheetDimView.kt

@@ -68,12 +68,11 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) :
 
   /**
    * Attaches this dim view to a target view group.
-   * For CoordinatorLayout usage, pass null to use the default (activity's decor view).
    * For stacked sheets, pass the parent sheet's bottom sheet view with corner radius.
    */
-  fun attach(view: ViewGroup? = null, cornerRadius: Float = 0f) {
+  fun attach(view: ViewGroup, cornerRadius: Float = 0f) {
     if (parent != null) return
-    targetView = view ?: reactContext.currentActivity?.window?.decorView as? ViewGroup
+    targetView = view
 
     if (cornerRadius > 0f) {
       outlineProvider = object : ViewOutlineProvider() {
@@ -87,7 +86,19 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) :
       clipToOutline = false
     }
 
-    targetView?.addView(this)
+    view.addView(this)
+
+    // Manually measure and layout for React Native views (they don't layout native children)
+    view.post {
+      val width = view.width
+      val height = view.height
+      if (width > 0 && height > 0) {
+        val widthSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY)
+        val heightSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+        measure(widthSpec, heightSpec)
+        layout(0, 0, width, height)
+      }
+    }
   }
 
   /**

package/android/src/main/java/com/lodev09/truesheet/core/TrueSheetStackManager.kt

@@ -13,12 +13,18 @@ object TrueSheetStackManager {
   /**
    * Called when a sheet is about to be presented.
    * Returns the visible parent sheet to stack on, or null if none.
+   * Only returns a parent if it's in the same container (e.g., same Screen).
    */
   @JvmStatic
   fun onSheetWillPresent(sheetView: TrueSheetView, detentIndex: Int): TrueSheetView? {
     synchronized(presentedSheetStack) {
+      val rootContainer = sheetView.rootContainerView
       val parentSheet = presentedSheetStack.lastOrNull()
-        ?.takeIf { it.viewController.isPresented && it.viewController.isSheetVisible }
+        ?.takeIf {
+          it.viewController.isPresented &&
+            it.viewController.isSheetVisible &&
+            it.rootContainerView == rootContainer
+        }
 
       val childSheetTop = sheetView.viewController.detentCalculator.getSheetTopForDetentIndex(detentIndex)
       parentSheet?.updateTranslationForChild(childSheetTop)
@@ -48,6 +54,7 @@ object TrueSheetStackManager {
   /**
    * Called when a presented sheet's size changes (e.g., after setupSheetDetents).
    * Updates parent sheet translations to match the new sheet position.
+   * Only affects parent sheets in the same container.
    */
   @JvmStatic
   fun onSheetSizeChanged(sheetView: TrueSheetView) {
@@ -55,7 +62,9 @@ object TrueSheetStackManager {
       val index = presentedSheetStack.indexOf(sheetView)
       if (index <= 0) return
 
+      val rootContainer = sheetView.rootContainerView
       val parentSheet = presentedSheetStack[index - 1]
+        .takeIf { it.rootContainerView == rootContainer } ?: return
 
       // Post to ensure layout is complete before reading position
       sheetView.viewController.post {
@@ -71,15 +80,18 @@ object TrueSheetStackManager {
   }
 
   /**
-   * Returns all sheets presented on top of the given sheet (children/descendants).
-   * Returns them in reverse order (top-most first) for proper dismissal.
+   * Returns all sheets presented on top of the given sheet (children/descendants)
+   * that are in the same container. Returns them in reverse order (top-most first) for proper dismissal.
    */
   @JvmStatic
   fun getSheetsAbove(sheetView: TrueSheetView): List<TrueSheetView> {
     synchronized(presentedSheetStack) {
       val index = presentedSheetStack.indexOf(sheetView)
       if (index < 0 || index >= presentedSheetStack.size - 1) return emptyList()
-      return presentedSheetStack.subList(index + 1, presentedSheetStack.size).reversed()
+      val rootContainer = sheetView.rootContainerView
+      return presentedSheetStack.subList(index + 1, presentedSheetStack.size)
+        .filter { it.rootContainerView == rootContainer }
+        .reversed()
     }
   }
 
@@ -99,23 +111,26 @@ object TrueSheetStackManager {
 
   /**
    * Gets the parent sheet of the given sheet, if any.
+   * Only returns a parent if it's in the same container.
    */
   @JvmStatic
   fun getParentSheet(sheetView: TrueSheetView): TrueSheetView? {
     synchronized(presentedSheetStack) {
       val index = presentedSheetStack.indexOf(sheetView)
       if (index <= 0) return null
-      return presentedSheetStack[index - 1]
+      val rootContainer = sheetView.rootContainerView
+      return presentedSheetStack[index - 1].takeIf { it.rootContainerView == rootContainer }
     }
   }
 
   /**
-   * Returns true if the given sheet is the topmost presented sheet.
+   * Returns true if the given sheet is the topmost presented sheet in its container.
    */
   @JvmStatic
   fun isTopmostSheet(sheetView: TrueSheetView): Boolean {
     synchronized(presentedSheetStack) {
-      return presentedSheetStack.lastOrNull() == sheetView
+      val rootContainer = sheetView.rootContainerView
+      return presentedSheetStack.lastOrNull { it.rootContainerView == rootContainer } == sheetView
     }
   }
 }

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewShadowNode.h

@@ -22,6 +22,12 @@ class JSI_EXPORT TrueSheetViewShadowNode final
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
  public:
+  static ShadowNodeTraits BaseTraits() {
+    auto traits = ConcreteViewShadowNode::BaseTraits();
+    traits.set(ShadowNodeTraits::Trait::RootNodeKind);
+    return traits;
+  }
+
   void adjustLayoutWithState();
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "3.6.10",
+  "version": "3.7.0-beta.0",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",

package/android/src/main/java/com/lodev09/truesheet/core/RNScreensFragmentObserver.kt

@@ -1,181 +0,0 @@
-package com.lodev09.truesheet.core
-
-import android.content.Context
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import com.facebook.react.bridge.ReactContext
-
-private const val RN_SCREENS_PACKAGE = "com.swmansion.rnscreens"
-
-/**
- * Observes fragment lifecycle to detect react-native-screens modal presentation.
- * Automatically notifies when modals are presented/dismissed.
- */
-class RNScreensFragmentObserver(
-  private val reactContext: ReactContext,
-  private val onModalPresented: () -> Unit,
-  private val onModalWillDismiss: () -> Unit,
-  private val onModalDidDismiss: () -> Unit
-) {
-  private var fragmentLifecycleCallback: FragmentManager.FragmentLifecycleCallbacks? = null
-  private var activityLifecycleObserver: DefaultLifecycleObserver? = null
-  private val activeModalFragments: MutableSet<Fragment> = mutableSetOf()
-  private var isActivityInForeground = true
-  private var pendingDismissRunnable: Runnable? = null
-
-  /**
-   * Start observing fragment lifecycle events.
-   */
-  fun start() {
-    val activity = reactContext.currentActivity as? AppCompatActivity ?: return
-    val fragmentManager = activity.supportFragmentManager
-
-    // Track activity foreground state to ignore fragment lifecycle events during background/foreground transitions
-    activityLifecycleObserver = object : DefaultLifecycleObserver {
-      override fun onResume(owner: LifecycleOwner) {
-        isActivityInForeground = true
-      }
-
-      override fun onPause(owner: LifecycleOwner) {
-        isActivityInForeground = false
-      }
-    }
-    activity.lifecycle.addObserver(activityLifecycleObserver!!)
-
-    fragmentLifecycleCallback = object : FragmentManager.FragmentLifecycleCallbacks() {
-      override fun onFragmentAttached(fm: FragmentManager, f: Fragment, context: Context) {
-        super.onFragmentAttached(fm, f, context)
-
-        // Ignore if app is resuming from background
-        if (!isActivityInForeground) return
-
-        if (isModalFragment(f) && !activeModalFragments.contains(f)) {
-          // Cancel any pending dismiss since a modal is being presented
-          cancelPendingDismiss()
-
-          activeModalFragments.add(f)
-
-          if (activeModalFragments.size == 1) {
-            onModalPresented()
-          }
-        }
-      }
-
-      override fun onFragmentStopped(fm: FragmentManager, f: Fragment) {
-        super.onFragmentStopped(fm, f)
-
-        // Ignore if app is going to background (fragments stop with activity)
-        if (!isActivityInForeground) return
-
-        // Only trigger when fragment is being removed (not just stopped for navigation)
-        if (activeModalFragments.contains(f) && f.isRemoving) {
-          activeModalFragments.remove(f)
-
-          if (activeModalFragments.isEmpty()) {
-            // Post dismiss to allow fragment attach to cancel if navigation is happening
-            schedulePendingDismiss()
-          }
-        }
-      }
-
-      override fun onFragmentDestroyed(fm: FragmentManager, f: Fragment) {
-        super.onFragmentDestroyed(fm, f)
-
-        if (activeModalFragments.isEmpty() && pendingDismissRunnable == null) {
-          onModalDidDismiss()
-        }
-      }
-    }
-
-    fragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallback!!, true)
-  }
-
-  /**
-   * Stop observing and cleanup.
-   */
-  fun stop() {
-    val activity = reactContext.currentActivity as? AppCompatActivity
-
-    cancelPendingDismiss()
-
-    fragmentLifecycleCallback?.let { callback ->
-      activity?.supportFragmentManager?.unregisterFragmentLifecycleCallbacks(callback)
-    }
-    fragmentLifecycleCallback = null
-
-    activityLifecycleObserver?.let { observer ->
-      activity?.lifecycle?.removeObserver(observer)
-    }
-    activityLifecycleObserver = null
-
-    activeModalFragments.clear()
-  }
-
-  private fun schedulePendingDismiss() {
-    val activity = reactContext.currentActivity ?: return
-    val decorView = activity.window?.decorView ?: return
-
-    cancelPendingDismiss()
-
-    pendingDismissRunnable = Runnable {
-      pendingDismissRunnable = null
-      if (activeModalFragments.isEmpty()) {
-        onModalWillDismiss()
-      }
-    }
-    decorView.post(pendingDismissRunnable)
-  }
-
-  private fun cancelPendingDismiss() {
-    val activity = reactContext.currentActivity ?: return
-    val decorView = activity.window?.decorView ?: return
-
-    pendingDismissRunnable?.let {
-      decorView.removeCallbacks(it)
-      pendingDismissRunnable = null
-    }
-  }
-
-  companion object {
-    /**
-     * Check if fragment is from react-native-screens.
-     */
-    private fun isScreensFragment(fragment: Fragment): Boolean = fragment.javaClass.name.startsWith(RN_SCREENS_PACKAGE)
-
-    /**
-     * Check if fragment is a react-native-screens modal (fullScreenModal, transparentModal, or formSheet).
-     * Uses reflection to check the fragment's screen.stackPresentation property.
-     */
-    private fun isModalFragment(fragment: Fragment): Boolean {
-      val className = fragment.javaClass.name
-
-      if (!isScreensFragment(fragment)) {
-        return false
-      }
-
-      // ScreenModalFragment is always a modal (used for formSheet with BottomSheetDialog)
-      if (className.contains("ScreenModalFragment")) {
-        return true
-      }
-
-      // For ScreenStackFragment, check the screen's stackPresentation via reflection
-      try {
-        val getScreenMethod = fragment.javaClass.getMethod("getScreen")
-        val screen = getScreenMethod.invoke(fragment) ?: return false
-
-        val getStackPresentationMethod = screen.javaClass.getMethod("getStackPresentation")
-        val stackPresentation = getStackPresentationMethod.invoke(screen) ?: return false
-
-        val presentationName = stackPresentation.toString()
-        return presentationName == "MODAL" ||
-          presentationName == "TRANSPARENT_MODAL" ||
-          presentationName == "FORM_SHEET"
-      } catch (e: Exception) {
-        return false
-      }
-    }
-  }
-}