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

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

@@ -67,7 +67,11 @@ class TrueSheetViewManager :
       DragBeginEvent.EVENT_NAME to hashMapOf("registrationName" to DragBeginEvent.REGISTRATION_NAME),
       DragChangeEvent.EVENT_NAME to hashMapOf("registrationName" to DragChangeEvent.REGISTRATION_NAME),
       DragEndEvent.EVENT_NAME to hashMapOf("registrationName" to DragEndEvent.REGISTRATION_NAME),
-      PositionChangeEvent.EVENT_NAME to hashMapOf("registrationName" to PositionChangeEvent.REGISTRATION_NAME)
+      PositionChangeEvent.EVENT_NAME to hashMapOf("registrationName" to PositionChangeEvent.REGISTRATION_NAME),
+      WillFocusEvent.EVENT_NAME to hashMapOf("registrationName" to WillFocusEvent.REGISTRATION_NAME),
+      FocusEvent.EVENT_NAME to hashMapOf("registrationName" to FocusEvent.REGISTRATION_NAME),
+      WillBlurEvent.EVENT_NAME to hashMapOf("registrationName" to WillBlurEvent.REGISTRATION_NAME),
+      BlurEvent.EVENT_NAME to hashMapOf("registrationName" to BlurEvent.REGISTRATION_NAME)
     )
 
   // ==================== Props ====================
@@ -110,6 +114,11 @@ class TrueSheetViewManager :
     view.setDismissible(dismissible)
   }
 
+  @ReactProp(name = "draggable", defaultBoolean = true)
+  override fun setDraggable(view: TrueSheetView, draggable: Boolean) {
+    view.setDraggable(draggable)
+  }
+
   @ReactProp(name = "dimmed", defaultBoolean = true)
   override fun setDimmed(view: TrueSheetView, dimmed: Boolean) {
     view.setDimmed(dimmed)
@@ -149,7 +158,16 @@ class TrueSheetViewManager :
   @ReactProp(name = "blurTint")
   override fun setBlurTint(view: TrueSheetView, tint: String?) {
     // iOS-specific prop - no-op on Android
-    view.setBlurTint(tint)
+  }
+
+  @ReactProp(name = "blurIntensity", defaultDouble = 1.0)
+  override fun setBlurIntensity(view: TrueSheetView, value: Double) {
+    // iOS-specific prop - no-op on Android
+  }
+
+  @ReactProp(name = "blurInteraction", defaultBoolean = false)
+  override fun setBlurInteraction(view: TrueSheetView, value: Boolean) {
+    // iOS-specific prop - no-op on Android
   }
 
   @ReactProp(name = "edgeToEdgeFullScreen", defaultBoolean = false)
@@ -157,8 +175,8 @@ class TrueSheetViewManager :
     view.setEdgeToEdgeFullScreen(edgeToEdgeFullScreen)
   }
 
