fix(android): only handle keyboard for focused views within sheet (#365)

* fix(android): only handle keyboard for focused views within sheet

* refactor(android): move isKeyboardTransitioning to observer

* refactor(android): move isFocusedViewWithinSheet to keyboard observer

Author: lodev09

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

@@ -139,7 +139,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   // Keyboard State
   private var detentIndexBeforeKeyboard: Int = -1
-  private var isKeyboardTransitioning: Boolean = false
 
   // Promises
   var presentPromise: (() -> Unit)? = null
@@ -238,6 +237,14 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private val currentKeyboardInset: Int
     get() = keyboardObserver?.currentHeight ?: 0
 
+  private val isKeyboardTransitioning: Boolean
+    get() = keyboardObserver?.isTransitioning ?: false
+
+  private fun isFocusedViewWithinSheet(): Boolean {
+    val sheet = sheetView ?: return false
+    return keyboardObserver?.isFocusedViewWithinSheet(sheet) ?: false
+  }
+
   val bottomInset: Int
     get() = if (edgeToEdgeEnabled) ScreenUtils.getInsets(reactContext).bottom else 0
 
@@ -320,7 +327,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     isPresented = false
     isSheetVisible = false
     wasHiddenByModal = false
-    isKeyboardTransitioning = false
     isPresentAnimating = false
     lastEmittedPositionPx = -1
     detentIndexBeforeKeyboard = -1
@@ -872,9 +878,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // MARK: - Keyboard Handling
   // =============================================================================
 
-  private fun shouldHandleKeyboard(): Boolean {
+  private fun shouldHandleKeyboard(checkFocus: Boolean = true): Boolean {
     if (wasHiddenByModal) return false
-    return isTopmostSheet
+    if (!isTopmostSheet) return false
+    if (checkFocus && !isFocusedViewWithinSheet()) return false
+    return true
   }
 
   fun setupKeyboardObserver() {
@@ -886,25 +894,23 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     keyboardObserver = TrueSheetKeyboardObserver(coordinator, reactContext).apply {
       delegate = object : TrueSheetKeyboardObserverDelegate {
         override fun keyboardWillShow(height: Int) {
-          isKeyboardTransitioning = true
           if (!shouldHandleKeyboard()) return
           detentIndexBeforeKeyboard = currentDetentIndex
           setupSheetDetents()
           setStateForDetentIndex(detents.size - 1)
         }
 
         override fun keyboardWillHide() {
-          if (!shouldHandleKeyboard()) return
+          if (!shouldHandleKeyboard(checkFocus = false)) return
+
           setupSheetDetents()
           if (!isDismissing && detentIndexBeforeKeyboard >= 0) {
             setStateForDetentIndex(detentIndexBeforeKeyboard)
             detentIndexBeforeKeyboard = -1
           }
         }
 
-        override fun keyboardDidHide() {
-          isKeyboardTransitioning = false
-        }
+        override fun keyboardDidHide() {}
 
         override fun keyboardDidChangeHeight(height: Int) {
           if (!shouldHandleKeyboard()) return

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

@@ -21,7 +21,10 @@ interface TrueSheetKeyboardObserverDelegate {
  * Tracks keyboard height and notifies delegate on changes.
  * Uses WindowInsetsAnimationCompat on API 30+, ViewTreeObserver fallback on older versions.
  */
-class TrueSheetKeyboardObserver(private val targetView: View, private val reactContext: ThemedReactContext) {
+class TrueSheetKeyboardObserver(
+  private val targetView: View,
+  private val reactContext: ThemedReactContext
+) {
 
   var delegate: TrueSheetKeyboardObserverDelegate? = null
 
@@ -31,6 +34,20 @@ class TrueSheetKeyboardObserver(private val targetView: View, private val reactC
   var targetHeight: Int = 0
     private set
 
+  var isTransitioning: Boolean = false
+    private set
+
+  fun isFocusedViewWithinSheet(sheetView: View): Boolean {
+    val focusedView = reactContext.currentActivity?.currentFocus ?: return false
+    var current: View? = focusedView
+    while (current != null && current !== targetView) {
+      if (current === sheetView) return true
+      val parent = current.parent
+      current = if (parent is View) parent else null
+    }
+    return false
+  }
+
   private var isHiding: Boolean = false
   private var globalLayoutListener: ViewTreeObserver.OnGlobalLayoutListener? = null
   private var activityRootView: View? = null
@@ -80,6 +97,7 @@ class TrueSheetKeyboardObserver(private val targetView: View, private val reactC
           endHeight = getKeyboardHeight()
           targetHeight = endHeight
           isHiding = endHeight < startHeight
+          isTransitioning = true
           if (endHeight > startHeight) {
             delegate?.keyboardWillShow(endHeight)
           } else if (isHiding) {
@@ -102,6 +120,7 @@ class TrueSheetKeyboardObserver(private val targetView: View, private val reactC
         override fun onEnd(animation: WindowInsetsAnimationCompat) {
           val finalHeight = getKeyboardHeight()
           updateHeight(startHeight, finalHeight, 1f)
+          isTransitioning = false
           if (isHiding) {
             delegate?.keyboardDidHide()
             isHiding = false
@@ -134,6 +153,7 @@ class TrueSheetKeyboardObserver(private val targetView: View, private val reactC
       targetHeight = newHeight
       isHiding = newHeight < previousHeight
 
+      isTransitioning = true
       if (newHeight > previousHeight) {
         delegate?.keyboardWillShow(newHeight)
       } else if (isHiding) {
@@ -142,6 +162,7 @@ class TrueSheetKeyboardObserver(private val targetView: View, private val reactC
 
       // On legacy API, keyboard has already animated - just update immediately
       updateHeight(previousHeight, newHeight, 1f)
+      isTransitioning = false
 
       if (isHiding && newHeight == 0) {
         delegate?.keyboardDidHide()

example/shared/src/screens/ModalScreen.tsx

@@ -18,14 +18,14 @@ export const ModalScreen = ({ onNavigateToTest, onDismiss }: ModalScreenProps) =
   return (
     <TrueSheetProvider>
       <View style={styles.content}>
-        <Button text="Dismiss Modal" onPress={onDismiss} />
         <View style={styles.heading}>
           <Text style={styles.title}>Modal Screen</Text>
           <Text style={styles.subtitle}>
             This is a fullScreenModal opened from a TrueSheet. You can present sheets from here too!
           </Text>
         </View>
         <Input />
+        <Button text="Dismiss Modal" onPress={onDismiss} />
         <Button text="TrueSheet Prompt" onPress={() => promptSheet.current?.present()} />
         <Button text="TrueSheet FlatList" onPress={() => flatlistSheet.current?.present()} />
         <Spacer />