@lodev09/react-native-true-sheet 3.9.4 → 3.9.5

package/ios/TrueSheetView.mm

@@ -62,6 +62,8 @@ using namespace facebook::react;
   BOOL _pendingNavigationRepresent;
   BOOL _pendingMountEvent;
   BOOL _pendingSizeChange;
+  BOOL _pendingPropsUpdate;
+  NSArray *_pendingDetents;
   RNScreensEventObserver *_screensEventObserver;
 }
 
@@ -172,7 +174,12 @@ using namespace facebook::react;
       _pendingLayoutUpdate = YES;
     }
   }
-  _controller.detents = detents;
+
+  if (_controller.isBeingPresented) {
+    _pendingDetents = detents;
+  } else {
+    _controller.detents = detents;
+  }
 
   // Background color
   _controller.backgroundColor = RCTUIColorFromSharedColor(newProps.backgroundColor);
@@ -231,7 +238,7 @@ using namespace facebook::react;
   }
 
   _controller.pageSizing = newProps.pageSizing;
-  _controller.modalInPresentation = !newProps.dismissible;
+  _controller.dismissible = newProps.dismissible;
   _controller.draggable = newProps.draggable;
   _controller.dimmed = newProps.dimmed;
 
@@ -317,24 +324,9 @@ using namespace facebook::react;
   }
 
   if (_controller.isPresented) {
-    BOOL pendingLayoutUpdate = _pendingLayoutUpdate;
-    _pendingLayoutUpdate = NO;
-
-    UIView *presenterView = _controller.presentingViewController.view;
-    [_controller setupAnchorViewInView:presenterView];
-
-    [_controller setupSheetSizing];
-
-    [_controller.sheetPresentationController animateChanges:^{
-      [self->_controller setupSheetProps];
-      if (pendingLayoutUpdate) {
-        [self->_controller setupSheetDetentsForDetentsChange];
-      } else {
-        [self->_controller setupSheetDetents];
-      }
-      [self->_controller applyActiveDetent];
-    }];
-    [_controller setupDraggable];
+    [self applySheetPropsUpdate];
+  } else if (_controller.isBeingPresented) {
+    _pendingPropsUpdate = YES;
   } else if (_initialDetentIndex >= 0) {
     _pendingLayoutUpdate = NO;
   }
@@ -556,7 +548,7 @@ using namespace facebook::react;
   if (_isSheetUpdatePending)
     return;
 
