@lodev09/react-native-true-sheet 3.10.0-beta.0 → 3.10.0-beta.1

package/README.md

@@ -15,6 +15,7 @@ The true native bottom sheet experience for your React Native Apps. 💩
 * 🚀 **Fully Native** - Implemented in the native realm, zero JS hacks
 * ♿ **Accessible** - Native accessibility and screen reader support out of the box
 * 🔄 **Flexible API** - Use [imperative methods](https://sheet.lodev09.com/reference/methods#ref-methods) or [lifecycle events](https://sheet.lodev09.com/reference/events)
+* ⌨️ **Keyboard Handling** - Built-in [keyboard handling](https://sheet.lodev09.com/guides/keyboard) with automatic adjustment
 * 📐 **Side Sheets** - Native [side sheet](https://sheet.lodev09.com/guides/side-sheets) support for iPad and Android tablets
 * 🪟 **Liquid Glass** - [iOS 26+ Liquid Glass](https://sheet.lodev09.com/guides/liquid-glass) support out of the box, featured in [Expo Blog](https://expo.dev/blog/how-to-create-apple-maps-style-liquid-glass-sheets)
 * 🐎 **Reanimated** - First-class support for [react-native-reanimated](https://sheet.lodev09.com/guides/reanimated)

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

@@ -119,9 +119,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
     if (child is TrueSheetContainerView) {
       child.delegate = this
-      viewController.createSheet()
-      setupScrollable()
-
       val surfaceId = UIManagerHelper.getSurfaceId(this)
       eventDispatcher?.dispatchEvent(MountEvent(surfaceId, id))
     }
@@ -349,11 +346,8 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
       return
     }
 
-    if (viewController.coordinatorLayout == null || viewController.sheetView == null) {
-      RNLog.w(reactContext, "TrueSheet: sheet is not ready. Ensure it is mounted before presenting.")
-      promiseCallback()
-      return
-    }
+    viewController.createSheet()
+    setupScrollable()
 
     // Dismiss keyboard if focused view is within a sheet or if target detent will be dimmed
     val parentSheet = TrueSheetStackManager.getTopmostSheet()

package/ios/TrueSheetContentView.mm

@@ -216,15 +216,18 @@ using namespace facebook::react;
                    animations:^{
                      [self setScrollViewContentInset:height
                                       indicatorInset:self->_originalIndicatorBottomInset + height];
-
-                     if (firstResponder) {
-                       CGRect responderFrame = [firstResponder convertRect:firstResponder.bounds
-                                                                    toView:self->_pinnedScrollView.scrollView];
-                       responderFrame.size.height += self.keyboardScrollOffset;
-                       [self->_pinnedScrollView.scrollView scrollRectToVisible:responderFrame animated:NO];
-                     }
                    }
                    completion:nil];
+
+  // Defer scroll until the next run loop so content insets are applied first
+  if (firstResponder) {
+    dispatch_async(dispatch_get_main_queue(), ^{
+      CGRect responderFrame = [firstResponder convertRect:firstResponder.bounds
+                                                   toView:self->_pinnedScrollView.scrollView];
+      responderFrame.size.height += self.keyboardScrollOffset;
+      [self->_pinnedScrollView.scrollView scrollRectToVisible:responderFrame animated:YES];
+    });
+  }
 }
 
 - (void)keyboardWillHide:(NSTimeInterval)duration curve:(UIViewAnimationOptions)curve {

package/ios/TrueSheetView.mm

@@ -261,11 +261,7 @@ using namespace facebook::react;
   _insetAdjustment = (NSInteger)newProps.insetAdjustment;
   _controller.insetAdjustment = _insetAdjustment;
 
-  if (_containerView) {
-    _containerView.scrollableEnabled = _scrollable;
-    _containerView.insetAdjustment = _insetAdjustment;
-    _containerView.scrollableOptions = _scrollableOptions;
-  }
+  [self setupScrollable];
 }
 
 - (void)updateState:(const State::Shared &)state oldState:(const State::Shared &)oldState {
@@ -314,9 +310,7 @@ using namespace facebook::react;
   if (!(updateMask & RNComponentViewUpdateMaskProps) || !_controller)
     return;
 
-  if (_containerView) {
-    [_containerView setupScrollable];
-  }
+  [self setupScrollable];
 
   if (_controller.isPresented) {
     [self applySheetPropsUpdate];
@@ -384,11 +378,6 @@ using namespace facebook::react;
     _controller.headerHeight = @(headerHeight);
   }
 
-  _containerView.scrollableEnabled = _scrollable;
-  _containerView.insetAdjustment = _insetAdjustment;
-  _containerView.scrollableOptions = _scrollableOptions;
-  [_containerView setupScrollable];
-
   if (_eventEmitter) {
     [TrueSheetLifecycleEvents emitMount:_eventEmitter];
   } else {
@@ -449,6 +438,8 @@ using namespace facebook::react;
   [_controller setupSheetDetents];
   [_controller setupActiveDetentWithIndex:index];
 
+  [self setupScrollable];
+
   [_screensEventObserver capturePresenterScreenFromView:self];
   [_screensEventObserver startObservingWithState:_state.get()->getData()];
 
@@ -575,7 +566,7 @@ using namespace facebook::react;
 
 // When the ScrollView changes (e.g. conditional remount), re-pin the new ScrollView.
 - (void)containerViewScrollViewDidChange {
-  [_containerView setupScrollable];
+  [self setupScrollable];
 }
 
 #pragma mark - TrueSheetViewControllerDelegate
@@ -697,6 +688,16 @@ using namespace facebook::react;
 
 #pragma mark - Private Helpers
 
+- (void)setupScrollable {
+  if (!_containerView)
+    return;
+
+  _containerView.scrollableEnabled = _scrollable;
+  _containerView.insetAdjustment = _insetAdjustment;
+  _containerView.scrollableOptions = _scrollableOptions;
+  [_containerView setupScrollable];
+}
+
 - (void)applySheetPropsUpdate {
   BOOL pendingLayoutUpdate = _pendingLayoutUpdate;
   _pendingLayoutUpdate = NO;

package/package.json

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