@lodev09/react-native-true-sheet 3.9.0-beta.2 → 3.9.0-beta.3

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

@@ -528,6 +528,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     when (newState) {
       BottomSheetBehavior.STATE_DRAGGING -> handleDragBegin(sheetView)
 
+      BottomSheetBehavior.STATE_SETTLING -> handleSettling(sheetView)
+
       BottomSheetBehavior.STATE_EXPANDED,
       BottomSheetBehavior.STATE_COLLAPSED,
       BottomSheetBehavior.STATE_HALF_EXPANDED -> handleStateSettled(sheetView, newState)
@@ -581,7 +583,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
         val detent = detentCalculator.getDetentValueForIndex(detentInfo.index)
         delegate?.viewControllerDidDragEnd(detentInfo.index, detentInfo.position, detent)
 
-        if (detentInfo.index != currentDetentIndex) {
+        // Skip detent change if keyboard inset is still active — detent mapping is unreliable.
+        // keyboardWillHide will recalculate detents and settle at the correct index.
+        if (detentInfo.index != currentDetentIndex && keyboardInset == 0) {
           currentDetentIndex = detentInfo.index
           setupDimmedBackground()
           delegate?.viewControllerDidChangeDetent(detentInfo.index, detentInfo.position, detent)
@@ -713,6 +717,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       return
     }
 
+    // Commit the new index so keyboardWillHide restores to it instead of the stale one
+    if (detentIndexBeforeKeyboard >= 0) {
+      detentIndexBeforeKeyboard = detentIndex
+    }
+
     setupDimmedBackground()
     setStateForDetentIndex(detentIndex)
     resizePromise?.invoke()
@@ -1015,7 +1024,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
         override fun keyboardWillHide() {
           if (!shouldHandleKeyboard(checkFocus = false)) return
-
           setupSheetDetents()
           if (!isBeingDismissed && detentIndexBeforeKeyboard >= 0) {
             setStateForDetentIndex(detentIndexBeforeKeyboard)
@@ -1062,14 +1070,50 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     detentCalculator.getPositionDp(detentCalculator.getVisibleSheetHeight(sheetView.top))
 
   private fun handleDragBegin(sheetView: View) {
+    detentIndexBeforeKeyboard = -1
+
     val position = getPositionDpForView(sheetView)
     val detent = detentCalculator.getDetentValueForIndex(currentDetentIndex)
     delegate?.viewControllerDidDragBegin(currentDetentIndex, position, detent)
     interactionState = InteractionState.Dragging(startTop = sheetView.top)
   }
 
+  private fun handleSettling(sheetView: View) {
+    if (interactionState !is InteractionState.Dragging) return
+    if (keyboardInset <= 0) return
+
+    // After drag release, check if the sheet was dragged past the midpoint between the
+    // keyboard-expanded position and a non-keyboard detent position. If so, dismiss
+    // keyboard and commit to that detent.
+    val maxAvailableHeight = realScreenHeight - topInset
+    val keyboardHeight = minOf(detentCalculator.getDetentHeight(detents.last()), maxAvailableHeight)
+    val keyboardTop = realScreenHeight - keyboardHeight
+
+    for (i in detents.indices) {
+      val nonKeyboardHeight = minOf(detentCalculator.getDetentHeight(detents[i], includeKeyboard = false), maxAvailableHeight)
+      val nonKeyboardTop = realScreenHeight - nonKeyboardHeight
+      val midpoint = keyboardTop + (nonKeyboardTop - keyboardTop) / 2
+
+      if (sheetView.top >= midpoint) {
+        // Target position matches the keyboard-expanded position — keep keyboard open
+        if (nonKeyboardTop == keyboardTop) break
+
+        detentIndexBeforeKeyboard = -1
+        currentDetentIndex = i
+        dismissKeyboard()
+        setupDimmedBackground()
+
+        val position = getPositionDpForView(sheetView)
+        val detent = detentCalculator.getDetentValueForIndex(i)
+        delegate?.viewControllerDidChangeDetent(i, position, detent)
+        break
+      }
+    }
+  }
+
   private fun handleDragChange(sheetView: View) {
     if (interactionState !is InteractionState.Dragging) return
+
     val position = getPositionDpForView(sheetView)
     val detent = detentCalculator.getDetentValueForIndex(currentDetentIndex)
     delegate?.viewControllerDidDragChange(currentDetentIndex, position, detent)

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

@@ -39,7 +39,7 @@ class TrueSheetDetentCalculator(private val reactContext: ThemedReactContext) {
    * Calculate the height in pixels for a given detent value.
    * @param detent The detent value: -1.0 for content-fit, or 0.0-1.0 for screen fraction
    */
-  fun getDetentHeight(detent: Double): Int {
+  fun getDetentHeight(detent: Double, includeKeyboard: Boolean = true): Int {
     val baseHeight = if (detent == -1.0) {
       contentHeight + headerHeight + contentBottomInset
     } else {
@@ -49,7 +49,7 @@ class TrueSheetDetentCalculator(private val reactContext: ThemedReactContext) {
       (detent * screenHeight).toInt() + contentBottomInset
     }
 
-    val height = baseHeight + keyboardInset
+    val height = if (includeKeyboard) baseHeight + keyboardInset else baseHeight
     val maxAllowedHeight = screenHeight + contentBottomInset
     return maxContentHeight?.let { minOf(height, it, maxAllowedHeight) } ?: minOf(height, maxAllowedHeight)
   }

package/ios/TrueSheetView.mm

@@ -291,6 +291,8 @@ using namespace facebook::react;
   stateData.containerHeight = static_cast<float>(size.height);
 
 #if REACT_NATIVE_VERSION_MINOR >= 82
+  // TODO: RN 0.82+ processes state updates in the same layout pass (synchronous).
+  // Once stable, we can drop native layout constraints in favor of synchronous Yoga layout.
   _state->updateState(std::move(stateData), facebook::react::EventQueue::UpdateMode::unstable_Immediate);
 #else
   _state->updateState(std::move(stateData));
@@ -669,7 +671,12 @@ using namespace facebook::react;
 - (void)presenterScreenWillAppear {
   if (_dismissedByNavigation && !_controller.isPresented && !_controller.isBeingPresented) {
     _dismissedByNavigation = NO;
-    _pendingNavigationRepresent = YES;
+
+    if (self.window) {
+      [self presentAtIndex:_controller.activeDetentIndex animated:YES completion:nil];
+    } else {
+      _pendingNavigationRepresent = YES;
+    }
   }
 }
 

package/ios/core/RNScreensEventObserver.h

@@ -34,7 +34,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)stopObserving;
 
 - (void)capturePresenterScreenFromView:(UIView *)view;
-- (BOOL)shouldDismissForScreenTag:(NSInteger)screenTag;
 
 @end
 

package/ios/core/RNScreensEventObserver.mm

@@ -25,6 +25,8 @@ using namespace facebook::react;
   __weak UIViewController *_parentScreenController;
   __weak UIWindow *_window;
   BOOL _dismissedByNavigation;
+  BOOL _pendingInteractiveDismiss;
+  BOOL _pendingInteractiveAppear;
 }
 
 - (instancetype)init {
@@ -60,19 +62,44 @@ using namespace facebook::react;
 
       if (auto family = event.shadowNodeFamily.lock()) {
         Tag screenTag = family->getTag();
+        if (![strongSelf->_screenTags containsObject:@(screenTag)]) {
+          return false;
+        }
+
+        BOOL interactive = [strongSelf isInteractiveTransition];
 
         if (event.type == "topWillDisappear") {
-          if ([strongSelf->_screenTags containsObject:@(screenTag)]) {
-            if ([strongSelf shouldDismissForScreenTag:screenTag]) {
-              strongSelf->_dismissedByNavigation = YES;
-              [strongSelf.delegate presenterScreenWillDisappear];
-            }
+          if (interactive) {
+            strongSelf->_pendingInteractiveDismiss = YES;
+          } else if ([strongSelf shouldDismissForScreenTag:screenTag]) {
+            strongSelf->_dismissedByNavigation = YES;
+            [strongSelf.delegate presenterScreenWillDisappear];
+          }
+        } else if (event.type == "topDisappear") {
+          if (strongSelf->_pendingInteractiveDismiss) {
+            strongSelf->_pendingInteractiveDismiss = NO;
+            strongSelf->_dismissedByNavigation = YES;
+            [strongSelf.delegate presenterScreenWillDisappear];
           }
         } else if (event.type == "topWillAppear") {
-          if ([strongSelf->_screenTags containsObject:@(screenTag)] && strongSelf->_dismissedByNavigation) {
+          if (strongSelf->_dismissedByNavigation) {
+            if (interactive) {
+              strongSelf->_pendingInteractiveAppear = YES;
+            } else {
+              strongSelf->_dismissedByNavigation = NO;
+              [strongSelf.delegate presenterScreenWillAppear];
+            }
+          }
+          strongSelf->_pendingInteractiveDismiss = NO;
+        } else if (event.type == "topAppear") {
+          if (strongSelf->_pendingInteractiveAppear) {
+            strongSelf->_pendingInteractiveAppear = NO;
             strongSelf->_dismissedByNavigation = NO;
             [strongSelf.delegate presenterScreenWillAppear];
           }
+        } else if (event.type == "topGestureCancel") {
+          strongSelf->_pendingInteractiveDismiss = NO;
+          strongSelf->_pendingInteractiveAppear = NO;
         }
       }
       return false;
@@ -121,6 +148,11 @@ using namespace facebook::react;
   }
 }
 
+- (BOOL)isInteractiveTransition {
+  UINavigationController *navController = _presenterScreenController.navigationController;
+  return navController.transitionCoordinator.isInteractive;
+}
+
 - (BOOL)shouldDismissForScreenTag:(NSInteger)screenTag {
   // For parent screens (not immediate presenter), check if the presenter screen is being removed
   // This handles nested stack removal case

package/package.json

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