-  if (!_controller.isPresented) {
+  if (_controller.isBeingPresented) {
     _pendingSizeChange = YES;
     return;
   }
@@ -593,6 +585,11 @@ using namespace facebook::react;
   [_containerView setupKeyboardObserverWithViewController:_controller];
   [TrueSheetLifecycleEvents emitDidPresent:_eventEmitter index:index position:position detent:detent];
 
+  if (_pendingPropsUpdate) {
+    _pendingPropsUpdate = NO;
+    [self applySheetPropsUpdate];
+  }
+
   if (_pendingSizeChange) {
     _pendingSizeChange = NO;
     [self setupSheetDetentsForSizeChange];
@@ -696,6 +693,32 @@ using namespace facebook::react;
 
 #pragma mark - Private Helpers
 
+- (void)applySheetPropsUpdate {
+  BOOL pendingLayoutUpdate = _pendingLayoutUpdate;
+  _pendingLayoutUpdate = NO;
+
+  if (_pendingDetents) {
+    _controller.detents = _pendingDetents;
+    _pendingDetents = nil;
+  }
+
+  UIView *presenterView = _controller.presentingViewController.view;
+  [_controller setupAnchorViewInView:presenterView];
+
+  [_controller setupSheetSizing];
+
+  [_controller.sheetPresentationController animateChanges:^{
+    [self->_controller setupSheetProps];
+    if (pendingLayoutUpdate) {
+      [self->_controller setupSheetDetentsForDetentsChange];
+    } else {
+      [self->_controller setupSheetDetents];
+    }
+    [self->_controller applyActiveDetent];
+  }];
+  [_controller setupDraggable];
+}
+
 - (UIViewController *)findPresentingViewController {
   if (!self.window)
     return nil;

package/ios/TrueSheetViewController.h

@@ -68,6 +68,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL pageSizing;
 @property (nonatomic, assign) NSInteger anchor;
 @property (nonatomic, assign) NSInteger insetAdjustment;
+@property (nonatomic, assign) BOOL dismissible;
 @property (nonatomic, assign) BOOL isPresented;
 @property (nonatomic, assign) NSInteger activeDetentIndex;
 @property (nonatomic, readonly) BOOL isTopmostPresentedController;

package/ios/TrueSheetViewController.mm

@@ -37,6 +37,7 @@ using namespace facebook::react;
   UIView *_transitionFakeView;
   BOOL _isDragging;
   BOOL _isTransitioning;
+  BOOL _isTransitionSnapping;
   BOOL _isTrackingPositionFromLayout;
   BOOL _isWillDismissEmitted;
 
@@ -58,6 +59,7 @@ using namespace facebook::react;
     _headerHeight = @(0);
     _grabber = YES;
     _draggable = YES;
+    _dismissible = YES;
     _dimmed = YES;
     _dimmedDetentIndex = @(0);
     _pageSizing = YES;
@@ -188,10 +190,6 @@ using namespace facebook::react;
   [super viewWillAppear:animated];
 
   if (!_isPresented) {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [self storeResolvedPositionForIndex:self.currentDetentIndex];
-    });
-
     UIViewController *presenter = self.presentingViewController;
     if ([presenter isKindOfClass:[TrueSheetViewController class]]) {
       _parentSheetController = (TrueSheetViewController *)presenter;
@@ -219,6 +217,8 @@ using namespace facebook::react;
 
     dispatch_async(dispatch_get_main_queue(), ^{
       NSInteger index = [self currentDetentIndex];
+      [self learnOffsetForDetentIndex:index];
+
       CGFloat detent = [self detentValueForIndex:index];
       [self.delegate viewControllerDidPresentAtIndex:index position:self.currentPosition detent:detent];
       [self.delegate viewControllerDidFocus];
@@ -290,7 +290,7 @@ using namespace facebook::react;
       _pendingContentSizeChange = NO;
       _pendingDetentsChange = NO;
       realtime = NO;
-      [self storeResolvedPositionForIndex:self.currentDetentIndex];
+      [self learnOffsetForDetentIndex:self.currentDetentIndex];
     }
 
     [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:realtime debug:@"layout"];
@@ -312,7 +312,7 @@ using namespace facebook::react;
     _pendingDetentIndex = -1;
 
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-      [self storeResolvedPositionForIndex:pendingIndex];
+      [self learnOffsetForDetentIndex:pendingIndex];
       CGFloat detent = [self detentValueForIndex:pendingIndex];
       [self.delegate viewControllerDidChangeDetent:pendingIndex position:self.currentPosition detent:detent];
       [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:NO debug:@"pending detent change"];
@@ -389,7 +389,7 @@ using namespace facebook::react;
     case UIGestureRecognizerStateCancelled: {
       if (!_isTransitioning) {
         dispatch_async(dispatch_get_main_queue(), ^{
-          [self storeResolvedPositionForIndex:self.currentDetentIndex];
+          [self learnOffsetForDetentIndex:self.currentDetentIndex];
           [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:NO debug:@"drag end"];
         });
       }
@@ -412,7 +412,6 @@ using namespace facebook::react;
   CGRect presentedFrame = CGRectMake(0, self.currentPosition, 0, 0);
 
   _transitionFakeView.frame = self.isBeingDismissed ? presentedFrame : dismissedFrame;
-  [self storeResolvedPositionForIndex:self.currentDetentIndex];
 
   __weak __typeof(self) weakSelf = self;
 
@@ -439,6 +438,17 @@ using namespace facebook::react;
       strongSelf->_transitioningTimer = nil;
       [strongSelf->_transitionFakeView removeFromSuperview];
       strongSelf->_isTransitioning = NO;
+      strongSelf->_isTransitionSnapping = NO;
+
+      // Emit settled position after detent snap.
+      // Uses dispatch_after because presentedView frame isn't final until UIKit
+      // completes its layout pass after the transition animation.
+      if (strongSelf->_isPresented) {
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+          CGFloat position = strongSelf.currentPosition;
+          [strongSelf emitChangePositionDelegateWithPosition:position realtime:NO debug:@"transition end"];
+        });
+      }
     }];
 }
 
@@ -455,7 +465,12 @@ using namespace facebook::react;
 
     } else {
       CGFloat position = fmax(self.currentPosition, layerPosition);
-      [self emitChangePositionDelegateWithPosition:position realtime:YES debug:@"transition in"];
+      // Detect drag → snap transition jump; stay non-realtime for the rest of the animation
+      if (!_isTransitionSnapping && _isPresented && _lastPosition > 0 && fabs(_lastPosition - position) > 20) {
+        _isTransitionSnapping = YES;
+      }
+      BOOL realtime = !_isTransitionSnapping;
+      [self emitChangePositionDelegateWithPosition:position realtime:realtime debug:@"transition in"];
     }
   }
 }
