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

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

@@ -37,6 +37,10 @@ import com.lodev09.truesheet.core.TrueSheetKeyboardObserver
 import com.lodev09.truesheet.core.TrueSheetKeyboardObserverDelegate
 import com.lodev09.truesheet.utils.ScreenUtils
 
+// =============================================================================
+// MARK: - Data Types & Delegate Protocol
+// =============================================================================
+
 data class DetentInfo(val index: Int, val position: Float)
 
 interface TrueSheetViewControllerDelegate {
@@ -57,9 +61,13 @@ interface TrueSheetViewControllerDelegate {
   fun viewControllerDidBackPress()
 }
 
+// =============================================================================
+// MARK: - TrueSheetViewController
+// =============================================================================
+
 /**
- * TrueSheetViewController manages the bottom sheet dialog and its presentation lifecycle.
- * This view also acts as a RootView to properly handle and dispatch touch events to React Native.
+ * Manages the bottom sheet dialog and its presentation lifecycle.
+ * Acts as a RootView to properly dispatch touch events to React Native.
  */
 @SuppressLint("ClickableViewAccessibility", "ViewConstructor")
 class TrueSheetViewController(private val reactContext: ThemedReactContext) :
@@ -71,6 +79,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   companion object {
     const val TAG_NAME = "TrueSheet"
 
+    // Prevents fully expanded ratio which causes behavior issues
     private const val MAX_HALF_EXPANDED_RATIO = 0.999f
     private const val GRABBER_TAG = "TrueSheetGrabber"
     private const val DEFAULT_MAX_WIDTH = 640 // dp
@@ -78,52 +87,28 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     private const val TRANSLATE_ANIMATION_DURATION = 200L
   }
 
-  // ====================================================================
-  // MARK: - Delegate
-  // ====================================================================
+  // =============================================================================
+  // MARK: - Types
+  // =============================================================================
 
-  var delegate: TrueSheetViewControllerDelegate? = null
+  private sealed class InteractionState {
+    data object Idle : InteractionState()
+    data class Dragging(val startTop: Int) : InteractionState()
+    data object Reconfiguring : InteractionState()
+  }
+
+  // =============================================================================
+  // MARK: - Properties
+  // =============================================================================
 
-  // ====================================================================
-  // MARK: - Dialog & Views
-  // ====================================================================
+  var delegate: TrueSheetViewControllerDelegate? = null
 
+  // Dialog & Views
   private var dialog: BottomSheetDialog? = null
   private var dimView: TrueSheetDimView? = null
   private var parentDimView: TrueSheetDimView? = null
 
-  private val behavior: BottomSheetBehavior<FrameLayout>?
-    get() = dialog?.behavior
-
-  private val sheetContainer: FrameLayout?
-    get() = this.parent as? FrameLayout
-
-  override val bottomSheetView: FrameLayout?
-    get() = dialog?.findViewById(com.google.android.material.R.id.design_bottom_sheet)
-
-  private val containerView: TrueSheetContainerView?
-    get() = if (this.isNotEmpty()) getChildAt(0) as? TrueSheetContainerView else null
-
-  override val contentHeight: Int
-    get() = containerView?.contentHeight ?: 0
-
-  override val headerHeight: Int
-    get() = containerView?.headerHeight ?: 0
-
-  override val keyboardHeight: Int
-    get() = keyboardObserver?.currentHeight ?: 0
-
-  // ====================================================================
-  // MARK: - State
-  // ====================================================================
-
-  /** Interaction state for the sheet */
-  private sealed class InteractionState {
-    data object Idle : InteractionState()
-    data class Dragging(val startTop: Int, val startKeyboardHeight: Int, val shouldDismissKeyboard: Boolean = false) : InteractionState()
-    data object Reconfiguring : InteractionState()
-  }
-
+  // Presentation State
   var isPresented = false
     private set
 
@@ -142,45 +127,46 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private var lastStateHeight: Int = 0
   private var lastEmittedPositionPx: Int = -1
 
+  // Keyboard State
+  private var detentIndexBeforeKeyboard: Int = -1
+  private var isKeyboardTransitioning: Boolean = false
+
+  // Promises
   var presentPromise: (() -> Unit)? = null
   var dismissPromise: (() -> Unit)? = null
 
-  // Reference to parent TrueSheetView (if presented from another sheet)
+  // For stacked sheets
   var parentSheetView: TrueSheetView? = null
 
-  // ====================================================================
-  // MARK: - Helper Classes
-  // ====================================================================
-
+  // Helper Objects
   private val sheetAnimator = TrueSheetAnimator(this)
   private var keyboardObserver: TrueSheetKeyboardObserver? = null
   private var rnScreensObserver: RNScreensFragmentObserver? = null
+  private val detentCalculator = TrueSheetDetentCalculator(this)
 
-  // ====================================================================
-  // MARK: - Configuration Properties
-  // ====================================================================
-
-  override val screenHeight: Int
-    get() = ScreenUtils.getScreenHeight(reactContext)
-  val screenWidth: Int
-    get() = ScreenUtils.getScreenWidth(reactContext)
-  override val realScreenHeight: Int
-    get() = ScreenUtils.getRealScreenHeight(reactContext)
+  // Touch Dispatchers
+  internal var eventDispatcher: EventDispatcher? = null
+  private val jSTouchDispatcher = JSTouchDispatcher(this)
+  private var jSPointerDispatcher: JSPointerDispatcher? = null
 
+  // Detent Configuration
   override var maxSheetHeight: Int? = null
   override var detents: MutableList<Double> = mutableListOf(0.5, 1.0)
 
+  // Appearance Configuration
   var dimmed = true
   var dimmedDetentIndex = 0
   var grabber: Boolean = true
   var grabberOptions: GrabberOptions? = null
+  var sheetBackgroundColor: Int? = null
+  var edgeToEdgeFullScreen: Boolean = false
+  var insetAdjustment: String = "automatic"
+
   var sheetCornerRadius: Float = DEFAULT_CORNER_RADIUS.dpToPx()
     set(value) {
       field = if (value < 0) DEFAULT_CORNER_RADIUS.dpToPx() else value
       if (isPresented) setupBackground()
     }
-  var sheetBackgroundColor: Int? = null
-  var edgeToEdgeFullScreen: Boolean = false
 
   var dismissible: Boolean = true
     set(value) {
@@ -198,9 +184,49 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       behavior?.isDraggable = value
     }
 
-  // ====================================================================
+  // =============================================================================
   // MARK: - Computed Properties
-  // ====================================================================
+  // =============================================================================
+
+  // Dialog
+  private val behavior: BottomSheetBehavior<FrameLayout>?
+    get() = dialog?.behavior
+
+  private val sheetContainer: FrameLayout?
+    get() = this.parent as? FrameLayout
+
+  override val bottomSheetView: FrameLayout?
+    get() = dialog?.findViewById(com.google.android.material.R.id.design_bottom_sheet)
+
+  private val containerView: TrueSheetContainerView?
+    get() = if (this.isNotEmpty()) getChildAt(0) as? TrueSheetContainerView else null
+
+  // Screen Measurements
+  override val screenHeight: Int
+    get() = ScreenUtils.getScreenHeight(reactContext)
+
+  val screenWidth: Int
+    get() = ScreenUtils.getScreenWidth(reactContext)
+
+  // Includes system bars for accurate positioning
+  override val realScreenHeight: Int
+    get() = ScreenUtils.getRealScreenHeight(reactContext)
+
+  // Content Measurements
+  override val contentHeight: Int
+    get() = containerView?.contentHeight ?: 0
+
+  override val headerHeight: Int
+    get() = containerView?.headerHeight ?: 0
+
+  // Insets
+  // Target keyboard height used for detent calculations
+  override val keyboardInset: Int
+    get() = keyboardObserver?.targetHeight ?: 0
+
+  // Current animated keyboard height for positioning
+  private val currentKeyboardInset: Int
+    get() = keyboardObserver?.currentHeight ?: 0
 
   val bottomInset: Int
     get() = if (edgeToEdgeEnabled) ScreenUtils.getInsets(reactContext).bottom else 0
@@ -208,8 +234,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   val topInset: Int
     get() = if (edgeToEdgeEnabled) ScreenUtils.getInsets(reactContext).top else 0
 
-  var insetAdjustment: String = "automatic"
-
   override val contentBottomInset: Int
     get() = if (insetAdjustment == "automatic") bottomInset else 0
 
@@ -219,24 +243,33 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       return BuildConfig.EDGE_TO_EDGE_ENABLED || dialog?.edgeToEdgeEnabled == true || defaultEnabled
     }
 
