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

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

@@ -29,7 +29,8 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.lodev09.truesheet.core.GrabberOptions
 import com.lodev09.truesheet.core.RNScreensFragmentObserver
 import com.lodev09.truesheet.core.TrueSheetGrabberView
-import com.lodev09.truesheet.core.TrueSheetKeyboardHandler
+import com.lodev09.truesheet.core.TrueSheetKeyboardObserver
+import com.lodev09.truesheet.core.TrueSheetKeyboardObserverDelegate
 import com.lodev09.truesheet.utils.ScreenUtils
 
 data class DetentInfo(val index: Int, val position: Float)
@@ -126,6 +127,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private var windowAnimation: Int = 0
   private var lastEmittedPositionPx: Int = -1
 
+  /** Tracks if this sheet was hidden due to a RN Screens modal (vs sheet stacking) */
+  private var wasHiddenByModal = false
+
   var presentPromise: (() -> Unit)? = null
   var dismissPromise: (() -> Unit)? = null
 
@@ -224,7 +228,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
       window?.apply {
         windowAnimation = attributes.windowAnimations
-        // Disable default keyboard avoidance - sheet handles it via setupKeyboardHandler
+        // Disable default keyboard avoidance - sheet handles it via setupKeyboardObserver
         setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING)
       }
 
@@ -255,7 +259,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       setOnDismissListener(null)
     }
 
-    cleanupKeyboardHandler()
+    cleanupKeyboardObserver()
     cleanupModalObserver()
     sheetContainer?.removeView(this)
 
@@ -264,6 +268,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     isDismissing = false
     isPresented = false
     isDialogVisible = false
+    wasHiddenByModal = false
     lastEmittedPositionPx = -1
   }
 
@@ -274,7 +279,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       resetAnimation()
       setupBackground()
       setupGrabber()
