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

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

@@ -43,7 +43,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   var eventDispatcher: EventDispatcher? = null
 
   // Initial present configuration (set by ViewManager before mount)
-  var pendingInitialPresent: Boolean = false
   var initialDetentIndex: Int = -1
   var initialDetentAnimated: Boolean = true
 
@@ -105,7 +104,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
       viewController.createDialog()
 
       if (initialDetentIndex >= 0) {
-        pendingInitialPresent = true
+        post { present(initialDetentIndex, initialDetentAnimated) { } }
       }
 
       val surfaceId = UIManagerHelper.getSurfaceId(this)
@@ -292,16 +291,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
    * Uses post() to ensure all layout passes complete before reconfiguring.
    */
   fun updateSheetIfNeeded() {
-    if (!viewController.isPresented) {
-      // Handle initial present if pending
-      if (pendingInitialPresent) {
-        viewController.setupSheetDetents()
-        present(initialDetentIndex, initialDetentAnimated) { }
-        pendingInitialPresent = false
-      }
-      return
-    }
-
+    if (!viewController.isPresented) return
     if (isSheetUpdatePending) return
 
     isSheetUpdatePending = true
@@ -320,7 +310,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
    * Propagates additional translation to parent so the entire stack stays visually consistent.
    */
   fun updateTranslationForChild(childSheetTop: Int) {
-    if (!viewController.isDialogVisible || viewController.isExpanded) return
+    if (viewController.isExpanded) return
 
     val mySheetTop = viewController.getExpectedSheetTop(viewController.currentDetentIndex)
     val newTranslation = maxOf(0, childSheetTop - mySheetTop)
@@ -338,12 +328,24 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
    * Recursively adds translation to this sheet and all parent sheets.
    */
   private fun addTranslation(amount: Int) {
-    if (!viewController.isDialogVisible || viewController.isExpanded) return
+    if (viewController.isExpanded) return
 
     viewController.translateDialog(viewController.currentTranslationY + amount)
     TrueSheetDialogObserver.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.
+   */
+  fun resetTranslation() {
+    viewController.translateDialog(0)
+
+    // Parent should recalculate its translation based on this sheet's position
+    val mySheetTop = viewController.getExpectedSheetTop(viewController.currentDetentIndex)
+    TrueSheetDialogObserver.getParentSheet(this)?.updateTranslationForChild(mySheetTop)
+  }
+
   // ==================== TrueSheetViewControllerDelegate ====================
 
   override fun viewControllerWillPresent(index: Int, position: Float, detent: Float) {

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

@@ -1,15 +1,13 @@
 package com.lodev09.truesheet
 
 import android.annotation.SuppressLint
-import android.graphics.Color
-import android.graphics.drawable.ShapeDrawable
-import android.graphics.drawable.shapes.RoundRectShape
-import android.util.TypedValue
+import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import android.view.WindowManager
 import android.view.accessibility.AccessibilityNodeInfo
 import android.widget.FrameLayout
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isNotEmpty
 import androidx.core.view.isVisible
 import com.facebook.react.R
@@ -30,9 +28,10 @@ import com.lodev09.truesheet.core.TrueSheetAnimator
 import com.lodev09.truesheet.core.TrueSheetAnimatorProvider
 import com.lodev09.truesheet.core.TrueSheetDetentCalculator
 import com.lodev09.truesheet.core.TrueSheetDetentMeasurements
+import com.lodev09.truesheet.core.TrueSheetDialogFragment
+import com.lodev09.truesheet.core.TrueSheetDialogFragmentDelegate
 import com.lodev09.truesheet.core.TrueSheetDialogObserver
 import com.lodev09.truesheet.core.TrueSheetDimView
-import com.lodev09.truesheet.core.TrueSheetGrabberView
 import com.lodev09.truesheet.core.TrueSheetKeyboardObserver
 import com.lodev09.truesheet.core.TrueSheetKeyboardObserverDelegate
 import com.lodev09.truesheet.utils.ScreenUtils
@@ -66,7 +65,7 @@ interface TrueSheetViewControllerDelegate {
 // =============================================================================
 
 /**
- * Manages the bottom sheet dialog and its presentation lifecycle.
+ * Manages the bottom sheet dialog fragment and its presentation lifecycle.
  * Acts as a RootView to properly dispatch touch events to React Native.
  */
 @SuppressLint("ClickableViewAccessibility", "ViewConstructor")
@@ -74,13 +73,13 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   ReactViewGroup(reactContext),
   RootView,
   TrueSheetDetentMeasurements,
-  TrueSheetAnimatorProvider {
+  TrueSheetAnimatorProvider,
+  TrueSheetDialogFragmentDelegate {
 
   companion object {
     const val TAG_NAME = "TrueSheet"
 
-    // Prevents fully expanded ratio which causes behavior issues
-    private const val GRABBER_TAG = "TrueSheetGrabber"
+    private const val FRAGMENT_TAG = "TrueSheetDialogFragment"
     private const val DEFAULT_MAX_WIDTH = 640 // dp
     private const val DEFAULT_CORNER_RADIUS = 16 // dp
     private const val TRANSLATE_ANIMATION_DURATION = 200L
@@ -102,8 +101,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   var delegate: TrueSheetViewControllerDelegate? = null
 
-  // Dialog & Views
-  private var dialog: BottomSheetDialog? = null
+  // Dialog Fragment
+  private var dialogFragment: TrueSheetDialogFragment? = null
   private var dimView: TrueSheetDimView? = null
   private var parentDimView: TrueSheetDimView? = null
 
@@ -164,23 +163,20 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   var sheetCornerRadius: Float = DEFAULT_CORNER_RADIUS.dpToPx()
     set(value) {
       field = if (value < 0) DEFAULT_CORNER_RADIUS.dpToPx() else value
-      if (isPresented) setupBackground()
+      dialogFragment?.sheetCornerRadius = field
+      if (isPresented) dialogFragment?.setupBackground()
     }
 
   var dismissible: Boolean = true
     set(value) {
       field = value
-      dialog?.apply {
-        setCanceledOnTouchOutside(value)
-        setCancelable(value)
-        behavior.isHideable = value
-      }
+      dialogFragment?.dismissible = value
     }
 
   var draggable: Boolean = true
     set(value) {
       field = value
-      behavior?.isDraggable = value
+      dialogFragment?.updateDraggable(value)
     }
 
   // =============================================================================
@@ -188,14 +184,17 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // =============================================================================
 
   // Dialog
+  private val dialog: BottomSheetDialog?
+    get() = dialogFragment?.bottomSheetDialog
+
   private val behavior: BottomSheetBehavior<FrameLayout>?
-    get() = dialog?.behavior
+    get() = dialogFragment?.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)
+    get() = dialogFragment?.bottomSheetView
 
   private val containerView: TrueSheetContainerView?
     get() = if (this.isNotEmpty()) getChildAt(0) as? TrueSheetContainerView else null
@@ -267,53 +266,29 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   // =============================================================================
-  // MARK: - Dialog Creation & Cleanup
+  // MARK: - Fragment Creation & Cleanup
   // =============================================================================
 
   fun createDialog() {
-    if (dialog != null) return
-
-    val style = if (edgeToEdgeEnabled) {
-      com.lodev09.truesheet.R.style.TrueSheetEdgeToEdgeEnabledDialog
-    } else {
-      com.lodev09.truesheet.R.style.TrueSheetDialog
+    if (dialogFragment != null) return
+
+    dialogFragment = TrueSheetDialogFragment.newInstance().apply {
+      this.delegate = this@TrueSheetViewController
+      this.contentView = this@TrueSheetViewController
+      this.reactContext = this@TrueSheetViewController.reactContext
+      this.sheetCornerRadius = this@TrueSheetViewController.sheetCornerRadius
+      this.sheetBackgroundColor = this@TrueSheetViewController.sheetBackgroundColor
+      this.edgeToEdgeFullScreen = this@TrueSheetViewController.edgeToEdgeFullScreen
+      this.grabberEnabled = this@TrueSheetViewController.grabber
+      this.grabberOptions = this@TrueSheetViewController.grabberOptions
+      this.dismissible = this@TrueSheetViewController.dismissible
+      this.draggable = this@TrueSheetViewController.draggable
     }
 
-    dialog = BottomSheetDialog(reactContext, style).apply {
-      setContentView(this@TrueSheetViewController)
-
-      window?.apply {
-        setWindowAnimations(0)
-        setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING)
-      }
-
-      setupModalObserver()
-      setupDialogListeners(this)
-      setupBottomSheetBehavior(this)
-
-      setCanceledOnTouchOutside(dismissible)
-      setCancelable(dismissible)
-      behavior.isHideable = dismissible
-      behavior.isDraggable = draggable
-
-      onBackPressedDispatcher.addCallback(object : androidx.activity.OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-          this@TrueSheetViewController.delegate?.viewControllerDidBackPress()
-          if (dismissible) {
-            dismiss()
-          }
-        }
-      })
-    }
+    setupModalObserver()
   }
 
   private fun cleanupDialog() {
-    dialog?.apply {
-      setOnShowListener(null)
-      setOnCancelListener(null)
-      setOnDismissListener(null)
-    }
-
     cleanupKeyboardObserver()
     cleanupModalObserver()
     sheetAnimator.cancel()
@@ -323,7 +298,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     parentDimView = null
     sheetContainer?.removeView(this)
 
-    dialog = null
+    dialogFragment = null
     interactionState = InteractionState.Idle
     isDismissing = false
     isPresented = false
@@ -334,94 +309,94 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   // =============================================================================
-  // MARK: - Dialog Listeners
+  // MARK: - TrueSheetDialogFragmentDelegate
   // =============================================================================
 
-  private fun setupDialogListeners(dialog: BottomSheetDialog) {
-    dialog.setOnShowListener {
-      bottomSheetView?.visibility = VISIBLE
+  override fun onDialogShow() {
+    bottomSheetView?.visibility = VISIBLE
 
-      isPresented = true
-      isDialogVisible = true
+    isPresented = true
+    isDialogVisible = true
 
-      emitWillPresentEvents()
+    emitWillPresentEvents()
 
-      setupSheetDetents()
-      setupBackground()
-      setupGrabber()
-      setupKeyboardObserver()
-
-      if (shouldAnimatePresent) {
-        val toTop = getExpectedSheetTop(currentDetentIndex)
-        sheetAnimator.animatePresent(
-          toTop = toTop,
-          onUpdate = { effectiveTop ->
-            emitChangePositionDelegate(effectiveTop)
-            positionFooter()
-            updateDimAmount(effectiveTop)
-          },
-          onEnd = { finishPresent() }
-        )
-      } else {
-        val toTop = getExpectedSheetTop(currentDetentIndex)
-        emitChangePositionDelegate(toTop)
-        positionFooter()
-        finishPresent()
-      }
-    }
+    setupSheetDetents()
+    setupDimmedBackground(currentDetentIndex)
+    setupKeyboardObserver()
 
-    dialog.setOnDismissListener {
-      emitDidDismissEvents()
-      cleanupDialog()
+    if (shouldAnimatePresent) {
+      val toTop = getExpectedSheetTop(currentDetentIndex)
+      sheetAnimator.animatePresent(
+        toTop = toTop,
+        onUpdate = { effectiveTop ->
+          emitChangePositionDelegate(effectiveTop)
+          positionFooter()
+          updateDimAmount(effectiveTop)
+        },
+        onEnd = { finishPresent() }
+      )
+    } else {
+      val toTop = getExpectedSheetTop(currentDetentIndex)
+      emitChangePositionDelegate(toTop)
+      positionFooter()
+      finishPresent()
     }
   }
 
-  private fun setupBottomSheetBehavior(dialog: BottomSheetDialog) {
-    dialog.behavior.addBottomSheetCallback(
-      object : BottomSheetBehavior.BottomSheetCallback() {
-        override fun onSlide(sheetView: View, slideOffset: Float) {
-          val behavior = behavior ?: return
+  override fun onDialogDismiss() {
+    emitDidDismissEvents()
+    cleanupDialog()
+  }
 
-          when (behavior.state) {
-            BottomSheetBehavior.STATE_DRAGGING,
-            BottomSheetBehavior.STATE_SETTLING -> handleDragChange(sheetView)
+  override fun onDialogCancel() {
+    // Cancel is called before dismiss for user-initiated cancellation
+  }
 
-            else -> { }
-          }
+  override fun onStateChanged(sheetView: View, newState: Int) {
+    if (newState == BottomSheetBehavior.STATE_HIDDEN) {
+      if (isDismissing) return
+      isDismissing = true
+      emitWillDismissEvents()
+      dialogFragment?.dismiss()
+      return
+    }
 
-          if (!sheetAnimator.isAnimating) {
-            emitChangePositionDelegate(sheetView.top)
+    if (!isPresented) return
 
-            if (!isKeyboardTransitioning) {
-              positionFooter(slideOffset)
-              updateDimAmount(sheetView.top)
-            }
-          }
-        }
+    when (newState) {
+      BottomSheetBehavior.STATE_DRAGGING -> handleDragBegin(sheetView)
 
-        override fun onStateChanged(sheetView: View, newState: Int) {
-          if (newState == BottomSheetBehavior.STATE_HIDDEN) {
-            if (isDismissing) return
-            isDismissing = true
-            emitWillDismissEvents()
-            dialog.dismiss()
-            return
-          }
+      BottomSheetBehavior.STATE_EXPANDED,
+      BottomSheetBehavior.STATE_COLLAPSED,
+      BottomSheetBehavior.STATE_HALF_EXPANDED -> handleStateSettled(sheetView, newState)
 
-          if (!isPresented) return
+      else -> {}
+    }
+  }
 
-          when (newState) {
-            BottomSheetBehavior.STATE_DRAGGING -> handleDragBegin(sheetView)
+  override fun onSlide(sheetView: View, slideOffset: Float) {
+    // Skip if our custom animator is handling the animation
+    if (sheetAnimator.isAnimating) return
 
-            BottomSheetBehavior.STATE_EXPANDED,
-            BottomSheetBehavior.STATE_COLLAPSED,
-            BottomSheetBehavior.STATE_HALF_EXPANDED -> handleStateSettled(sheetView, newState)
+    val behavior = behavior ?: return
 
-            else -> {}
-          }
-        }
-      }
-    )
+    when (behavior.state) {
+      BottomSheetBehavior.STATE_DRAGGING,
+      BottomSheetBehavior.STATE_SETTLING -> handleDragChange(sheetView)
+
+      else -> { }
+    }
+
+    emitChangePositionDelegate(sheetView.top)
+
+    if (!isKeyboardTransitioning) {
+      positionFooter(slideOffset)
+      updateDimAmount(sheetView.top)
+    }
+  }
+
+  override fun onBackPressed() {
+    delegate?.viewControllerDidBackPress()
   }
 
   private fun handleStateSettled(sheetView: View, newState: Int) {
@@ -526,24 +501,32 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // =============================================================================
 
   fun present(detentIndex: Int, animated: Boolean = true) {
-    val dialog = this.dialog ?: run {
-      RNLog.w(reactContext, "TrueSheet: No dialog available. Ensure the sheet is mounted before presenting.")
+    val fragment = this.dialogFragment ?: run {
+      RNLog.w(reactContext, "TrueSheet: No dialog fragment available. Ensure the sheet is mounted before presenting.")
       return
     }
 
-    setupDimmedBackground(detentIndex)
-    setStateForDetentIndex(detentIndex)
+    val activity = reactContext.currentActivity as? AppCompatActivity ?: run {
+      RNLog.w(reactContext, "TrueSheet: No AppCompatActivity available for fragment transaction.")
+      return
+    }
 
-    if (!isPresented) {
+    if (isPresented) {
+      setupDimmedBackground(detentIndex)
+      setStateForDetentIndex(detentIndex)
+    } else {
       shouldAnimatePresent = animated
       currentDetentIndex = detentIndex
       interactionState = InteractionState.Idle
 
-      // Position off-screen until animation starts
-      bottomSheetView?.translationY = realScreenHeight.toFloat()
-      bottomSheetView?.visibility = INVISIBLE
+      // Show the fragment - detents are configured in onDialogShow
+      if (!fragment.isAdded) {
+        fragment.show(activity.supportFragmentManager, FRAGMENT_TAG)
+      }
 
-      dialog.show()
+      // Execute pending transactions to ensure fragment is added
+      activity.supportFragmentManager.executePendingTransactions()
+      bottomSheetView?.visibility = INVISIBLE
     }
   }
 
@@ -560,11 +543,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
           positionFooter()
           updateDimAmount(effectiveTop)
         },
-        onEnd = { dialog?.dismiss() }
+        onEnd = { dialogFragment?.dismiss() }
       )
     } else {
       emitChangePositionDelegate(realScreenHeight)
-      dialog?.dismiss()
+      dialogFragment?.dismiss()
     }
   }
 
@@ -583,51 +566,57 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // =============================================================================
 
   fun setupSheetDetents() {
+    val fragment = this.dialogFragment ?: return
     val behavior = this.behavior ?: return
 
     interactionState = InteractionState.Reconfiguring
     val edgeToEdgeTopInset: Int = if (!edgeToEdgeFullScreen) topInset else 0
 
-    behavior.apply {
-      isFitToContents = false
-      maxWidth = DEFAULT_MAX_WIDTH.dpToPx().toInt()
+    behavior.isFitToContents = false
 
-      val maxAvailableHeight = realScreenHeight - edgeToEdgeTopInset
+    val maxAvailableHeight = realScreenHeight - edgeToEdgeTopInset
 
-      setPeekHeight(detentCalculator.getDetentHeight(detents[0]), isPresented)
+    val peekHeight = detentCalculator.getDetentHeight(detents[0])
 
-      val halfExpandedDetentHeight = when (detents.size) {
-        1 -> peekHeight
-        else -> detentCalculator.getDetentHeight(detents[1])
-      }
+    val halfExpandedDetentHeight = when (detents.size) {
+      1 -> peekHeight
+      else -> detentCalculator.getDetentHeight(detents[1])
+    }
 
-      val maxDetentHeight = detentCalculator.getDetentHeight(detents.last())
+    val maxDetentHeight = detentCalculator.getDetentHeight(detents.last())
 
-      val adjustedHalfExpandedHeight = minOf(halfExpandedDetentHeight, maxAvailableHeight)
-      halfExpandedRatio = (adjustedHalfExpandedHeight.toFloat() / realScreenHeight.toFloat())
-        .coerceIn(0f, 0.999f)
+    val adjustedHalfExpandedHeight = minOf(halfExpandedDetentHeight, maxAvailableHeight)
+    val halfExpandedRatio = (adjustedHalfExpandedHeight.toFloat() / realScreenHeight.toFloat())
+      .coerceIn(0f, 0.999f)
 
-      expandedOffset = maxOf(edgeToEdgeTopInset, realScreenHeight - maxDetentHeight)
+    val expandedOffset = maxOf(edgeToEdgeTopInset, realScreenHeight - maxDetentHeight)
 
-      // fitToContents works better with <= 2 detents when no expanded offset
-      isFitToContents = detents.size < 3 && expandedOffset == 0
+    // fitToContents works better with <= 2 detents when no expanded offset
+    val fitToContents = detents.size < 3 && expandedOffset == 0
 
-      val offset = if (expandedOffset == 0) topInset else 0
-      val newHeight = realScreenHeight - expandedOffset - offset
-      val newWidth = minOf(screenWidth, maxWidth)
+    fragment.configureDetents(
+      peekHeight = peekHeight,
+      halfExpandedRatio = halfExpandedRatio,
+      expandedOffset = expandedOffset,
+      fitToContents = fitToContents,
+      animate = isPresented
+    )
 
-      if (lastStateWidth != newWidth || lastStateHeight != newHeight) {
-        lastStateWidth = newWidth
-        lastStateHeight = newHeight
-        delegate?.viewControllerDidChangeSize(newWidth, newHeight)
-      }
+    val offset = if (expandedOffset == 0) topInset else 0
+    val newHeight = realScreenHeight - expandedOffset - offset
+    val newWidth = minOf(screenWidth, DEFAULT_MAX_WIDTH.dpToPx().toInt())
 
-      if (isPresented) {
-        setStateForDetentIndex(currentDetentIndex)
-      }
+    if (lastStateWidth != newWidth || lastStateHeight != newHeight) {
+      lastStateWidth = newWidth
+      lastStateHeight = newHeight
+      delegate?.viewControllerDidChangeSize(newWidth, newHeight)
+    }
 
-      interactionState = InteractionState.Idle
+    if (isPresented) {
+      setStateForDetentIndex(currentDetentIndex)
     }
+
+    interactionState = InteractionState.Idle
   }
 
   fun setupSheetDetentsForSizeChange() {
@@ -636,7 +625,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   fun setStateForDetentIndex(index: Int) {
-    behavior?.state = detentCalculator.getStateForDetentIndex(index)
+    dialogFragment?.setState(detentCalculator.getStateForDetentIndex(index))
   }
 
   // =============================================================================
@@ -644,19 +633,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // =============================================================================
 
   fun setupGrabber() {
-    val bottomSheet = bottomSheetView ?: return
-
-    bottomSheet.findViewWithTag<View>(GRABBER_TAG)?.let {
-      bottomSheet.removeView(it)
-    }
-
-    if (!grabber || !draggable) return
-
-    val grabberView = TrueSheetGrabberView(reactContext, grabberOptions).apply {
-      tag = GRABBER_TAG
+    dialogFragment?.apply {
+      grabberEnabled = this@TrueSheetViewController.grabber
+      grabberOptions = this@TrueSheetViewController.grabberOptions
+      setupGrabber()
     }
-
-    bottomSheet.addView(grabberView)
   }
 
   // =============================================================================
@@ -664,25 +645,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // =============================================================================
 
   fun setupBackground() {
-    val bottomSheet = bottomSheetView ?: return
-
-    // Rounded corners only on top
-    val outerRadii = floatArrayOf(
-      sheetCornerRadius,
-      sheetCornerRadius,
-      sheetCornerRadius,
-      sheetCornerRadius,
-      0f,
-      0f,
-      0f,
-      0f
-    )
-    val backgroundColor = sheetBackgroundColor ?: getDefaultBackgroundColor()
-
-    bottomSheet.background = ShapeDrawable(RoundRectShape(outerRadii, null, null)).apply {
-      paint.color = backgroundColor
+    dialogFragment?.apply {
+      sheetCornerRadius = this@TrueSheetViewController.sheetCornerRadius
+      sheetBackgroundColor = this@TrueSheetViewController.sheetBackgroundColor
+      setupBackground()
     }
-    bottomSheet.clipToOutline = true
   }
 
   fun setupDimmedBackground(detentIndex: Int) {
@@ -754,25 +721,12 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
   }
 
-  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) {
+    if (!isPresented) return
     val footerView = containerView?.footerView ?: return
     val bottomSheet = bottomSheetView ?: return
 
@@ -827,7 +781,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
           isKeyboardTransitioning = false
         }
 
-        override fun keyboardDidChangeHeight(height: Int) {}
+        override fun keyboardDidChangeHeight(height: Int) {
+          if (!shouldHandleKeyboard()) return
+          positionFooter()
+        }
       }
       start()
     }

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

@@ -44,18 +44,20 @@ class TrueSheetAnimator(private val provider: TrueSheetAnimatorProvider) {
       return
     }
 
-    val fromY = (provider.realScreenHeight - toTop).toFloat()
+    val fromTop = provider.realScreenHeight
+    val distance = fromTop - toTop
 
     presentAnimator?.cancel()
-    presentAnimator = ValueAnimator.ofFloat(1f, 0f).apply {
+    presentAnimator = ValueAnimator.ofFloat(0f, 1f).apply {
       duration = PRESENT_DURATION
       interpolator = DecelerateInterpolator()
 
       addUpdateListener { animator ->
         val fraction = animator.animatedValue as Float
-        bottomSheet.translationY = fromY * fraction
-
-        val effectiveTop = bottomSheet.top + bottomSheet.translationY.toInt()
+        // Calculate effective top based on animation progress
+        val effectiveTop = fromTop - (distance * fraction).toInt()
+        // Adjust translationY to compensate for bottomSheet.top position
+        bottomSheet.translationY = (effectiveTop - bottomSheet.top).toFloat()
         onUpdate(effectiveTop)
       }
 

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

@@ -0,0 +1,320 @@
+package com.lodev09.truesheet.core
+
+import android.app.Dialog
+import android.graphics.Color
+import android.graphics.drawable.ShapeDrawable
+import android.graphics.drawable.shapes.RoundRectShape
+import android.os.Bundle
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.FrameLayout
+import androidx.activity.OnBackPressedCallback
+import com.facebook.react.uimanager.PixelUtil.dpToPx
+import com.facebook.react.uimanager.ThemedReactContext
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.lodev09.truesheet.BuildConfig
+import com.lodev09.truesheet.R
+import com.lodev09.truesheet.utils.ScreenUtils
+
+// =============================================================================
+// MARK: - Delegate Protocol
+// =============================================================================
+
+interface TrueSheetDialogFragmentDelegate {
+  fun onDialogShow()
+  fun onDialogDismiss()
+  fun onDialogCancel()
+  fun onStateChanged(sheetView: View, newState: Int)
+  fun onSlide(sheetView: View, slideOffset: Float)
+  fun onBackPressed()
+}
+
+// =============================================================================
+// MARK: - TrueSheetDialogFragment
+// =============================================================================
+
+/**
+ * Custom BottomSheetDialogFragment for TrueSheet.
+ * Provides a Material Design bottom sheet with proper lifecycle management.
+ *
+ * This fragment handles:
+ * - Dialog creation with proper theming (edge-to-edge support)
+ * - BottomSheetBehavior configuration and callbacks
+ * - Background styling with corner radius
+ * - Grabber view management
+ * - Back press handling
+ *
+ * The parent TrueSheetViewController handles:
+ * - React Native touch dispatching
+ * - Detent calculations
+ * - Animations
+ * - Keyboard/modal observers
+ * - Stacking and dimming
+ */
+class TrueSheetDialogFragment : BottomSheetDialogFragment() {
+
+  companion object {
+    private const val GRABBER_TAG = "TrueSheetGrabber"
+    private const val DEFAULT_MAX_WIDTH = 640 // dp
+    private const val DEFAULT_CORNER_RADIUS = 16f // dp
+
+    fun newInstance(): TrueSheetDialogFragment = TrueSheetDialogFragment()
+  }
+
+  // =============================================================================
+  // MARK: - Properties
+  // =============================================================================
+
+  var delegate: TrueSheetDialogFragmentDelegate? = null
+
+  // Content view provided by the controller
+  var contentView: View? = null
+
+  // React context for theme resolution and screen utils
+  var reactContext: ThemedReactContext? = null
+
+  // Configuration
+  var sheetCornerRadius: Float = DEFAULT_CORNER_RADIUS.dpToPx()
+  var sheetBackgroundColor: Int? = null
+  var edgeToEdgeFullScreen: Boolean = false
+  var grabberEnabled: Boolean = true
+  var grabberOptions: GrabberOptions? = null
+  var draggable: Boolean = true
+
+  var dismissible: Boolean = true
+    set(value) {
+      field = value
+      (dialog as? BottomSheetDialog)?.apply {
+        setCanceledOnTouchOutside(value)
+        setCancelable(value)
+        behavior.isHideable = value
+      }
+    }
+
+  // =============================================================================
+  // MARK: - Computed Properties
+  // =============================================================================
+
+  val bottomSheetDialog: BottomSheetDialog?
+    get() = dialog as? BottomSheetDialog
+
+  val behavior: BottomSheetBehavior<FrameLayout>?
+    get() = bottomSheetDialog?.behavior
+
+  val bottomSheetView: FrameLayout?
+    get() = dialog?.findViewById(com.google.android.material.R.id.design_bottom_sheet)
+
+  private val edgeToEdgeEnabled: Boolean
+    get() {
+      val defaultEnabled = android.os.Build.VERSION.SDK_INT >= 36
+      return BuildConfig.EDGE_TO_EDGE_ENABLED || bottomSheetDialog?.edgeToEdgeEnabled == true || defaultEnabled
+    }
+
+  val topInset: Int
+    get() = reactContext?.let { if (edgeToEdgeEnabled) ScreenUtils.getInsets(it).top else 0 } ?: 0
+
+  // =============================================================================
+  // MARK: - Lifecycle
+  // =============================================================================
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    // Prevent dialog from being recreated on configuration change
+    // The controller manages state separately
+    retainInstance = true
+  }
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    val ctx = reactContext ?: requireContext()
+
+    val style = if (edgeToEdgeEnabled) {
+      R.style.TrueSheetEdgeToEdgeEnabledDialog
+    } else {
+      R.style.TrueSheetDialog
+    }
+
+    val dialog = BottomSheetDialog(ctx, style)
+
+    dialog.window?.apply {
+      setWindowAnimations(0)
+      setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING)
+      // Clear default dim - TrueSheet uses custom TrueSheetDimView for dimming
+      clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+    }
+
+    dialog.setOnShowListener {
+      setupBottomSheetBehavior()
+      setupBackground()
+      setupGrabber()
+      // Re-apply dismissible after show since behavior may reset it
+      dialog.behavior.isHideable = dismissible
+      delegate?.onDialogShow()
+    }
+
+    dialog.setCanceledOnTouchOutside(dismissible)
+    dialog.setCancelable(dismissible)
+    dialog.behavior.isHideable = dismissible
+    dialog.behavior.isDraggable = draggable
+    dialog.behavior.maxWidth = DEFAULT_MAX_WIDTH.dpToPx().toInt()
+
+    // Handle back press
+    dialog.onBackPressedDispatcher.addCallback(
+      this,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          delegate?.onBackPressed()
+          if (dismissible) {
+            dismiss()
+          }
+        }
+      }
+    )
+
+    return dialog
+  }
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? = contentView
+
+  override fun onCancel(dialog: android.content.DialogInterface) {
+    super.onCancel(dialog)
+    delegate?.onDialogCancel()
+  }
+
+  override fun onDismiss(dialog: android.content.DialogInterface) {
+    super.onDismiss(dialog)
+    delegate?.onDialogDismiss()
+  }
+
+  override fun onDestroyView() {
+    // Detach content view to prevent it from being destroyed with the fragment
+    (contentView?.parent as? ViewGroup)?.removeView(contentView)
+    super.onDestroyView()
+  }
+
+  // =============================================================================
+  // MARK: - Setup
+  // =============================================================================
+
+  private fun setupBottomSheetBehavior() {
+    val behavior = this.behavior ?: return
+
+    behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
+      override fun onSlide(sheetView: View, slideOffset: Float) {
+        delegate?.onSlide(sheetView, slideOffset)
+      }
+
+      override fun onStateChanged(sheetView: View, newState: Int) {
+        delegate?.onStateChanged(sheetView, newState)
+      }
+    })
+  }
+
+  fun setupBackground() {
+    val bottomSheet = bottomSheetView ?: return
+    val ctx = reactContext ?: return
+
+    val radius = if (sheetCornerRadius < 0) DEFAULT_CORNER_RADIUS.dpToPx() else sheetCornerRadius
+
+    // Rounded corners only on top
+    val outerRadii = floatArrayOf(
+      radius,
+      radius,
+      radius,
+      radius,
+      0f,
+      0f,
+      0f,
+      0f
+    )
+    val backgroundColor = sheetBackgroundColor ?: getDefaultBackgroundColor(ctx)
+
+    bottomSheet.background = ShapeDrawable(RoundRectShape(outerRadii, null, null)).apply {
+      paint.color = backgroundColor
+    }
+    bottomSheet.clipToOutline = true
+  }
+
+  fun setupGrabber() {
+    val bottomSheet = bottomSheetView ?: return
+    val ctx = reactContext ?: return
+
+    // Remove existing grabber
+    bottomSheet.findViewWithTag<View>(GRABBER_TAG)?.let {
+      bottomSheet.removeView(it)
+    }
+
+    if (!grabberEnabled || !draggable) return
+
+    val grabberView = TrueSheetGrabberView(ctx, grabberOptions).apply {
+      tag = GRABBER_TAG
+    }
+
+    bottomSheet.addView(grabberView)
+  }
+
+  // =============================================================================
+  // MARK: - Configuration
+  // =============================================================================
+
+  /**
+   * Configure detent-related behavior settings.
+   * Called by the controller when detents change.
+   */
+  fun configureDetents(
+    peekHeight: Int,
+    halfExpandedRatio: Float,
+    expandedOffset: Int,
+    fitToContents: Boolean,
+    skipCollapsed: Boolean = false,
+    animate: Boolean = false
+  ) {
+    val behavior = this.behavior ?: return
+
+    behavior.apply {
+      isFitToContents = fitToContents
+      this.skipCollapsed = skipCollapsed
+      setPeekHeight(peekHeight, animate)
+      this.halfExpandedRatio = halfExpandedRatio.coerceIn(0f, 0.999f)
+      this.expandedOffset = expandedOffset
+    }
+  }
+
+  /**
+   * Set the behavior state.
+   */
+  fun setState(state: Int) {
+    behavior?.state = state
+  }
+
+  /**
+   * Update draggable state.
+   */
+  fun updateDraggable(enabled: Boolean) {
+    draggable = enabled
+    behavior?.isDraggable = enabled
+    if (isAdded) setupGrabber()
+  }
+
+  // =============================================================================
+  // MARK: - Helpers
+  // =============================================================================
+
+  private fun getDefaultBackgroundColor(context: ThemedReactContext): Int {
+    val typedValue = TypedValue()
+    return if (context.theme.resolveAttribute(
+        com.google.android.material.R.attr.colorSurfaceContainerLow,
+        typedValue,
+        true
+      )
+    ) {
+      typedValue.data
+    } else {
+      Color.WHITE
+    }
+  }
+}

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

@@ -40,7 +40,7 @@ object TrueSheetDialogObserver {
     synchronized(presentedSheetStack) {
       presentedSheetStack.remove(sheetView)
       if (hadParent) {
-        presentedSheetStack.lastOrNull()?.viewController?.translateDialog(0)
+        presentedSheetStack.lastOrNull()?.resetTranslation()
       }
     }
   }

package/package.json

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