-  internal var eventDispatcher: EventDispatcher? = null
-  private val jSTouchDispatcher = JSTouchDispatcher(this)
-  private var jSPointerDispatcher: JSPointerDispatcher? = null
+  // Sheet State
+  val isExpanded: Boolean
+    get() {
+      val sheetTop = bottomSheetView?.top ?: return false
+      return sheetTop <= topInset
+    }
 
-  /** Single instance that reads current values via TrueSheetDetentMeasurements interface */
-  private val detentCalculator = TrueSheetDetentCalculator(this)
+  val currentTranslationY: Int
+    get() = bottomSheetView?.translationY?.toInt() ?: 0
+
+  private val isTopmostSheet: Boolean
+    get() {
+      val hostView = delegate as? TrueSheetView ?: return true
+      return TrueSheetDialogObserver.isTopmostSheet(hostView)
+    }
 
-  // ====================================================================
+  // =============================================================================
   // MARK: - Initialization
-  // ====================================================================
+  // =============================================================================
 
   init {
     jSPointerDispatcher = JSPointerDispatcher(this)
   }
 
-  // ====================================================================
-  // MARK: - Dialog Lifecycle
-  // ====================================================================
+  // =============================================================================
+  // MARK: - Dialog Creation & Cleanup
+  // =============================================================================
 
   fun createDialog() {
     if (dialog != null) return
@@ -301,6 +334,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     shouldAnimatePresent = true
   }
 