-  @ReactProp(name = "fitScrollView", defaultBoolean = false)
-  override fun setFitScrollView(view: TrueSheetView, value: Boolean) {
+  @ReactProp(name = "scrollable", defaultBoolean = false)
+  override fun setScrollable(view: TrueSheetView, value: Boolean) {
     // iOS-specific prop - no-op on Android
   }
 

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

@@ -19,11 +19,6 @@ class RNScreensFragmentObserver(
   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.
    */

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

@@ -0,0 +1,67 @@
+package com.lodev09.truesheet.core
+
+import com.lodev09.truesheet.TrueSheetView
+
+/**
+ * Manages TrueSheet stacking behavior.
+ * Tracks presented sheets and handles visibility when sheets stack on top of each other.
+ */
+object TrueSheetDialogObserver {
+
+  private val presentedSheetStack = mutableListOf<TrueSheetView>()
+
+  /**
+   * Called when a sheet is about to be presented.
+   * Returns the visible parent sheet to stack on, or null if none.
+   */
+  @JvmStatic
+  fun onSheetWillPresent(sheetView: TrueSheetView, detentIndex: Int): TrueSheetView? {
+    synchronized(presentedSheetStack) {
+      val parentSheet = presentedSheetStack.lastOrNull()
+        ?.takeIf { it.viewController.isPresented && it.viewController.isDialogVisible }
+
+      // Hide parent if the new sheet would cover it
+      parentSheet?.let {
+        val parentTop = it.viewController.currentSheetTop
+        val newSheetTop = sheetView.viewController.getExpectedSheetTop(detentIndex)
+        if (!it.viewController.isExpanded && parentTop <= newSheetTop) {
+          it.viewController.hideDialog()
+        }
+      }
+
+      if (!presentedSheetStack.contains(sheetView)) {
+        presentedSheetStack.add(sheetView)
+      }
+
+      return parentSheet
+    }
+  }
+
+  /**
+   * Called when a sheet has been dismissed.
+   * Shows the parent sheet if this sheet was stacked on it.
+   */
+  @JvmStatic
+  fun onSheetDidDismiss(sheetView: TrueSheetView, hadParent: Boolean) {
+    synchronized(presentedSheetStack) {
+      presentedSheetStack.remove(sheetView)
+      if (hadParent) {
+        presentedSheetStack.lastOrNull()?.viewController?.showDialog()
+      }
+    }
+  }
+
+  @JvmStatic
+  fun removeSheet(sheetView: TrueSheetView) {
+    synchronized(presentedSheetStack) {
+      presentedSheetStack.remove(sheetView)
+    }
+  }
+
+  @JvmStatic
+  fun clear() {
+    synchronized(presentedSheetStack) {
+      presentedSheetStack.clear()
+    }
+  }
+}

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

@@ -0,0 +1,44 @@
+package com.lodev09.truesheet.core
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.GradientDrawable
+import android.view.Gravity
+import android.view.View
+import android.widget.FrameLayout
+import com.facebook.react.uimanager.PixelUtil.dpToPx
+
+/**
+ * Native grabber (drag handle) view for the bottom sheet.
+ * Displays a small pill-shaped indicator at the top of the sheet.
+ */
+@SuppressLint("ViewConstructor")
+class TrueSheetGrabberView(context: Context) : View(context) {
+
+  companion object {
+    private const val GRABBER_WIDTH = 32f // dp
+    private const val GRABBER_HEIGHT = 4f // dp
+    private const val GRABBER_TOP_MARGIN = 16f // dp
+    private val GRABBER_COLOR = Color.argb((0.4 * 255).toInt(), 73, 69, 79) // #49454F @ 40%
+  }
+
+  init {
+    layoutParams = FrameLayout.LayoutParams(
+      GRABBER_WIDTH.dpToPx().toInt(),
+      GRABBER_HEIGHT.dpToPx().toInt()
+    ).apply {
+      gravity = Gravity.CENTER_HORIZONTAL or Gravity.TOP
+      topMargin = GRABBER_TOP_MARGIN.dpToPx().toInt()
+    }
+
+    background = GradientDrawable().apply {
+      shape = GradientDrawable.RECTANGLE
+      cornerRadius = (GRABBER_HEIGHT / 2).dpToPx()
+      setColor(GRABBER_COLOR)
+    }
+
+    // High elevation to ensure grabber appears above content views
+    elevation = 100f
+  }
+}

package/android/src/main/java/com/lodev09/truesheet/events/TrueSheetDragEvents.kt

@@ -0,0 +1,71 @@
+package com.lodev09.truesheet.events
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+
+/**
+ * Fired when dragging begins
+ * Payload: { index: number, position: number, detent: number }
+ */
+class DragBeginEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float, private val detent: Float) :
+  Event<DragBeginEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap =
+    Arguments.createMap().apply {
+      putInt("index", index)
+      putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
+    }
+
+  companion object {
+    const val EVENT_NAME = "topDragBegin"
+    const val REGISTRATION_NAME = "onDragBegin"
+  }
+}
+
+/**
+ * Fired continuously during dragging
+ * Payload: { index: number, position: number, detent: number }
+ */
+class DragChangeEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float, private val detent: Float) :
+  Event<DragChangeEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap =
+    Arguments.createMap().apply {
+      putInt("index", index)
+      putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
+    }
+
+  companion object {
+    const val EVENT_NAME = "topDragChange"
+    const val REGISTRATION_NAME = "onDragChange"
+  }
+}
+
+/**
+ * Fired when dragging ends
+ * Payload: { index: number, position: number, detent: number }
+ */
+class DragEndEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float, private val detent: Float) :
+  Event<DragEndEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap =
+    Arguments.createMap().apply {
+      putInt("index", index)
+      putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
+    }
+
+  companion object {
+    const val EVENT_NAME = "topDragEnd"
+    const val REGISTRATION_NAME = "onDragEnd"
+  }
+}

