@lodev09/react-native-true-sheet 3.1.0-beta.6 → 3.1.0-beta.7

package/ios/TrueSheetView.mm

@@ -223,7 +223,7 @@ using namespace facebook::react;
       [self->_controller setupSheetDetents];
       [self->_controller applyActiveDetent];
     }];
-    [_controller updateDraggable];
+    [_controller setupDraggable];
   } else if (_initialDetentIndex >= 0) {
     [self presentAtIndex:_initialDetentIndex animated:_initialDetentAnimated completion:nil];
   }
@@ -361,7 +361,7 @@ using namespace facebook::react;
 /**
  * Debounced sheet update to handle rapid content/header size changes.
  */
-- (void)updateSheetIfNeeded {
+- (void)setupSheetDetentsForSizeChange {
   if (!_controller.isPresented || _isSheetUpdatePending)
     return;
 
@@ -371,19 +371,19 @@ using namespace facebook::react;
     self->_isSheetUpdatePending = NO;
 
     [self->_controller.sheetPresentationController animateChanges:^{
-      [self->_controller setupSheetDetents];
+      [self->_controller setupSheetDetentsForSizeChange];
     }];
   });
 }
 
 - (void)containerViewContentDidChangeSize:(CGSize)newSize {
   _controller.contentHeight = @(newSize.height);
-  [self updateSheetIfNeeded];
+  [self setupSheetDetentsForSizeChange];
 }
 
 - (void)containerViewHeaderDidChangeSize:(CGSize)newSize {
   _controller.headerHeight = @(newSize.height);
-  [self updateSheetIfNeeded];
+  [self setupSheetDetentsForSizeChange];
 }
 
 #pragma mark - TrueSheetViewControllerDelegate

package/ios/TrueSheetViewController.h

@@ -69,9 +69,10 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)applyActiveDetent;
 - (void)setupActiveDetentWithIndex:(NSInteger)index;
 - (void)resizeToDetentIndex:(NSInteger)index;
-- (void)setupSheetDetents;
 - (void)setupSheetProps;
-- (void)updateDraggable;
+- (void)setupSheetDetents;
+- (void)setupSheetDetentsForSizeChange;
+- (void)setupDraggable;
 
 @end
 

package/ios/TrueSheetViewController.mm

@@ -22,13 +22,15 @@
 
 @implementation TrueSheetViewController {
   CGFloat _lastPosition;
-  BOOL _isDragging;
   NSInteger _pendingDetentIndex;
+  BOOL _pendingContentSizeChange;
 
-  // Transitioning tracker
+  // Position tracking
   CADisplayLink *_transitioningTimer;
   UIView *_transitionFakeView;
+  BOOL _isDragging;
   BOOL _isTransitioning;
+  BOOL _isTrackingPositionFromLayout;
 
   // Reference to parent TrueSheetViewController (if presented from another sheet)
   __weak TrueSheetViewController *_parentSheetController;
@@ -61,10 +63,13 @@
     _lastPosition = 0;
     _isDragging = NO;
     _isPresented = NO;
+    _pendingContentSizeChange = NO;
     _activeDetentIndex = -1;
     _pendingDetentIndex = -1;
+
     _isTransitioning = NO;
     _transitionFakeView = [UIView new];
+    _isTrackingPositionFromLayout = NO;
 
     _blurInteraction = YES;
     _resolvedDetentPositions = [NSMutableArray array];
@@ -200,6 +205,9 @@
       if ([self.delegate respondsToSelector:@selector(viewControllerDidFocus)]) {
         [self.delegate viewControllerDidFocus];
       }
+
+      // Emit correct position after presentation
+      [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:NO debug:@"did present"];
     });
 
     [self setupGestureRecognizer];
@@ -264,6 +272,31 @@
   }
 }
 
+- (void)viewWillLayoutSubviews {
+  [super viewWillLayoutSubviews];
+
+  if (!_isTransitioning) {
+    _isTrackingPositionFromLayout = YES;
+
+    UIViewController *presented = self.presentedViewController;
+
+    // Not realtime when another controller is presented that triggers our layout
+    BOOL hasPresentedController = presented != nil && !presented.isBeingPresented && !presented.isBeingDismissed;
+
+    BOOL realtime = !hasPresentedController;
+
+    if (_pendingContentSizeChange) {
+      _pendingContentSizeChange = NO;
+      realtime = NO;
+
+      // Store resolved position after content size changes
+      [self storeResolvedPositionForIndex:self.currentDetentIndex];
+    }
+
+    [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:realtime debug:@"layout"];
+  }
+}
+
 - (void)viewDidLayoutSubviews {
   [super viewDidLayoutSubviews];
 
@@ -271,15 +304,6 @@
     [self.delegate viewControllerDidChangeSize:self.view.frame.size];
   }
 
