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

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)
@@ -224,7 +225,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 +256,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       setOnDismissListener(null)
     }
 
-    cleanupKeyboardHandler()
+    cleanupKeyboardObserver()
     cleanupModalObserver()
     sheetContainer?.removeView(this)
 
@@ -274,7 +275,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       resetAnimation()
       setupBackground()
       setupGrabber()
-      setupKeyboardHandler()
+      setupKeyboardObserver()
 
       sheetContainer?.post {
         bottomSheetView?.let { emitChangePositionDelegate(it, realtime = false) }
@@ -568,18 +569,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 +638,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 +812,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/{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/package.json

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