-      setupKeyboardHandler()
+      setupKeyboardObserver()
 
       sheetContainer?.post {
         bottomSheetView?.let { emitChangePositionDelegate(it, realtime = false) }
@@ -380,13 +385,16 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     rnScreensObserver = RNScreensFragmentObserver(
       reactContext = reactContext,
       onModalPresented = {
-        if (isPresented) {
-          hideDialog()
+        if (isPresented && isDialogVisible) {
+          hideDialog(animated = true)
+          wasHiddenByModal = true
         }
       },
       onModalDismissed = {
-        if (isPresented) {
-          showDialog()
+        // Only show if we were the one hidden by modal, not by sheet stacking
+        if (isPresented && wasHiddenByModal) {
+          showDialog(animated = true)
+          wasHiddenByModal = false
         }
       }
     )
@@ -436,8 +444,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   /** Hides without dismissing. Used for sheet stacking and RN Screens modals. */
-  fun hideDialog(emitPosition: Boolean = false) {
+  fun hideDialog(emitPosition: Boolean = false, animated: Boolean = false) {
     isDialogVisible = false
+    if (animated) {
+      dialog?.window?.setWindowAnimations(com.lodev09.truesheet.R.style.TrueSheetFadeAnimation)
+    }
     dialog?.window?.decorView?.visibility = INVISIBLE
     if (emitPosition) {
       emitDismissedPosition()
@@ -445,12 +456,18 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   /** Shows a previously hidden dialog. */
-  fun showDialog(emitPosition: Boolean = false) {
+  fun showDialog(emitPosition: Boolean = false, animated: Boolean = false) {
     isDialogVisible = true
     dialog?.window?.decorView?.visibility = VISIBLE
     if (emitPosition) {
       bottomSheetView?.let { emitChangePositionDelegate(it, realtime = false) }
     }
+    if (animated) {
+      // Restore original animation after fade-in completes (100ms)
+      sheetContainer?.postDelayed({
+        dialog?.window?.setWindowAnimations(windowAnimation)
+      }, 100)
+    }
   }
 
   // ====================================================================
@@ -568,18 +585,23 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     bottomSheet.addView(grabberView)
   }
 
-  private var keyboardHandler: TrueSheetKeyboardHandler? = null
+  private var keyboardObserver: TrueSheetKeyboardObserver? = null
 
-  /** Sets up keyboard handler for IME transitions. */
-  fun setupKeyboardHandler() {
+  fun setupKeyboardObserver() {
     val bottomSheet = bottomSheetView ?: return
-    keyboardHandler = TrueSheetKeyboardHandler(bottomSheet, reactContext) { topInset }
-    keyboardHandler?.setup()
+    keyboardObserver = TrueSheetKeyboardObserver(bottomSheet, reactContext).apply {
+      delegate = object : TrueSheetKeyboardObserverDelegate {
+        override fun keyboardHeightDidChange(height: Int) {
+          setupSheetDetents()
+        }
+      }
+      start()
+    }
   }
 
-  fun cleanupKeyboardHandler() {
-    keyboardHandler?.cleanup()
-    keyboardHandler = null
+  fun cleanupKeyboardObserver() {
+    keyboardObserver?.stop()
+    keyboardObserver = null
   }
 
   fun setupBackground() {
@@ -632,7 +654,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     val sheetTop = bottomSheet.top
 
     // Footer Y relative to sheet: place at bottom of sheet container minus footer height
-    var footerY = (sheetHeight - sheetTop - footerHeight).toFloat()
+    var footerY = (sheetHeight - sheetTop - footerHeight - keyboardHeight).toFloat()
 
     if (slideOffset != null && slideOffset < 0) {
       footerY -= (footerHeight * slideOffset)
@@ -806,16 +828,17 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // MARK: - Detent Calculations
   // ====================================================================
 
+  private val keyboardHeight: Int
+    get() = keyboardObserver?.currentHeight ?: 0
+
   private fun getDetentHeight(detent: Double): Int {
-    val height: Int = if (detent == -1.0) {
-      // Auto height: add bottomInset to content to match iOS behavior
-      contentHeight + headerHeight + contentBottomInset
+    val height = if (detent == -1.0) {
+      contentHeight + headerHeight + contentBottomInset + keyboardHeight
     } else {
       if (detent <= 0.0 || detent > 1.0) {
         throw IllegalArgumentException("TrueSheet: detent fraction ($detent) must be between 0 and 1")
       }
-      // Fractional detent: add bottomInset to match iOS behavior
-      (detent * screenHeight).toInt() + contentBottomInset
+      (detent * screenHeight).toInt() + contentBottomInset + keyboardHeight
     }
 
     val maxAllowedHeight = screenHeight + contentBottomInset

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

@@ -27,8 +27,8 @@ class RNScreensFragmentObserver(
     val fragmentManager = activity.supportFragmentManager
 
     fragmentLifecycleCallback = object : FragmentManager.FragmentLifecycleCallbacks() {
-      override fun onFragmentStarted(fm: FragmentManager, fragment: Fragment) {
-        super.onFragmentStarted(fm, fragment)
+      override fun onFragmentPreAttached(fm: FragmentManager, fragment: Fragment, context: android.content.Context) {
+        super.onFragmentPreAttached(fm, fragment, context)
 
         if (isModalFragment(fragment) && !activeModalFragments.contains(fragment)) {
           activeModalFragments.add(fragment)

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

@@ -20,12 +20,15 @@ object TrueSheetDialogObserver {
       val parentSheet = presentedSheetStack.lastOrNull()
         ?.takeIf { it.viewController.isPresented && it.viewController.isDialogVisible }
 
-      // Hide parent if the new sheet would cover it
-      parentSheet?.let {
-        val parentTop = it.viewController.currentSheetTop
-        val newSheetTop = sheetView.viewController.getExpectedSheetTop(detentIndex)
-        if (!it.viewController.isExpanded && parentTop <= newSheetTop) {
-          it.viewController.hideDialog(emitPosition = true)
+      // Hide any parent sheets that would be visible behind the new sheet
+      val newSheetTop = sheetView.viewController.getExpectedSheetTop(detentIndex)
+      for (sheet in presentedSheetStack) {
+        if (!sheet.viewController.isDialogVisible) continue
+        if (sheet.viewController.isExpanded) continue
+
+        val sheetTop = sheet.viewController.currentSheetTop
+        if (sheetTop < newSheetTop) {
+          sheet.viewController.hideDialog(emitPosition = true)
         }
       }
 

package/android/src/main/java/com/lodev09/truesheet/core/{TrueSheetKeyboardHandler.kt → TrueSheetKeyboardObserver.kt}

@@ -9,25 +9,25 @@ import androidx.core.view.WindowInsetsAnimationCompat
 import androidx.core.view.WindowInsetsCompat
 import com.facebook.react.uimanager.ThemedReactContext
 
+interface TrueSheetKeyboardObserverDelegate {
+  fun keyboardHeightDidChange(height: Int)
+}
+
 /**
- * Handles keyboard (IME) for sheet translation.
- * Uses WindowInsetsAnimationCompat for smooth animation on API 30+,
- * falls back to ViewTreeObserver on Activity's decor view for API 29 and below.
- *
- * @param targetView The view to translate (typically the bottom sheet)
- * @param reactContext The React context to get the current activity
- * @param topInset The top safe area inset to respect
+ * Tracks keyboard height and notifies delegate on changes.
+ * Uses WindowInsetsAnimationCompat on API 30+, ViewTreeObserver fallback on older versions.
  */
-class TrueSheetKeyboardHandler(
-  private val targetView: View,
-  private val reactContext: ThemedReactContext,
-  private val topInset: () -> Int
-) {
+class TrueSheetKeyboardObserver(private val targetView: View, private val reactContext: ThemedReactContext) {
+
+  var delegate: TrueSheetKeyboardObserverDelegate? = null
+
+  var currentHeight: Int = 0
+    private set
 
   private var globalLayoutListener: ViewTreeObserver.OnGlobalLayoutListener? = null
   private var activityRootView: View? = null
 
-  fun setup() {
+  fun start() {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
       setupAnimationCallback()
     } else {
@@ -35,7 +35,7 @@ class TrueSheetKeyboardHandler(
     }
   }
 
-  fun cleanup() {
+  fun stop() {
     globalLayoutListener?.let { listener ->
       activityRootView?.viewTreeObserver?.removeOnGlobalLayoutListener(listener)
       globalLayoutListener = null
@@ -44,35 +44,31 @@ class TrueSheetKeyboardHandler(
     ViewCompat.setWindowInsetsAnimationCallback(targetView, null)
   }
 
-  private fun applyTranslation(imeHeight: Int) {
-    // Cap translation so sheet doesn't move beyond screen bounds
-    val maxTranslation = maxOf(0, targetView.top - topInset())
-    val translation = minOf(imeHeight, maxTranslation)
-    targetView.translationY = -translation.toFloat()
+  private fun updateHeight(height: Int) {
+    if (currentHeight != height) {
+      currentHeight = height
+      delegate?.keyboardHeightDidChange(height)
+    }
   }
 
-  /** API 30+ smooth keyboard animation */
+  private fun getKeyboardHeight(insets: WindowInsetsCompat?): Int = insets?.getInsets(WindowInsetsCompat.Type.ime())?.bottom ?: 0
+
   private fun setupAnimationCallback() {
     ViewCompat.setWindowInsetsAnimationCallback(
       targetView,
       object : WindowInsetsAnimationCompat.Callback(DISPATCH_MODE_CONTINUE_ON_SUBTREE) {
-        private var startImeHeight = 0
-        private var endImeHeight = 0
-
-        private fun getKeyboardHeight(rootInsets: WindowInsetsCompat?): Int {
-          if (rootInsets == null) return 0
-          return rootInsets.getInsets(WindowInsetsCompat.Type.ime()).bottom
-        }
+        private var startHeight = 0
+        private var endHeight = 0
 
         override fun onPrepare(animation: WindowInsetsAnimationCompat) {
-          startImeHeight = getKeyboardHeight(ViewCompat.getRootWindowInsets(targetView))
+          startHeight = getKeyboardHeight(ViewCompat.getRootWindowInsets(targetView))
         }
 
         override fun onStart(
           animation: WindowInsetsAnimationCompat,
           bounds: WindowInsetsAnimationCompat.BoundsCompat
         ): WindowInsetsAnimationCompat.BoundsCompat {
-          endImeHeight = getKeyboardHeight(ViewCompat.getRootWindowInsets(targetView))
+          endHeight = getKeyboardHeight(ViewCompat.getRootWindowInsets(targetView))
           return bounds
         }
 
@@ -82,23 +78,21 @@ class TrueSheetKeyboardHandler(
           } ?: return insets
 
           val fraction = imeAnimation.interpolatedFraction
-          val currentImeHeight = (startImeHeight + (endImeHeight - startImeHeight) * fraction).toInt()
-          applyTranslation(currentImeHeight)
+          val currentHeight = (startHeight + (endHeight - startHeight) * fraction).toInt()
+          updateHeight(currentHeight)
 
           return insets
         }
 
         override fun onEnd(animation: WindowInsetsAnimationCompat) {
-          applyTranslation(getKeyboardHeight(ViewCompat.getRootWindowInsets(targetView)))
+          updateHeight(getKeyboardHeight(ViewCompat.getRootWindowInsets(targetView)))
         }
       }
     )
   }
 
-  /** API 29 and below fallback using ViewTreeObserver on Activity's root view */
   private fun setupLegacyListener() {
     val rootView = reactContext.currentActivity?.window?.decorView?.rootView ?: return
-
     activityRootView = rootView
 
     globalLayoutListener = ViewTreeObserver.OnGlobalLayoutListener {
@@ -108,11 +102,7 @@ class TrueSheetKeyboardHandler(
       val screenHeight = rootView.height
       val keyboardHeight = screenHeight - rect.bottom
 
-      if (keyboardHeight > screenHeight * 0.15) {
-        applyTranslation(keyboardHeight)
-      } else {
-        applyTranslation(0)
-      }
+      updateHeight(if (keyboardHeight > screenHeight * 0.15) keyboardHeight else 0)
     }
 
     rootView.viewTreeObserver.addOnGlobalLayoutListener(globalLayoutListener)

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

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

package/android/src/main/res/anim/true_sheet_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:duration="100"
+    android:fromAlpha="1.0"
+    android:toAlpha="0.0"
+    android:interpolator="@android:interpolator/accelerate_cubic" />

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

@@ -6,6 +6,12 @@
         <item name="android:windowExitAnimation">@anim/true_sheet_slide_out</item>
     </style>
 
+    <!-- Fast fade animation - used for hide/show when modal is presented -->
+    <style name="TrueSheetFadeAnimation" parent="Animation.AppCompat.Dialog">
+        <item name="android:windowEnterAnimation">@anim/true_sheet_fade_in</item>
+        <item name="android:windowExitAnimation">@anim/true_sheet_fade_out</item>
+    </style>
+
     <!-- Default BottomSheetDialog style with smooth animations -->
     <style name="TrueSheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
         <item name="android:windowAnimationStyle">@style/TrueSheetAnimation</item>

package/package.json

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