-  UIViewController *presented = self.presentedViewController;
-  BOOL hasPresentedController = presented != nil && !presented.isBeingPresented && !presented.isBeingDismissed;
-
-  if (!_isDragging && !_isTransitioning) {
-    // Update stored position for current detent (handles content size changes)
-    [self storeResolvedPositionForIndex:self.currentDetentIndex];
-    [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:hasPresentedController];
-  }
-
   // Emit pending detent change after programmatic resize settles
   if (_pendingDetentIndex >= 0) {
     NSInteger pendingIndex = _pendingDetentIndex;
@@ -289,9 +313,14 @@
       if ([self.delegate respondsToSelector:@selector(viewControllerDidChangeDetent:position:detent:)]) {
         CGFloat detent = [self detentValueForIndex:pendingIndex];
         [self.delegate viewControllerDidChangeDetent:pendingIndex position:self.currentPosition detent:detent];
+
+        // Emit position for the final position
+        [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:NO debug:@"pending detent change"];
       }
     });
   }
+
+  _isTrackingPositionFromLayout = NO;
 }
 
 #pragma mark - Presentation Tracking (for RN Screens integration)
@@ -402,7 +431,7 @@
   }
 }
 
-- (void)updateDraggable {
+- (void)setupDraggable {
   UIView *presentedView = self.presentedView;
   if (!presentedView)
     return;
@@ -432,7 +461,9 @@
       _isDragging = YES;
       break;
     case UIGestureRecognizerStateChanged:
-      [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:YES];
+      if (!_isTrackingPositionFromLayout) {
+        [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:YES debug:@"drag change"];
+      }
       break;
     case UIGestureRecognizerStateEnded:
     case UIGestureRecognizerStateCancelled: {
@@ -440,7 +471,9 @@
         dispatch_async(dispatch_get_main_queue(), ^{
           // Store resolved position when drag ends
           [self storeResolvedPositionForIndex:self.currentDetentIndex];
-          [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:NO];
+
+          // Emit the correct position after dragging
+          [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:NO debug:@"drag end"];
         });
       }
 
@@ -461,7 +494,7 @@
   _isTransitioning = YES;
 
   CGRect dismissedFrame = CGRectMake(0, self.screenHeight, 0, 0);
-  CGRect presentedFrame = CGRectMake(0, self.presentedView.frame.origin.y, 0, 0);
+  CGRect presentedFrame = CGRectMake(0, self.currentPosition, 0, 0);
 
   // Set starting fake view position
   _transitionFakeView.frame = self.isDismissing ? presentedFrame : dismissedFrame;
@@ -470,7 +503,7 @@
   auto animation = ^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {
     [[context containerView] addSubview:self->_transitionFakeView];
 
-    // Set the fake view target position
+    // Set ending fake view position
     self->_transitionFakeView.frame = self.isDismissing ? dismissedFrame : presentedFrame;
 
     self->_transitioningTimer = [CADisplayLink displayLinkWithTarget:self selector:@selector(handleTransitionTracker)];
@@ -495,16 +528,17 @@
 
     if (self.currentPosition >= self.screenHeight) {
       // Dismissing position
-      [self emitChangePositionDelegateWithPosition:layerPosition realtime:YES];
+      CGFloat position = fmax(_lastPosition, layerPosition);
+      [self emitChangePositionDelegateWithPosition:position realtime:YES debug:@"transition out"];
     } else {
       // Presenting position
       CGFloat position = fmax(self.currentPosition, layerPosition);
-      [self emitChangePositionDelegateWithPosition:position realtime:YES];
+      [self emitChangePositionDelegateWithPosition:position realtime:YES debug:@"transition in"];
     }
   }
 }
 
-- (void)emitChangePositionDelegateWithPosition:(CGFloat)position realtime:(BOOL)realtime {
+- (void)emitChangePositionDelegateWithPosition:(CGFloat)position realtime:(BOOL)realtime debug:(NSString *)debug {
   // Use epsilon comparison to avoid missing updates due to floating point precision
   if (fabs(_lastPosition - position) > 0.01) {
     _lastPosition = position;
@@ -514,6 +548,9 @@
     if ([self.delegate respondsToSelector:@selector(viewControllerDidChangePosition:position:detent:realtime:)]) {
       [self.delegate viewControllerDidChangePosition:index position:position detent:detent realtime:realtime];
     }
+
+    // Debug position tracking
+    // NSLog(@"position from %@: %f, realtime: %i", debug, position, realtime);
   }
 }
 
@@ -658,6 +695,11 @@
 
 #pragma mark - Sheet Configuration
 
+- (void)setupSheetDetentsForSizeChange {
+  _pendingContentSizeChange = YES;
+  [self setupSheetDetents];
+}
+
 - (void)setupSheetDetents {
   UISheetPresentationController *sheet = self.sheetPresentationController;
   if (!sheet)

package/lib/module/reanimated/ReanimatedTrueSheetProvider.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { createContext, useContext, useMemo } from 'react';
+import { createContext, useContext } from 'react';
 import { useWindowDimensions } from 'react-native';
 import { useSharedValue } from 'react-native-reanimated';
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -31,11 +31,11 @@ export const ReanimatedTrueSheetProvider = ({
   const animatedPosition = useSharedValue(height);
   const animatedIndex = useSharedValue(-1);
   const animatedDetent = useSharedValue(0);
-  const value = useMemo(() => ({
+  const value = {
     animatedPosition,
     animatedIndex,
     animatedDetent
-  }), [animatedPosition, animatedIndex, animatedDetent]);
+  };
   return /*#__PURE__*/_jsx(ReanimatedTrueSheetContext.Provider, {
     value: value,
     children: children

package/lib/module/reanimated/ReanimatedTrueSheetProvider.js.map

@@ -1 +1 @@
-{"version":3,"names":["createContext","useContext","useMemo","useWindowDimensions","useSharedValue","jsx","_jsx","ReanimatedTrueSheetContext","ReanimatedTrueSheetProvider","children","height","animatedPosition","animatedIndex","animatedDetent","value","Provider","useReanimatedTrueSheet","context","Error"],"sourceRoot":"../../../src","sources":["reanimated/ReanimatedTrueSheetProvider.tsx"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,UAAU,EAAEC,OAAO,QAAwB,OAAO;AAC1E,SAASC,mBAAmB,QAAQ,cAAc;AAClD,SAASC,cAAc,QAA0B,yBAAyB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAmB3E,MAAMC,0BAA0B,gBAAGP,aAAa,CAAyC,IAAI,CAAC;AAM9F;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMQ,2BAA2B,GAAGA,CAAC;EAAEC;AAA2C,CAAC,KAAK;EAC7F,MAAM;IAAEC;EAAO,CAAC,GAAGP,mBAAmB,CAAC,CAAC;EACxC,MAAMQ,gBAAgB,GAAGP,cAAc,CAACM,MAAM,CAAC;EAC/C,MAAME,aAAa,GAAGR,cAAc,CAAC,CAAC,CAAC,CAAC;EACxC,MAAMS,cAAc,GAAGT,cAAc,CAAC,CAAC,CAAC;EAExC,MAAMU,KAAK,GAAGZ,OAAO,CACnB,OAAO;IACLS,gBAAgB;IAChBC,aAAa;IACbC;EACF,CAAC,CAAC,EACF,CAACF,gBAAgB,EAAEC,aAAa,EAAEC,cAAc,CAClD,CAAC;EAED,oBACEP,IAAA,CAACC,0BAA0B,CAACQ,QAAQ;IAACD,KAAK,EAAEA,KAAM;IAAAL,QAAA,EAC/CA;EAAQ,CAC0B,CAAC;AAE1C,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMO,sBAAsB,GAAGA,CAAA,KAAuC;EAC3E,MAAMC,OAAO,GAAGhB,UAAU,CAACM,0BAA0B,CAAC;EAEtD,IAAI,CAACU,OAAO,EAAE;IACZ,MAAM,IAAIC,KAAK,CACb,4EAA4E,GAC1E,2EACJ,CAAC;EACH;EAEA,OAAOD,OAAO;AAChB,CAAC","ignoreList":[]}
+{"version":3,"names":["createContext","useContext","useWindowDimensions","useSharedValue","jsx","_jsx","ReanimatedTrueSheetContext","ReanimatedTrueSheetProvider","children","height","animatedPosition","animatedIndex","animatedDetent","value","Provider","useReanimatedTrueSheet","context","Error"],"sourceRoot":"../../../src","sources":["reanimated/ReanimatedTrueSheetProvider.tsx"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,UAAU,QAAwB,OAAO;AACjE,SAASC,mBAAmB,QAAQ,cAAc;AAClD,SAASC,cAAc,QAA0B,yBAAyB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAmB3E,MAAMC,0BAA0B,gBAAGN,aAAa,CAAyC,IAAI,CAAC;AAM9F;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMO,2BAA2B,GAAGA,CAAC;EAAEC;AAA2C,CAAC,KAAK;EAC7F,MAAM;IAAEC;EAAO,CAAC,GAAGP,mBAAmB,CAAC,CAAC;EACxC,MAAMQ,gBAAgB,GAAGP,cAAc,CAACM,MAAM,CAAC;EAC/C,MAAME,aAAa,GAAGR,cAAc,CAAC,CAAC,CAAC,CAAC;EACxC,MAAMS,cAAc,GAAGT,cAAc,CAAC,CAAC,CAAC;EAExC,MAAMU,KAAsC,GAAG;IAC7CH,gBAAgB;IAChBC,aAAa;IACbC;EACF,CAAC;EAED,oBACEP,IAAA,CAACC,0BAA0B,CAACQ,QAAQ;IAACD,KAAK,EAAEA,KAAM;IAAAL,QAAA,EAC/CA;EAAQ,CAC0B,CAAC;AAE1C,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMO,sBAAsB,GAAGA,CAAA,KAAuC;EAC3E,MAAMC,OAAO,GAAGf,UAAU,CAACK,0BAA0B,CAAC;EAEtD,IAAI,CAACU,OAAO,EAAE;IACZ,MAAM,IAAIC,KAAK,CACb,4EAA4E,GAC1E,2EACJ,CAAC;EACH;EAEA,OAAOD,OAAO;AAChB,CAAC","ignoreList":[]}

package/lib/typescript/src/reanimated/ReanimatedTrueSheetProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReanimatedTrueSheetProvider.d.ts","sourceRoot":"","sources":["../../../../src/reanimated/ReanimatedTrueSheetProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAE3E,OAAO,EAAkB,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3E,MAAM,WAAW,+BAA+B;IAC9C;;OAEG;IACH,gBAAgB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACtC;;;OAGG;IACH,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACnC;;;OAGG;IACH,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACrC;AAID,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,2BAA2B,GAAI,cAAc,gCAAgC,4CAoBzF,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,sBAAsB,QAAO,+BAWzC,CAAC"}
+{"version":3,"file":"ReanimatedTrueSheetProvider.d.ts","sourceRoot":"","sources":["../../../../src/reanimated/ReanimatedTrueSheetProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAElE,OAAO,EAAkB,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3E,MAAM,WAAW,+BAA+B;IAC9C;;OAEG;IACH,gBAAgB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACtC;;;OAGG;IACH,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACnC;;;OAGG;IACH,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACrC;AAID,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,2BAA2B,GAAI,cAAc,gCAAgC,4CAiBzF,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,sBAAsB,QAAO,+BAWzC,CAAC"}

package/package.json

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

package/src/reanimated/ReanimatedTrueSheetProvider.tsx

@@ -1,4 +1,4 @@
-import { createContext, useContext, useMemo, type ReactNode } from 'react';
+import { createContext, useContext, type ReactNode } from 'react';
 import { useWindowDimensions } from 'react-native';
 import { useSharedValue, type SharedValue } from 'react-native-reanimated';
 
@@ -48,14 +48,11 @@ export const ReanimatedTrueSheetProvider = ({ children }: ReanimatedTrueSheetPro
   const animatedIndex = useSharedValue(-1);
   const animatedDetent = useSharedValue(0);
 
-  const value = useMemo(
-    () => ({
-      animatedPosition,
-      animatedIndex,
-      animatedDetent,
-    }),
-    [animatedPosition, animatedIndex, animatedDetent]
-  );
+  const value: ReanimatedTrueSheetContextValue = {
+    animatedPosition,
+    animatedIndex,
+    animatedDetent,
+  };
 
   return (
     <ReanimatedTrueSheetContext.Provider value={value}>