@lodev09/react-native-true-sheet 4.0.0-beta.17 → 4.0.0-beta.19

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

@@ -403,11 +403,22 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     val parentSheet = TrueSheetStackManager.getTopmostSheet()
     val isFocusedViewWithinSheet = parentSheet?.viewController?.isFocusedViewWithinSheet() == true
     val shouldDismissKeyboard = isFocusedViewWithinSheet || viewController.isDimmedAtDetentIndex(detentIndex)
-    if (KeyboardUtils.isKeyboardVisible(reactContext) && shouldDismissKeyboard) {
+    if (shouldDismissKeyboard && KeyboardUtils.isKeyboardVisible(reactContext)) {
       viewController.saveFocusedView()
       KeyboardUtils.dismiss(this) {
-        post { present(detentIndex, animated, promiseCallback) }
+        post { presentSheet(detentIndex, animated, promiseCallback) }
       }
+      // Blur like iOS so JS focus state stays in sync until restoreFocusedView() refocuses it
+      rootView.findFocus()?.clearFocus()
+      return
+    }
+
+    presentSheet(detentIndex, animated, promiseCallback)
+  }
+
+  private fun presentSheet(detentIndex: Int, animated: Boolean, promiseCallback: () -> Unit) {
+    if (viewController.isPresented) {
+      promiseCallback()
       return
     }
 

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

@@ -708,6 +708,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     if (isPresentAnimating) {
       isPresentAnimating = false
       finishPresent()
+      flushPendingSizeChange()
       return
     }
 
@@ -1233,7 +1234,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     if (!viewToFocus.isAttachedToWindow) return
     if (viewToFocus.requestFocus()) {
       viewToFocus.postDelayed({
-        KeyboardUtils.show(viewToFocus)
+        if (viewToFocus.isFocused) KeyboardUtils.show(viewToFocus)
       }, 100)
     }
   }

package/android/src/main/java/com/lodev09/truesheet/utils/KeyboardUtils.kt

@@ -3,6 +3,7 @@ package com.lodev09.truesheet.utils
 import android.content.Context
 import android.os.Build
 import android.view.View
+import android.view.WindowInsets
 import android.view.inputmethod.InputMethodManager
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsAnimationCompat
@@ -36,10 +37,22 @@ object KeyboardUtils {
    * Dismisses the soft keyboard with an optional callback when the animation completes.
    */
   fun dismiss(view: View, onComplete: (() -> Unit)?) {
+    if (!isKeyboardVisible(view)) {
+      onComplete?.invoke()
+      return
+    }
+
     val imm = view.context.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
     val focusedView = view.rootView.findFocus()
 
-    if (focusedView == null || !isKeyboardVisible(view)) {
+    // A keyboard can stay up with nothing focused, e.g. a blur that lands after focus was restored,
+    // so hide it through the window instead of treating it as already hidden.
+    if (focusedView == null) {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        view.windowInsetsController?.hide(WindowInsets.Type.ime())
+      } else {
+        imm?.hideSoftInputFromWindow(view.windowToken, 0)
+      }
       onComplete?.invoke()
       return
     }

package/package.json

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