package/android/src/main/java/com/lodev09/truesheet/events/TrueSheetFocusEvents.kt

@@ -0,0 +1,65 @@
+package com.lodev09.truesheet.events
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+
+/**
+ * Fired when the sheet is about to regain focus because a sheet on top of it is being dismissed
+ */
+class WillFocusEvent(surfaceId: Int, viewId: Int) : Event<WillFocusEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap = Arguments.createMap()
+
+  companion object {
+    const val EVENT_NAME = "topWillFocus"
+    const val REGISTRATION_NAME = "onWillFocus"
+  }
+}
+
+/**
+ * Fired when the sheet regains focus after a sheet on top of it is dismissed
+ */
+class FocusEvent(surfaceId: Int, viewId: Int) : Event<FocusEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap = Arguments.createMap()
+
+  companion object {
+    const val EVENT_NAME = "topDidFocus"
+    const val REGISTRATION_NAME = "onDidFocus"
+  }
+}
+
+/**
+ * Fired when the sheet is about to lose focus because another sheet is being presented on top of it
+ */
+class WillBlurEvent(surfaceId: Int, viewId: Int) : Event<WillBlurEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap = Arguments.createMap()
+
+  companion object {
+    const val EVENT_NAME = "topWillBlur"
+    const val REGISTRATION_NAME = "onWillBlur"
+  }
+}
+
+/**
+ * Fired when the sheet loses focus because another sheet is presented on top of it
+ */
+class BlurEvent(surfaceId: Int, viewId: Int) : Event<BlurEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap = Arguments.createMap()
+
+  companion object {
+    const val EVENT_NAME = "topDidBlur"
+    const val REGISTRATION_NAME = "onDidBlur"
+  }
+}

package/android/src/main/java/com/lodev09/truesheet/events/TrueSheetLifecycleEvents.kt

@@ -0,0 +1,94 @@
+package com.lodev09.truesheet.events
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+
+/**
+ * Fired when the sheet component is mounted and ready
+ */
+class MountEvent(surfaceId: Int, viewId: Int) : Event<MountEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap = Arguments.createMap()
+
+  companion object {
+    const val EVENT_NAME = "topMount"
+    const val REGISTRATION_NAME = "onMount"
+  }
+}
+
+/**
+ * Fired before the sheet is presented
+ * Payload: { index: number, position: number, detent: number }
+ */
+class WillPresentEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float, private val detent: Float) :
+  Event<WillPresentEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap =
+    Arguments.createMap().apply {
+      putInt("index", index)
+      putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
+    }
+
+  companion object {
+    const val EVENT_NAME = "topWillPresent"
+    const val REGISTRATION_NAME = "onWillPresent"
+  }
+}
+
+/**
+ * Fired after the sheet is presented
+ * Payload: { index: number, position: number, detent: number }
+ */
+class DidPresentEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float, private val detent: Float) :
+  Event<DidPresentEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap =
+    Arguments.createMap().apply {
+      putInt("index", index)
+      putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
+    }
+
+  companion object {
+    const val EVENT_NAME = "topDidPresent"
+    const val REGISTRATION_NAME = "onDidPresent"
+  }
+}
+
+/**
+ * Fired before the sheet is dismissed
+ */
+class WillDismissEvent(surfaceId: Int, viewId: Int) : Event<WillDismissEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap = Arguments.createMap()
+
+  companion object {
+    const val EVENT_NAME = "topWillDismiss"
+    const val REGISTRATION_NAME = "onWillDismiss"
+  }
+}
+
+/**
+ * Fired after the sheet is dismissed
+ */
+class DidDismissEvent(surfaceId: Int, viewId: Int) : Event<DidDismissEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap = Arguments.createMap()
+
+  companion object {
+    const val EVENT_NAME = "topDidDismiss"
+    const val REGISTRATION_NAME = "onDidDismiss"
+  }
+}

