@lodev09/react-native-true-sheet 3.0.0-beta.7 → 3.0.0-beta.8

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

@@ -37,7 +37,7 @@ class TrueSheetViewManager :
 
   override fun onAfterUpdateTransaction(view: TrueSheetView) {
     super.onAfterUpdateTransaction(view)
-    view.showOrUpdate()
+    view.finalizeUpdates()
   }
 
   override fun addEventEmitters(reactContext: ThemedReactContext, view: TrueSheetView) {
@@ -97,9 +97,7 @@ class TrueSheetViewManager :
 
   @ReactProp(name = "cornerRadius", defaultDouble = -1.0)
   override fun setCornerRadius(view: TrueSheetView, radius: Double) {
-    if (radius >= 0) {
-      view.setCornerRadius(radius.dpToPx())
-    }
+    view.setCornerRadius(radius.dpToPx())
   }
 
   @ReactProp(name = "grabber", defaultBoolean = true)

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

@@ -0,0 +1,116 @@
+package com.lodev09.truesheet.core
+
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import com.facebook.react.bridge.ReactContext
+
+private const val RN_SCREENS_PACKAGE = "com.swmansion.rnscreens"
+
+/**
+ * Observes fragment lifecycle to detect react-native-screens modal presentation.
+ * Automatically notifies when modals are presented/dismissed.
+ */
+class RNScreensFragmentObserver(
+  private val reactContext: ReactContext,
+  private val onModalPresented: () -> Unit,
+  private val onModalDismissed: () -> Unit
+) {
+  private var fragmentLifecycleCallback: FragmentManager.FragmentLifecycleCallbacks? = null
+  private val activeModalFragments: MutableSet<Fragment> = mutableSetOf()
+
+  /**
+   * Check if there are active modal fragments being tracked.
+   */
+  fun hasActiveModals(): Boolean = activeModalFragments.isNotEmpty()
+
+  /**
+   * Start observing fragment lifecycle events.
+   */
+  fun start() {
+    val activity = reactContext.currentActivity as? AppCompatActivity ?: return
+    val fragmentManager = activity.supportFragmentManager
+
+    fragmentLifecycleCallback = object : FragmentManager.FragmentLifecycleCallbacks() {
+      override fun onFragmentAttached(fm: FragmentManager, fragment: Fragment, context: android.content.Context) {
+        super.onFragmentAttached(fm, fragment, context)
+
+        if (isModalFragment(fragment)) {
+          activeModalFragments.add(fragment)
+
+          // Notify when the first modal is attached
+          if (activeModalFragments.size == 1) {
+            onModalPresented()
+          }
+        }
+      }
+
+      override fun onFragmentStopped(fm: FragmentManager, fragment: Fragment) {
+        super.onFragmentStopped(fm, fragment)
+
+        if (activeModalFragments.contains(fragment)) {
+          activeModalFragments.remove(fragment)
+
+          // Notify when all modals are dismissed
+          if (activeModalFragments.isEmpty()) {
+            onModalDismissed()
+          }
+        }
+      }
+    }
+
+    fragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallback!!, true)
+  }
+
+  /**
+   * Stop observing and cleanup.
+   */
+  fun stop() {
+    fragmentLifecycleCallback?.let { callback ->
+      val activity = reactContext.currentActivity as? AppCompatActivity
+      activity?.supportFragmentManager?.unregisterFragmentLifecycleCallbacks(callback)
+    }
+    fragmentLifecycleCallback = null
+    activeModalFragments.clear()
+  }
+
+  companion object {
+    /**
+     * Check if fragment is from react-native-screens.
+     */
+    private fun isScreensFragment(fragment: Fragment): Boolean = fragment.javaClass.name.startsWith(RN_SCREENS_PACKAGE)
+
+    /**
+     * Check if fragment is a react-native-screens modal (fullScreenModal, transparentModal, or formSheet).
+     * Uses reflection to check the fragment's screen.stackPresentation property.
+     */
+    private fun isModalFragment(fragment: Fragment): Boolean {
+      val className = fragment.javaClass.name
+
+      if (!isScreensFragment(fragment)) {
+        return false
+      }
+
+      // ScreenModalFragment is always a modal (used for formSheet with BottomSheetDialog)
+      if (className.contains("ScreenModalFragment")) {
+        return true
+      }
+
+      // For ScreenStackFragment, check the screen's stackPresentation via reflection
+      try {
+        val getScreenMethod = fragment.javaClass.getMethod("getScreen")
+        val screen = getScreenMethod.invoke(fragment) ?: return false
+
+        val getStackPresentationMethod = screen.javaClass.getMethod("getStackPresentation")
+        val stackPresentation = getStackPresentationMethod.invoke(screen) ?: return false
+
+        val presentationName = stackPresentation.toString()
+        return presentationName == "MODAL" ||
+          presentationName == "TRANSPARENT_MODAL" ||
+          presentationName == "FORM_SHEET"
+      } catch (e: Exception) {
+        return false
+      }
+    }
+  }
+}

