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

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

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.graphics.Color
 import android.graphics.drawable.ShapeDrawable
 import android.graphics.drawable.shapes.RoundRectShape
+import android.util.Log
 import android.util.TypedValue
 import android.view.MotionEvent
 import android.view.View
@@ -110,9 +111,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   override val headerHeight: Int
     get() = containerView?.headerHeight ?: 0
 
-  override val keyboardHeight: Int
-    get() = keyboardObserver?.currentHeight ?: 0
-
   // ====================================================================
   // MARK: - State
   // ====================================================================
@@ -120,7 +118,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   /** Interaction state for the sheet */
   private sealed class InteractionState {
     data object Idle : InteractionState()
-    data class Dragging(val startTop: Int, val startKeyboardHeight: Int, val shouldDismissKeyboard: Boolean = false) : InteractionState()
+    data class Dragging(val startTop: Int) : InteractionState()
     data object Reconfiguring : InteractionState()
   }
 
@@ -141,6 +139,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private var lastStateWidth: Int = 0
   private var lastStateHeight: Int = 0
   private var lastEmittedPositionPx: Int = -1
+  private var detentIndexBeforeKeyboard: Int = -1
+  private var isKeyboardTransitioning: Boolean = false
 
   var presentPromise: (() -> Unit)? = null
   var dismissPromise: (() -> Unit)? = null
@@ -202,6 +202,12 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // MARK: - Computed Properties
   // ====================================================================
 
+  override val keyboardInset: Int
+    get() = keyboardObserver?.targetHeight ?: 0
+
+  private val currentKeyboardInset: Int
+    get() = keyboardObserver?.currentHeight ?: 0
+
   val bottomInset: Int
     get() = if (edgeToEdgeEnabled) ScreenUtils.getInsets(reactContext).bottom else 0
 
@@ -349,8 +355,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
             else -> { }
           }
 
