@lodev09/react-native-true-sheet 3.7.0-beta.3 → 3.7.0-beta.5

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

@@ -18,6 +18,7 @@ import com.facebook.react.views.view.ReactViewGroup
 import com.lodev09.truesheet.core.GrabberOptions
 import com.lodev09.truesheet.core.TrueSheetStackManager
 import com.lodev09.truesheet.events.*
+import com.lodev09.truesheet.utils.KeyboardUtils
 
 /**
  * Main TrueSheet host view that manages the sheet and dispatches events to JavaScript.
@@ -276,6 +277,18 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   @UiThread
   fun present(detentIndex: Int, animated: Boolean = true, promiseCallback: () -> Unit) {
     if (!viewController.isPresented) {
+      // Dismiss keyboard if focused view is within a sheet or if target detent will be dimmed
+      val parentSheet = TrueSheetStackManager.getTopmostSheet()
+      val isFocusedViewWithinSheet = parentSheet?.viewController?.isFocusedViewWithinSheet() == true
+      val shouldDismissKeyboard = isFocusedViewWithinSheet || viewController.isDimmedAtDetentIndex(detentIndex)
+      if (KeyboardUtils.isKeyboardVisible(reactContext) && shouldDismissKeyboard) {
+        viewController.saveFocusedView()
+        KeyboardUtils.dismiss(this) {
+          post { present(detentIndex, animated, promiseCallback) }
+        }
+        return
+      }
+
       // Attach coordinator to the root container
       rootContainerView = findRootContainerView()
       viewController.coordinatorLayout?.let { rootContainerView?.addView(it) }

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

@@ -140,6 +140,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   // Keyboard State
   private var detentIndexBeforeKeyboard: Int = -1
+  private var focusedViewBeforeBlur: View? = null
 
   // Promises
   var presentPromise: (() -> Unit)? = null
@@ -204,9 +205,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       if (isPresented) sheetView?.setupGrabber()
     }
 
-  val isDimmedAtCurrentDetent: Boolean
-    get() = dimmed && currentDetentIndex >= dimmedDetentIndex
-
   // =============================================================================
   // MARK: - Computed Properties
   // =============================================================================
@@ -248,7 +246,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private val isKeyboardTransitioning: Boolean
     get() = keyboardObserver?.isTransitioning ?: false
 
-  private fun isFocusedViewWithinSheet(): Boolean {
+  fun isFocusedViewWithinSheet(): Boolean {
     val sheet = sheetView ?: return false
     return keyboardObserver?.isFocusedViewWithinSheet(sheet) ?: false
   }
@@ -287,6 +285,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private val dimViews: List<TrueSheetDimView>
     get() = listOfNotNull(dimView, parentDimView)
 
+  val isDimmedAtCurrentDetent: Boolean
+    get() = isDimmedAtDetentIndex(currentDetentIndex)
+
+  fun isDimmedAtDetentIndex(index: Int): Boolean = dimmed && index >= dimmedDetentIndex
+
   // =============================================================================
   // MARK: - Sheet Creation & Cleanup
   // =============================================================================
@@ -331,6 +334,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     isPresentAnimating = false
     lastEmittedPositionPx = -1
     detentIndexBeforeKeyboard = -1
+    focusedViewBeforeBlur = null
     shouldAnimatePresent = true
   }
 
@@ -513,7 +517,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       reactContext = reactContext,
       onModalPresented = {
         if (isPresented && isSheetVisible && isTopmostSheet) {
-          hideForModal()
+          dismissKeyboard()
+          post { hideForModal() }
         }
       },
       onModalWillDismiss = {
@@ -710,6 +715,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   private fun finishDismiss() {
+    restoreFocusedView()
     emitDidDismissEvents()
     cleanupSheet()
   }
@@ -885,6 +891,22 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     return true
   }
 
+  fun saveFocusedView() {
+    focusedViewBeforeBlur = reactContext.currentActivity?.currentFocus
+  }
+
+  fun restoreFocusedView() {
+    val viewToFocus = focusedViewBeforeBlur ?: return
+    focusedViewBeforeBlur = null
+
+    if (!viewToFocus.isAttachedToWindow) return
+    if (viewToFocus.requestFocus()) {
+      viewToFocus.postDelayed({
+        KeyboardUtils.show(viewToFocus)
+      }, 100)
+    }
+  }
+
   fun setupKeyboardObserver() {
     val coordinator = coordinatorLayout ?: run {
       RNLog.e(reactContext, "TrueSheet: coordinatorLayout is null in setupKeyboardObserver")

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

@@ -1,5 +1,6 @@
 package com.lodev09.truesheet.core
 
+import android.view.ViewGroup
 import com.lodev09.truesheet.TrueSheetView
 
 /**
@@ -10,6 +11,25 @@ object TrueSheetStackManager {
 
   private val presentedSheetStack = mutableListOf<TrueSheetView>()
 
+  /**
+   * Gets the parent sheet at the given index, if any.
+   * Only returns a parent if it's in the same container.
+   * Must be called within synchronized block.
+   */
+  private fun getParentSheetAt(index: Int, rootContainer: ViewGroup?): TrueSheetView? {
+    if (index <= 0) return null
+    return presentedSheetStack[index - 1].takeIf { it.rootContainerView == rootContainer }
+  }
+
+  /**
+   * Returns the topmost presented and visible sheet.
+   * Must be called within synchronized block.
+   */
+  private fun findTopmostSheet(): TrueSheetView? =
+    presentedSheetStack.lastOrNull {
+      it.viewController.isPresented && it.viewController.isSheetVisible
+    }
+
   /**
    * Called when a sheet is about to be presented.
    * Returns the visible parent sheet to stack on, or null if none.
@@ -18,13 +38,7 @@ object TrueSheetStackManager {
   @JvmStatic
   fun onSheetWillPresent(sheetView: TrueSheetView, detentIndex: Int): TrueSheetView? {
     synchronized(presentedSheetStack) {
-      val rootContainer = sheetView.rootContainerView
-      val parentSheet = presentedSheetStack.lastOrNull()
-        ?.takeIf {
-          it.viewController.isPresented &&
-            it.viewController.isSheetVisible &&
-            it.rootContainerView == rootContainer
-        }
+      val parentSheet = findTopmostSheet()?.takeIf { it.rootContainerView == sheetView.rootContainerView }
 
       val childSheetTop = sheetView.viewController.detentCalculator.getSheetTopForDetentIndex(detentIndex)
       parentSheet?.updateTranslationForChild(childSheetTop)
@@ -60,11 +74,7 @@ object TrueSheetStackManager {
   fun onSheetSizeChanged(sheetView: TrueSheetView) {
     synchronized(presentedSheetStack) {
       val index = presentedSheetStack.indexOf(sheetView)
-      if (index <= 0) return
-
-      val rootContainer = sheetView.rootContainerView
-      val parentSheet = presentedSheetStack[index - 1]
-        .takeIf { it.rootContainerView == rootContainer } ?: return
+      val parentSheet = getParentSheetAt(index, sheetView.rootContainerView) ?: return
 
       // Post to ensure layout is complete before reading position
       sheetView.viewController.post {
@@ -117,9 +127,7 @@ object TrueSheetStackManager {
   fun getParentSheet(sheetView: TrueSheetView): TrueSheetView? {
     synchronized(presentedSheetStack) {
       val index = presentedSheetStack.indexOf(sheetView)
-      if (index <= 0) return null
-      val rootContainer = sheetView.rootContainerView
-      return presentedSheetStack[index - 1].takeIf { it.rootContainerView == rootContainer }
+      return getParentSheetAt(index, sheetView.rootContainerView)
     }
   }
 
@@ -133,4 +141,14 @@ object TrueSheetStackManager {
       return presentedSheetStack.lastOrNull { it.rootContainerView == rootContainer } == sheetView
     }
   }
+
+  /**
+   * Returns the topmost presented sheet, or null if none.
+   */
+  @JvmStatic
+  fun getTopmostSheet(): TrueSheetView? {
+    synchronized(presentedSheetStack) {
+      return findTopmostSheet()
+    }
+  }
 }

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

