@lodev09/react-native-true-sheet 3.5.2 → 3.5.4

package/ios/TrueSheetContentView.mm

@@ -14,6 +14,7 @@
 #import <react/renderer/components/TrueSheetSpec/EventEmitters.h>
 #import <react/renderer/components/TrueSheetSpec/Props.h>
 #import <react/renderer/components/TrueSheetSpec/RCTComponentViewHelpers.h>
+#import "TrueSheetView.h"
 #import "TrueSheetViewController.h"
 #import "utils/LayoutUtil.h"
 
@@ -128,6 +129,9 @@ using namespace facebook::react;
 
 - (RCTScrollViewComponentView *)findScrollViewInSubviews:(NSArray<UIView *> *)subviews {
   for (UIView *subview in subviews) {
+    if ([subview isKindOfClass:TrueSheetView.class]) {
+      continue;
+    }
     if ([subview isKindOfClass:RCTScrollViewComponentView.class]) {
       return (RCTScrollViewComponentView *)subview;
     }
@@ -161,7 +165,7 @@ using namespace facebook::react;
     CGFloat closestDistance = CGFLOAT_MAX;
 
     for (UIView *sibling in self.subviews) {
-      if (sibling == scrollView) {
+      if (sibling == scrollView || [sibling isKindOfClass:TrueSheetView.class]) {
         continue;
       }
 

package/ios/TrueSheetView.mm

@@ -51,6 +51,7 @@ using namespace facebook::react;
   BOOL _initialDetentAnimated;
   BOOL _isSheetUpdatePending;
   BOOL _pendingLayoutUpdate;
+  BOOL _pendingInitialPresentation;
 }
 
 #pragma mark - Initialization
@@ -73,6 +74,7 @@ using namespace facebook::react;
     _initialDetentAnimated = YES;
     _scrollable = NO;
     _isSheetUpdatePending = NO;
+    _pendingInitialPresentation = NO;
   }
   return self;
 }
@@ -87,6 +89,9 @@ using namespace facebook::react;
   if (self.tag > 0) {
     [TrueSheetModule registerView:self withTag:@(self.tag)];
   }
+
+  // Handle pending initial presentation after view is in window hierarchy
+  [self presentInitialDetentIfNeeded];
 }
 
 - (void)dealloc {
@@ -247,7 +252,8 @@ using namespace facebook::react;
     [_controller setupDraggable];
   } else if (_initialDetentIndex >= 0) {
     _pendingLayoutUpdate = NO;
-    [self presentAtIndex:_initialDetentIndex animated:_initialDetentAnimated completion:nil];
+    _pendingInitialPresentation = YES;
+    [self presentInitialDetentIfNeeded];
   }
 }
 
@@ -495,6 +501,14 @@ using namespace facebook::react;
 
 #pragma mark - Private Helpers
 
+- (void)presentInitialDetentIfNeeded {
+  if (!_pendingInitialPresentation || _initialDetentIndex < 0 || _controller.isPresented || !self.window)
+    return;
+
+  _pendingInitialPresentation = NO;
+  [self presentAtIndex:_initialDetentIndex animated:_initialDetentAnimated completion:nil];
+}
+
 - (UIViewController *)findPresentingViewController {
   UIWindow *keyWindow = [WindowUtil keyWindow];
   if (!keyWindow)

package/package.json

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