-          positionFooter(slideOffset)
-          updateDimAmount(sheetView.top)
+          if (!isKeyboardTransitioning) {
+            positionFooter(slideOffset)
+            updateDimAmount(sheetView.top)
+          }
         }
 
         override fun onStateChanged(sheetView: View, newState: Int) {
@@ -387,17 +395,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
     when (interactionState) {
       is InteractionState.Dragging -> {
-        val draggingState = interactionState as InteractionState.Dragging
         val detent = detentCalculator.getDetentValueForIndex(detentInfo.index)
         delegate?.viewControllerDidDragEnd(detentInfo.index, detentInfo.position, detent)
 
-        // Dismiss keyboard if dragged past threshold
-        if (draggingState.shouldDismissKeyboard) {
-          val imm = reactContext.getSystemService(android.content.Context.INPUT_METHOD_SERVICE)
-            as? android.view.inputmethod.InputMethodManager
-          imm?.hideSoftInputFromWindow((dialog?.currentFocus ?: bottomSheetView)?.windowToken, 0)
-        }
-
         if (detentInfo.index != currentDetentIndex) {
           presentPromise?.invoke()
           presentPromise = null
@@ -412,8 +412,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       else -> {
         if (detentInfo.index != currentDetentIndex) {
           currentDetentIndex = detentInfo.index
-          val detent = detentCalculator.getDetentValueForIndex(detentInfo.index)
-          delegate?.viewControllerDidChangeDetent(detentInfo.index, detentInfo.position, detent)
+          if (!isKeyboardTransitioning) {
+            val detent = detentCalculator.getDetentValueForIndex(detentInfo.index)
+            delegate?.viewControllerDidChangeDetent(detentInfo.index, detentInfo.position, detent)
+          }
         }
       }
     }
@@ -427,23 +429,18 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
           isDialogVisible = false
           wasHiddenByModal = true
 
-          bottomSheetView?.animate()?.alpha(0f)?.setDuration(200)?.start()
+          dialog?.window?.setWindowAnimations(com.lodev09.truesheet.R.style.TrueSheetFastFadeOut)
+          dialog?.window?.decorView?.visibility = GONE
           dimView?.visibility = INVISIBLE
           parentDimView?.visibility = INVISIBLE
-          dialog?.window?.setFlags(
-            WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
-            WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-          )
         }
       },
       onModalWillDismiss = {
         if (isPresented && wasHiddenByModal) {
           isDialogVisible = true
 
-          dialog?.window?.clearFlags(
-            WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-          )
-          bottomSheetView?.alpha = 1f
+          dialog?.window?.setWindowAnimations(0)
+          dialog?.window?.decorView?.visibility = VISIBLE
           dimView?.visibility = VISIBLE
           parentDimView?.visibility = VISIBLE
         }
@@ -689,15 +686,29 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     val bottomSheet = bottomSheetView ?: return
     keyboardObserver = TrueSheetKeyboardObserver(bottomSheet, reactContext).apply {
       delegate = object : TrueSheetKeyboardObserverDelegate {
-        override fun keyboardWillShow(height: Int) {}
-
-        override fun keyboardWillHide() {}
+        override fun keyboardWillShow(height: Int) {
+          if (!shouldHandleKeyboard()) return
+          detentIndexBeforeKeyboard = currentDetentIndex
+          isKeyboardTransitioning = true
+          setupSheetDetents()
+          setStateForDetentIndex(detents.size - 1)
+        }
 
-        override fun keyboardDidChangeHeight(height: Int) {
+        override fun keyboardWillHide() {
           if (!shouldHandleKeyboard()) return
           setupSheetDetents()
-          positionFooter()
+          if (detentIndexBeforeKeyboard >= 0) {
+            setStateForDetentIndex(detentIndexBeforeKeyboard)
+            detentIndexBeforeKeyboard = -1
+          }
         }
+
+        override fun keyboardDidHide() {
+          if (!shouldHandleKeyboard()) return
+          isKeyboardTransitioning = false
+        }
+
+        override fun keyboardDidChangeHeight(height: Int) {}
       }
       start()
     }
@@ -784,7 +795,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   fun updateDimAmount(sheetTop: Int? = null) {
     if (!dimmed) return
-    val top = sheetTop ?: bottomSheetView?.top ?: return
+    val top = (sheetTop ?: bottomSheetView?.top ?: return) + currentKeyboardInset
     dimView?.interpolateAlpha(top, dimmedDetentIndex, detentCalculator::getSheetTopForDetentIndex)
     parentDimView?.interpolateAlpha(top, dimmedDetentIndex, detentCalculator::getSheetTopForDetentIndex)
   }
@@ -797,7 +808,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     val sheetHeight = bottomSheet.height
     val sheetTop = bottomSheet.top
 
-    var footerY = (sheetHeight - sheetTop - footerHeight - keyboardHeight).toFloat()
+    var footerY = (sheetHeight - sheetTop - footerHeight - currentKeyboardInset).toFloat()
     if (slideOffset != null && slideOffset < 0) {
       footerY -= (footerHeight * slideOffset)
     }
@@ -832,31 +843,14 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     val position = detentCalculator.getPositionDp(detentCalculator.getVisibleSheetHeight(sheetView.top))
     val detent = detentCalculator.getDetentValueForIndex(currentDetentIndex)
     delegate?.viewControllerDidDragBegin(currentDetentIndex, position, detent)
-    interactionState = InteractionState.Dragging(
-      startTop = sheetView.top,
-      startKeyboardHeight = keyboardHeight
-    )
+    interactionState = InteractionState.Dragging(startTop = sheetView.top)
   }
 
   private fun handleDragChange(sheetView: View) {
-    val draggingState = interactionState as? InteractionState.Dragging ?: return
+    if (interactionState !is InteractionState.Dragging) return
     val position = detentCalculator.getPositionDp(detentCalculator.getVisibleSheetHeight(sheetView.top))
     val detent = detentCalculator.getDetentValueForIndex(currentDetentIndex)
     delegate?.viewControllerDidDragChange(currentDetentIndex, position, detent)
-
-    // Dismiss keyboard if dragged below original position (without keyboard)
-    if (draggingState.startKeyboardHeight > 0) {
-      val detentTopWithoutKeyboard = getExpectedSheetTop(currentDetentIndex) + draggingState.startKeyboardHeight
-      val shouldDismiss = sheetView.top >= detentTopWithoutKeyboard
-
-      if (shouldDismiss != draggingState.shouldDismissKeyboard) {
-        android.util.Log.d(
-          TAG_NAME,
-          "shouldDismissKeyboard changed to: $shouldDismiss (currentTop: ${sheetView.top}, detentTop: $detentTopWithoutKeyboard)"
-        )
-        interactionState = draggingState.copy(shouldDismissKeyboard = shouldDismiss)
-      }
-    }
   }
 
   // ====================================================================

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

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

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

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

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

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

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

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

package/package.json

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