@lodev09/react-native-true-sheet 3.6.6 → 3.6.8

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 {
@@ -154,13 +158,16 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   fun onDropInstance() {
     reactContext.removeLifecycleEventListener(this)
-    TrueSheetModule.unregisterView(id)
-    TrueSheetStackManager.removeSheet(this)
 
     if (viewController.isPresented) {
       viewController.dismiss(animated = false)
     }
+
+    TrueSheetModule.unregisterView(id)
+    TrueSheetStackManager.removeSheet(this)
+
     viewController.delegate = null
+    didInitiallyPresent = false
   }
 
   /**
@@ -262,6 +269,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)
     }
@@ -387,6 +398,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))
 
@@ -461,4 +476,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
 
@@ -303,9 +303,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     cleanupBackCallback()
     sheetView?.animate()?.cancel()
 
-    // Remove from activity
-    removeFromActivity()
-
     // Cleanup dim views
     dimView?.detach()
     dimView = null
@@ -330,12 +327,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     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 +594,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()

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

@@ -258,13 +258,14 @@ using namespace facebook::react;
 - (void)prepareForRecycle {
   [super prepareForRecycle];
 
-  _lastStateSize = CGSizeZero;
-
   if (_controller && _controller.presentingViewController) {
     [_controller dismissViewControllerAnimated:YES completion:nil];
   }
 
   [TrueSheetModule unregisterViewWithTag:@(self.tag)];
+
+  _lastStateSize = CGSizeZero;
+  _didInitiallyPresent = NO;
 }
 
 #pragma mark - Child Component Mounting

package/package.json

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