package/android/src/main/java/com/lodev09/truesheet/events/TrueSheetStateEvents.kt

@@ -0,0 +1,56 @@
+package com.lodev09.truesheet.events
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+
+/**
+ * Fired when the detent changes
+ * Payload: { index: number, position: number, detent: number }
+ */
+class DetentChangeEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float, private val detent: Float) :
+  Event<DetentChangeEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap =
+    Arguments.createMap().apply {
+      putInt("index", index)
+      putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
+    }
+
+  companion object {
+    const val EVENT_NAME = "topDetentChange"
+    const val REGISTRATION_NAME = "onDetentChange"
+  }
+}
+
+/**
+ * Fired continuously for position updates during drag and animation
+ * Payload: { index: number, position: number, detent: number, realtime: boolean }
+ */
+class PositionChangeEvent(
+  surfaceId: Int,
+  viewId: Int,
+  private val index: Float,
+  private val position: Float,
+  private val detent: Float,
+  private val realtime: Boolean = false
+) : Event<PositionChangeEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap =
+    Arguments.createMap().apply {
+      putDouble("index", index.toDouble())
+      putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
+      putBoolean("realtime", realtime)
+    }
+
+  companion object {
+    const val EVENT_NAME = "topPositionChange"
+    const val REGISTRATION_NAME = "onPositionChange"
+  }
+}

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

@@ -19,6 +19,18 @@ object ScreenUtils {
       context.resources.getIdentifier(name, "dimen", "android")
     ).takeIf { it > 0 } ?: 0
 
+  /**
+   * Get the WindowInsets for API 30+, or null for older APIs
+   */
+  private fun getWindowInsets(context: ReactContext): WindowInsets? {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+      return context.getSystemService(WindowManager::class.java)
+        ?.currentWindowMetrics
+        ?.windowInsets
+    }
+    return null
+  }
+
   /**
    * Get the status bar height
    *
@@ -26,20 +38,29 @@ object ScreenUtils {
    * @return Status bar height in pixels
    */
   fun getStatusBarHeight(context: ReactContext): Int {
-    // Modern approach using WindowInsets (API 30+)
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-      val windowManager = context.getSystemService(WindowManager::class.java)
-      val windowMetrics = windowManager?.currentWindowMetrics
-      val insets = windowMetrics?.windowInsets?.getInsetsIgnoringVisibility(WindowInsets.Type.statusBars())
-      if (insets != null) {
-        return insets.top
-      }
+      getWindowInsets(context)
+        ?.getInsetsIgnoringVisibility(WindowInsets.Type.statusBars())
+        ?.let { return it.top }
     }
-
-    // Fallback to legacy approach for older APIs
     return getIdentifierHeight(context, "status_bar_height")
   }
 
