@lodev09/react-native-true-sheet 3.6.11 → 3.7.0-beta.1

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

@@ -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 ====================
 

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

@@ -367,6 +367,13 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
   }
 
+  override fun coordinatorLayoutDidChangeConfiguration() {
+    if (!isPresented) return
+
+    updateStateDimensions()
+    sheetView?.let { emitChangePositionDelegate(it.top, realtime = false) }
+  }
+
   // =============================================================================
   // MARK: - TrueSheetDimViewDelegate
   // =============================================================================
@@ -749,15 +756,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)
@@ -907,14 +906,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()
         }
       }
@@ -1003,6 +1007,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
 
@@ -1047,22 +1064,6 @@ 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) }
-    }
-  }
-
   // =============================================================================
   // MARK: - RootView Touch Handling
   // =============================================================================

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/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.11",
+  "version": "3.7.0-beta.1",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",