@lodev09/react-native-true-sheet 3.1.0-beta.7 → 3.1.0-beta.9

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

@@ -22,10 +22,6 @@ class TrueSheetModule(reactContext: ReactApplicationContext) :
 
   override fun getName(): String = NAME
 
-  override fun initialize() {
-    super.initialize()
-  }
-
   override fun invalidate() {
     super.invalidate()
     // Clear all registered views and observer on module invalidation

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

@@ -170,48 +170,26 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   val statusBarHeight: Int
     get() = ScreenUtils.getStatusBarHeight(reactContext)
 
-  /**
-   * The bottom inset (navigation bar height) to add to sheet height.
-   * This matches iOS behavior where the system adds bottom safe area inset internally.
-   */
+  /** Navigation bar height, added to sheet height to match iOS behavior. */
   private val bottomInset: Int
     get() = ScreenUtils.getNavigationBarHeight(reactContext)
 
-  /**
-   * Edge-to-edge is enabled by default on API 36+, or when explicitly configured.
-   */
+  /** Edge-to-edge enabled by default on API 36+, or when explicitly configured. */
   private val edgeToEdgeEnabled: Boolean
     get() {
       val defaultEnabled = android.os.Build.VERSION.SDK_INT >= 36
       return BuildConfig.EDGE_TO_EDGE_ENABLED || dialog?.edgeToEdgeEnabled == true || defaultEnabled
     }
 
-  /**
-   * The top inset to apply when edge-to-edge is enabled but not full-screen.
-   * This prevents the sheet from going under the status bar.
-   */
+  /** Top inset when edge-to-edge is enabled but not full-screen. */
   private val sheetTopInset: Int
     get() = if (edgeToEdgeEnabled && !edgeToEdgeFullScreen) statusBarHeight else 0
 
-  // ====================================================================
-  // MARK: - Touch Dispatchers
-  // ====================================================================
-
-  /**
-   * Touch dispatchers are required for RootView to properly forward touch events to React Native.
-   */
   internal var eventDispatcher: EventDispatcher? = null
   private val jSTouchDispatcher = JSTouchDispatcher(this)
   private var jSPointerDispatcher: JSPointerDispatcher? = null
 
-  // ====================================================================
-  // MARK: - Modal Observer
-  // ====================================================================
-
-  /**
-   * Observes react-native-screens modal fragments to hide/show the sheet appropriately.
-   * This prevents the sheet from rendering on top of modals.
-   */
+  /** Hides/shows the sheet when RN Screens modals are presented/dismissed. */
   private var rnScreensObserver: RNScreensFragmentObserver? = null
 
   // ====================================================================
@@ -253,7 +231,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       behavior.isHideable = dismissible
       behavior.isDraggable = draggable
 
-      // Handle back press
       onBackPressedDispatcher.addCallback(object : androidx.activity.OnBackPressedCallback(true) {
         override fun handleOnBackPressed() {
           this@TrueSheetViewController.delegate?.viewControllerDidBackPress()
@@ -293,25 +270,17 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
       sheetContainer?.post {
         val positionPx = bottomSheetView?.let { ScreenUtils.getScreenY(it) } ?: screenHeight
-
-        // Store resolved position for initial detent
         storeResolvedPosition(currentDetentIndex)
         emitChangePositionDelegate(positionPx, realtime = false)
-
         positionFooter()
       }
 
-      // Emit didPresent/didFocus after present animation completes
       sheetContainer?.postDelayed({
         val detentInfo = getDetentInfoForIndex(currentDetentIndex)
         val detent = getDetentValueForIndex(detentInfo.index)
 
         delegate?.viewControllerDidPresent(detentInfo.index, detentInfo.position, detent)
-
-        // Notify parent sheet that it has lost focus (after this sheet appeared)
         parentSheetView?.viewControllerDidBlur()
-
-        // Emit didFocus with didPresent
         delegate?.viewControllerDidFocus()
 
         presentPromise?.invoke()
@@ -320,25 +289,19 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
 
     dialog.setOnCancelListener {
-      // Skip if already handled by STATE_HIDDEN (programmatic dismiss)
       if (isDismissing) return@setOnCancelListener
 
-      // User-initiated dismiss (back button, tap outside)
       isDismissing = true
       emitWillDismissEvents()
-
-      // Emit off-screen position since onSlide isn't triggered for user-initiated dismiss
       emitChangePositionDelegate(screenHeight, realtime = false)
+    }
 
-      // Emit didBlur/didDismiss after dismiss animation completes
+    dialog.setOnDismissListener {
       android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
         emitDidDismissEvents()
+        cleanupDialog()
       }, DISMISS_ANIMATION_DURATION)
     }
-
-    dialog.setOnDismissListener {
-      cleanupDialog()
-    }
   }
 
   private fun setupBottomSheetBehavior(dialog: BottomSheetDialog) {
@@ -362,9 +325,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
         override fun onStateChanged(sheetView: View, newState: Int) {
           if (newState == BottomSheetBehavior.STATE_HIDDEN) {
-            // Mark as dismissing so setOnCancelListener skips emitting events
+            if (isDismissing) return
             isDismissing = true
-            emitDidDismissEvents()
+            emitWillDismissEvents()
             dialog.dismiss()
             return
           }
@@ -377,15 +340,12 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
             BottomSheetBehavior.STATE_EXPANDED,
             BottomSheetBehavior.STATE_COLLAPSED,
             BottomSheetBehavior.STATE_HALF_EXPANDED -> {
-              // Ignore state changes triggered by content size reconfiguration
               if (isReconfiguring) return
 
               getDetentInfoForState(newState)?.let { detentInfo ->
-                // Store resolved position when sheet settles
                 storeResolvedPosition(detentInfo.index)
 
                 if (isDragging) {
-                  // Handle drag end
                   val detent = getDetentValueForIndex(detentInfo.index)
                   delegate?.viewControllerDidDragEnd(detentInfo.index, detentInfo.position, detent)
 
@@ -398,13 +358,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
                   }
 
                   isDragging = false
-                } else {
-                  // Handle programmatic resize - emit detent change after sheet settles
-                  if (detentInfo.index != currentDetentIndex) {
-                    val detent = getDetentValueForIndex(detentInfo.index)
-                    currentDetentIndex = detentInfo.index
-                    delegate?.viewControllerDidChangeDetent(detentInfo.index, detentInfo.position, detent)
-                  }
+                } else if (detentInfo.index != currentDetentIndex) {
+                  val detent = getDetentValueForIndex(detentInfo.index)
+                  currentDetentIndex = detentInfo.index
+                  delegate?.viewControllerDidChangeDetent(detentInfo.index, detentInfo.position, detent)
                 }
               }
             }
@@ -450,22 +407,12 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     rnScreensObserver = null
   }
 
-  // ====================================================================
-  // MARK: - Dismiss Event Helpers
-  // ====================================================================
-
-  /**
-   * Emits willBlur and willDismiss events, and notifies parent sheet of upcoming focus change.
-   */
   private fun emitWillDismissEvents() {
     delegate?.viewControllerWillBlur()
     delegate?.viewControllerWillDismiss()
     parentSheetView?.viewControllerWillFocus()
   }
 
-  /**
-   * Emits didBlur and didDismiss events, notifies parent sheet, and invokes dismiss promise.
-   */
   private fun emitDidDismissEvents() {
     val hadParent = parentSheetView != null
     parentSheetView?.viewControllerDidFocus()
@@ -482,53 +429,32 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // MARK: - Dialog Visibility (for stacking)
   // ====================================================================
 
-  /**
-   * Returns true if the sheet's top is at or above the status bar.
-   */
   val isExpanded: Boolean
     get() {
       val sheetTop = bottomSheetView?.top ?: return false
       return sheetTop <= statusBarHeight
     }
 
-  /**
-   * Returns the current top position of the sheet (Y coordinate from screen top).
-   * Used for comparing sheet positions during stacking.
-   */
   val currentSheetTop: Int
     get() = bottomSheetView?.let { ScreenUtils.getScreenY(it) } ?: screenHeight
 
-  /**
-   * Returns the expected top position of the sheet when presented at the given detent index.
-   * Used for comparing sheet positions before presentation.
-   */
   fun getExpectedSheetTop(detentIndex: Int): Int {
     if (detentIndex < 0 || detentIndex >= detents.size) return screenHeight
     val detentHeight = getDetentHeight(detents[detentIndex])
     return screenHeight - detentHeight
   }
 
-  /**
-   * Hides the dialog without dismissing it.
-   * Used when another TrueSheet presents on top or when RN screen is presented.
-   */
+  /** Hides without dismissing. Used for sheet stacking and RN Screens modals. */
   fun hideDialog() {
     isDialogVisible = false
     dialog?.window?.decorView?.visibility = INVISIBLE
-
-    // Emit off-screen position (detent = 0 since sheet is fully hidden)
     emitChangePositionDelegate(screenHeight, realtime = false)
   }
 
-  /**
-   * Shows a previously hidden dialog.
-   * Used when the sheet on top dismisses.
-   */
+  /** Shows a previously hidden dialog. */
   fun showDialog() {
     isDialogVisible = true
     dialog?.window?.decorView?.visibility = VISIBLE
-
-    // Emit current position
     val positionPx = bottomSheetView?.let { ScreenUtils.getScreenY(it) } ?: screenHeight
     emitChangePositionDelegate(positionPx, realtime = false)
   }
@@ -546,8 +472,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     setupDimmedBackground(detentIndex)
 
     if (isPresented) {
-      // Detent change will be emitted when sheet settles in onStateChanged
-      // Don't update currentDetentIndex here - it will be updated when sheet settles
       setStateForDetentIndex(detentIndex)
     } else {
       currentDetentIndex = detentIndex
@@ -558,12 +482,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       val detentInfo = getDetentInfoForIndex(detentIndex)
       val detent = getDetentValueForIndex(detentInfo.index)
 
-      // Notify parent sheet that it is about to lose focus (before this sheet appears)
       parentSheetView?.viewControllerWillBlur()
-
       delegate?.viewControllerWillPresent(detentInfo.index, detentInfo.position, detent)
-
-      // Emit willFocus with willPresent
       delegate?.viewControllerWillFocus()
 
       if (!animated) {
@@ -575,10 +495,12 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   fun dismiss(animated: Boolean = true) {
+    if (isDismissing) return
+
+    isDismissing = true
     emitWillDismissEvents()
 
     this.post {
-      // Emit off-screen position (detent = 0 since sheet is fully hidden)
       emitChangePositionDelegate(screenHeight, realtime = false)
     }
 
@@ -586,9 +508,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       dialog?.window?.setWindowAnimations(0)
     }
 
-    // Temporarily enable hideable to allow STATE_HIDDEN transition
-    behavior?.isHideable = true
-    behavior?.state = BottomSheetBehavior.STATE_HIDDEN
+    dialog?.dismiss()
   }
 
   // ====================================================================
@@ -598,13 +518,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   fun setupSheetDetents() {
     val behavior = this.behavior ?: return
 
-    // Reset resolved positions if detents count changed
     if (resolvedDetentPositions.size != detents.size) {
       resolvedDetentPositions.clear()
       repeat(detents.size) { resolvedDetentPositions.add(0) }
     }
 
-    // Always update auto detent positions based on current content height
     for (i in detents.indices) {
       if (detents[i] == -1.0) {
         val detentHeight = getDetentHeight(detents[i])
@@ -612,7 +530,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       }
     }
 
-    // Flag to prevent state change callbacks from updating detent index during reconfiguration
     isReconfiguring = true
 
     behavior.apply {
@@ -643,7 +560,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
         }
       }
 
-      // Keep container size in sync with sheet size
       if (oldExpandOffset != expandedOffset || expandedOffset == 0) {
         val offset = if (expandedOffset == 0) statusBarHeight else 0
         val newHeight = screenHeight - expandedOffset - offset
@@ -651,7 +567,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       }
 
       if (isPresented) {
-        // Re-apply current state to update position after config changes
         setStateForDetentIndex(currentDetentIndex)
       }
 
@@ -688,10 +603,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     bottomSheet.clipToOutline = true
   }
 
-  /**
-   * Configures the dimmed background based on the current detent index.
-   * When not dimmed, touch events pass through to the activity behind the sheet.
-   */
+  /** Configures dim and touch-through behavior based on detent index. */
   fun setupDimmedBackground(detentIndex: Int) {
     val dialog = this.dialog ?: return
     dialog.window?.apply {
@@ -700,9 +612,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       if (dimmed && detentIndex >= dimmedDetentIndex) {
         view.setOnTouchListener(null)
         setFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND, WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+        setDimAmount(0.32f) // M3 scrim opacity
         dialog.setCanceledOnTouchOutside(dismissible)
       } else {
-        // Forward touch events to the activity when not dimmed
         view.setOnTouchListener { v, event ->
           event.setLocation(event.rawX - v.x, event.rawY - v.y)
           reactContext.currentActivity?.dispatchTouchEvent(event)
@@ -718,11 +630,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     dialog?.window?.setWindowAnimations(windowAnimation)
   }
 
-  /**
-   * Positions the footer view at the bottom of the sheet.
-   * The footer stays fixed at the bottom edge of the visible sheet area,
-   * adjusting during drag gestures via slideOffset.
-   */
+  /** Positions footer at bottom of sheet, adjusting during drag via slideOffset. */
   fun positionFooter(slideOffset: Float? = null) {
     val footerView = containerView?.footerView ?: return
     val bottomSheet = bottomSheetView ?: return
@@ -732,13 +640,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
     var footerY = (screenHeight - bottomSheetY - footerHeight).toFloat()
 
-    // Animate footer down with sheet when below peek height
     if (slideOffset != null && slideOffset < 0) {
       footerY -= (footerHeight * slideOffset)
     }
 
-    // Clamp footer position to prevent it from going off screen when positioning at the top
-    // This happens when fullScreen is enabled in edge-to-edge mode
     val maxAllowedY = (screenHeight - statusBarHeight - footerHeight).toFloat()
     footerView.y = minOf(footerY, maxAllowedY)
   }
@@ -766,14 +671,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   // ====================================================================
-  // MARK: - Position Change Delegate
+  // MARK: - Position & Drag Handling
   // ====================================================================
 
-  /**
-   * Emits position change to the delegate if the position has changed.
-   * @param positionPx The current position in pixels (screen Y coordinate)
-   * @param realtime Whether the position is a real-time value (during drag or animation tracking)
-   */
   private fun emitChangePositionDelegate(positionPx: Int, realtime: Boolean) {
     if (positionPx == lastEmittedPositionPx) return
 
@@ -784,11 +684,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     delegate?.viewControllerDidChangePosition(interpolatedIndex, position, detent, realtime)
   }
 
-  /**
-   * Stores the current Y position as the resolved position for the given detent index.
-   * This is called when the sheet settles at a detent to capture the actual position
-   * which may differ from the calculated position due to system adjustments.
-   */
   private fun storeResolvedPosition(index: Int) {
     if (index < 0 || index >= resolvedDetentPositions.size) return
     val positionPx = bottomSheetView?.let { ScreenUtils.getScreenY(it) } ?: return
@@ -797,24 +692,16 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
   }
 
-  /**
-   * Stores the resolved position for the current detent.
-   * Called from TrueSheetView when content size changes.
-   */
   fun storeCurrentResolvedPosition() {
     storeResolvedPosition(currentDetentIndex)
   }
 
-  /**
-   * Returns the estimated Y position for a detent index, using stored positions when available.
-   */
   private fun getEstimatedPositionForIndex(index: Int): Int {
     if (index < 0 || index >= resolvedDetentPositions.size) return screenHeight
 
     val storedPos = resolvedDetentPositions[index]
     if (storedPos > 0) return storedPos
 
-    // Estimate based on getDetentHeight which accounts for bottomInset and maxAllowedHeight
     if (index < detents.size) {
       val detentHeight = getDetentHeight(detents[index])
       return screenHeight - detentHeight
@@ -823,11 +710,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     return screenHeight
   }
 
-  /**
-   * Finds the segment index and interpolation progress for a given position.
-   * Returns a Triple of (fromIndex, toIndex, progress) where progress is 0-1 within that segment.
-   * Returns null if position count is less than 2.
-   */
+  /** Returns (fromIndex, toIndex, progress) for interpolation, or null if < 2 detents. */
   private fun findSegmentForPosition(positionPx: Int): Triple<Int, Int, Float>? {
     val count = resolvedDetentPositions.size
     if (count < 2) return null
@@ -835,19 +718,16 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     val firstPos = getEstimatedPositionForIndex(0)
     val lastPos = getEstimatedPositionForIndex(count - 1)
 
-    // Below first detent
     if (positionPx > firstPos) {
       val range = screenHeight - firstPos
       val progress = if (range > 0) (positionPx - firstPos).toFloat() / range else 0f
-      return Triple(-1, 0, progress) // Special index -1 for below first
+      return Triple(-1, 0, progress)
     }
 
-    // Above last detent
     if (positionPx < lastPos) {
       return Triple(count - 1, count - 1, 0f)
     }
 
-    // Find segment (positions decrease as index increases)
     for (i in 0 until count - 1) {
       val pos = getEstimatedPositionForIndex(i)
       val nextPos = getEstimatedPositionForIndex(i + 1)
@@ -862,10 +742,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     return Triple(count - 1, count - 1, 0f)
   }
 
-  /**
-   * Calculates the interpolated index based on position.
-   * Returns a continuous value (e.g., 0.5 means halfway between detent 0 and 1).
-   */
+  /** Returns continuous index (e.g., 0.5 = halfway between detent 0 and 1). */
   private fun getInterpolatedIndexForPosition(positionPx: Int): Float {
     val count = resolvedDetentPositions.size
     if (count == 0) return -1f
@@ -874,16 +751,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     val segment = findSegmentForPosition(positionPx) ?: return 0f
     val (fromIndex, _, progress) = segment
 
-    // Below first detent
     if (fromIndex == -1) return -progress
-
     return fromIndex + progress
   }
 
-  /**
-   * Calculates the interpolated detent value based on position.
-   * Returns the actual screen fraction, clamped to valid detent range.
-   */
+  /** Returns interpolated screen fraction for position. */
   private fun getInterpolatedDetentForPosition(positionPx: Int): Float {
     val count = resolvedDetentPositions.size
     if (count == 0) return 0f
@@ -891,7 +763,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     val segment = findSegmentForPosition(positionPx) ?: return getDetentValueForIndex(0)
     val (fromIndex, toIndex, progress) = segment
 
-    // Below first detent
     if (fromIndex == -1) {
       val firstDetent = getDetentValueForIndex(0)
       return maxOf(0f, firstDetent * (1 - progress))
@@ -902,11 +773,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     return fromDetent + progress * (toDetent - fromDetent)
   }
 
-  /**
-   * Gets the detent value (fraction) for a given index.
-   * Returns the raw screen fraction without bottomInset for interpolation calculations.
-   * Note: bottomInset is only added in getDetentHeight() for actual sheet sizing.
-   */
+  /** Returns raw screen fraction for index (without bottomInset). */
   private fun getDetentValueForIndex(index: Int): Float {
     if (index < 0 || index >= detents.size) return 0f
     val value = detents[index]
@@ -917,10 +784,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
   }
 
-  // ====================================================================
-  // MARK: - Drag Handling
-  // ====================================================================
-
   private fun getCurrentDetentInfo(sheetView: View): DetentInfo {
     val screenY = ScreenUtils.getScreenY(sheetView)
     return DetentInfo(currentDetentIndex, screenY.pxToDp())
@@ -948,14 +811,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   private fun getDetentHeight(detent: Double): Int {
     val height: Int = if (detent == -1.0) {
-      // For auto detent, add bottomInset to match iOS behavior where the system
-      // adds bottom safe area inset internally to the sheet height
       contentHeight + headerHeight + bottomInset
     } else {
       if (detent <= 0.0 || detent > 1.0) {
         throw IllegalArgumentException("TrueSheet: detent fraction ($detent) must be between 0 and 1")
       }
-      // For fractional detents, add bottomInset to match iOS behavior
       (detent * screenHeight).toInt() + bottomInset
     }
 
@@ -1035,8 +895,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     super.onSizeChanged(w, h, oldw, oldh)
     if (w == oldw && h == oldh) return
 
-    // Skip when fully expanding to full screen (edgeToEdgeFullScreen enabled)
-    // Size keeps changing on this case
+    // Skip continuous size changes when fullScreen + edge-to-edge
     if (h + statusBarHeight > screenHeight && isExpanded && oldw == w) {
       return
     }
@@ -1063,11 +922,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // MARK: - Touch Event Handling
   // ====================================================================
 
-  /**
-   * Custom touch dispatch to handle footer touch events.
-   * The footer is positioned outside the normal view hierarchy, so we need to
-   * manually check if touches fall within its bounds and forward them.
-   */
+  /** Forwards touch events to footer which is positioned outside normal hierarchy. */
   override fun dispatchTouchEvent(event: MotionEvent): Boolean {
     val footer = containerView?.footerView
     if (footer != null && footer.isVisible) {

package/android/src/main/jni/CMakeLists.txt

@@ -28,36 +28,12 @@ target_include_directories(
   ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}
 )
 
-if (REACTNATIVE_MERGED_SO)
-  target_link_libraries(
-    ${LIB_TARGET_NAME}
-    fbjni
-    jsi
-    reactnative
-    log
-  )
-else()
-  target_link_libraries(
-    ${LIB_TARGET_NAME}
-    fbjni
-    folly_runtime
-    glog
-    jsi
-    react_codegen_rncore
-    react_debug
-    react_nativemodule_core
-    react_render_core
-    react_render_debug
-    react_render_graphics
-    react_render_mapbuffer
-    react_render_componentregistry
-    react_utils
-    rrc_view
-    turbomodulejsijni
-    yoga
-    log
-  )
-endif()
+target_link_libraries(
+  ${LIB_TARGET_NAME}
+  ReactAndroid::reactnative
+  ReactAndroid::jsi
+  fbjni::fbjni
+)
 
 target_include_directories(
   ${CMAKE_PROJECT_NAME}

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

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
     <translate
-        android:duration="200"
+        android:duration="250"
         android:fromYDelta="20%p"
         android:toYDelta="0"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
+        android:interpolator="@android:interpolator/decelerate_cubic" />
     <alpha
-        android:duration="200"
+        android:duration="150"
         android:fromAlpha="0.0"
         android:toAlpha="1.0"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
+        android:interpolator="@android:interpolator/decelerate_cubic" />
 </set>

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

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
     <translate
-        android:duration="150"
+        android:duration="200"
         android:fromYDelta="0"
         android:toYDelta="20%p"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
+        android:interpolator="@android:interpolator/accelerate_cubic" />
     <alpha
         android:duration="150"
+        android:startOffset="50"
         android:fromAlpha="1.0"
         android:toAlpha="0.0"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
+        android:interpolator="@android:interpolator/accelerate_cubic" />
 </set>

package/ios/TrueSheetViewController.mm

@@ -25,26 +25,18 @@
   NSInteger _pendingDetentIndex;
   BOOL _pendingContentSizeChange;
 
-  // Position tracking
   CADisplayLink *_transitioningTimer;
   UIView *_transitionFakeView;
   BOOL _isDragging;
   BOOL _isTransitioning;
   BOOL _isTrackingPositionFromLayout;
 
-  // Reference to parent TrueSheetViewController (if presented from another sheet)
   __weak TrueSheetViewController *_parentSheetController;
 
-  // Blur effect view
   TrueSheetBlurView *_blurView;
-
-  // Custom grabber view
   TrueSheetGrabberView *_grabberView;
 
-  // Resolved detent positions (Y coordinate when sheet rests at each detent)
   NSMutableArray<NSNumber *> *_resolvedDetentPositions;
-
-  // Tracks whether this sheet has a presented controller (e.g., RN Screens modal)
   BOOL _hasPresentedController;
 }
 
@@ -138,7 +130,6 @@
   [super viewDidLoad];
   self.view.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
 
-  // Create custom grabber view (hidden by default, shown when grabberOptions is set)
   _grabberView = [[TrueSheetGrabberView alloc] init];
   _grabberView.hidden = YES;
   [_grabberView addToView:self.view];
@@ -147,18 +138,14 @@
 - (void)viewWillAppear:(BOOL)animated {
   [super viewWillAppear:animated];
 
-  // Only trigger on initial presentation, not repositioning
   if (!_isPresented) {
-    // Initially store resolved position during presentation
     dispatch_async(dispatch_get_main_queue(), ^{
       [self storeResolvedPositionForIndex:self.currentDetentIndex];
     });
 
-    // Capture parent sheet reference if presented from another TrueSheet
     UIViewController *presenter = self.presentingViewController;
     if ([presenter isKindOfClass:[TrueSheetViewController class]]) {
       _parentSheetController = (TrueSheetViewController *)presenter;
-      // Notify parent that it is about to lose focus
       if ([_parentSheetController.delegate respondsToSelector:@selector(viewControllerWillBlur)]) {
         [_parentSheetController.delegate viewControllerWillBlur];
       }
@@ -173,7 +160,6 @@
         [self.delegate viewControllerWillPresentAtIndex:index position:position detent:detent];
       }
 
-      // Emit willFocus with willPresent
       if ([self.delegate respondsToSelector:@selector(viewControllerWillFocus)]) {
         [self.delegate viewControllerWillFocus];
       }
@@ -187,7 +173,6 @@
   [super viewDidAppear:animated];
 
   if (!_isPresented) {
-    // Notify parent that it has lost focus (after the child sheet appeared)
     if (_parentSheetController) {
       if ([_parentSheetController.delegate respondsToSelector:@selector(viewControllerDidBlur)]) {
         [_parentSheetController.delegate viewControllerDidBlur];
@@ -201,12 +186,10 @@
         [self.delegate viewControllerDidPresentAtIndex:index position:self.currentPosition detent:detent];
       }
 
-      // Emit didFocus with didPresent
       if ([self.delegate respondsToSelector:@selector(viewControllerDidFocus)]) {
         [self.delegate viewControllerDidFocus];
       }
 
-      // Emit correct position after presentation
       [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:NO debug:@"did present"];
     });
 
@@ -224,7 +207,6 @@
 
   if (self.isDismissing) {
     dispatch_async(dispatch_get_main_queue(), ^{
-      // Emit willBlur with willDismiss
       if ([self.delegate respondsToSelector:@selector(viewControllerWillBlur)]) {
         [self.delegate viewControllerWillBlur];
       }
@@ -234,7 +216,6 @@
       }
     });
 
-    // Notify the parent sheet (if any) that it is about to regain focus
     if (_parentSheetController) {
       if ([_parentSheetController.delegate respondsToSelector:@selector(viewControllerWillFocus)]) {
         [_parentSheetController.delegate viewControllerWillFocus];
@@ -248,12 +229,10 @@
 - (void)viewDidDisappear:(BOOL)animated {
   [super viewDidDisappear:animated];
 
-  // Only dispatch didDismiss when actually dismissing (not when another modal is presented on top)
   if (self.isDismissing) {
     _isPresented = NO;
     _activeDetentIndex = -1;
 
-    // Notify the parent sheet (if any) that it regained focus
     if (_parentSheetController) {
       if ([_parentSheetController.delegate respondsToSelector:@selector(viewControllerDidFocus)]) {
         [_parentSheetController.delegate viewControllerDidFocus];
@@ -261,7 +240,6 @@
       _parentSheetController = nil;
     }
 
-    // Emit didBlur with didDismiss
     if ([self.delegate respondsToSelector:@selector(viewControllerDidBlur)]) {
       [self.delegate viewControllerDidBlur];
     }
@@ -279,17 +257,12 @@
     _isTrackingPositionFromLayout = YES;
 
     UIViewController *presented = self.presentedViewController;
-
-    // Not realtime when another controller is presented that triggers our layout
     BOOL hasPresentedController = presented != nil && !presented.isBeingPresented && !presented.isBeingDismissed;
-
     BOOL realtime = !hasPresentedController;
 
     if (_pendingContentSizeChange) {
       _pendingContentSizeChange = NO;
       realtime = NO;
-
-      // Store resolved position after content size changes
       [self storeResolvedPositionForIndex:self.currentDetentIndex];
     }
 
@@ -304,7 +277,6 @@
     [self.delegate viewControllerDidChangeSize:self.view.frame.size];
   }
 
-  // Emit pending detent change after programmatic resize settles
   if (_pendingDetentIndex >= 0) {
     NSInteger pendingIndex = _pendingDetentIndex;
     _pendingDetentIndex = -1;
@@ -313,8 +285,6 @@
       if ([self.delegate respondsToSelector:@selector(viewControllerDidChangeDetent:position:detent:)]) {
         CGFloat detent = [self detentValueForIndex:pendingIndex];
         [self.delegate viewControllerDidChangeDetent:pendingIndex position:self.currentPosition detent:detent];
-
-        // Emit position for the final position
         [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:NO debug:@"pending detent change"];
       }
     });
@@ -323,18 +293,15 @@
   _isTrackingPositionFromLayout = NO;
 }
 
-#pragma mark - Presentation Tracking (for RN Screens integration)
+#pragma mark - Presentation Tracking (RN Screens)
 
 - (void)presentViewController:(UIViewController *)viewControllerToPresent
                      animated:(BOOL)flag
                    completion:(void (^)(void))completion {
-  // Check if this is a non-TrueSheet controller (e.g., RN Screens modal)
   BOOL isExternalController = ![viewControllerToPresent isKindOfClass:[TrueSheetViewController class]];
 
   if (isExternalController && !_hasPresentedController) {
     _hasPresentedController = YES;
-
-    // Emit blur events when an external controller is presented on top
     if ([self.delegate respondsToSelector:@selector(viewControllerWillBlur)]) {
       [self.delegate viewControllerWillBlur];
     }
@@ -359,7 +326,6 @@
   BOOL isExternalController = presented && ![presented isKindOfClass:[TrueSheetViewController class]];
 
   if (isExternalController && _hasPresentedController) {
-    // Emit focus events when external controller is dismissed
     if ([self.delegate respondsToSelector:@selector(viewControllerWillFocus)]) {
       [self.delegate viewControllerWillFocus];
     }
@@ -379,7 +345,7 @@
                             }];
 }
 
-#pragma mark - Gesture Handling
+#pragma mark - Position & Gesture Handling
 
 - (TrueSheetContentView *)findContentView:(UIView *)view {
   if ([view isKindOfClass:[TrueSheetContentView class]]) {
@@ -401,11 +367,9 @@
   if (!presentedView)
     return;
 
-  // Disable pan gestures if draggable is NO
   if (!self.draggable) {
     [GestureUtil setPanGesturesEnabled:NO forView:presentedView];
 
-    // Also disable ScrollView's pan gesture if present
     TrueSheetContentView *contentView = [self findContentView:presentedView];
     if (contentView) {
       RCTScrollViewComponentView *scrollViewComponent = [contentView findScrollView:nil];
@@ -416,10 +380,8 @@
     return;
   }
 
-  // Attach to presented view's pan gesture (sheet's drag gesture from UIKit)
   [GestureUtil attachPanGestureHandler:presentedView target:self selector:@selector(handlePanGesture:)];
 
-  // Also attach to ScrollView's pan gesture if present
   TrueSheetContentView *contentView = [self findContentView:presentedView];
   if (contentView) {
     RCTScrollViewComponentView *scrollViewComponent = [contentView findScrollView:nil];
@@ -438,7 +400,6 @@
 
   [GestureUtil setPanGesturesEnabled:self.draggable forView:presentedView];
 
-  // Also update ScrollView's pan gesture if present
   TrueSheetContentView *contentView = [self findContentView:presentedView];
   if (contentView) {
     RCTScrollViewComponentView *scrollViewComponent = [contentView findScrollView:nil];
@@ -469,10 +430,7 @@
     case UIGestureRecognizerStateCancelled: {
       if (!_isTransitioning) {
         dispatch_async(dispatch_get_main_queue(), ^{
-          // Store resolved position when drag ends
           [self storeResolvedPositionForIndex:self.currentDetentIndex];
-
-          // Emit the correct position after dragging
           [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:NO debug:@"drag end"];
         });
       }
@@ -485,8 +443,6 @@
   }
 }
 
-#pragma mark - Position Tracking
-
 - (void)setupTransitionTracker {
   if (!self.transitionCoordinator)
     return;
@@ -496,14 +452,11 @@
   CGRect dismissedFrame = CGRectMake(0, self.screenHeight, 0, 0);
   CGRect presentedFrame = CGRectMake(0, self.currentPosition, 0, 0);
 
-  // Set starting fake view position
   _transitionFakeView.frame = self.isDismissing ? presentedFrame : dismissedFrame;
   [self storeResolvedPositionForIndex:self.currentDetentIndex];
 
   auto animation = ^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {
     [[context containerView] addSubview:self->_transitionFakeView];
-
-    // Set ending fake view position
     self->_transitionFakeView.frame = self.isDismissing ? dismissedFrame : presentedFrame;
 
     self->_transitioningTimer = [CADisplayLink displayLinkWithTarget:self selector:@selector(handleTransitionTracker)];
@@ -523,15 +476,12 @@
 - (void)handleTransitionTracker {
   if (!_isDragging && _transitionFakeView.layer) {
     CALayer *layer = _transitionFakeView.layer;
-
     CGFloat layerPosition = layer.presentationLayer.frame.origin.y;
 
     if (self.currentPosition >= self.screenHeight) {
-      // Dismissing position
       CGFloat position = fmax(_lastPosition, layerPosition);
       [self emitChangePositionDelegateWithPosition:position realtime:YES debug:@"transition out"];
     } else {
-      // Presenting position
       CGFloat position = fmax(self.currentPosition, layerPosition);
       [self emitChangePositionDelegateWithPosition:position realtime:YES debug:@"transition in"];
     }
@@ -539,7 +489,6 @@
 }
 
 - (void)emitChangePositionDelegateWithPosition:(CGFloat)position realtime:(BOOL)realtime debug:(NSString *)debug {
-  // Use epsilon comparison to avoid missing updates due to floating point precision
   if (fabs(_lastPosition - position) > 0.01) {
     _lastPosition = position;
 
@@ -548,20 +497,15 @@
     if ([self.delegate respondsToSelector:@selector(viewControllerDidChangePosition:position:detent:realtime:)]) {
       [self.delegate viewControllerDidChangePosition:index position:position detent:detent realtime:realtime];
     }
-
-    // Debug position tracking
-    // NSLog(@"position from %@: %f, realtime: %i", debug, position, realtime);
   }
 }
 
-/// Stores the current position for the given detent index
 - (void)storeResolvedPositionForIndex:(NSInteger)index {
   if (index >= 0 && index < (NSInteger)_resolvedDetentPositions.count) {
     _resolvedDetentPositions[index] = @(self.currentPosition);
   }
 }
 
-/// Returns the estimated Y position for a detent index, using stored positions when available
 - (CGFloat)estimatedPositionForIndex:(NSInteger)index {
   if (index < 0 || index >= (NSInteger)_resolvedDetentPositions.count)
     return 0;
@@ -571,11 +515,9 @@
     return storedPos;
   }
 
-  // Estimate based on detent value and known offset from first resolved position
   CGFloat detentValue = [self detentValueForIndex:index];
   CGFloat basePosition = self.screenHeight - (detentValue * self.screenHeight);
 
-  // Find a resolved position to calculate offset
   for (NSInteger i = 0; i < (NSInteger)_resolvedDetentPositions.count; i++) {
     CGFloat pos = [_resolvedDetentPositions[i] doubleValue];
     if (pos > 0) {
@@ -589,8 +531,6 @@
   return basePosition;
 }
 
-/// Finds the segment containing the given position and returns the lower index and progress within that segment.
-/// Returns YES if a segment was found, NO otherwise. When NO, `outIndex` contains the boundary index.
 - (BOOL)findSegmentForPosition:(CGFloat)position outIndex:(NSInteger *)outIndex outProgress:(CGFloat *)outProgress {
   NSInteger count = _resolvedDetentPositions.count;
   if (count == 0) {
@@ -608,7 +548,6 @@
   CGFloat firstPos = [self estimatedPositionForIndex:0];
   CGFloat lastPos = [self estimatedPositionForIndex:count - 1];
 
-  // Below first detent (position > firstPos means sheet is smaller)
   if (position > firstPos) {
     CGFloat range = self.screenHeight - firstPos;
     *outIndex = -1;
@@ -616,14 +555,12 @@
     return NO;
   }
 
-  // Above last detent
   if (position < lastPos) {
     *outIndex = count - 1;
     *outProgress = 0;
     return NO;
   }
 
-  // Find segment (positions decrease as index increases)
   for (NSInteger i = 0; i < count - 1; i++) {
     CGFloat pos = [self estimatedPositionForIndex:i];
     CGFloat nextPos = [self estimatedPositionForIndex:i + 1];
@@ -648,14 +585,11 @@
 
   if (!found) {
     if (index == -1) {
-      // Below first detent - return negative progress
       return -progress;
     }
-    // At or beyond boundary
     return index;
   }
 
-  // Within a segment - interpolate
   return index + fmax(0, fmin(1, progress));
 }
 
@@ -666,15 +600,12 @@
 
   if (!found) {
     if (index == -1) {
-      // Below first detent
       CGFloat firstDetent = [self detentValueForIndex:0];
       return fmax(0, firstDetent * (1 - progress));
     }
-    // At or beyond boundary
     return [self detentValueForIndex:index];
   }
 
-  // Within a segment - interpolate between detent values
   CGFloat detent = [self detentValueForIndex:index];
   CGFloat nextDetent = [self detentValueForIndex:index + 1];
   return detent + progress * (nextDetent - detent);
@@ -683,7 +614,6 @@
 - (CGFloat)detentValueForIndex:(NSInteger)index {
   if (index >= 0 && index < (NSInteger)_detents.count) {
     CGFloat value = [_detents[index] doubleValue];
-    // For auto (-1), calculate actual fraction from content + header height
     if (value == -1) {
       CGFloat autoHeight = [self.contentHeight floatValue] + [self.headerHeight floatValue];
       return autoHeight / self.screenHeight;
@@ -716,13 +646,11 @@
                                                              withAutoHeight:autoHeight
                                                                     atIndex:index];
     [detents addObject:sheetDetent];
-    // Initialize with placeholder - will be updated when sheet settles at each detent
     [_resolvedDetentPositions addObject:@(0)];
   }
 
   sheet.detents = detents;
 
-  // Setup dimmed background
   if (self.dimmed && [self.dimmedDetentIndex integerValue] == 0) {
     sheet.largestUndimmedDetentIdentifier = nil;
   } else {
@@ -752,7 +680,6 @@
 
   CGFloat value = [detent doubleValue];
 
-  // -1 represents "auto" (fit content height)
   if (value == -1) {
     if (@available(iOS 16.0, *)) {
       return [self customDetentWithIdentifier:@"custom-auto" height:autoHeight];
@@ -818,7 +745,6 @@
   if (detentCount == 0)
     return;
 
-  // Clamp index to valid range
   NSInteger clampedIndex = _activeDetentIndex;
   if (clampedIndex < 0) {
     clampedIndex = 0;
@@ -875,7 +801,6 @@
 
   self.view.backgroundColor = self.backgroundColor;
 
-  // Setup blur effect view - recreate only when blurTint changes
   BOOL blurTintChanged = ![_blurView.blurTint isEqualToString:self.blurTint];
 
   if (_blurView && blurTintChanged) {
@@ -894,11 +819,9 @@
     [_blurView applyBlurEffect];
   }
 
-  // Setup grabber
   BOOL showGrabber = self.grabber && self.draggable;
 
   if (self.grabberOptions) {
-    // Use custom grabber view when options are provided
     sheet.prefersGrabberVisible = NO;
 
     NSDictionary *options = self.grabberOptions;
@@ -910,7 +833,6 @@
     [_grabberView applyConfiguration];
     _grabberView.hidden = !showGrabber;
   } else {
-    // Use system default grabber when no options provided
     sheet.prefersGrabberVisible = showGrabber;
     _grabberView.hidden = YES;
   }
@@ -935,13 +857,10 @@
 
 #if RNS_DISMISSIBLE_MODAL_PROTOCOL_AVAILABLE
 - (BOOL)isDismissible {
-  // Prevent react-native-screens from dismissing this sheet when presenting a modal
   return NO;
 }
 
 - (UIViewController *)newPresentingViewController {
-  // Find the topmost TrueSheetViewController in the chain
-  // This handles cases where this sheet is presenting another sheet (child sheet)
   UIViewController *topmost = self;
   while (topmost.presentedViewController != nil && !topmost.presentedViewController.isBeingDismissed &&
          [topmost.presentedViewController isKindOfClass:[TrueSheetViewController class]]) {

package/package.json

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