@lodev09/react-native-true-sheet 3.0.0-beta.11 → 3.0.0-beta.12

package/ios/TrueSheetContentView.mm

@@ -126,46 +126,53 @@ using namespace facebook::react;
   }
 }
 
+- (RCTScrollViewComponentView *)findScrollViewInSubviews:(NSArray<UIView *> *)subviews {
+  for (UIView *subview in subviews) {
+    if ([subview isKindOfClass:RCTScrollViewComponentView.class]) {
+      return (RCTScrollViewComponentView *)subview;
+    }
+  }
+  return nil;
+}
+
 - (RCTScrollViewComponentView *)findScrollView:(UIView **)outTopSibling {
   if (self.subviews.count == 0) {
     return nil;
   }
 
-  RCTScrollViewComponentView *scrollView = nil;
   UIView *topSibling = nil;
 
   // Check first-level children for scroll views (ScrollView or FlatList)
-  for (UIView *subview in self.subviews) {
-    if ([subview isKindOfClass:RCTScrollViewComponentView.class]) {
-      scrollView = (RCTScrollViewComponentView *)subview;
-
-      // Find the view positioned directly above this ScrollView by frame position
-      if (self.subviews.count > 1) {
-        CGFloat scrollViewTop = CGRectGetMinY(scrollView.frame);
-        CGFloat closestDistance = CGFLOAT_MAX;
-
-        for (UIView *sibling in self.subviews) {
-          // Skip the ScrollView itself
-          if (sibling == scrollView) {
-            continue;
-          }
-
-          CGFloat siblingBottom = CGRectGetMaxY(sibling.frame);
-
-          // Check if this sibling is positioned above the ScrollView
-          if (siblingBottom <= scrollViewTop) {
-            CGFloat distance = scrollViewTop - siblingBottom;
-
-            // Find the closest view above (smallest distance)
-            if (distance < closestDistance) {
-              closestDistance = distance;
-              topSibling = sibling;
-            }
-          }
-        }
+  RCTScrollViewComponentView *scrollView = [self findScrollViewInSubviews:self.subviews];
+
+  // If not found, check second level (grandchildren)
+  if (!scrollView) {
+    for (UIView *subview in self.subviews) {
+      scrollView = [self findScrollViewInSubviews:subview.subviews];
+      if (scrollView) {
+        break;
       }
+    }
+  }
 
-      break;  // Found ScrollView, no need to continue
+  // Find the view positioned directly above the ScrollView (only for first-level)
+  if (scrollView && scrollView.superview == self && self.subviews.count > 1) {
+    CGFloat scrollViewTop = CGRectGetMinY(scrollView.frame);
+    CGFloat closestDistance = CGFLOAT_MAX;
+
+    for (UIView *sibling in self.subviews) {
+      if (sibling == scrollView) {
+        continue;
+      }
+
+      CGFloat siblingBottom = CGRectGetMaxY(sibling.frame);
+      if (siblingBottom <= scrollViewTop) {
+        CGFloat distance = scrollViewTop - siblingBottom;
+        if (distance < closestDistance) {
+          closestDistance = distance;
+          topSibling = sibling;
+        }
+      }
     }
   }
 

package/package.json

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