@@ -1,22 +1,77 @@
 package com.lodev09.truesheet.utils
 
 import android.content.Context
+import android.os.Build
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsAnimationCompat
 import androidx.core.view.WindowInsetsCompat
 import com.facebook.react.uimanager.ThemedReactContext
 
 object KeyboardUtils {
 
+  /**
+   * Checks if the soft keyboard is currently visible.
+   */
+  fun isKeyboardVisible(reactContext: ThemedReactContext): Boolean {
+    val rootView = reactContext.currentActivity?.window?.decorView?.rootView ?: return false
+    return isKeyboardVisible(rootView)
+  }
+
+  private fun isKeyboardVisible(view: View): Boolean {
+    val insets = ViewCompat.getRootWindowInsets(view) ?: return false
+    return insets.isVisible(WindowInsetsCompat.Type.ime())
+  }
+
   /**
    * Dismisses the soft keyboard if currently shown.
    */
   fun dismiss(reactContext: ThemedReactContext) {
-    val imm = reactContext.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
-    reactContext.currentActivity?.currentFocus?.let { focusedView ->
-      imm?.hideSoftInputFromWindow(focusedView.windowToken, 0)
+    val rootView = reactContext.currentActivity?.window?.decorView?.rootView ?: return
+    dismiss(rootView, null)
+  }
+
+  /**
+   * Dismisses the soft keyboard with an optional callback when the animation completes.
+   */
+  fun dismiss(view: View, onComplete: (() -> Unit)?) {
+    val imm = view.context.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+    val focusedView = view.rootView.findFocus()
+
+    if (focusedView == null || !isKeyboardVisible(view)) {
+      onComplete?.invoke()
+      return
     }
+
+    if (onComplete != null) {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        ViewCompat.setWindowInsetsAnimationCallback(
+          view,
+          object : WindowInsetsAnimationCompat.Callback(DISPATCH_MODE_CONTINUE_ON_SUBTREE) {
+            override fun onProgress(insets: WindowInsetsCompat, runningAnimations: List<WindowInsetsAnimationCompat>): WindowInsetsCompat =
+              insets
+
+            override fun onEnd(animation: WindowInsetsAnimationCompat) {
+              ViewCompat.setWindowInsetsAnimationCallback(view, null)
+              onComplete()
+            }
+          }
+        )
+      } else {
+        view.postDelayed({ onComplete() }, 120)
+      }
+    }
+
+    imm?.hideSoftInputFromWindow(focusedView.windowToken, 0)
+  }
+
+  /**
+   * Shows the soft keyboard for the given view.
+   */
+  fun show(view: View) {
+    val imm = view.context.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+    imm?.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT)
   }
 
   /**

package/ios/TrueSheetFooterView.mm

@@ -15,6 +15,7 @@
 #import <react/renderer/components/TrueSheetSpec/RCTComponentViewHelpers.h>
 #import "TrueSheetViewController.h"
 #import "utils/LayoutUtil.h"
+#import "utils/UIView+FirstResponder.h"
 
 using namespace facebook::react;
 
@@ -139,6 +140,16 @@ using namespace facebook::react;
   return nil;
 }
 
+- (BOOL)isFirstResponderWithinSheet {
+  TrueSheetViewController *sheetController = [self findSheetViewController];
+  if (!sheetController) {
+    return NO;
+  }
+
+  UIView *firstResponder = [sheetController.view findFirstResponder];
+  return firstResponder != nil;
+}
+
 - (void)keyboardWillChangeFrame:(NSNotification *)notification {
   if (!_bottomConstraint) {
     return;
@@ -150,6 +161,11 @@ using namespace facebook::react;
     return;
   }
 
+  // Only respond if the focused view is within this sheet
+  if (![self isFirstResponderWithinSheet]) {
+    return;
+  }
+
   NSDictionary *userInfo = notification.userInfo;
   CGRect keyboardFrame = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
   NSTimeInterval duration = [userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue];

package/ios/utils/UIView+FirstResponder.h

@@ -0,0 +1,15 @@
+//
+//  Created by Jovanni Lo (@lodev09)
+//  Copyright (c) 2024-present. All rights reserved.
+//
+//  This source code is licensed under the MIT license found in the
+//  LICENSE file in the root directory of this source tree.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIView (FirstResponder)
+
+- (UIView *)findFirstResponder;
+
+@end

package/ios/utils/UIView+FirstResponder.mm

@@ -0,0 +1,26 @@
+//
+//  Created by Jovanni Lo (@lodev09)
+//  Copyright (c) 2024-present. All rights reserved.
+//
+//  This source code is licensed under the MIT license found in the
+//  LICENSE file in the root directory of this source tree.
+//
+
+#import "UIView+FirstResponder.h"
+
+@implementation UIView (FirstResponder)
+
+- (UIView *)findFirstResponder {
+  if (self.isFirstResponder) {
+    return self;
+  }
+  for (UIView *subview in self.subviews) {
+    UIView *firstResponder = [subview findFirstResponder];
+    if (firstResponder) {
+      return firstResponder;
+    }
+  }
+  return nil;
+}
+
+@end

package/package.json

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