package/android/src/main/java/com/lodev09/truesheet/utils/ScreenUtils.kt

@@ -89,14 +89,42 @@ object ScreenUtils {
   }
 
   /**
-   * Get the Y coordinate of a view in screen coordinates
+   * Get the screen width
    *
-   * @param view The view to get screen Y coordinate for
-   * @return Y coordinate in screen space
+   * @param context React context
+   * @return Screen width in pixels
    */
-  fun getScreenY(view: View): Int {
+  fun getScreenWidth(context: ReactContext): Int {
+    val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+      val windowMetrics = windowManager.currentWindowMetrics
+      windowMetrics.bounds.width()
+    } else {
+      val displayMetrics = DisplayMetrics()
+      @Suppress("DEPRECATION")
+      windowManager.defaultDisplay.getMetrics(displayMetrics)
+      displayMetrics.widthPixels
+    }
+  }
+
+  /**
+   * Get the location of a view in screen coordinates
+   *
+   * @param view The view to get screen location for
+   * @return IntArray with [x, y] coordinates in screen space
+   */
+  fun getScreenLocation(view: View): IntArray {
     val location = IntArray(2)
     view.getLocationOnScreen(location)
-    return location[1]
+    return location
   }
+
+  /**
+   * Get the Y coordinate of a view in screen coordinates
+   *
+   * @param view The view to get screen Y coordinate for
+   * @return Y coordinate in screen space
+   */
+  fun getScreenY(view: View): Int = getScreenLocation(view)[1]
 }

package/ios/TrueSheetContainerView.h

@@ -21,6 +21,14 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)containerViewContentDidChangeSize:(CGSize)newSize;
 
+@optional
+
+/**
+ * Called when the header size changes
+ * @param newSize The new size of the header
+ */
+- (void)containerViewHeaderDidChangeSize:(CGSize)newSize;
+
 @end
 
 @interface TrueSheetContainerView : RCTViewComponentView
@@ -30,20 +38,30 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, weak, nullable) id<TrueSheetContainerViewDelegate> delegate;
 
+/**
+ * Enable ScrollView pinning
+ */
+@property (nonatomic, assign) BOOL scrollViewPinningEnabled;
+
 /**
  * Returns the current content height
  */
 - (CGFloat)contentHeight;
 
+/**
+ * Returns the current header height
+ */
+- (CGFloat)headerHeight;
+
 /**
  * Updates footer layout constraints if needed
  */
 - (void)layoutFooter;
 
 /**
- * setup ScrollView pinning
+ * Setup ScrollView pinning
  */
-- (void)setupContentScrollViewPinning:(BOOL)pinned;
+- (void)setupContentScrollViewPinning;
 
 @end
 

package/ios/TrueSheetContainerView.mm

@@ -9,26 +9,32 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #import "TrueSheetContainerView.h"
+#import "TrueSheetContentView.h"
+#import "TrueSheetFooterView.h"
+#import "TrueSheetHeaderView.h"
+
 #import <react/renderer/components/TrueSheetSpec/ComponentDescriptors.h>
 #import <react/renderer/components/TrueSheetSpec/EventEmitters.h>
 #import <react/renderer/components/TrueSheetSpec/Props.h>
 #import <react/renderer/components/TrueSheetSpec/RCTComponentViewHelpers.h>
-#import "TrueSheetContentView.h"
-#import "TrueSheetFooterView.h"
 
 #import <React/RCTConversions.h>
 #import <React/RCTLog.h>
 
 using namespace facebook::react;
 