+  // =============================================================================
+  // MARK: - Dialog Listeners
+  // =============================================================================
+
   private fun setupDialogListeners(dialog: BottomSheetDialog) {
     dialog.setOnShowListener {
       bottomSheetView?.visibility = VISIBLE
@@ -349,8 +386,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
             else -> { }
           }
 
-          positionFooter(slideOffset)
-          updateDimAmount(sheetView.top)
+          if (!isKeyboardTransitioning) {
+            positionFooter(slideOffset)
+            updateDimAmount(sheetView.top)
+          }
         }
 
         override fun onStateChanged(sheetView: View, newState: Int) {
@@ -387,17 +426,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
     when (interactionState) {
       is InteractionState.Dragging -> {
-        val draggingState = interactionState as InteractionState.Dragging
         val detent = detentCalculator.getDetentValueForIndex(detentInfo.index)
         delegate?.viewControllerDidDragEnd(detentInfo.index, detentInfo.position, detent)
 
-        // Dismiss keyboard if dragged past threshold
-        if (draggingState.shouldDismissKeyboard) {
-          val imm = reactContext.getSystemService(android.content.Context.INPUT_METHOD_SERVICE)
-            as? android.view.inputmethod.InputMethodManager
-          imm?.hideSoftInputFromWindow((dialog?.currentFocus ?: bottomSheetView)?.windowToken, 0)
-        }
-
         if (detentInfo.index != currentDetentIndex) {
           presentPromise?.invoke()
           presentPromise = null
@@ -412,45 +443,39 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       else -> {
         if (detentInfo.index != currentDetentIndex) {
           currentDetentIndex = detentInfo.index
-          val detent = detentCalculator.getDetentValueForIndex(detentInfo.index)
-          delegate?.viewControllerDidChangeDetent(detentInfo.index, detentInfo.position, detent)
+          if (!isKeyboardTransitioning) {
+            val detent = detentCalculator.getDetentValueForIndex(detentInfo.index)
+            delegate?.viewControllerDidChangeDetent(detentInfo.index, detentInfo.position, detent)
+          }
         }
       }
     }
   }
 
+  // =============================================================================
+  // MARK: - Modal Observer (react-native-screens)
+  // =============================================================================
+
   private fun setupModalObserver() {
     rnScreensObserver = RNScreensFragmentObserver(
       reactContext = reactContext,
       onModalPresented = {
-        if (isPresented && isDialogVisible) {
-          isDialogVisible = false
-          wasHiddenByModal = true
-
-          bottomSheetView?.animate()?.alpha(0f)?.setDuration(200)?.start()
-          dimView?.visibility = INVISIBLE
-          parentDimView?.visibility = INVISIBLE
-          dialog?.window?.setFlags(
-            WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
-            WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-          )
+        if (isPresented && isDialogVisible && isTopmostSheet) {
+          hideForModal()
         }
       },
       onModalWillDismiss = {
-        if (isPresented && wasHiddenByModal) {
-          isDialogVisible = true
-
-          dialog?.window?.clearFlags(
-            WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-          )
-          bottomSheetView?.alpha = 1f
-          dimView?.visibility = VISIBLE
-          parentDimView?.visibility = VISIBLE
+        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() }
+          }
         }
       }
     )
@@ -462,88 +487,36 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     rnScreensObserver = null
   }
 
-  // ====================================================================
-  // MARK: - Event Emission
-  // ====================================================================
-
-  private fun emitWillPresentEvents() {
-    val (index, position, detent) = getDetentInfoWithValue(currentDetentIndex)
-    parentSheetView?.viewControllerWillBlur()
-    delegate?.viewControllerWillPresent(index, position, detent)
-    delegate?.viewControllerWillFocus()
-  }
-
-  private fun emitWillDismissEvents() {
-    delegate?.viewControllerWillBlur()
-    delegate?.viewControllerWillDismiss()
-    parentSheetView?.viewControllerWillFocus()
-  }
-
-  private fun emitDidDismissEvents() {
-    val hadParent = parentSheetView != null
-    parentSheetView?.viewControllerDidFocus()
-    parentSheetView = null
-
-    delegate?.viewControllerDidBlur()
-    delegate?.viewControllerDidDismiss(hadParent)
+  private fun hideForModal() {
+    isDialogVisible = false
+    wasHiddenByModal = true
 
-    dismissPromise?.invoke()
-    dismissPromise = null
-  }
+    // Prepare for fast fade out
+    dimView?.alpha = 0f
+    parentDimView?.alpha = 0f
 
-  private fun emitChangePositionDelegate(currentTop: Int, realtime: Boolean = true) {
-    if (currentTop == lastEmittedPositionPx) return
+    dialog?.window?.setWindowAnimations(com.lodev09.truesheet.R.style.TrueSheetFastFadeOut)
+    dialog?.window?.decorView?.visibility = GONE
+    dimView?.visibility = INVISIBLE
+    parentDimView?.visibility = INVISIBLE
 
-    lastEmittedPositionPx = currentTop
-    val visibleHeight = realScreenHeight - currentTop
-    val position = detentCalculator.getPositionDp(visibleHeight)
-    val interpolatedIndex = detentCalculator.getInterpolatedIndexForPosition(currentTop)
-    val detent = detentCalculator.getInterpolatedDetentForPosition(currentTop)
-    delegate?.viewControllerDidChangePosition(interpolatedIndex, position, detent, realtime)
-  }
-
-  private fun getDetentInfoWithValue(index: Int): Triple<Int, Float, Float> {
-    val state = detentCalculator.getStateForDetentIndex(index)
-    val detentIndex = detentCalculator.getDetentIndexForState(state) ?: 0
-    val position = getPositionForDetentIndex(detentIndex)
-    val detent = detentCalculator.getDetentValueForIndex(detentIndex)
-    return Triple(detentIndex, position, detent)
+    parentSheetView?.viewController?.hideForModal()
   }
 
-  // ====================================================================
-  // MARK: - Dialog Visibility (for stacking)
-  // ====================================================================
+  private fun showAfterModal() {
+    isDialogVisible = true
 
-  val isExpanded: Boolean
-    get() {
-      val sheetTop = bottomSheetView?.top ?: return false
-      return sheetTop <= topInset
-    }
+    dialog?.window?.setWindowAnimations(0)
+    dialog?.window?.decorView?.visibility = VISIBLE
+    dimView?.visibility = VISIBLE
+    parentDimView?.visibility = VISIBLE
 
-  val currentTranslationY: Int
-    get() = bottomSheetView?.translationY?.toInt() ?: 0
-
-  fun getExpectedSheetTop(detentIndex: Int): Int {
-    if (detentIndex < 0 || detentIndex >= detents.size) return screenHeight
-    return realScreenHeight - detentCalculator.getDetentHeight(detents[detentIndex])
+    updateDimAmount(animated = true)
   }
 
-  fun translateDialog(translationY: Int) {
-    val bottomSheet = bottomSheetView ?: return
-
-    bottomSheet.animate()
-      .translationY(translationY.toFloat())
-      .setDuration(TRANSLATE_ANIMATION_DURATION)
-      .setUpdateListener {
-        val effectiveTop = bottomSheet.top + bottomSheet.translationY.toInt()
-        emitChangePositionDelegate(effectiveTop)
-      }
-      .start()
-  }
-
-  // ====================================================================
+  // =============================================================================
   // MARK: - Presentation
-  // ====================================================================
+  // =============================================================================
 
   fun present(detentIndex: Int, animated: Boolean = true) {
     val dialog = this.dialog ?: run {
@@ -567,6 +540,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       setupBackground()
       setupGrabber()
 
+      // Hide until animation starts
       bottomSheetView?.visibility = INVISIBLE
 
       dialog.show()
@@ -604,9 +578,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     presentPromise = null
   }
 
-  // ====================================================================
+  // =============================================================================
   // MARK: - Sheet Configuration
-  // ====================================================================
+  // =============================================================================
 
   fun setupSheetDetents() {
     val behavior = this.behavior ?: return
@@ -630,9 +604,14 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       val maxDetentHeight = detentCalculator.getDetentHeight(detents.last())
 
       val adjustedHalfExpandedHeight = minOf(halfExpandedDetentHeight, maxAvailableHeight)
-      halfExpandedRatio = minOf(adjustedHalfExpandedHeight.toFloat() / realScreenHeight.toFloat(), MAX_HALF_EXPANDED_RATIO)
+      halfExpandedRatio = minOf(
+        adjustedHalfExpandedHeight.toFloat() / realScreenHeight.toFloat(),
+        MAX_HALF_EXPANDED_RATIO
+      )
 
       expandedOffset = maxOf(edgeToEdgeTopInset, realScreenHeight - maxDetentHeight)
+
+      // fitToContents works better with <= 2 detents when no expanded offset
       isFitToContents = detents.size < 3 && expandedOffset == 0
 
       val offset = if (expandedOffset == 0) topInset else 0
@@ -658,6 +637,14 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     positionFooter()
   }
 
+  fun setStateForDetentIndex(index: Int) {
+    behavior?.state = detentCalculator.getStateForDetentIndex(index)
+  }
+
+  // =============================================================================
+  // MARK: - Grabber
+  // =============================================================================
+
   fun setupGrabber() {
     val bottomSheet = bottomSheetView ?: return
 
@@ -674,47 +661,14 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     bottomSheet.addView(grabberView)
   }
 
-  // ====================================================================
-  // MARK: - Keyboard Handling
-  // ====================================================================
-
-  private fun shouldHandleKeyboard(): Boolean {
-    if (wasHiddenByModal) return false
-
-    val parentView = parentSheetView ?: return true
-    return TrueSheetDialogObserver.getSheetsAbove(parentView).firstOrNull()?.viewController == this
-  }
-
-  fun setupKeyboardObserver() {
-    val bottomSheet = bottomSheetView ?: return
-    keyboardObserver = TrueSheetKeyboardObserver(bottomSheet, reactContext).apply {
-      delegate = object : TrueSheetKeyboardObserverDelegate {
-        override fun keyboardWillShow(height: Int) {}
-
-        override fun keyboardWillHide() {}
-
-        override fun keyboardDidChangeHeight(height: Int) {
-          if (!shouldHandleKeyboard()) return
-          setupSheetDetents()
-          positionFooter()
-        }
-      }
-      start()
-    }
-  }
-
-  fun cleanupKeyboardObserver() {
-    keyboardObserver?.stop()
-    keyboardObserver = null
-  }
-
-  // ====================================================================
+  // =============================================================================
   // MARK: - Background & Dimming
-  // ====================================================================
+  // =============================================================================
 
   fun setupBackground() {
     val bottomSheet = bottomSheetView ?: return
 
+    // Rounded corners only on top
     val outerRadii = floatArrayOf(
       sheetCornerRadius,
       sheetCornerRadius,
@@ -748,6 +702,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
         if (dimView == null) dimView = TrueSheetDimView(reactContext)
         if (!parentDimVisible) dimView?.attach(null)
 
+        // Attach dim view to parent sheet if stacked
         val parentController = parentSheetView?.viewController
         val parentBottomSheet = parentController?.bottomSheetView
         if (parentBottomSheet != null) {
@@ -769,6 +724,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
           true
         }
       } else {
+        // Pass through touches to parent or activity when not dimmed
         touchOutside.setOnTouchListener { v, event ->
           event.setLocation(event.rawX - v.x, event.rawY - v.y)
           (
@@ -782,13 +738,42 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
   }
 
-  fun updateDimAmount(sheetTop: Int? = null) {
+  fun updateDimAmount(sheetTop: Int? = null, animated: Boolean = false) {
     if (!dimmed) return
-    val top = sheetTop ?: bottomSheetView?.top ?: return
-    dimView?.interpolateAlpha(top, dimmedDetentIndex, detentCalculator::getSheetTopForDetentIndex)
-    parentDimView?.interpolateAlpha(top, dimmedDetentIndex, detentCalculator::getSheetTopForDetentIndex)
+    val top = (sheetTop ?: bottomSheetView?.top ?: return) + currentKeyboardInset
+
+    if (animated) {
+      val targetAlpha = dimView?.calculateAlpha(
+        top,
+        dimmedDetentIndex,
+        detentCalculator::getSheetTopForDetentIndex
+      ) ?: 0f
+      dimView?.animate()?.alpha(targetAlpha)?.setDuration(200)?.start()
+      parentDimView?.animate()?.alpha(targetAlpha)?.setDuration(200)?.start()
+    } else {
+      dimView?.interpolateAlpha(top, dimmedDetentIndex, detentCalculator::getSheetTopForDetentIndex)
+      parentDimView?.interpolateAlpha(top, dimmedDetentIndex, detentCalculator::getSheetTopForDetentIndex)
+    }
   }
 
+  fun getDefaultBackgroundColor(): Int {
+    val typedValue = TypedValue()
+    return if (reactContext.theme.resolveAttribute(
+        com.google.android.material.R.attr.colorSurfaceContainerLow,
+        typedValue,
+        true
+      )
+    ) {
+      typedValue.data
+    } else {
+      Color.WHITE
+    }
+  }
+
+  // =============================================================================
+  // MARK: - Footer Positioning
+  // =============================================================================
+
   fun positionFooter(slideOffset: Float? = null) {
     val footerView = containerView?.footerView ?: return
     val bottomSheet = bottomSheetView ?: return
@@ -797,75 +782,151 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     val sheetHeight = bottomSheet.height
     val sheetTop = bottomSheet.top
 
-    var footerY = (sheetHeight - sheetTop - footerHeight - keyboardHeight).toFloat()
+    var footerY = (sheetHeight - sheetTop - footerHeight - currentKeyboardInset).toFloat()
+
+    // Adjust during dismiss animation when slideOffset is negative
     if (slideOffset != null && slideOffset < 0) {
       footerY -= (footerHeight * slideOffset)
     }
 
+    // Clamp to prevent footer going above safe area
     val maxAllowedY = (sheetHeight - topInset - footerHeight).toFloat()
     footerView.y = minOf(footerY, maxAllowedY)
   }
 
-  fun setStateForDetentIndex(index: Int) {
-    behavior?.state = detentCalculator.getStateForDetentIndex(index)
+  // =============================================================================
+  // MARK: - Keyboard Handling
+  // =============================================================================
+
+  private fun shouldHandleKeyboard(): Boolean {
+    if (wasHiddenByModal) return false
+    return isTopmostSheet
   }
 
-  fun getDefaultBackgroundColor(): Int {
-    val typedValue = TypedValue()
-    return if (reactContext.theme.resolveAttribute(
-        com.google.android.material.R.attr.colorSurfaceContainerLow,
-        typedValue,
-        true
-      )
-    ) {
-      typedValue.data
-    } else {
-      Color.WHITE
+  fun setupKeyboardObserver() {
+    val bottomSheet = bottomSheetView ?: return
+    keyboardObserver = TrueSheetKeyboardObserver(bottomSheet, reactContext).apply {
+      delegate = object : TrueSheetKeyboardObserverDelegate {
+        override fun keyboardWillShow(height: Int) {
+          if (!shouldHandleKeyboard()) return
+          detentIndexBeforeKeyboard = currentDetentIndex
+          isKeyboardTransitioning = true
+          setupSheetDetents()
+          setStateForDetentIndex(detents.size - 1)
+        }
+
+        override fun keyboardWillHide() {
+          if (!shouldHandleKeyboard()) return
+          setupSheetDetents()
+          if (detentIndexBeforeKeyboard >= 0) {
+            setStateForDetentIndex(detentIndexBeforeKeyboard)
+            detentIndexBeforeKeyboard = -1
+          }
+        }
+
+        override fun keyboardDidHide() {
+          if (!shouldHandleKeyboard()) return
+          isKeyboardTransitioning = false
+        }
+
+        override fun keyboardDidChangeHeight(height: Int) {}
+      }
+      start()
     }
   }
 
-  // ====================================================================
+  fun cleanupKeyboardObserver() {
+    keyboardObserver?.stop()
+    keyboardObserver = null
+  }
+
+  // =============================================================================
   // MARK: - Drag Handling
-  // ====================================================================
+  // =============================================================================
 
   private fun handleDragBegin(sheetView: View) {
     val position = detentCalculator.getPositionDp(detentCalculator.getVisibleSheetHeight(sheetView.top))
     val detent = detentCalculator.getDetentValueForIndex(currentDetentIndex)
     delegate?.viewControllerDidDragBegin(currentDetentIndex, position, detent)
-    interactionState = InteractionState.Dragging(
-      startTop = sheetView.top,
-      startKeyboardHeight = keyboardHeight
-    )
+    interactionState = InteractionState.Dragging(startTop = sheetView.top)
   }
 
   private fun handleDragChange(sheetView: View) {
-    val draggingState = interactionState as? InteractionState.Dragging ?: return
+    if (interactionState !is InteractionState.Dragging) return
     val position = detentCalculator.getPositionDp(detentCalculator.getVisibleSheetHeight(sheetView.top))
     val detent = detentCalculator.getDetentValueForIndex(currentDetentIndex)
     delegate?.viewControllerDidDragChange(currentDetentIndex, position, detent)
+  }
 
-    // Dismiss keyboard if dragged below original position (without keyboard)
-    if (draggingState.startKeyboardHeight > 0) {
-      val detentTopWithoutKeyboard = getExpectedSheetTop(currentDetentIndex) + draggingState.startKeyboardHeight
-      val shouldDismiss = sheetView.top >= detentTopWithoutKeyboard
+  // =============================================================================
+  // MARK: - Event Emission
+  // =============================================================================
 
-      if (shouldDismiss != draggingState.shouldDismissKeyboard) {
-        android.util.Log.d(
-          TAG_NAME,
-          "shouldDismissKeyboard changed to: $shouldDismiss (currentTop: ${sheetView.top}, detentTop: $detentTopWithoutKeyboard)"
-        )
-        interactionState = draggingState.copy(shouldDismissKeyboard = shouldDismiss)
-      }
-    }
+  private fun emitWillPresentEvents() {
+    val (index, position, detent) = getDetentInfoWithValue(currentDetentIndex)
+    parentSheetView?.viewControllerWillBlur()
+    delegate?.viewControllerWillPresent(index, position, detent)
+    delegate?.viewControllerWillFocus()
   }
 
-  // ====================================================================
+  private fun emitWillDismissEvents() {
+    delegate?.viewControllerWillBlur()
+    delegate?.viewControllerWillDismiss()
+    parentSheetView?.viewControllerWillFocus()
+  }
+
+  private fun emitDidDismissEvents() {
+    val hadParent = parentSheetView != null
+    parentSheetView?.viewControllerDidFocus()
+    parentSheetView = null
+
+    delegate?.viewControllerDidBlur()
+    delegate?.viewControllerDidDismiss(hadParent)
+
+    dismissPromise?.invoke()
+    dismissPromise = null
+  }
+
+  private fun emitChangePositionDelegate(currentTop: Int, realtime: Boolean = true) {
+    // Dedupe emissions for same position
+    if (currentTop == lastEmittedPositionPx) return
+
+    lastEmittedPositionPx = currentTop
+    val visibleHeight = realScreenHeight - currentTop
+    val position = detentCalculator.getPositionDp(visibleHeight)
+    val interpolatedIndex = detentCalculator.getInterpolatedIndexForPosition(currentTop)
+    val detent = detentCalculator.getInterpolatedDetentForPosition(currentTop)
+    delegate?.viewControllerDidChangePosition(interpolatedIndex, position, detent, realtime)
+  }
+
+  // =============================================================================
   // MARK: - Detent Helpers
-  // ====================================================================
+  // =============================================================================
 
-  fun getDetentInfoForState(state: Int): DetentInfo? {
-    val index = detentCalculator.getDetentIndexForState(state) ?: return null
-    return DetentInfo(index, getPositionForDetentIndex(index))
+  fun getExpectedSheetTop(detentIndex: Int): Int {
+    if (detentIndex < 0 || detentIndex >= detents.size) return screenHeight
+    return realScreenHeight - detentCalculator.getDetentHeight(detents[detentIndex])
+  }
+
+  fun translateDialog(translationY: Int) {
+    val bottomSheet = bottomSheetView ?: return
+
+    bottomSheet.animate()
+      .translationY(translationY.toFloat())
+      .setDuration(TRANSLATE_ANIMATION_DURATION)
+      .setUpdateListener {
+        val effectiveTop = bottomSheet.top + bottomSheet.translationY.toInt()
+        emitChangePositionDelegate(effectiveTop)
+      }
+      .start()
+  }
+
+  private fun getDetentInfoWithValue(index: Int): Triple<Int, Float, Float> {
+    val state = detentCalculator.getStateForDetentIndex(index)
+    val detentIndex = detentCalculator.getDetentIndexForState(state) ?: 0
+    val position = getPositionForDetentIndex(detentIndex)
+    val detent = detentCalculator.getDetentValueForIndex(detentIndex)
+    return Triple(detentIndex, position, detent)
   }
 
   private fun getPositionForDetentIndex(index: Int): Float {
@@ -873,7 +934,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
     bottomSheetView?.let {
       val visibleSheetHeight = detentCalculator.getVisibleSheetHeight(it.top)
-      if (visibleSheetHeight > 0 && visibleSheetHeight < realScreenHeight) {
+      if (visibleSheetHeight in 1..<realScreenHeight) {
         return detentCalculator.getPositionDp(visibleSheetHeight)
       }
     }
@@ -882,12 +943,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     return detentCalculator.getPositionDp(detentHeight)
   }
 
-  fun getDetentInfoForIndex(index: Int): DetentInfo =
-    getDetentInfoForState(detentCalculator.getStateForDetentIndex(index)) ?: DetentInfo(0, 0f)
-
-  // ====================================================================
+  // =============================================================================
   // MARK: - RootView Implementation
-  // ====================================================================
+  // =============================================================================
 
   override fun onInitializeAccessibilityNodeInfo(info: AccessibilityNodeInfo) {
     super.onInitializeAccessibilityNodeInfo(info)
@@ -899,6 +957,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
     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
 
     this.post {
@@ -912,17 +972,19 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     reactContext.reactApplicationContext.handleException(RuntimeException(t))
   }
 
-  // ====================================================================
+  // =============================================================================
   // MARK: - Touch Event 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) {
       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] &&

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

@@ -14,7 +14,7 @@ interface TrueSheetDetentMeasurements {
   val headerHeight: Int
   val contentBottomInset: Int
   val maxSheetHeight: Int?
-  val keyboardHeight: Int
+  val keyboardInset: Int
 }
 
 /**
@@ -30,7 +30,7 @@ class TrueSheetDetentCalculator(private val measurements: TrueSheetDetentMeasure
   private val headerHeight: Int get() = measurements.headerHeight
   private val contentBottomInset: Int get() = measurements.contentBottomInset
   private val maxSheetHeight: Int? get() = measurements.maxSheetHeight
-  private val keyboardHeight: Int get() = measurements.keyboardHeight
+  private val keyboardInset: Int get() = measurements.keyboardInset
 
   /**
    * Calculate the height in pixels for a given detent value.
@@ -46,7 +46,7 @@ class TrueSheetDetentCalculator(private val measurements: TrueSheetDetentMeasure
       (detent * screenHeight).toInt() + contentBottomInset
     }
 
-    val height = baseHeight + keyboardHeight
+    val height = baseHeight + keyboardInset
     val maxAllowedHeight = screenHeight + contentBottomInset
     return maxSheetHeight?.let { minOf(height, it, maxAllowedHeight) } ?: minOf(height, maxAllowedHeight)
   }

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

@@ -106,4 +106,14 @@ object TrueSheetDialogObserver {
       return presentedSheetStack[index - 1]
     }
   }
+
+  /**
+   * Returns true if the given sheet is the topmost presented sheet.
+   */
+  @JvmStatic
+  fun isTopmostSheet(sheetView: TrueSheetView): Boolean {
+    synchronized(presentedSheetStack) {
+      return presentedSheetStack.lastOrNull() == sheetView
+    }
+  }
 }

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

@@ -48,12 +48,12 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) : View(reac
     targetView = null
   }
 
-  fun interpolateAlpha(sheetTop: Int, dimmedDetentIndex: Int, getSheetTopForDetentIndex: (Int) -> Int) {
+  fun calculateAlpha(sheetTop: Int, dimmedDetentIndex: Int, getSheetTopForDetentIndex: (Int) -> Int): Float {
     val realHeight = ScreenUtils.getRealScreenHeight(reactContext)
     val dimmedDetentTop = getSheetTopForDetentIndex(dimmedDetentIndex)
     val belowDimmedTop = if (dimmedDetentIndex > 0) getSheetTopForDetentIndex(dimmedDetentIndex - 1) else realHeight
 
-    alpha = when {
+    return when {
       sheetTop <= dimmedDetentTop -> MAX_ALPHA
 
       sheetTop >= belowDimmedTop -> 0f
@@ -64,4 +64,8 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) : View(reac
       }
     }
   }
+
+  fun interpolateAlpha(sheetTop: Int, dimmedDetentIndex: Int, getSheetTopForDetentIndex: (Int) -> Int) {
+    alpha = calculateAlpha(sheetTop, dimmedDetentIndex, getSheetTopForDetentIndex)
+  }
 }

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

@@ -12,6 +12,7 @@ import com.facebook.react.uimanager.ThemedReactContext
 interface TrueSheetKeyboardObserverDelegate {
   fun keyboardWillShow(height: Int)
   fun keyboardWillHide()
+  fun keyboardDidHide()
   fun keyboardDidChangeHeight(height: Int)
 }
 
@@ -26,6 +27,10 @@ class TrueSheetKeyboardObserver(private val targetView: View, private val reactC
   var currentHeight: Int = 0
     private set
 
+  var targetHeight: Int = 0
+    private set
+
+  private var isHiding: Boolean = false
   private var globalLayoutListener: ViewTreeObserver.OnGlobalLayoutListener? = null
   private var activityRootView: View? = null
 
@@ -72,9 +77,11 @@ class TrueSheetKeyboardObserver(private val targetView: View, private val reactC
           bounds: WindowInsetsAnimationCompat.BoundsCompat
         ): WindowInsetsAnimationCompat.BoundsCompat {
           endHeight = getKeyboardHeight(ViewCompat.getRootWindowInsets(targetView))
+          targetHeight = endHeight
+          isHiding = endHeight < startHeight
           if (endHeight > startHeight) {
             delegate?.keyboardWillShow(endHeight)
-          } else if (endHeight < startHeight) {
+          } else if (isHiding) {
             delegate?.keyboardWillHide()
           }
           return bounds
@@ -94,6 +101,10 @@ class TrueSheetKeyboardObserver(private val targetView: View, private val reactC
         override fun onEnd(animation: WindowInsetsAnimationCompat) {
           val finalHeight = getKeyboardHeight(ViewCompat.getRootWindowInsets(targetView))
           updateHeight(startHeight, finalHeight, 1f)
+          if (isHiding) {
+            delegate?.keyboardDidHide()
+            isHiding = false
+          }
         }
       }
     )
@@ -114,12 +125,16 @@ class TrueSheetKeyboardObserver(private val targetView: View, private val reactC
       val previousHeight = currentHeight
 
       if (previousHeight != newHeight) {
+        targetHeight = newHeight
         if (newHeight > previousHeight) {
           delegate?.keyboardWillShow(newHeight)
         } else if (newHeight < previousHeight) {
           delegate?.keyboardWillHide()
         }
         updateHeight(previousHeight, newHeight, 1f)
+        if (newHeight == 0 && previousHeight > 0) {
+          delegate?.keyboardDidHide()
+        }
       }
     }
 

package/android/src/main/res/anim/fast_fade_out.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromAlpha="1.0"
+    android:toAlpha="0.0"
+    android:duration="100"
+    android:interpolator="@android:interpolator/accelerate_quad" />

package/android/src/main/res/values/styles.xml

@@ -6,6 +6,12 @@
         <item name="android:windowExitAnimation">@null</item>
     </style>
 
+    <!-- Fast fade out animation for hiding sheet when rn-screen is presented -->
+    <style name="TrueSheetFastFadeOut" parent="Animation.AppCompat.Dialog">
+        <item name="android:windowEnterAnimation">@null</item>
+        <item name="android:windowExitAnimation">@anim/fast_fade_out</item>
+    </style>
+
     <!-- Default BottomSheetDialog style with programmatic animations -->
     <style name="TrueSheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
         <item name="android:windowAnimationStyle">@style/TrueSheetNoAnimation</item>

package/package.json

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