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

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

@@ -66,12 +66,11 @@ interface TrueSheetViewControllerDelegate {
 // =============================================================================
 
 /**
- * Manages the bottom sheet using CoordinatorLayout + BottomSheetBehavior.
+ * Controls the presentation and behavior of a bottom sheet.
  *
- * This approach keeps the sheet in the same activity window (no separate dialog window),
- * which allows touch events to pass through to underlying views when the sheet is not
- * covering them. This solves the touch lag issue when sheets are presented over
- * interactive components like Maps.
+ * Uses CoordinatorLayout with BottomSheetBehavior to manage the sheet within the activity window,
+ * enabling touch pass-through to underlying views. Handles detent configuration, drag interactions,
+ * keyboard avoidance, dimmed backgrounds, back button, and lifecycle events for stacked sheets.
  */
 @SuppressLint("ClickableViewAccessibility", "ViewConstructor")
 class TrueSheetViewController(private val reactContext: ThemedReactContext) :
@@ -89,6 +88,7 @@ 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
   }
 
   // =============================================================================
@@ -190,6 +190,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       if (isPresented) sheetView?.setupGrabber()
     }
 
+  val isDimmedAtCurrentDetent: Boolean
+    get() = dimmed && currentDetentIndex >= dimmedDetentIndex
+
   // =============================================================================
   // MARK: - Computed Properties
   // =============================================================================
@@ -336,9 +339,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     backCallback = object : OnBackPressedCallback(true) {
       override fun handleOnBackPressed() {
         delegate?.viewControllerDidBackPress()
-        if (dismissible) {
-          dismiss(animated = true)
-        }
+        dismissOrCollapseToLowest()
       }
     }
 
@@ -366,26 +367,26 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // =============================================================================
 
   override fun dimViewDidTap() {
-    val hostView = delegate as? TrueSheetView
-    if (hostView == null) {
-      RNLog.e(reactContext, "TrueSheet: Expected delegate to be TrueSheetView")
-      return
-    }
+    val hostView = delegate as? TrueSheetView ?: return
+
+    val children = TrueSheetStackManager.getSheetsAbove(hostView)
+    val topmostChild = children.firstOrNull()?.viewController
 
-    // If there's a child sheet on top, handle it instead
-    val topmostChild = TrueSheetStackManager.getSheetsAbove(hostView).firstOrNull()
-    if (topmostChild != null) {
-      if (topmostChild.viewController.dismissible) {
-        topmostChild.viewController.dismiss(animated = true)
+    // If topmost child is dimmed, only handle that child
+    if (topmostChild?.isDimmedAtCurrentDetent == true) {
+      if (topmostChild.dismissible) {
+        topmostChild.dismiss(animated = true)
       }
       return
     }
 
-    if (dismissible) {
-      dismiss(animated = true)
-    } else if (parentSheetView == null && currentDetentIndex > 0) {
-      setStateForDetentIndex(0)
+    // Pass through to parent - dismiss all if possible
+    val allDismissible = dismissible && children.all { it.viewController.dismissible }
+    if (allDismissible) {
+      children.forEach { it.viewController.dismiss(animated = true) }
     }
+
+    dismissOrCollapseToLowest()
   }
 
   // =============================================================================
@@ -533,16 +534,31 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   private fun hideForModal() {
+    val sheet = sheetView ?: run {
+      RNLog.e(reactContext, "TrueSheet: sheetView is null in hideForModal")
+      return
+    }
+
     isSheetVisible = false
     wasHiddenByModal = true
-    dimViews.forEach { it.alpha = 0f }
-    setSheetVisibility(false)
+
+    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)
   }
 
@@ -659,6 +675,14 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
   }
 
+  private fun dismissOrCollapseToLowest() {
+    if (dismissible) {
+      dismiss(animated = true)
+    } else if (parentSheetView == null && isDimmedAtCurrentDetent && dimmedDetentIndex > 0) {
+      setStateForDetentIndex(dimmedDetentIndex - 1)
+    }
+  }
+
   private fun animateDismiss() {
     val sheet = sheetView ?: run {
       finishDismiss()

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

@@ -2,11 +2,13 @@ package com.lodev09.truesheet.core
 
 import android.annotation.SuppressLint
 import android.graphics.Color
+import android.graphics.Outline
 import android.graphics.drawable.ShapeDrawable
 import android.graphics.drawable.shapes.RoundRectShape
 import android.util.TypedValue
 import android.view.Gravity
 import android.view.View
+import android.view.ViewOutlineProvider
 import android.widget.FrameLayout
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import com.facebook.react.uimanager.PixelUtil.dpToPx
@@ -113,6 +115,12 @@ class TrueSheetBottomSheetView(private val reactContext: ThemedReactContext) : F
     background = ShapeDrawable(RoundRectShape(outerRadii, null, null)).apply {
       paint.color = color
     }
+
+    outlineProvider = object : ViewOutlineProvider() {
+      override fun getOutline(view: View, outline: Outline) {
+        outline.setRoundRect(0, 0, view.width, view.height, effectiveRadius)
+      }
+    }
     clipToOutline = true
   }
 

package/package.json

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