-@interface TrueSheetContainerView () <TrueSheetContentViewDelegate>
+@interface TrueSheetContainerView () <TrueSheetContentViewDelegate, TrueSheetHeaderViewDelegate>
 @end
 
 @implementation TrueSheetContainerView {
   TrueSheetContentView *_contentView;
+  TrueSheetHeaderView *_headerView;
   TrueSheetFooterView *_footerView;
+  BOOL _scrollViewPinningSet;
 }
 
+#pragma mark - Initialization
+
 + (ComponentDescriptorProvider)componentDescriptorProvider {
   return concreteComponentDescriptorProvider<TrueSheetContainerViewComponentDescriptor>();
 }
@@ -39,17 +45,20 @@ using namespace facebook::react;
     _props = defaultProps;
 
     self.backgroundColor = [UIColor clearColor];
-
     _contentView = nil;
+    _headerView = nil;
     _footerView = nil;
+    _scrollViewPinningSet = NO;
   }
   return self;
 }
 
+#pragma mark - Layout
+
 - (void)layoutSubviews {
   [super layoutSubviews];
 
-  // Override Yoga layout - fill the entire parent (controller's view)
+  // Override Yoga layout to fill parent (controller's view)
   if (self.superview) {
     CGRect parentBounds = self.superview.bounds;
     if (!CGRectEqualToRect(self.frame, parentBounds)) {
@@ -62,9 +71,12 @@ using namespace facebook::react;
   return _contentView ? _contentView.frame.size.height : 0;
 }
 
+- (CGFloat)headerHeight {
+  return _headerView ? _headerView.frame.size.height : 0;
+}
+
 - (void)layoutFooter {
   if (_footerView) {
-    // Force footer to reapply constraints on size change
     CGFloat height = _footerView.frame.size.height;
     if (height > 0) {
       [_footerView setupConstraintsWithHeight:height];
@@ -72,42 +84,70 @@ using namespace facebook::react;
   }
 }
 
-- (void)setupContentScrollViewPinning:(BOOL)pinned {
-  if (_contentView) {
-    [_contentView setupScrollViewPinning:pinned];
+- (void)setScrollViewPinningEnabled:(BOOL)scrollViewPinningEnabled {
+  _scrollViewPinningEnabled = scrollViewPinningEnabled;
+  _scrollViewPinningSet = YES;
+}
+
+- (void)setupContentScrollViewPinning {
+  if (_scrollViewPinningSet && _contentView) {
+    [_contentView setupScrollViewPinning:_scrollViewPinningEnabled withHeaderView:_headerView];
   }
 }
 
+#pragma mark - Child Component Mounting
+
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
   [super mountChildComponentView:childComponentView index:index];
 
-  // Handle content view mounting
   if ([childComponentView isKindOfClass:[TrueSheetContentView class]]) {
     if (_contentView != nil) {
       RCTLogWarn(@"TrueSheet: Container can only have one content component.");
       return;
     }
-
     _contentView = (TrueSheetContentView *)childComponentView;
     _contentView.delegate = self;
   }
 
-  // Handle footer view mounting
+  if ([childComponentView isKindOfClass:[TrueSheetHeaderView class]]) {
+    if (_headerView != nil) {
+      RCTLogWarn(@"TrueSheet: Container can only have one header component.");
+      return;
+    }
+    _headerView = (TrueSheetHeaderView *)childComponentView;
+    _headerView.delegate = self;
+
+    if (_contentView) {
+      [self setupContentScrollViewPinning];
+    }
+    [self headerViewDidChangeSize:_headerView.frame.size];
+  }
+
   if ([childComponentView isKindOfClass:[TrueSheetFooterView class]]) {
     if (_footerView != nil) {
       RCTLogWarn(@"TrueSheet: Container can only have one footer component.");
       return;
     }
-
     _footerView = (TrueSheetFooterView *)childComponentView;
   }
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
   if ([childComponentView isKindOfClass:[TrueSheetContentView class]]) {
+    _contentView.delegate = nil;
     _contentView = nil;
   }
 
+  if ([childComponentView isKindOfClass:[TrueSheetHeaderView class]]) {
+    _headerView.delegate = nil;
+    _headerView = nil;
+
+    if (_contentView) {
+      [self setupContentScrollViewPinning];
+    }
+    [self headerViewDidChangeSize:CGSizeZero];
+  }
+
   if ([childComponentView isKindOfClass:[TrueSheetFooterView class]]) {
     _footerView = nil;
   }
@@ -122,12 +162,19 @@ using namespace facebook::react;
 #pragma mark - TrueSheetContentViewDelegate
 
 - (void)contentViewDidChangeSize:(CGSize)newSize {
-  // Forward content size changes to host view for sheet resizing
   if ([self.delegate respondsToSelector:@selector(containerViewContentDidChangeSize:)]) {
     [self.delegate containerViewContentDidChangeSize:newSize];
   }
 }
 
+#pragma mark - TrueSheetHeaderViewDelegate
+
+- (void)headerViewDidChangeSize:(CGSize)newSize {
+  if ([self.delegate respondsToSelector:@selector(containerViewHeaderDidChangeSize:)]) {
+    [self.delegate containerViewHeaderDidChangeSize:newSize];
+  }
+}
+
 @end
 
 #endif

package/ios/TrueSheetContentView.h

@@ -31,9 +31,11 @@ NS_ASSUME_NONNULL_BEGIN
 - (RCTScrollViewComponentView *_Nullable)findScrollView;
 
 /**
- * setup ScrollView pinning
+ * Setup ScrollView pinning
+ * @param pinned Whether to pin the scroll view
+ * @param headerView Optional header view to pin below (can be nil)
  */
-- (void)setupScrollViewPinning:(BOOL)pinned;
+- (void)setupScrollViewPinning:(BOOL)pinned withHeaderView:(nullable UIView *)headerView;
 
 @end
 

package/ios/TrueSheetContentView.mm

@@ -53,98 +53,55 @@ using namespace facebook::react;
   }
 }
 
-- (void)unpinScrollView {
+- (void)unpinScrollViewFromParentView:(UIView *)parentView {
   // Unpin previous scroll view if exists
   if (_pinnedScrollView) {
-    [LayoutUtil unpinView:_pinnedScrollView];
+    [LayoutUtil unpinView:_pinnedScrollView fromParentView:parentView];
   }
 }
 
-- (void)setupScrollViewPinning:(BOOL)pinned {
+- (void)setupScrollViewPinning:(BOOL)pinned withHeaderView:(UIView *)headerView {
+  // Pin to container view (parent of content view)
+  UIView *containerView = self.superview;
+
   if (!pinned) {
-    [self unpinScrollView];
+    [self unpinScrollViewFromParentView:containerView];
+    _pinnedScrollView = nil;
     return;
   }
 
   // Auto-detect and pin scroll views for proper sheet scrolling behavior
-  // Pinning ensures ScrollView fills the sheet area and scrolls correctly with the sheet
-  UIView *topSibling = nil;
-  RCTScrollViewComponentView *scrollView = [self findScrollView:&topSibling];
-
-  if (scrollView && scrollView != _pinnedScrollView) {
-    [self unpinScrollView];
-
-    // Pin to container view to enable proper scrolling within the sheet
-    UIView *containerView = self.superview;
-    if (containerView) {
-      if (topSibling) {
-        // Pin ScrollView below the top sibling
-        [LayoutUtil pinView:scrollView
-               toParentView:containerView
-                withTopView:topSibling
-                      edges:UIRectEdgeLeft | UIRectEdgeRight | UIRectEdgeBottom];
-      } else {
-        // No top sibling, pin to all edges of container (original behavior)
-        [LayoutUtil pinView:scrollView toParentView:containerView edges:UIRectEdgeAll];
-      }
-
-      _pinnedScrollView = scrollView;
+  // Pinning ensures ScrollView fills the available area and scrolls correctly with the sheet
+  RCTScrollViewComponentView *scrollView = [self findScrollView];
+
+  if (scrollView && containerView) {
+    // Always unpin first to remove old constraints
+    [self unpinScrollViewFromParentView:containerView];
+
+    if (headerView) {
+      // Pin ScrollView below the header view
+      [LayoutUtil pinView:scrollView
+             toParentView:containerView
+              withTopView:headerView
+                    edges:UIRectEdgeLeft | UIRectEdgeRight | UIRectEdgeBottom];
+    } else {
+      // No header, pin to all edges of container
+      [LayoutUtil pinView:scrollView toParentView:containerView edges:UIRectEdgeAll];
     }
+
+    _pinnedScrollView = scrollView;
   }
 }
 
 - (RCTScrollViewComponentView *)findScrollView {
-  return [self findScrollView: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 = static_cast<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;
-            }
-          }
-        }
-      }
-
-      break;  // Found ScrollView, no need to continue
+      return (RCTScrollViewComponentView *)subview;
     }
   }
 
-  if (outTopSibling) {
-    *outTopSibling = topSibling;
-  }
-
-  return scrollView;
+  return nil;
 }
 
 - (void)prepareForRecycle {
@@ -152,7 +109,7 @@ using namespace facebook::react;
 
   // Remove scroll view constraints
   if (_pinnedScrollView) {
-    [LayoutUtil unpinView:_pinnedScrollView];
+    [LayoutUtil unpinView:_pinnedScrollView fromParentView:self.superview];
     _pinnedScrollView = nil;
   }
 }

package/ios/TrueSheetFooterView.mm

@@ -48,7 +48,7 @@ using namespace facebook::react;
   }
 
   // Remove existing constraints before applying new ones
-  [LayoutUtil unpinView:self];
+  [LayoutUtil unpinView:self fromParentView:parentView];
 
   // Pin footer to bottom and sides of container with specific height
   [LayoutUtil pinView:self
@@ -90,7 +90,7 @@ using namespace facebook::react;
   [super prepareForRecycle];
 
   // Remove footer constraints
-  [LayoutUtil unpinView:self];
+  [LayoutUtil unpinView:self fromParentView:self.superview];
 
   _lastHeight = 0;
   _didInitialLayout = NO;

package/ios/TrueSheetHeaderView.h

@@ -0,0 +1,29 @@
+//
+//  Created by Jovanni Lo (@lodev09)
+//  Copyright (c) 2024-present. All rights reserved.
+//
+//  This source code is licensed under the MIT license found in the
+//  LICENSE file in the root directory of this source tree.
+//
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol TrueSheetHeaderViewDelegate <NSObject>
+@optional
+- (void)headerViewDidChangeSize:(CGSize)size;
+@end
+
+@interface TrueSheetHeaderView : RCTViewComponentView
+
+@property (nonatomic, weak, nullable) id<TrueSheetHeaderViewDelegate> delegate;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif

package/ios/TrueSheetHeaderView.mm

@@ -0,0 +1,60 @@
+//
+//  Created by Jovanni Lo (@lodev09)
+//  Copyright (c) 2024-present. All rights reserved.
+//
+//  This source code is licensed under the MIT license found in the
+//  LICENSE file in the root directory of this source tree.
+//
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "TrueSheetHeaderView.h"
+#import <react/renderer/components/TrueSheetSpec/ComponentDescriptors.h>
+#import <react/renderer/components/TrueSheetSpec/EventEmitters.h>
+#import <react/renderer/components/TrueSheetSpec/Props.h>
+#import <react/renderer/components/TrueSheetSpec/RCTComponentViewHelpers.h>
+#import "utils/LayoutUtil.h"
+
+using namespace facebook::react;
+
+@implementation TrueSheetHeaderView {
+  CGSize _lastSize;
+}
+
++ (ComponentDescriptorProvider)componentDescriptorProvider {
+  return concreteComponentDescriptorProvider<TrueSheetHeaderViewComponentDescriptor>();
+}
+
+- (instancetype)initWithFrame:(CGRect)frame {
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const TrueSheetHeaderViewProps>();
+    _props = defaultProps;
+
+    _lastSize = CGSizeZero;
+  }
+  return self;
+}
+
+- (void)updateLayoutMetrics:(const facebook::react::LayoutMetrics &)layoutMetrics
+           oldLayoutMetrics:(const facebook::react::LayoutMetrics &)oldLayoutMetrics {
+  [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
+
+  CGSize newSize = CGSizeMake(layoutMetrics.frame.size.width, layoutMetrics.frame.size.height);
+
+  // Notify delegate when header size changes
+  if (!CGSizeEqualToSize(newSize, _lastSize)) {
+    _lastSize = newSize;
+    if ([self.delegate respondsToSelector:@selector(headerViewDidChangeSize:)]) {
+      [self.delegate headerViewDidChangeSize:newSize];
+    }
+  }
+}
+
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  _lastSize = CGSizeZero;
+}
+
+@end
+
+#endif