@lodev09/react-native-true-sheet 3.11.17 → 3.11.18

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

@@ -264,6 +264,7 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
   private fun scrollToFocusedInput() {
     val scrollView = pinnedScrollView ?: findScrollView() ?: return
     val focusedView = findFocus() ?: return
+    if (!focusedView.isDescendantOf(scrollView)) return
 
     val focusedLocation = IntArray(2)
     val scrollViewLocation = IntArray(2)

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

@@ -23,12 +23,14 @@ object TrueSheetStackManager {
   }
 
   /**
-   * Returns the topmost presented and visible sheet.
+   * Returns the topmost presented and visible sheet, skipping sheets that are dismissing.
+   * A dismissing sheet can't parent a new one: its dim would suppress the child's own dim
+   * and then disappear with it, leaving the child undimmed.
    * Must be called within synchronized block.
    */
   private fun findTopmostSheet(): TrueSheetView? =
     presentedSheetStack.lastOrNull {
-      it.viewController.isPresented && it.viewController.isSheetVisible
+      it.viewController.run { isPresented && isSheetVisible && !isBeingDismissed }
     }
 
   /**

package/ios/TrueSheetContentView.mm

@@ -322,11 +322,12 @@ using namespace facebook::react;
 
   TrueSheetViewController *sheetController = _keyboardObserver.viewController;
   UIView *firstResponder = sheetController ? [sheetController.view findFirstResponder] : nil;
-  if (!firstResponder) {
+  UIScrollView *scrollView = _pinnedScrollView.scrollView;
+  // An input outside the scrollable (e.g. in the footer) can't be revealed by scrolling it
+  if (!firstResponder || ![firstResponder isDescendantOfView:scrollView]) {
     return;
   }
 
-  UIScrollView *scrollView = _pinnedScrollView.scrollView;
   CGRect targetRect = [firstResponder convertRect:firstResponder.bounds toView:scrollView];
 
   if ([firstResponder conformsToProtocol:@protocol(UITextInput)]) {

package/package.json

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