@lodev09/react-native-true-sheet 3.6.7 → 3.6.9

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

@@ -2,6 +2,7 @@ package com.lodev09.truesheet
 
 import android.annotation.SuppressLint
 import android.view.View
+import android.view.ViewGroup
 import android.view.ViewStructure
 import android.view.accessibility.AccessibilityEvent
 import androidx.annotation.UiThread
@@ -64,6 +65,9 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   // Debounce flag to coalesce rapid layout changes into a single sheet update
   private var isSheetUpdatePending: Boolean = false
 
+  // Root container for the coordinator layout (activity or Modal dialog content view)
+  private var rootContainerView: ViewGroup? = null
+
   // ==================== Initialization ====================
 
   init {
@@ -131,6 +135,11 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     val child = getChildAt(index)
     if (child is TrueSheetContainerView) {
       child.delegate = null
+
+      // Dismiss the sheet when container is removed
+      if (viewController.isPresented) {
+        viewController.dismiss(animated = false)
+      }
     }
     viewController.removeView(child)
   }
@@ -155,14 +164,12 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   fun onDropInstance() {
     reactContext.removeLifecycleEventListener(this)
 
-    if (viewController.isPresented) {
-      viewController.dismiss(animated = false)
-    }
+    viewController.dismiss()
+    viewController.delegate = null
 
     TrueSheetModule.unregisterView(id)
     TrueSheetStackManager.removeSheet(this)
 
-    viewController.delegate = null
     didInitiallyPresent = false
   }
 
@@ -265,6 +272,10 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   @UiThread
   fun present(detentIndex: Int, animated: Boolean = true, promiseCallback: () -> Unit) {
     if (!viewController.isPresented) {
+      // Attach coordinator to the root container
+      rootContainerView = findRootContainerView()
+      viewController.coordinatorLayout?.let { rootContainerView?.addView(it) }
+
       // Register with observer to track sheet stack hierarchy
       viewController.parentSheetView = TrueSheetStackManager.onSheetWillPresent(this, detentIndex)
     }
@@ -390,6 +401,10 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   }
 
   override fun viewControllerDidDismiss(hadParent: Boolean) {
+    // Detach coordinator from the root container view
+    viewController.coordinatorLayout?.let { rootContainerView?.removeView(it) }
+    rootContainerView = null
+
     val surfaceId = UIManagerHelper.getSurfaceId(this)
     eventDispatcher?.dispatchEvent(DidDismissEvent(surfaceId, id))
 
@@ -464,4 +479,25 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     // Footer changes don't affect detents, only reposition it
     viewController.positionFooter()
   }
+
+  // ==================== Private Helpers ====================
+
+  /**
+   * Find the root container view for presenting the sheet.
+   * This traverses up the view hierarchy to find the content view (android.R.id.content)
+   * of whichever window this view is in - whether that's the activity's window or a
+   * Modal's dialog window.
+   */
+  private fun findRootContainerView(): ViewGroup? {
+    var current: android.view.ViewParent? = parent
+
+    while (current != null) {
+      if (current is ViewGroup && current.id == android.R.id.content) {
+        return current
+      }
+      current = current.parent
+    }
+
+    return reactContext.currentActivity?.findViewById(android.R.id.content)
+  }
 }

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

@@ -110,7 +110,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   // CoordinatorLayout components (replaces DialogFragment)
   internal var sheetView: TrueSheetBottomSheetView? = null
-  private var coordinatorLayout: TrueSheetCoordinatorLayout? = null
+  internal var coordinatorLayout: TrueSheetCoordinatorLayout? = null
   private var dimView: TrueSheetDimView? = null
   private var parentDimView: TrueSheetDimView? = null
 
@@ -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
 
@@ -303,9 +310,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     cleanupBackCallback()
     sheetView?.animate()?.cancel()
 
-    // Remove from activity
-    removeFromActivity()
-
     // Cleanup dim views
     dimView?.detach()
     dimView = null
@@ -323,19 +327,12 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     isPresented = false
     isSheetVisible = false
     wasHiddenByModal = false
-    isKeyboardTransitioning = false
     isPresentAnimating = false
     lastEmittedPositionPx = -1
     detentIndexBeforeKeyboard = -1
     shouldAnimatePresent = true
   }
 
-  private fun removeFromActivity() {
-    val coordinator = coordinatorLayout ?: return
-    val contentView = reactContext.currentActivity?.findViewById<ViewGroup>(android.R.id.content)
-    contentView?.removeView(coordinator)
-  }
-
   // =============================================================================
   // MARK: - Back Button Handling
   // =============================================================================
