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

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

@@ -8,7 +8,7 @@ import com.facebook.react.uimanager.events.Event
  * Fired continuously while user is dragging the sheet
  * Payload: { index: number, position: number }
  */
-class DragChangeEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float) :
+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
@@ -17,6 +17,7 @@ class DragChangeEvent(surfaceId: Int, viewId: Int, private val index: Int, priva
     Arguments.createMap().apply {
       putInt("index", index)
       putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
     }
 
   companion object {

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

@@ -8,7 +8,7 @@ import com.facebook.react.uimanager.events.Event
  * Fired when user stops dragging the sheet
  * Payload: { index: number, position: number }
  */
-class DragEndEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float) :
+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
@@ -17,6 +17,7 @@ class DragEndEvent(surfaceId: Int, viewId: Int, private val index: Int, private
     Arguments.createMap().apply {
       putInt("index", index)
       putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
     }
 
   companion object {

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

@@ -0,0 +1,20 @@
+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 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"
+  }
+}

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

@@ -6,13 +6,14 @@ import com.facebook.react.uimanager.events.Event
 
 /**
  * Fired continuously for position updates during drag and animation
- * Payload: { index: number, position: number, transitioning: boolean }
+ * Payload: { index: number, position: number, detent: number, transitioning: boolean }
  */
 class PositionChangeEvent(
   surfaceId: Int,
   viewId: Int,
-  private val index: Int,
+  private val index: Float,
   private val position: Float,
+  private val detent: Float,
   private val transitioning: Boolean = false
 ) : Event<PositionChangeEvent>(surfaceId, viewId) {
 
@@ -20,8 +21,9 @@ class PositionChangeEvent(
 
   override fun getEventData(): WritableMap =
     Arguments.createMap().apply {
-      putInt("index", index)
+      putDouble("index", index.toDouble())
       putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
       putBoolean("transitioning", transitioning)
     }
 

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

@@ -8,7 +8,7 @@ import com.facebook.react.uimanager.events.Event
  * Fired before the sheet is presented
  * Payload: { index: number, position: number }
  */
-class WillPresentEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float) :
+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
@@ -17,6 +17,7 @@ class WillPresentEvent(surfaceId: Int, viewId: Int, private val index: Int, priv
     Arguments.createMap().apply {
       putInt("index", index)
       putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
     }
 
   companion object {

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/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/ios/TrueSheetView.mm

@@ -15,7 +15,9 @@
 #import "TrueSheetModule.h"
 #import "TrueSheetViewController.h"
 #import "events/OnDetentChangeEvent.h"
+#import "events/OnDidBlurEvent.h"
 #import "events/OnDidDismissEvent.h"
+#import "events/OnDidFocusEvent.h"
 #import "events/OnDidPresentEvent.h"
 #import "events/OnDragBeginEvent.h"
 #import "events/OnDragChangeEvent.h"
@@ -369,24 +371,28 @@ using namespace facebook::react;
 - (void)viewControllerWillPresent {
   NSInteger index = [_controller currentDetentIndex];
   _controller.activeDetentIndex = index;
-  [OnWillPresentEvent emit:_eventEmitter index:index position:_controller.currentPosition];
+  CGFloat detent = [_controller detentValueForIndex:index];
+  [OnWillPresentEvent emit:_eventEmitter index:index position:_controller.currentPosition detent:detent];
 }
 
 - (void)viewControllerDidPresent {
-  [OnDidPresentEvent emit:_eventEmitter index:[_controller currentDetentIndex] position:_controller.currentPosition];
+  NSInteger index = [_controller currentDetentIndex];
+  CGFloat detent = [_controller detentValueForIndex:index];
+  [OnDidPresentEvent emit:_eventEmitter index:index position:_controller.currentPosition detent:detent];
 }
 
 - (void)viewControllerDidDrag:(UIGestureRecognizerState)state index:(NSInteger)index position:(CGFloat)position {
+  CGFloat detent = [_controller detentValueForIndex:index];
   switch (state) {
     case UIGestureRecognizerStateBegan:
-      [OnDragBeginEvent emit:_eventEmitter index:index position:position];
+      [OnDragBeginEvent emit:_eventEmitter index:index position:position detent:detent];
       break;
     case UIGestureRecognizerStateChanged:
-      [OnDragChangeEvent emit:_eventEmitter index:index position:position];
+      [OnDragChangeEvent emit:_eventEmitter index:index position:position detent:detent];
       break;
     case UIGestureRecognizerStateEnded:
     case UIGestureRecognizerStateCancelled:
-      [OnDragEndEvent emit:_eventEmitter index:index position:position];
+      [OnDragEndEvent emit:_eventEmitter index:index position:position detent:detent];
       break;
     default:
       break;
@@ -406,17 +412,29 @@ using namespace facebook::react;
   if (_controller.activeDetentIndex != index) {
     _controller.activeDetentIndex = index;
   }
-  [OnDetentChangeEvent emit:_eventEmitter index:index position:position];
+  CGFloat detent = [_controller detentValueForIndex:index];
+  [OnDetentChangeEvent emit:_eventEmitter index:index position:position detent:detent];
 }
 
-- (void)viewControllerDidChangePosition:(NSInteger)index position:(CGFloat)position transitioning:(BOOL)transitioning {
-  [OnPositionChangeEvent emit:_eventEmitter index:index position:position transitioning:transitioning];
+- (void)viewControllerDidChangePosition:(CGFloat)index
+                               position:(CGFloat)position
+                                 detent:(CGFloat)detent
+                          transitioning:(BOOL)transitioning {
+  [OnPositionChangeEvent emit:_eventEmitter index:index position:position detent:detent transitioning:transitioning];
 }
 
 - (void)viewControllerDidChangeSize:(CGSize)size {
   [self updateStateWithSize:size];
 }
 
+- (void)viewControllerDidFocus {
+  [OnDidFocusEvent emit:_eventEmitter];
+}
+
+- (void)viewControllerDidBlur {
+  [OnDidBlurEvent emit:_eventEmitter];
+}
+
 #pragma mark - Private Helpers
 
 - (UIViewController *)findPresentingViewController {

package/ios/TrueSheetViewController.h

@@ -25,8 +25,13 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)viewControllerDidDismiss;
 - (void)viewControllerDidChangeDetent:(NSInteger)index position:(CGFloat)position;
 - (void)viewControllerDidDrag:(UIGestureRecognizerState)state index:(NSInteger)index position:(CGFloat)position;
-- (void)viewControllerDidChangePosition:(NSInteger)index position:(CGFloat)position transitioning:(BOOL)transitioning;
+- (void)viewControllerDidChangePosition:(CGFloat)index
+                               position:(CGFloat)position
+                                 detent:(CGFloat)detent
+                          transitioning:(BOOL)transitioning;
 - (void)viewControllerDidChangeSize:(CGSize)size;
+- (void)viewControllerDidFocus;
+- (void)viewControllerDidBlur;
 
 @end
 
@@ -60,6 +65,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSInteger)currentDetentIndex;
 - (CGFloat)currentPosition;
 - (CGFloat)bottomInset;
+- (CGFloat)detentValueForIndex:(NSInteger)index;
 
 @end
 

package/ios/TrueSheetViewController.mm

@@ -29,6 +29,9 @@
   // Hidden view used to track position during native transition animations
   UIView *_fakeTransitionView;
   CADisplayLink *_displayLink;
+
+  // Reference to parent TrueSheetViewController (if presented from another sheet)
+  __weak TrueSheetViewController *_parentSheetController;
 }
 
 #pragma mark - Initialization
@@ -97,13 +100,8 @@
   return window ? window.safeAreaInsets.bottom : 0;
 }
 
-- (CGFloat)currentHeight {
-  return self.containerHeight - self.currentPosition - self.bottomInset;
-}
-
-- (CGFloat)containerHeight {
-  UIView *sheetContainerView = self.sheetPresentationController.containerView;
-  return sheetContainerView ? sheetContainerView.frame.size.height : 0.0;
+- (CGFloat)screenHeight {
+  return UIScreen.mainScreen.bounds.size.height;
 }
 
 - (NSInteger)currentDetentIndex {
@@ -146,6 +144,16 @@
 
   // Only trigger on initial presentation, not repositioning
   if (!_isPresented) {
+    // Capture parent sheet reference if presented from another TrueSheet
+    UIViewController *presenter = self.presentingViewController;
+    if ([presenter isKindOfClass:[TrueSheetViewController class]]) {
+      _parentSheetController = (TrueSheetViewController *)presenter;
+      // Notify parent that it lost focus
+      if ([_parentSheetController.delegate respondsToSelector:@selector(viewControllerDidBlur)]) {
+        [_parentSheetController.delegate viewControllerDidBlur];
+      }
+    }
+
     if ([self.delegate respondsToSelector:@selector(viewControllerWillPresent)]) {
       [self.delegate viewControllerWillPresent];
     }
@@ -182,8 +190,18 @@
   // Only dispatch didDismiss when actually dismissing (not when another modal is presented on top)
   BOOL isActuallyDismissing = self.presentingViewController == nil || self.isBeingDismissed;
 
-  if (isActuallyDismissing && [self.delegate respondsToSelector:@selector(viewControllerDidDismiss)]) {
-    [self.delegate viewControllerDidDismiss];
+  if (isActuallyDismissing) {
+    // Notify the parent sheet (if any) that it regained focus
+    if (_parentSheetController) {
+      if ([_parentSheetController.delegate respondsToSelector:@selector(viewControllerDidFocus)]) {
+        [_parentSheetController.delegate viewControllerDidFocus];
+      }
+      _parentSheetController = nil;
+    }
+
+    if ([self.delegate respondsToSelector:@selector(viewControllerDidDismiss)]) {
+      [self.delegate viewControllerDidDismiss];
+    }
   }
 
   _isTrackingPositionFromLayout = NO;
@@ -283,13 +301,67 @@
   if (_lastPosition != position) {
     _lastPosition = position;
 
-    NSInteger index = [self currentDetentIndex];
-    if ([self.delegate respondsToSelector:@selector(viewControllerDidChangePosition:position:transitioning:)]) {
-      [self.delegate viewControllerDidChangePosition:index position:position transitioning:transitioning];
+    CGFloat index = [self interpolatedIndexForPosition:position];
+    NSInteger discreteIndex = (NSInteger)round(index);
+    CGFloat detent = [self detentValueForIndex:discreteIndex];
+    if ([self.delegate respondsToSelector:@selector(viewControllerDidChangePosition:position:detent:transitioning:)]) {
+      [self.delegate viewControllerDidChangePosition:index position:position detent:detent transitioning:transitioning];
     }
   }
 }
 
+- (CGFloat)interpolatedIndexForPosition:(CGFloat)position {
+  NSInteger count = _detents.count;
+  if (count == 0)
+    return -1;
+  if (count == 1)
+    return 0;
+
+  // Convert position to detent fraction: detent = (screenHeight - position) / screenHeight
+  CGFloat currentDetent = (self.screenHeight - position) / self.screenHeight;
+
+  // Handle below first detent (interpolate from -1 to 0)
+  CGFloat firstDetentValue = [self detentValueForIndex:0];
+  if (currentDetent < firstDetentValue) {
+    // Interpolate: 0 at firstDetentValue, -1 at 0
+    if (firstDetentValue <= 0)
+      return 0;
+    CGFloat progress = currentDetent / firstDetentValue;
+    return progress - 1;
+  }
+
+  // Find which segment the current detent falls into and interpolate
+  for (NSInteger i = 0; i < count - 1; i++) {
+    CGFloat detentValue = [self detentValueForIndex:i];
+    CGFloat nextDetentValue = [self detentValueForIndex:i + 1];
+
+    if (currentDetent <= nextDetentValue) {
+      // Interpolate between index i and i+1
+      CGFloat range = nextDetentValue - detentValue;
+      if (range <= 0)
+        return i;
+      CGFloat progress = (currentDetent - detentValue) / range;
+      return i + fmax(0, fmin(1, progress));
+    }
+  }
+
+  return count - 1;
+}
+
+- (CGFloat)detentValueForIndex:(NSInteger)index {
+  if (index >= 0 && index < (NSInteger)_detents.count) {
+    CGFloat value = [_detents[index] floatValue];
+    // For auto (-1), calculate actual fraction from content + header height
+    // Subtract bottomInset to match the actual sheet height (consistent with detent resolver)
+    if (value == -1) {
+      CGFloat autoHeight = [self.contentHeight floatValue] + [self.headerHeight floatValue] - self.bottomInset;
+      return autoHeight / self.screenHeight;
+    }
+    return value;
+  }
+  return 0;
+}
+
 /**
  * Sets up position tracking during view controller transitions using a fake view.
  *
@@ -313,7 +385,7 @@
   BOOL isPresenting = self.isBeingPresented;
 
   // Set initial position: presenting starts from bottom, dismissing from current
-  frame.origin.y = isPresenting ? self.containerHeight : presentedView.frame.origin.y;
+  frame.origin.y = isPresenting ? self.screenHeight : presentedView.frame.origin.y;
   _fakeTransitionView.frame = frame;
 
   auto animation = ^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {
@@ -375,12 +447,12 @@
   NSMutableArray<UISheetPresentationControllerDetent *> *detents = [NSMutableArray array];
 
   // Subtract bottomInset to prevent iOS from adding extra bottom insets
-  CGFloat totalHeight = [self.contentHeight floatValue] + [self.headerHeight floatValue] - self.bottomInset;
+  CGFloat autoHeight = [self.contentHeight floatValue] + [self.headerHeight floatValue] - self.bottomInset;
 
   for (NSInteger index = 0; index < self.detents.count; index++) {
     id detent = self.detents[index];
     UISheetPresentationControllerDetent *sheetDetent = [self detentForValue:detent
-                                                                 withHeight:totalHeight
+                                                             withAutoHeight:autoHeight
                                                                     atIndex:index];
     [detents addObject:sheetDetent];
   }
@@ -408,7 +480,9 @@
   }
 }
 
-- (UISheetPresentationControllerDetent *)detentForValue:(id)detent withHeight:(CGFloat)height atIndex:(NSInteger)index {
+- (UISheetPresentationControllerDetent *)detentForValue:(id)detent
+                                         withAutoHeight:(CGFloat)autoHeight
+                                                atIndex:(NSInteger)index {
   if (![detent isKindOfClass:[NSNumber class]]) {
     return [UISheetPresentationControllerDetent mediumDetent];
   }
@@ -418,15 +492,9 @@
   // -1 represents "auto" (fit content height)
   if (value == -1) {
     if (@available(iOS 16.0, *)) {
-      NSString *detentId = @"custom-auto";
-      return [UISheetPresentationControllerDetent
-        customDetentWithIdentifier:detentId
-                          resolver:^CGFloat(id<UISheetPresentationControllerDetentResolutionContext> context) {
-                            CGFloat maxDetentValue = context.maximumDetentValue;
-                            CGFloat maxValue =
-                              self.maxHeight ? fmin(maxDetentValue, [self.maxHeight floatValue]) : maxDetentValue;
-                            return fmin(height, maxValue);
-                          }];
+      // Subtract bottomInset so position matches screenHeight - sheetHeight
+      // iOS adds bottom safe area to sheet height internally
+      return [self customDetentWithIdentifier:@"custom-auto" height:autoHeight - self.bottomInset];
     } else {
       return [UISheetPresentationControllerDetent mediumDetent];
     }
@@ -438,21 +506,11 @@
   }
 
   if (@available(iOS 16.0, *)) {
-    if (value == 1.0) {
-      return [UISheetPresentationControllerDetent largeDetent];
-    } else if (value == 0.5) {
-      return [UISheetPresentationControllerDetent mediumDetent];
-    } else {
-      NSString *detentId = [NSString stringWithFormat:@"custom-%f", value];
-      return [UISheetPresentationControllerDetent
-        customDetentWithIdentifier:detentId
-                          resolver:^CGFloat(id<UISheetPresentationControllerDetentResolutionContext> context) {
-                            CGFloat maxDetentValue = context.maximumDetentValue;
-                            CGFloat maxValue =
-                              self.maxHeight ? fmin(maxDetentValue, [self.maxHeight floatValue]) : maxDetentValue;
-                            return fmin(value * maxDetentValue, maxValue);
-                          }];
-    }
+    NSString *detentId = [NSString stringWithFormat:@"custom-%f", value];
+    // Subtract bottomInset so position matches screenHeight - (detent * screenHeight)
+    // iOS adds bottom safe area to sheet height internally
+    CGFloat sheetHeight = value * self.screenHeight - self.bottomInset;
+    return [self customDetentWithIdentifier:detentId height:sheetHeight];
   } else if (value >= 0.5) {
     return [UISheetPresentationControllerDetent largeDetent];
   } else {
@@ -460,6 +518,18 @@
   }
 }
 
+- (UISheetPresentationControllerDetent *)customDetentWithIdentifier:(NSString *)identifier
+                                                             height:(CGFloat)height API_AVAILABLE(ios(16.0)) {
+  return [UISheetPresentationControllerDetent
+    customDetentWithIdentifier:identifier
+                      resolver:^CGFloat(id<UISheetPresentationControllerDetentResolutionContext> context) {
+                        CGFloat maxDetentValue = context.maximumDetentValue;
+                        CGFloat maxValue =
+                          self.maxHeight ? fmin(maxDetentValue, [self.maxHeight floatValue]) : maxDetentValue;
+                        return fmin(height, maxValue);
+                      }];
+}
+
 - (UISheetPresentationControllerDetentIdentifier)detentIdentifierForIndex:(NSInteger)index {
   UISheetPresentationController *sheet = self.sheetPresentationController;
   if (!sheet)

package/ios/events/OnDetentChangeEvent.h

@@ -19,7 +19,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (void)emit:(std::shared_ptr<const facebook::react::EventEmitter>)eventEmitter
        index:(NSInteger)index
-    position:(CGFloat)position;
+    position:(CGFloat)position
+      detent:(CGFloat)detent;
 
 @end
 

package/ios/events/OnDetentChangeEvent.mm

@@ -14,7 +14,8 @@
 
 + (void)emit:(std::shared_ptr<const facebook::react::EventEmitter>)eventEmitter
        index:(NSInteger)index
-    position:(CGFloat)position {
+    position:(CGFloat)position
+      detent:(CGFloat)detent {
   if (!eventEmitter)
     return;
 
@@ -22,6 +23,7 @@
   TrueSheetViewEventEmitter::OnDetentChange event;
   event.index = static_cast<int>(index);
   event.position = static_cast<double>(position);
+  event.detent = static_cast<double>(detent);
   emitter->onDetentChange(event);
 }
 

package/ios/events/OnDidBlurEvent.h

@@ -0,0 +1,26 @@
+//
+//  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 <Foundation/Foundation.h>
+#import <react/renderer/components/TrueSheetSpec/EventEmitters.h>
+
+using namespace facebook::react;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface OnDidBlurEvent : NSObject
+
++ (void)emit:(std::shared_ptr<const facebook::react::EventEmitter>)eventEmitter;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif  // RCT_NEW_ARCH_ENABLED

package/ios/events/OnDidBlurEvent.mm

@@ -0,0 +1,25 @@
+//
+//  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 "OnDidBlurEvent.h"
+
+@implementation OnDidBlurEvent
+
++ (void)emit:(std::shared_ptr<const facebook::react::EventEmitter>)eventEmitter {
+  if (!eventEmitter)
+    return;
+
+  auto emitter = std::static_pointer_cast<TrueSheetViewEventEmitter const>(eventEmitter);
+  emitter->onDidBlur({});
+}
+
+@end
+
+#endif  // RCT_NEW_ARCH_ENABLED