@lodev09/react-native-true-sheet 3.5.1-beta.2 → 3.5.1-beta.4

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

@@ -183,11 +183,6 @@ class TrueSheetViewManager :
     // iOS-specific prop - no-op on Android
   }
 
-  @ReactProp(name = "edgeToEdgeFullScreen", defaultBoolean = false)
-  override fun setEdgeToEdgeFullScreen(view: TrueSheetView, edgeToEdgeFullScreen: Boolean) {
-    view.setEdgeToEdgeFullScreen(edgeToEdgeFullScreen)
-  }
-
   @ReactProp(name = "insetAdjustment")
   override fun setInsetAdjustment(view: TrueSheetView, insetAdjustment: String?) {
     view.setInsetAdjustment(insetAdjustment ?: "automatic")

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

@@ -4,6 +4,8 @@ import android.content.Context
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
 import com.facebook.react.bridge.ReactContext
 
 private const val RN_SCREENS_PACKAGE = "com.swmansion.rnscreens"
@@ -19,7 +21,9 @@ class RNScreensFragmentObserver(
   private val onModalDidDismiss: () -> Unit
 ) {
   private var fragmentLifecycleCallback: FragmentManager.FragmentLifecycleCallbacks? = null
+  private var activityLifecycleObserver: DefaultLifecycleObserver? = null
   private val activeModalFragments: MutableSet<Fragment> = mutableSetOf()
+  private var isActivityInForeground = true
 
   /**
    * Start observing fragment lifecycle events.
@@ -28,10 +32,25 @@ class RNScreensFragmentObserver(
     val activity = reactContext.currentActivity as? AppCompatActivity ?: return
     val fragmentManager = activity.supportFragmentManager
 
+    // Track activity foreground state to ignore fragment lifecycle events during background/foreground transitions
+    activityLifecycleObserver = object : DefaultLifecycleObserver {
+      override fun onResume(owner: LifecycleOwner) {
+        isActivityInForeground = true
+      }
+
+      override fun onPause(owner: LifecycleOwner) {
+        isActivityInForeground = false
+      }
+    }
+    activity.lifecycle.addObserver(activityLifecycleObserver!!)
+
     fragmentLifecycleCallback = object : FragmentManager.FragmentLifecycleCallbacks() {
       override fun onFragmentAttached(fm: FragmentManager, f: Fragment, context: Context) {
         super.onFragmentAttached(fm, f, context)
 
+        // Ignore if app is resuming from background
+        if (!isActivityInForeground) return
+
         if (isModalFragment(f) && !activeModalFragments.contains(f)) {
           activeModalFragments.add(f)
 
@@ -44,14 +63,14 @@ class RNScreensFragmentObserver(
       override fun onFragmentStopped(fm: FragmentManager, f: Fragment) {
         super.onFragmentStopped(fm, f)
 
-        // Ignore if app is in background (fragments stop with activity)
-        val activity = reactContext.currentActivity as? AppCompatActivity ?: return
-        if (!activity.lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED)) {
-          return
-        }
+        // Ignore if app is going to background (fragments stop with activity)
+        if (!isActivityInForeground) return
 
-        if (activeModalFragments.contains(f)) {
-          if (activeModalFragments.size == 1) {
+        // Only trigger when fragment is being removed (not just stopped for navigation)
+        if (activeModalFragments.contains(f) && f.isRemoving) {
+          activeModalFragments.remove(f)
+
+          if (activeModalFragments.isEmpty()) {
             onModalWillDismiss()
           }
         }
@@ -60,12 +79,8 @@ class RNScreensFragmentObserver(
       override fun onFragmentDestroyed(fm: FragmentManager, f: Fragment) {
         super.onFragmentDestroyed(fm, f)
 
-        if (activeModalFragments.contains(f)) {
-          activeModalFragments.remove(f)
-
-          if (activeModalFragments.isEmpty()) {
-            onModalDidDismiss()
-          }
+        if (activeModalFragments.isEmpty()) {
+          onModalDidDismiss()
         }
       }
     }
@@ -77,11 +92,18 @@ class RNScreensFragmentObserver(
    * Stop observing and cleanup.
    */
   fun stop() {
+    val activity = reactContext.currentActivity as? AppCompatActivity
+
     fragmentLifecycleCallback?.let { callback ->
-      val activity = reactContext.currentActivity as? AppCompatActivity
       activity?.supportFragmentManager?.unregisterFragmentLifecycleCallbacks(callback)
     }
     fragmentLifecycleCallback = null
+
+    activityLifecycleObserver?.let { observer ->
+      activity?.lifecycle?.removeObserver(observer)
+    }
+    activityLifecycleObserver = null
+
     activeModalFragments.clear()
   }
 

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

@@ -0,0 +1,150 @@
+package com.lodev09.truesheet.core
+
+import android.annotation.SuppressLint
+import android.graphics.Color
+import android.graphics.drawable.ShapeDrawable
+import android.graphics.drawable.shapes.RoundRectShape
+import android.util.TypedValue
+import android.view.Gravity
+import android.view.View
+import android.widget.FrameLayout
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.facebook.react.uimanager.PixelUtil.dpToPx
+import com.facebook.react.uimanager.ThemedReactContext
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+
+interface TrueSheetBottomSheetViewDelegate {
+  val isTopmostSheet: Boolean
+  val sheetCornerRadius: Float
+  val sheetBackgroundColor: Int?
+  val grabber: Boolean
+  val grabberOptions: GrabberOptions?
+}
+
+/**
+ * The bottom sheet view that holds the content.
+ * This view has BottomSheetBehavior attached via CoordinatorLayout.LayoutParams.
+ *
+ * Touch dispatching to React Native is handled by TrueSheetViewController,
+ * which is the actual RootView containing the React content.
+ */
+@SuppressLint("ViewConstructor")
+class TrueSheetBottomSheetView(private val reactContext: ThemedReactContext) : FrameLayout(reactContext) {
+
+  companion object {
+    private const val GRABBER_TAG = "TrueSheetGrabber"
+    private const val DEFAULT_CORNER_RADIUS = 16f // dp
+    private const val DEFAULT_MAX_WIDTH = 640 // dp
+  }
+
+  // =============================================================================
+  // MARK: - Properties
+  // =============================================================================
+
+  var delegate: TrueSheetBottomSheetViewDelegate? = null
+
+  // Behavior reference (set after adding to CoordinatorLayout)
+  val behavior: BottomSheetBehavior<TrueSheetBottomSheetView>?
+    get() = (layoutParams as? CoordinatorLayout.LayoutParams)
+      ?.behavior as? BottomSheetBehavior<TrueSheetBottomSheetView>
+
+  // =============================================================================
+  // MARK: - Initialization
+  // =============================================================================
+
+  init {
+    // Allow content to extend beyond bounds (for footer positioning)
+    clipChildren = false
+    clipToPadding = false
+  }
+
+  override fun setTranslationY(translationY: Float) {
+    // Skip resetting translation to 0 for parent sheets (non-topmost)
+    // This prevents keyboard inset animations from resetting parent sheet translation
+    if (delegate?.isTopmostSheet == false && translationY == 0f && this.translationY != 0f) {
+      return
+    }
+    super.setTranslationY(translationY)
+  }
+
+  // =============================================================================
+  // MARK: - Layout
+  // =============================================================================
+
+  /**
+   * Creates layout params with BottomSheetBehavior attached.
+   */
+  fun createLayoutParams(): CoordinatorLayout.LayoutParams {
+    val behavior = BottomSheetBehavior<TrueSheetBottomSheetView>().apply {
+      isHideable = true
+      maxWidth = DEFAULT_MAX_WIDTH.dpToPx().toInt()
+    }
+
+    return CoordinatorLayout.LayoutParams(
+      CoordinatorLayout.LayoutParams.MATCH_PARENT,
+      CoordinatorLayout.LayoutParams.MATCH_PARENT
+    ).apply {
+      this.behavior = behavior
+      this.gravity = Gravity.CENTER_HORIZONTAL or Gravity.BOTTOM
+    }
+  }
+
+  // =============================================================================
+  // MARK: - Background & Styling
+  // =============================================================================
+
+  fun setupBackground() {
+    val radius = delegate?.sheetCornerRadius ?: DEFAULT_CORNER_RADIUS.dpToPx()
+    val effectiveRadius = if (radius < 0) DEFAULT_CORNER_RADIUS.dpToPx() else radius
+
+    val outerRadii = floatArrayOf(
+      effectiveRadius,
+      effectiveRadius, // top-left
+      effectiveRadius,
+      effectiveRadius, // top-right
+      0f,
+      0f, // bottom-right
+      0f,
+      0f // bottom-left
+    )
+
+    val color = delegate?.sheetBackgroundColor ?: getDefaultBackgroundColor()
+
+    background = ShapeDrawable(RoundRectShape(outerRadii, null, null)).apply {
+      paint.color = color
+    }
+    clipToOutline = true
+  }
+
+  private fun getDefaultBackgroundColor(): Int {
+    val typedValue = TypedValue()
+    return if (reactContext.theme.resolveAttribute(
+        com.google.android.material.R.attr.colorSurfaceContainerLow,
+        typedValue,
+        true
+      )
+    ) {
+      typedValue.data
+    } else {
+      Color.WHITE
+    }
+  }
+
+  // =============================================================================
+  // MARK: - Grabber
+  // =============================================================================
+
+  fun setupGrabber() {
+    findViewWithTag<View>(GRABBER_TAG)?.let { removeView(it) }
+
+    val isEnabled = delegate?.grabber ?: true
+    val isDraggable = behavior?.isDraggable ?: true
+    if (!isEnabled || !isDraggable) return
+
+    val grabberView = TrueSheetGrabberView(reactContext, delegate?.grabberOptions).apply {
+      tag = GRABBER_TAG
+    }
+
+    addView(grabberView, 0)
+  }
+}

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

@@ -0,0 +1,55 @@
+package com.lodev09.truesheet.core
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.view.View
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.facebook.react.uimanager.PointerEvents
+import com.facebook.react.uimanager.ReactPointerEventsView
+
+interface TrueSheetCoordinatorLayoutDelegate {
+  fun coordinatorLayoutDidLayout(changed: Boolean)
+}
+
+/**
+ * Custom CoordinatorLayout that hosts the bottom sheet and dim view.
+ * Implements ReactPointerEventsView to allow touch events to pass through
+ * to underlying React Native views when appropriate.
+ */
+@SuppressLint("ViewConstructor")
+class TrueSheetCoordinatorLayout(context: Context) :
+  CoordinatorLayout(context),
+  ReactPointerEventsView {
+
+  var delegate: TrueSheetCoordinatorLayoutDelegate? = null
+
+  init {
+    // Fill the entire screen
+    layoutParams = LayoutParams(
+      LayoutParams.MATCH_PARENT,
+      LayoutParams.MATCH_PARENT
+    )
+
+    // Ensure we don't clip the sheet during animations
+    clipChildren = false
+    clipToPadding = false
+  }
+
+  override fun onLayout(
+    changed: Boolean,
+    l: Int,
+    t: Int,
+    r: Int,
+    b: Int
+  ) {
+    super.onLayout(changed, l, t, r, b)
+    delegate?.coordinatorLayoutDidLayout(changed)
+  }
+
+  /**
+   * Allow pointer events to pass through to underlying views.
+   * The DimView and BottomSheetView handle their own touch interception.
+   */
+  override val pointerEvents: PointerEvents
+    get() = PointerEvents.BOX_NONE
+}

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

@@ -1,12 +1,14 @@
 package com.lodev09.truesheet.core
 
 import com.facebook.react.uimanager.PixelUtil.pxToDp
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.util.RNLog
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 
 /**
  * Provides screen dimensions and content measurements for detent calculations.
  */
-interface TrueSheetDetentMeasurements {
+interface TrueSheetDetentCalculatorDelegate {
   val screenHeight: Int
   val realScreenHeight: Int
   val detents: MutableList<Double>
@@ -19,18 +21,19 @@ interface TrueSheetDetentMeasurements {
 
 /**
  * Handles all detent-related calculations for the bottom sheet.
- * Takes a measurements provider to always read current values.
  */
-class TrueSheetDetentCalculator(private val measurements: TrueSheetDetentMeasurements) {
+class TrueSheetDetentCalculator(private val reactContext: ThemedReactContext) {
 
-  private val screenHeight: Int get() = measurements.screenHeight
-  private val realScreenHeight: Int get() = measurements.realScreenHeight
-  private val detents: List<Double> get() = measurements.detents
-  private val contentHeight: Int get() = measurements.contentHeight
-  private val headerHeight: Int get() = measurements.headerHeight
-  private val contentBottomInset: Int get() = measurements.contentBottomInset
-  private val maxSheetHeight: Int? get() = measurements.maxSheetHeight
-  private val keyboardInset: Int get() = measurements.keyboardInset
+  var delegate: TrueSheetDetentCalculatorDelegate? = null
+
+  private val screenHeight: Int get() = delegate?.screenHeight ?: 0
+  private val realScreenHeight: Int get() = delegate?.realScreenHeight ?: 0
+  private val detents: List<Double> get() = delegate?.detents ?: emptyList()
+  private val contentHeight: Int get() = delegate?.contentHeight ?: 0
+  private val headerHeight: Int get() = delegate?.headerHeight ?: 0
+  private val contentBottomInset: Int get() = delegate?.contentBottomInset ?: 0
+  private val maxSheetHeight: Int? get() = delegate?.maxSheetHeight
+  private val keyboardInset: Int get() = delegate?.keyboardInset ?: 0
 
   /**
    * Calculate the height in pixels for a given detent value.
@@ -55,7 +58,10 @@ class TrueSheetDetentCalculator(private val measurements: TrueSheetDetentMeasure
    * Get the expected sheet top position for a detent index.
    */
   fun getSheetTopForDetentIndex(index: Int): Int {
-    if (index < 0 || index >= detents.size) return realScreenHeight
+    if (index < 0 || index >= detents.size) {
+      RNLog.w(reactContext, "TrueSheet: Detent index ($index) is out of bounds (0..${detents.size - 1})")
+      return realScreenHeight
+    }
     return realScreenHeight - getDetentHeight(detents[index])
   }
 

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

@@ -3,21 +3,51 @@ package com.lodev09.truesheet.core
 import android.annotation.SuppressLint
 import android.graphics.Color
 import android.graphics.Outline
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewOutlineProvider
+import com.facebook.react.uimanager.PointerEvents
+import com.facebook.react.uimanager.ReactPointerEventsView
 import com.facebook.react.uimanager.ThemedReactContext
 import com.lodev09.truesheet.utils.ScreenUtils
 
-@SuppressLint("ViewConstructor")
-class TrueSheetDimView(private val reactContext: ThemedReactContext) : View(reactContext) {
+/**
+ * Delegate for handling dim view interactions.
+ */
+interface TrueSheetDimViewDelegate {
+  fun dimViewDidTap()
+}
+
+/**
+ * Dim view that sits behind the bottom sheet in the CoordinatorLayout.
+ *
+ * Key behaviors:
+ * - When alpha > 0 (dimmed): blocks touches and calls delegate on tap
+ * - When alpha == 0 (not dimmed): passes touches through to views below
+ *
+ * This implements the "dimmedDetentIndex" equivalent functionality:
+ * the view only becomes interactive when the sheet is at or above the dimmed detent.
+ */
+@SuppressLint("ViewConstructor", "ClickableViewAccessibility")
+class TrueSheetDimView(private val reactContext: ThemedReactContext) :
+  View(reactContext),
+  ReactPointerEventsView {
 
   companion object {
     private const val MAX_ALPHA = 0.5f
   }
 
+  var delegate: TrueSheetDimViewDelegate? = null
+
   private var targetView: ViewGroup? = null
 
+  /**
+   * Whether this view should block gestures (when dimmed).
+   */
+  private val blockGestures: Boolean
+    get() = alpha > 0f
+
   init {
     layoutParams = ViewGroup.LayoutParams(
       ViewGroup.LayoutParams.MATCH_PARENT,
@@ -25,8 +55,22 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) : View(reac
     )
     setBackgroundColor(Color.BLACK)
     alpha = 0f
+
+    // Handle taps on the dim view
+    setOnClickListener {
+      delegate?.dimViewDidTap()
+    }
   }
 
+  // =============================================================================
+  // MARK: - Attachment
+  // =============================================================================
+
+  /**
+   * Attaches this dim view to a target view group.
+   * For CoordinatorLayout usage, pass null to use the default (activity's decor view).
+   * For stacked sheets, pass the parent sheet's bottom sheet view with corner radius.
+   */
   fun attach(view: ViewGroup? = null, cornerRadius: Float = 0f) {
     if (parent != null) return
     targetView = view ?: reactContext.currentActivity?.window?.decorView as? ViewGroup
@@ -38,16 +82,34 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) : View(reac
         }
       }
       clipToOutline = true
+    } else {
+      outlineProvider = null
+      clipToOutline = false
     }
 
     targetView?.addView(this)
   }
 
+  /**
+   * Attaches this dim view to a CoordinatorLayout at index 0 (behind the sheet).
+   */
+  fun attachToCoordinator(coordinator: TrueSheetCoordinatorLayout) {
+    if (parent != null) return
+    targetView = coordinator
+    outlineProvider = null
+    clipToOutline = false
+    coordinator.addView(this, 0)
+  }
+
   fun detach() {
     targetView?.removeView(this)
     targetView = null
   }
 
+  // =============================================================================
+  // MARK: - Alpha Calculation
+  // =============================================================================
+
   fun calculateAlpha(sheetTop: Int, dimmedDetentIndex: Int, getSheetTopForDetentIndex: (Int) -> Int): Float {
     val realHeight = ScreenUtils.getRealScreenHeight(reactContext)
     val dimmedDetentTop = getSheetTopForDetentIndex(dimmedDetentIndex)
@@ -68,4 +130,31 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) : View(reac
   fun interpolateAlpha(sheetTop: Int, dimmedDetentIndex: Int, getSheetTopForDetentIndex: (Int) -> Int) {
     alpha = calculateAlpha(sheetTop, dimmedDetentIndex, getSheetTopForDetentIndex)
   }
+
+  // =============================================================================
+  // MARK: - Touch Handling
+  // =============================================================================
+
+  override fun onTouchEvent(event: MotionEvent): Boolean {
+    if (blockGestures) {
+      // When dimmed, consume touch and trigger click on ACTION_UP
+      if (event.action == MotionEvent.ACTION_UP) {
+        performClick()
+      }
+      return true
+    }
+    // When not dimmed, let touches pass through
+    return false
+  }
+
+  // =============================================================================
+  // MARK: - ReactPointerEventsView
+  // =============================================================================
+
+  /**
+   * When dimmed (alpha > 0), intercept touches (AUTO).
+   * When not dimmed (alpha == 0), pass through (NONE).
+   */
+  override val pointerEvents: PointerEvents
+    get() = if (blockGestures) PointerEvents.AUTO else PointerEvents.NONE
 }

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

@@ -111,6 +111,9 @@ class TrueSheetKeyboardObserver(private val targetView: View, private val reactC
   }
 
   private fun setupLegacyListener() {
+    // Ensure we don't add duplicate listeners
+    if (globalLayoutListener != null) return
+
     val rootView = reactContext.currentActivity?.window?.decorView?.rootView ?: return
     activityRootView = rootView
 
@@ -122,19 +125,26 @@ class TrueSheetKeyboardObserver(private val targetView: View, private val reactC
       val keyboardHeight = screenHeight - rect.bottom
 
       val newHeight = if (keyboardHeight > screenHeight * 0.15) keyboardHeight else 0
+
+      // Skip if already at this height
+      if (targetHeight == newHeight) return@OnGlobalLayoutListener
+
       val previousHeight = currentHeight
+      targetHeight = newHeight
+      isHiding = newHeight < previousHeight
 
-      if (previousHeight != newHeight) {
-        targetHeight = newHeight
-        if (newHeight > previousHeight) {
-          delegate?.keyboardWillShow(newHeight)
-        } else if (newHeight < previousHeight) {
-          delegate?.keyboardWillHide()
-        }
-        updateHeight(previousHeight, newHeight, 1f)
-        if (newHeight == 0 && previousHeight > 0) {
-          delegate?.keyboardDidHide()
-        }
+      if (newHeight > previousHeight) {
+        delegate?.keyboardWillShow(newHeight)
+      } else if (isHiding) {
+        delegate?.keyboardWillHide()
+      }
+
+      // On legacy API, keyboard has already animated - just update immediately
+      updateHeight(previousHeight, newHeight, 1f)
+
+      if (isHiding && newHeight == 0) {
+        delegate?.keyboardDidHide()
+        isHiding = false
       }
     }
 

package/android/src/main/java/com/lodev09/truesheet/core/{TrueSheetDialogObserver.kt → TrueSheetStackManager.kt}

@@ -6,7 +6,7 @@ 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 {
+object TrueSheetStackManager {
 
   private val presentedSheetStack = mutableListOf<TrueSheetView>()
 
@@ -18,9 +18,9 @@ object TrueSheetDialogObserver {
   fun onSheetWillPresent(sheetView: TrueSheetView, detentIndex: Int): TrueSheetView? {
     synchronized(presentedSheetStack) {
       val parentSheet = presentedSheetStack.lastOrNull()
-        ?.takeIf { it.viewController.isPresented && it.viewController.isDialogVisible }
+        ?.takeIf { it.viewController.isPresented && it.viewController.isSheetVisible }
 
-      val childSheetTop = sheetView.viewController.getExpectedSheetTop(detentIndex)
+      val childSheetTop = sheetView.viewController.detentCalculator.getSheetTopForDetentIndex(detentIndex)
       parentSheet?.updateTranslationForChild(childSheetTop)
 
       if (!presentedSheetStack.contains(sheetView)) {
@@ -59,8 +59,10 @@ object TrueSheetDialogObserver {
 
       // Post to ensure layout is complete before reading position
       sheetView.viewController.post {
-        val childMinSheetTop = sheetView.viewController.getExpectedSheetTop(0)
-        val childCurrentSheetTop = sheetView.viewController.getExpectedSheetTop(sheetView.viewController.currentDetentIndex)
+        val childMinSheetTop = sheetView.viewController.detentCalculator.getSheetTopForDetentIndex(0)
+        val childCurrentSheetTop = sheetView.viewController.detentCalculator.getSheetTopForDetentIndex(
+          sheetView.viewController.currentDetentIndex
+        )
         // Cap to minimum detent position
         val childSheetTop = maxOf(childMinSheetTop, childCurrentSheetTop)
         parentSheet.updateTranslationForChild(childSheetTop)

package/ios/TrueSheetViewController.h

@@ -7,6 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "core/TrueSheetDetentCalculator.h"
 
 #if __has_include(<RNScreens/RNSDismissibleModalProtocol.h>)
 #import <RNScreens/RNSDismissibleModalProtocol.h>
@@ -40,10 +41,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@protocol TrueSheetDetentMeasurements;
-
 @interface TrueSheetViewController : UIViewController <UISheetPresentationControllerDelegate,
-                                       TrueSheetDetentMeasurements
+                                       TrueSheetDetentCalculatorDelegate
 #if RNS_DISMISSIBLE_MODAL_PROTOCOL_AVAILABLE
                                        ,
                                        RNSDismissibleModalProtocol

package/ios/TrueSheetViewController.mm

@@ -65,7 +65,8 @@
 
     _blurInteraction = YES;
     _insetAdjustment = @"automatic";
-    _detentCalculator = [[TrueSheetDetentCalculator alloc] initWithMeasurements:self];
+    _detentCalculator = [[TrueSheetDetentCalculator alloc] init];
+    _detentCalculator.delegate = self;
   }
   return self;
 }
@@ -503,8 +504,10 @@
 
 - (void)setupSheetDetents {
   UISheetPresentationController *sheet = self.sheetPresentationController;
-  if (!sheet)
+  if (!sheet) {
+    RCTLogError(@"TrueSheet: sheetPresentationController is nil in setupSheetDetents");
     return;
+  }
 
   NSMutableArray<UISheetPresentationControllerDetent *> *detents = [NSMutableArray array];
   [_detentCalculator clearResolvedPositions];
@@ -591,8 +594,10 @@
 
 - (UISheetPresentationControllerDetentIdentifier)detentIdentifierForIndex:(NSInteger)index {
   UISheetPresentationController *sheet = self.sheetPresentationController;
-  if (!sheet)
+  if (!sheet) {
+    RCTLogError(@"TrueSheet: sheetPresentationController is nil in detentIdentifierForIndex");
     return UISheetPresentationControllerDetentIdentifierMedium;
+  }
 
   UISheetPresentationControllerDetentIdentifier identifier = UISheetPresentationControllerDetentIdentifierMedium;
   if (index >= 0 && index < (NSInteger)sheet.detents.count) {
@@ -611,8 +616,10 @@
 
 - (void)applyActiveDetent {
   UISheetPresentationController *sheet = self.sheetPresentationController;
-  if (!sheet)
+  if (!sheet) {
+    RCTLogError(@"TrueSheet: sheetPresentationController is nil in applyActiveDetent");
     return;
+  }
 
   NSInteger detentCount = _detents.count;
   if (detentCount == 0)