@@ -603,15 +600,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       // Setup sheet in coordinator layout
       setupSheetInCoordinator(coordinator, sheet)
 
-      // Add coordinator to activity
-      val activity = reactContext.currentActivity ?: run {
-        RNLog.w(reactContext, "TrueSheet: No activity available for presentation.")
-        return
-      }
-
-      val contentView = activity.findViewById<ViewGroup>(android.R.id.content)
-      contentView?.addView(coordinator)
-
       emitWillPresentEvents()
 
       setupSheetDetents()
@@ -890,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() {
@@ -904,7 +894,6 @@ 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()
@@ -912,7 +901,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
         }
 
         override fun keyboardWillHide() {
-          if (!shouldHandleKeyboard()) return
+          if (!shouldHandleKeyboard(checkFocus = false)) return
+
           setupSheetDetents()
           if (!isDismissing && detentIndexBeforeKeyboard >= 0) {
             setStateForDetentIndex(detentIndexBeforeKeyboard)
@@ -920,9 +910,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
           }
         }
 
-        override fun keyboardDidHide() {
-          isKeyboardTransitioning = false
-        }
+        override fun keyboardDidHide() {}
 
         override fun keyboardDidChangeHeight(height: Int) {
           if (!shouldHandleKeyboard()) return

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

@@ -31,6 +31,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 +94,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 +117,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 +150,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 +159,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()

package/ios/TrueSheetFooterView.mm

@@ -22,6 +22,7 @@ using namespace facebook::react;
   CGFloat _lastHeight;
   BOOL _didInitialLayout;
   NSLayoutConstraint *_bottomConstraint;
+  CGFloat _currentKeyboardOffset;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
@@ -39,6 +40,7 @@ using namespace facebook::react;
     _lastHeight = 0;
     _didInitialLayout = NO;
     _bottomConstraint = nil;
+    _currentKeyboardOffset = 0;
   }
   return self;
 }
@@ -59,8 +61,9 @@ using namespace facebook::react;
   [self.leadingAnchor constraintEqualToAnchor:parentView.leadingAnchor].active = YES;
   [self.trailingAnchor constraintEqualToAnchor:parentView.trailingAnchor].active = YES;
 
-  // Store bottom constraint for keyboard adjustment
-  _bottomConstraint = [self.bottomAnchor constraintEqualToAnchor:parentView.bottomAnchor];
+  // Store bottom constraint for keyboard adjustment, preserving current keyboard offset
+  _bottomConstraint = [self.bottomAnchor constraintEqualToAnchor:parentView.bottomAnchor
+                                                        constant:-_currentKeyboardOffset];
   _bottomConstraint.active = YES;
 
   // Apply height constraint
@@ -109,6 +112,7 @@ using namespace facebook::react;
   _lastHeight = 0;
   _didInitialLayout = NO;
   _bottomConstraint = nil;
+  _currentKeyboardOffset = 0;
 }
 
 #pragma mark - Keyboard Handling
@@ -163,6 +167,9 @@ using namespace facebook::react;
   // Cap to ensure we don't go negative
   CGFloat bottomOffset = MAX(0, keyboardHeight);
 
+  // Store the current keyboard offset so it persists through constraint recreation
+  _currentKeyboardOffset = bottomOffset;
+
   [UIView animateWithDuration:duration
                         delay:0
                       options:curve | UIViewAnimationOptionBeginFromCurrentState

package/ios/TrueSheetView.mm

@@ -96,7 +96,12 @@ using namespace facebook::react;
 
 - (void)dealloc {
   if (_controller && _controller.presentingViewController) {
-    [_controller dismissViewControllerAnimated:NO completion:nil];
+    // Find the root presenting controller to dismiss the entire stack
+    UIViewController *root = _controller.presentingViewController;
+    while (root.presentingViewController != nil) {
+      root = root.presentingViewController;
+    }
+    [root dismissViewControllerAnimated:YES completion:nil];
   }
 
   _controller.delegate = nil;
@@ -258,10 +263,6 @@ using namespace facebook::react;
 - (void)prepareForRecycle {
   [super prepareForRecycle];
 
-  if (_controller && _controller.presentingViewController) {
-    [_controller dismissViewControllerAnimated:YES completion:nil];
-  }
-
   [TrueSheetModule unregisterViewWithTag:@(self.tag)];
 
   _lastStateSize = CGSizeZero;

package/package.json

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