@lodev09/react-native-true-sheet 3.5.1-beta.5 → 3.5.2

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

@@ -309,13 +309,15 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   // ==================== Sheet Stack Translation ====================
 
   /**
-   * Updates this sheet's translation based on its child sheet's position.
-   * When a child sheet is presented, parent sheets slide down to create a stacked appearance.
+   * Updates this sheet's translation and disables dragging when a child sheet is presented.
+   * Parent sheets slide down to create a stacked appearance.
    * Propagates additional translation to parent so the entire stack stays visually consistent.
    */
   fun updateTranslationForChild(childSheetTop: Int) {
     if (!viewController.isSheetVisible || viewController.isExpanded) return
 
+    viewController.sheetView?.behavior?.isDraggable = false
+
     val mySheetTop = viewController.detentCalculator.getSheetTopForDetentIndex(viewController.currentDetentIndex)
     val newTranslation = maxOf(0, childSheetTop - mySheetTop)
     val additionalTranslation = newTranslation - viewController.currentTranslationY
@@ -332,17 +334,18 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
    * Recursively adds translation to this sheet and all parent sheets.
    */
   private fun addTranslation(amount: Int) {
-    if (!viewController.isSheetVisible || viewController.isExpanded) return
+    if (viewController.isExpanded) return
 
     viewController.translateSheet(viewController.currentTranslationY + amount)
     TrueSheetStackManager.getParentSheet(this)?.addTranslation(amount)
   }
 
   /**
-   * Resets this sheet's translation and updates parent sheets.
-   * This sheet resets to 0 (it's now topmost), but parent recalculates based on this sheet's position.
+   * Resets this sheet's translation and restores dragging when it becomes topmost.
+   * Parent recalculates its translation based on this sheet's position.
    */
   fun resetTranslation() {
+    viewController.sheetView?.behavior?.isDraggable = viewController.draggable
     viewController.translateSheet(0)
 
     // Parent should recalculate its translation based on this sheet's position

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

@@ -534,24 +534,25 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   private fun hideForModal() {
-    isSheetVisible = false
-    wasHiddenByModal = true
-
     val sheet = sheetView ?: run {
-      setSheetVisibility(false)
-      parentSheetView?.viewController?.hideForModal()
+      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)
-        parentSheetView?.viewController?.hideForModal()
       }
       .start()
+
+    // This will hide parent sheets first
+    parentSheetView?.viewController?.hideForModal()
   }
 
   private fun showAfterModal() {

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

@@ -24,6 +24,7 @@ class RNScreensFragmentObserver(
   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.
@@ -52,6 +53,9 @@ class RNScreensFragmentObserver(
         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) {
@@ -71,7 +75,8 @@ class RNScreensFragmentObserver(
           activeModalFragments.remove(f)
 
           if (activeModalFragments.isEmpty()) {
-            onModalWillDismiss()
+            // Post dismiss to allow fragment attach to cancel if navigation is happening
+            schedulePendingDismiss()
           }
         }
       }
@@ -79,7 +84,7 @@ class RNScreensFragmentObserver(
       override fun onFragmentDestroyed(fm: FragmentManager, f: Fragment) {
         super.onFragmentDestroyed(fm, f)
 
-        if (activeModalFragments.isEmpty()) {
+        if (activeModalFragments.isEmpty() && pendingDismissRunnable == null) {
           onModalDidDismiss()
         }
       }
@@ -94,6 +99,8 @@ class RNScreensFragmentObserver(
   fun stop() {
     val activity = reactContext.currentActivity as? AppCompatActivity
 
+    cancelPendingDismiss()
+
     fragmentLifecycleCallback?.let { callback ->
       activity?.supportFragmentManager?.unregisterFragmentLifecycleCallbacks(callback)
     }
@@ -107,6 +114,31 @@ class RNScreensFragmentObserver(
     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.

package/package.json

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