@@ -475,16 +490,13 @@ using namespace facebook::react;
 
     CGFloat index = [self interpolatedIndexForPosition:position];
     CGFloat detent = [self interpolatedDetentForPosition:position];
+
     [self.delegate viewControllerDidChangePosition:index position:position detent:detent realtime:realtime];
   }
 }
 
-- (void)storeResolvedPositionForIndex:(NSInteger)index {
-  [_detentCalculator storeResolvedPositionForIndex:index];
-}
-
-- (CGFloat)estimatedPositionForIndex:(NSInteger)index {
-  return [_detentCalculator estimatedPositionForIndex:index];
+- (void)learnOffsetForDetentIndex:(NSInteger)index {
+  [_detentCalculator learnOffsetForDetentIndex:index];
 }
 
 - (BOOL)findSegmentForPosition:(CGFloat)position outIndex:(NSInteger *)outIndex outProgress:(CGFloat *)outProgress {
@@ -525,7 +537,7 @@ using namespace facebook::react;
   }
 
   NSMutableArray<UISheetPresentationControllerDetent *> *detents = [NSMutableArray array];
-  [_detentCalculator clearResolvedPositions];
+  [_detentCalculator clearResolvedHeights];
 
   CGFloat autoHeight = [self.contentHeight floatValue] + [self.headerHeight floatValue];
 
@@ -571,7 +583,7 @@ using namespace facebook::react;
 
   if (value == -1) {
     if (@available(iOS 16.0, *)) {
-      return [self customDetentWithIdentifier:@"custom-auto" height:autoHeight];
+      return [self customDetentWithIdentifier:@"custom-auto" height:autoHeight atIndex:index];
     } else {
       return [UISheetPresentationControllerDetent mediumDetent];
     }
@@ -585,7 +597,7 @@ using namespace facebook::react;
   if (@available(iOS 16.0, *)) {
     NSString *detentId = [NSString stringWithFormat:@"custom-%f", value];
     CGFloat sheetHeight = value * self.screenHeight;
-    return [self customDetentWithIdentifier:detentId height:sheetHeight];
+    return [self customDetentWithIdentifier:detentId height:sheetHeight atIndex:index];
   } else if (value >= 0.5) {
     return [UISheetPresentationControllerDetent largeDetent];
   } else {
@@ -594,17 +606,27 @@ using namespace facebook::react;
 }
 
 - (UISheetPresentationControllerDetent *)customDetentWithIdentifier:(NSString *)identifier
-                                                             height:(CGFloat)height API_AVAILABLE(ios(16.0)) {
+                                                             height:(CGFloat)height
+                                                            atIndex:(NSInteger)index API_AVAILABLE(ios(16.0)) {
   CGFloat bottomAdjustment = [self detentBottomAdjustmentForHeight:height];
   return [UISheetPresentationControllerDetent
     customDetentWithIdentifier:identifier
                       resolver:^CGFloat(id<UISheetPresentationControllerDetentResolutionContext> context) {
                         CGFloat maxDetentValue = context.maximumDetentValue;
+                        self->_detentCalculator.maxDetentHeight = maxDetentValue;
+
                         CGFloat maxValue = self.maxContentHeight
                                              ? fmin(maxDetentValue, [self.maxContentHeight floatValue])
                                              : maxDetentValue;
                         CGFloat adjustedHeight = height - bottomAdjustment;
-                        return fmin(adjustedHeight, maxValue);
+                        CGFloat resolved = fmin(adjustedHeight, maxValue);
+
+                        NSMutableArray *heights = self->_detentCalculator.resolvedDetentHeights;
+                        if (heights && index >= 0 && index < (NSInteger)heights.count) {
+                          heights[index] = @(resolved);
+                        }
+
+                        return resolved;
                       }];
 }
 
@@ -802,6 +824,10 @@ using namespace facebook::react;
 
 #pragma mark - UISheetPresentationControllerDelegate
 
+- (BOOL)presentationControllerShouldDismiss:(UIPresentationController *)presentationController {
+  return self.dismissible;
+}
+
 - (void)sheetPresentationControllerDidChangeSelectedDetentIdentifier:
   (UISheetPresentationController *)sheetPresentationController {
   dispatch_async(dispatch_get_main_queue(), ^{

package/ios/core/TrueSheetDetentCalculator.h

@@ -30,6 +30,8 @@ NS_ASSUME_NONNULL_BEGIN
 @interface TrueSheetDetentCalculator : NSObject
 
 @property (nonatomic, weak, nullable) id<TrueSheetDetentCalculatorDelegate> delegate;
+@property (nonatomic, assign) CGFloat maxDetentHeight;
+@property (nonatomic, strong, nullable) NSMutableArray<NSNumber *> *resolvedDetentHeights;
 
 /**
  Returns the detent value (0-1 fraction) for a given index.
@@ -38,16 +40,10 @@ NS_ASSUME_NONNULL_BEGIN
 - (CGFloat)detentValueForIndex:(NSInteger)index;
 
 /**
- Returns the estimated screen position (Y coordinate) for a detent index.
- Uses stored resolved positions if available, otherwise calculates from detent value.
- */
-- (CGFloat)estimatedPositionForIndex:(NSInteger)index;
-
-/**
- Stores the current resolved position for a detent index.
+ Learns the offset between resolver height and actual presented height for a detent.
  Called when the sheet settles at a detent.
  */
-- (void)storeResolvedPositionForIndex:(NSInteger)index;
+- (void)learnOffsetForDetentIndex:(NSInteger)index;
 
 /**
  Finds the segment between detents for a given position.
@@ -71,10 +67,10 @@ NS_ASSUME_NONNULL_BEGIN
 - (CGFloat)interpolatedDetentForPosition:(CGFloat)position;
 
 /**
- Clears all stored resolved positions.
+ Clears all resolved heights and learned offsets.
  Called when detents configuration changes.
  */
-- (void)clearResolvedPositions;
+- (void)clearResolvedHeights;
 
 /**
  Sets the count of detents (initializes storage for resolved positions).

package/ios/core/TrueSheetDetentCalculator.mm

@@ -9,14 +9,7 @@
 #import "TrueSheetDetentCalculator.h"
 
 @implementation TrueSheetDetentCalculator {
-  NSMutableArray<NSNumber *> *_resolvedDetentPositions;
-}
-
-- (instancetype)init {
-  if (self = [super init]) {
-    _resolvedDetentPositions = [NSMutableArray array];
-  }
-  return self;
+  NSMutableArray<NSNumber *> *_resolvedDetentOffsets;
 }
 
 #pragma mark - Public Methods
@@ -34,42 +27,57 @@
   return 0;
 }
 
-- (CGFloat)estimatedPositionForIndex:(NSInteger)index {
-  if (index < 0 || index >= (NSInteger)_resolvedDetentPositions.count) {
-    return 0;
+- (void)learnOffsetForDetentIndex:(NSInteger)index {
+  if (index < 0 || !_resolvedDetentHeights || index >= (NSInteger)_resolvedDetentHeights.count) {
+    return;
   }
 
-  CGFloat storedPos = [_resolvedDetentPositions[index] doubleValue];
-  if (storedPos > 0) {
-    return storedPos;
+  CGFloat actualHeight = self.delegate.screenHeight - self.delegate.currentPosition;
+  CGFloat resolverHeight = [_resolvedDetentHeights[index] doubleValue];
+  // Always update — system offset can change between detent transitions
+  if (resolverHeight > 0 && actualHeight > 0) {
+    _resolvedDetentOffsets[index] = @(actualHeight - resolverHeight);
   }
+}
 
-  CGFloat screenHeight = self.delegate.screenHeight;
-  CGFloat detentValue = [self detentValueForIndex:index];
-  CGFloat basePosition = screenHeight - (detentValue * screenHeight);
-
-  // Try to find offset from a known resolved position
-  for (NSInteger i = 0; i < (NSInteger)_resolvedDetentPositions.count; i++) {
-    CGFloat pos = [_resolvedDetentPositions[i] doubleValue];
-    if (pos > 0) {
-      CGFloat knownDetent = [self detentValueForIndex:i];
-      CGFloat expectedPos = screenHeight - (knownDetent * screenHeight);
-      CGFloat offset = pos - expectedPos;
-      return basePosition + offset;
+- (CGFloat)resolvedHeightForIndex:(NSInteger)index {
+  if (_resolvedDetentHeights && index >= 0 && index < (NSInteger)_resolvedDetentHeights.count) {
+    CGFloat h = [_resolvedDetentHeights[index] doubleValue];
+    if (h > 0) {
+      // Use per-detent offset if learned, otherwise find any known offset
+      CGFloat offset = [self offsetForIndex:index];
+      return h + offset;
     }
   }
 
-  return basePosition;
+  CGFloat detentValue = [self detentValueForIndex:index];
+  if (_maxDetentHeight > 0) {
+    return detentValue * _maxDetentHeight;
+  }
+  return detentValue * self.delegate.screenHeight;
 }
 
-- (void)storeResolvedPositionForIndex:(NSInteger)index {
-  if (index >= 0 && index < (NSInteger)_resolvedDetentPositions.count) {
-    _resolvedDetentPositions[index] = @(self.delegate.currentPosition);
+- (CGFloat)offsetForIndex:(NSInteger)index {
+  // Use this detent's own offset if available
+  if (index >= 0 && index < (NSInteger)_resolvedDetentOffsets.count) {
+    CGFloat offset = [_resolvedDetentOffsets[index] doubleValue];
+    if (offset != 0)
+      return offset;
+  }
+
+  // Fall back to any known offset
+  for (NSInteger i = 0; i < (NSInteger)_resolvedDetentOffsets.count; i++) {
+    CGFloat offset = [_resolvedDetentOffsets[i] doubleValue];
+    if (offset != 0)
+      return offset;
   }
+
+  return 0;
 }
 
 - (BOOL)findSegmentForPosition:(CGFloat)position outIndex:(NSInteger *)outIndex outProgress:(CGFloat *)outProgress {
-  NSInteger count = _resolvedDetentPositions.count;
+  NSArray<NSNumber *> *detents = self.delegate.detents;
+  NSInteger count = detents.count;
   if (count == 0) {
     *outIndex = -1;
     *outProgress = 0;
@@ -77,27 +85,27 @@
   }
 
   CGFloat screenHeight = self.delegate.screenHeight;
-  CGFloat firstPos = [self estimatedPositionForIndex:0];
+  CGFloat sheetHeight = screenHeight - position;
+  CGFloat firstHeight = [self resolvedHeightForIndex:0];
 
-  // Above first detent - interpolating toward closed
-  if (position > firstPos) {
-    CGFloat range = screenHeight - firstPos;
+  // Below first detent - interpolating toward closed
+  if (sheetHeight < firstHeight) {
     *outIndex = -1;
-    *outProgress = range > 0 ? (position - firstPos) / range : 0;
+    *outProgress = firstHeight > 0 ? (firstHeight - sheetHeight) / firstHeight : 0;
     return NO;
   }
 
-  // Single detent - at or above the detent
+  // Single detent
   if (count == 1) {
     *outIndex = 0;
     *outProgress = 0;
     return NO;
   }
 
-  CGFloat lastPos = [self estimatedPositionForIndex:count - 1];
+  CGFloat lastHeight = [self resolvedHeightForIndex:count - 1];
 
-  // Below last detent
-  if (position < lastPos) {
+  // Above last detent
+  if (sheetHeight > lastHeight) {
     *outIndex = count - 1;
     *outProgress = 0;
     return NO;
@@ -105,13 +113,13 @@
 
   // Between detents
   for (NSInteger i = 0; i < count - 1; i++) {
-    CGFloat pos = [self estimatedPositionForIndex:i];
-    CGFloat nextPos = [self estimatedPositionForIndex:i + 1];
+    CGFloat h = [self resolvedHeightForIndex:i];
+    CGFloat nextH = [self resolvedHeightForIndex:i + 1];
 
-    if (position <= pos && position >= nextPos) {
-      CGFloat range = pos - nextPos;
+    if (sheetHeight >= h && sheetHeight <= nextH) {
+      CGFloat range = nextH - h;
       *outIndex = i;
-      *outProgress = range > 0 ? (pos - position) / range : 0;
+      *outProgress = range > 0 ? (sheetHeight - h) / range : 0;
       return YES;
     }
   }
@@ -154,14 +162,17 @@
   return detent + progress * (nextDetent - detent);
 }
 
-- (void)clearResolvedPositions {
-  [_resolvedDetentPositions removeAllObjects];
+- (void)clearResolvedHeights {
+  [_resolvedDetentHeights removeAllObjects];
+  [_resolvedDetentOffsets removeAllObjects];
 }
 
 - (void)setDetentCount:(NSInteger)count {
-  [_resolvedDetentPositions removeAllObjects];
+  _resolvedDetentHeights = [NSMutableArray arrayWithCapacity:count];
+  _resolvedDetentOffsets = [NSMutableArray arrayWithCapacity:count];
   for (NSInteger i = 0; i < count; i++) {
-    [_resolvedDetentPositions addObject:@(0)];
+    [_resolvedDetentHeights addObject:@(0)];
+    [_resolvedDetentOffsets addObject:@(0)];
   }
 }
 

package/package.json

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