+  /**
+   * Get the navigation bar height (bottom inset)
+   *
+   * @param context React context
+   * @return Navigation bar height in pixels
+   */
+  fun getNavigationBarHeight(context: ReactContext): Int {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+      getWindowInsets(context)
+        ?.getInsetsIgnoringVisibility(WindowInsets.Type.navigationBars())
+        ?.let { return it.bottom }
+    }
+    return getIdentifierHeight(context, "navigation_bar_height")
+  }
+
   /**
    * Calculate the screen height
    *
@@ -55,36 +76,20 @@ object ScreenUtils {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
       context.display?.getRealMetrics(displayMetrics)
     } else {
+      @Suppress("DEPRECATION")
       windowManager.defaultDisplay.getMetrics(displayMetrics)
     }
 
     val screenHeight = displayMetrics.heightPixels
-    val statusBarHeight = getStatusBarHeight(context)
-
-    val hasNavigationBar = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-      context.getSystemService(WindowManager::class.java)
-        ?.currentWindowMetrics
-        ?.windowInsets
-        ?.isVisible(WindowInsets.Type.navigationBars()) ?: false
-    } else {
-      context.resources.getIdentifier("navigation_bar_height", "dimen", "android") > 0
-    }
-
-    val navigationBarHeight = if (hasNavigationBar) {
-      getIdentifierHeight(context, "navigation_bar_height")
-    } else {
-      0
-    }
 
     return if (edgeToEdge) {
-      // getRealMetrics includes navigation bar height
-      // windowManager.defaultDisplay.getMetrics doesn't
-      when (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-        true -> screenHeight
-        false -> screenHeight + navigationBarHeight
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        screenHeight
+      } else {
+        screenHeight + getNavigationBarHeight(context)
       }
     } else {
-      screenHeight - statusBarHeight - navigationBarHeight
+      screenHeight - getStatusBarHeight(context) - getNavigationBarHeight(context)
     }
   }
 
@@ -98,8 +103,7 @@ object ScreenUtils {
     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()
+      windowManager.currentWindowMetrics.bounds.width()
     } else {
       val displayMetrics = DisplayMetrics()
       @Suppress("DEPRECATION")

package/android/src/main/res/anim/true_sheet_slide_in.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="200"
+        android:fromYDelta="20%p"
+        android:toYDelta="0"
+        android:interpolator="@android:interpolator/fast_out_slow_in" />
+    <alpha
+        android:duration="200"
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0"
+        android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>

package/android/src/main/res/anim/true_sheet_slide_out.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="150"
+        android:fromYDelta="0"
+        android:toYDelta="20%p"
+        android:interpolator="@android:interpolator/fast_out_slow_in" />
+    <alpha
+        android:duration="150"
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0"
+        android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>

package/android/src/main/res/values/styles.xml

@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Custom BottomSheetDialog style with edge-to-edge enabled -->
+    <!-- Smooth slide animation for BottomSheetDialog -->
+    <style name="TrueSheetAnimation" parent="Animation.AppCompat.Dialog">
+        <item name="android:windowEnterAnimation">@anim/true_sheet_slide_in</item>
+        <item name="android:windowExitAnimation">@anim/true_sheet_slide_out</item>
+    </style>
+
+    <!-- Default BottomSheetDialog style with smooth animations -->
+    <style name="TrueSheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
+        <item name="android:windowAnimationStyle">@style/TrueSheetAnimation</item>
+    </style>
+
+    <!-- BottomSheetDialog style with edge-to-edge and smooth animations -->
     <style name="TrueSheetEdgeToEdgeEnabledDialog" parent="Theme.Design.Light.BottomSheetDialog">
         <item name="android:windowIsFloating">false</item>
         <item name="enableEdgeToEdge">true</item>
+        <item name="android:windowAnimationStyle">@style/TrueSheetAnimation</item>
     </style>
 </resources>

package/ios/TrueSheetContainerView.mm

@@ -167,6 +167,10 @@ using namespace facebook::react;
   }
 }
 
+- (void)contentViewDidChangeChildren {
+  [self setupContentScrollViewPinning];
+}
+
 #pragma mark - TrueSheetHeaderViewDelegate
 
 - (void)headerViewDidChangeSize:(CGSize)newSize {

package/ios/TrueSheetContentView.h

@@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol TrueSheetContentViewDelegate <NSObject>
 
 - (void)contentViewDidChangeSize:(CGSize)newSize;
+- (void)contentViewDidChangeChildren;
 
 @end
 
@@ -28,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, weak, nullable) id<TrueSheetContentViewDelegate> delegate;
 
-- (RCTScrollViewComponentView *_Nullable)findScrollView;
+- (RCTScrollViewComponentView *_Nullable)findScrollView:(UIView *_Nullable *_Nullable)outTopSibling;
 
 /**
  * Setup ScrollView pinning