@lodev09/react-native-true-sheet 4.0.0-beta.29 → 4.0.0-beta.30

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

@@ -448,6 +448,17 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     viewController.createSheet()
     setupScrollable()
 
+    // Attach before any keyboard wait so the touches meanwhile don't reach the views below
+    rootContainerView = findRootContainerView()
+    rootContainerView?.let { container ->
+      viewController.coordinatorLayout?.let {
+        it.blocksTouches = true
+        container.addView(it)
+        // Touches skip a view without a frame — don't wait for the next layout pass
+        it.layout(0, 0, container.width, container.height)
+      }
+    }
+
     // Dismiss keyboard if focused view is within a sheet or if target detent will be dimmed
     val parentSheet = TrueSheetStackManager.getTopmostSheet()
     val isFocusedViewWithinSheet = parentSheet?.viewController?.isFocusedViewWithinSheet() == true
@@ -481,10 +492,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
       return
     }
 
-    // Attach coordinator to the root container
-    rootContainerView = findRootContainerView()
-    viewController.coordinatorLayout?.let { rootContainerView?.addView(it) }
-
     // Register with observer to track sheet stack hierarchy
     viewController.parentSheetView = TrueSheetStackManager.registerSheet(this)
 
@@ -492,6 +499,11 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     viewController.present(detentIndex, animated)
   }
 
+  private fun detachCoordinator() {
+    viewController.coordinatorLayout?.let { rootContainerView?.removeView(it) }
+    rootContainerView = null
+  }
+
   @UiThread
   fun handleBackPress() {
     viewController.handleBackPress()
@@ -505,6 +517,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     val callback = pendingPresentCallback ?: return false
     pendingPresentCallback = null
     pendingPresentParent = null
+    detachCoordinator()
     if (restoreFocus) {
       viewController.restoreFocusedView()
     } else {
@@ -725,10 +738,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     // A slide-back cut short by this sheet's own dismissal never emits; don't carry it over
     isDidFocusPending = false
 
-    // Detach coordinator from the root container view
-    viewController.coordinatorLayout?.let { rootContainerView?.removeView(it) }
-    rootContainerView = null
-
+    detachCoordinator()
     cleanupScreenEventObserver()
 
     val surfaceId = UIManagerHelper.getSurfaceId(this)

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

@@ -1017,6 +1017,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   private fun finishPresent() {
+    coordinatorLayout?.blocksTouches = false
+
     // Restore isHideable to actual value after present animation
     behavior?.isHideable = dismissible
 
@@ -1550,8 +1552,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     delegate?.viewControllerWillDismiss()
     parentSheetView?.viewControllerWillFocus()
 
-    // Dismissed mid-present: finishPresent() won't run. Settle the pending present well
-    // before didDismiss so JS clears isPresenting and unmounts the lazy native view
+    // Dismissed mid-present: finishPresent() won't run. Stop blocking touches, and settle the
+    // pending present well before didDismiss so JS clears isPresenting and unmounts the lazy native view
+    coordinatorLayout?.blocksTouches = false
     presentPromise?.invoke()
     presentPromise = null
   }

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

@@ -80,19 +80,29 @@ class TrueSheetCoordinatorLayout(context: Context) :
   // Pull-down tracking. BottomSheetBehavior gives no callback when a downward drag
   // is clamped by `isHideable = false` — the sheet stays put (or the scrollable
   // overscrolls) and no state change fires. Accumulate the downward finger travel
-  // neither the sheet nor its scrollable followed and report it on release so the
-  // controller can surface a blocked dismiss attempt.
+  // neither the sheet nor a scroller under the finger followed and report it on
+  // release so the controller can surface a blocked dismiss attempt. Like iOS, a
+  // pull that began on a scroller that could scroll up stays a scroll, even past
+  // its top.
   private var pullTracking = false
   private var pullStartX = 0f
   private var pullStartY = 0f
   private var pullLastY = 0f
   private var pullOverdrag = 0f
   private var pullKeyboardVisible = false
+  private var pullScrollers: List<View> = emptyList()
+  private var pullBeganScrolled = false
 
   // A touch that began inside the sheet is still down
   val isTouchingSheet: Boolean
     get() = pullTracking
 
+  // Set while the sheet presents, from present() (keyboard wait included) until the
+  // present finishes or a dismiss starts. A stream that begins meanwhile is swallowed
+  // whole so nothing below takes it, like the iOS presentation transition.
+  var blocksTouches = false
+  private var streamBlocked = false
+
   init {
     layoutParams = LayoutParams(
       LayoutParams.MATCH_PARENT,
@@ -123,6 +133,14 @@ class TrueSheetCoordinatorLayout(context: Context) :
     get() = PointerEvents.BOX_NONE
 
   override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
+    if (ev.actionMasked == MotionEvent.ACTION_DOWN) streamBlocked = blocksTouches
+    if (streamBlocked) {
+      if (ev.actionMasked == MotionEvent.ACTION_UP || ev.actionMasked == MotionEvent.ACTION_CANCEL) {
+        streamBlocked = false
+      }
+      return true
+    }
+
     when (ev.actionMasked) {
       MotionEvent.ACTION_DOWN -> {
         val sheet = delegate?.findSheetView()
@@ -140,9 +158,14 @@ class TrueSheetCoordinatorLayout(context: Context) :
         val handled = super.dispatchTouchEvent(ev)
         val step = ev.rawY - pullLastY
         pullLastY = ev.rawY
-        // Finger moved down but the sheet stayed put and the scrollable is at
-        // its top — the pull was clamped
-        if (step > 0 && sheet != null && sheet.top == topBefore && delegate?.findScrollView()?.canScrollVertically(-1) != true) {
+        // Finger moved down but the sheet stayed put and nothing under the finger
+        // scrolled — the pull was clamped
+        if (!pullBeganScrolled &&
+          step > 0 &&
+          sheet != null &&
+          sheet.top == topBefore &&
+          pullScrollers.none { it.canScrollVertically(-1) }
+        ) {
           pullOverdrag += step
         }
         return handled
@@ -205,18 +228,27 @@ class TrueSheetCoordinatorLayout(context: Context) :
   /**
    * Resolves the stream's touch target (respecting zIndex and pointerEvents) and
    * decides whether the sheet may drag from it — inside the sheet, outside the detected
-   * scrollable, and nothing along the target's chain scrolls vertically.
+   * scrollable, and nothing along the target's chain scrolls vertically. Also collects
+   * the chain's vertical scrollers for pull-down tracking.
    */
   private fun updateStreamTargetFlags(ev: MotionEvent) {
     streamSheetDraggable = false
     streamDraggableEditText = false
     streamScrollsIndependently = false
+    pullScrollers = emptyList()
+    pullBeganScrolled = false
 
     val sheet = delegate?.findSheetView() ?: return
     val target = TouchTargetHelper.findTargetPathAndCoordinatesForTouch(ev.x, ev.y, this, FloatArray(2))
       .firstNotNullOfOrNull { it.getView() } ?: return
     if (target !== sheet && !target.isDescendantOf(sheet)) return
 
+    pullScrollers = generateSequence(target) { it.parent as? View }
+      .takeWhile { it !== this }
+      .filter { it.canScrollVertically(1) || it.canScrollVertically(-1) }
+      .toList()
+    pullBeganScrolled = pullScrollers.any { it.canScrollVertically(-1) }
+
     // A detected scrollable that can scroll (or hosts pull-to-refresh) owns its
     // touches — nested scrolling drags the sheet. When it can't scroll (e.g.
     // the sheet is fully expanded and the content fits) it eats the gesture

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

@@ -44,6 +44,10 @@ class TrueSheetOverlayRootView(private val reactContext: ThemedReactContext) :
   init {
     layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
 
+    // React children draw outside their bounds (shadows, overflow)
+    clipChildren = false
+    clipToPadding = false
+
     // Draws and receives touches above the sheet coordinators regardless of add order
     translationZ = OVERLAY_Z
   }

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

@@ -161,7 +161,7 @@ object TrueSheetStackManager {
         return
       }
 
-      // The dimmed sheet and any sheets above it stay accessible
+      // The dimmed sheet, any sheets above it, and overlays (rendered above every sheet) stay accessible
       val accessibleCoordinators = presentedSheetStack
         .subList(topDimmedIndex, presentedSheetStack.size)
         .mapNotNull { it.viewController.coordinatorLayout }
@@ -169,7 +169,7 @@ object TrueSheetStackManager {
 
       for (i in 0 until root.childCount) {
         val child = root.getChildAt(i)
-        if (child in accessibleCoordinators) {
+        if (child in accessibleCoordinators || child is TrueSheetOverlayRootView) {
           savedBackgroundImportance.remove(child)?.let { child.importantForAccessibility = it }
           continue
         }

package/ios/TrueSheetContainerView.mm

@@ -248,22 +248,29 @@ using namespace facebook::react;
     _contentView.footerView = _footerView;
     [_footerView setBottomInset:_footerBottomInset];
     [self footerViewDidChangeSize:_footerView.frame.size];
+
+    // The observer is set up on present — a footer mounted after that (e.g. a
+    // conditional one) joins it here and rises above a keyboard that's already open
+    _footerView.keyboardObserver = _keyboardObserver;
+    [self updateFooterKeyboardOffset];
   }
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
-  if ([childComponentView isKindOfClass:[TrueSheetContentView class]]) {
+  if (childComponentView == _contentView) {
+    _contentView.keyboardObserver = nil;
     _contentView.delegate = nil;
     _contentView = nil;
   }
 
-  if ([childComponentView isKindOfClass:[TrueSheetHeaderView class]]) {
+  if (childComponentView == _headerView) {
     _headerView.delegate = nil;
     _headerView = nil;
     [self headerViewDidChangeSize:CGSizeZero];
   }
 
-  if ([childComponentView isKindOfClass:[TrueSheetFooterView class]]) {
+  if (childComponentView == _footerView) {
+    _footerView.keyboardObserver = nil;
     _footerView.delegate = nil;
     _footerView = nil;
     _contentView.footerView = nil;
@@ -364,17 +371,8 @@ using namespace facebook::react;
 
   _keyboardObserver = [[TrueSheetKeyboardObserver alloc] init];
   _keyboardObserver.viewController = (TrueSheetViewController *)viewController;
-
-  if (_contentView) {
-    _contentView.keyboardObserver = _keyboardObserver;
-    [_keyboardObserver addDelegate:_contentView];
-  }
-
-  if (_footerView) {
-    _footerView.keyboardObserver = _keyboardObserver;
-    [_keyboardObserver addDelegate:_footerView];
-  }
-
+  _contentView.keyboardObserver = _keyboardObserver;
+  _footerView.keyboardObserver = _keyboardObserver;
   [_keyboardObserver start];
 }
 

package/ios/TrueSheetContentView.mm

@@ -388,6 +388,12 @@ using namespace facebook::react;
 
 #pragma mark - TrueSheetKeyboardObserverDelegate
 
+- (void)setKeyboardObserver:(TrueSheetKeyboardObserver *)keyboardObserver {
+  [_keyboardObserver removeDelegate:self];
+  _keyboardObserver = keyboardObserver;
+  [keyboardObserver addDelegate:self];
+}
+
 - (void)keyboardWillShow:(CGFloat)height duration:(NSTimeInterval)duration curve:(UIViewAnimationOptions)curve {
   if (!_detectedScrollView) {
     return;

package/ios/TrueSheetFooterView.mm

@@ -156,7 +156,19 @@ using namespace facebook::react;
 
 - (void)updateLayoutMetrics:(const facebook::react::LayoutMetrics &)layoutMetrics
            oldLayoutMetrics:(const facebook::react::LayoutMetrics &)oldLayoutMetrics {
-  [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
+  // UIKit resizes the sheet for the keyboard inside its animation, and the new
+  // size usually relays out the footer in the same pass. When the keyboard
+  // changes during a React commit (e.g. its input unmounts), that layout can
+  // only mount after the commit, outside the animation — the footer, pinned to
+  // the container's bottom edge, would snap by the keyboard's height while the
+  // sheet is still animating. Carry it on the rest of the keyboard's curve.
+  if (layoutMetrics.frame.origin.y != oldLayoutMetrics.frame.origin.y) {
+    [self animateAlongKeyboard:^{
+      [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
+    }];
+  } else {
+    [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
+  }
 
   // State lands before layout metrics within the same mount transaction, so
   // this reflects the inset the shadow node baked into this frame — seeded
@@ -197,6 +209,28 @@ using namespace facebook::react;
 
 #pragma mark - TrueSheetKeyboardObserverDelegate
 
+- (void)setKeyboardObserver:(TrueSheetKeyboardObserver *)keyboardObserver {
+  [_keyboardObserver removeDelegate:self];
+  _keyboardObserver = keyboardObserver;
+  [keyboardObserver addDelegate:self];
+}
+
+- (void)animateAlongKeyboard:(void (^)(void))changes {
+  NSTimeInterval remaining = self.keyboardObserver.remainingAnimationDuration;
+  if (remaining > 0 && [UIView inheritedAnimationDuration] == 0) {
+    [UIView animateWithDuration:remaining
+                          delay:0
+                        options:self.keyboardObserver.animationCurve | UIViewAnimationOptionBeginFromCurrentState
+                     animations:^{
+                       changes();
+                       [self syncEdgeEffect];
+                     }
+                     completion:nil];
+  } else {
+    changes();
+  }
+}
+
 // Only an absolute footer floats above the keyboard — a relative footer stays
 // in the layout flow behind it, and an absolute one opts out via
 // footerOptions.avoidKeyboard.
@@ -291,7 +325,11 @@ using namespace facebook::react;
 
   CGFloat slide = [self keyboardSlideForHeight:height];
   [self setKeyboardOffset:slide];
-  self.transform = CGAffineTransformMakeTranslation(0, -slide);
+  // A footer mounted or relaid out mid-keyboard animation follows the keyboard
+  // instead of snapping ahead of it
+  [self animateAlongKeyboard:^{
+    self.transform = CGAffineTransformMakeTranslation(0, -slide);
+  }];
 }
 
 @end

package/ios/TrueSheetOverlayView.h

@@ -13,6 +13,11 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+/**
+ * Posted when an overlay container joins or leaves a window.
+ */
+extern NSNotificationName const TrueSheetOverlayWindowDidChangeNotification;
+
 /**
  * Hidden host that renders its children in a container attached directly to
  * the window, above every presented sheet.
@@ -25,6 +30,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (void)bringOverlaysToFrontInWindow:(nullable UIWindow *)window;
 
+/**
+ * The overlay containers attached to the window, front to back.
+ */
++ (NSArray<UIView *> *)overlayContainersInWindow:(nullable UIWindow *)window;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/TrueSheetOverlayView.mm

@@ -21,6 +21,8 @@
 
 using namespace facebook::react;
 
+NSNotificationName const TrueSheetOverlayWindowDidChangeNotification = @"TrueSheetOverlayWindowDidChangeNotification";
+
 static NSHashTable<TrueSheetOverlayView *> *gOverlayViews;
 
 @interface TrueSheetOverlayView () <TrueSheetOverlayContainerViewDelegate>
@@ -53,6 +55,16 @@ static NSHashTable<TrueSheetOverlayView *> *gOverlayViews;
   }
 }
 
++ (NSArray<UIView *> *)overlayContainersInWindow:(nullable UIWindow *)window {
+  NSMutableArray<UIView *> *containers = [NSMutableArray array];
+  for (UIView *subview in window.subviews.reverseObjectEnumerator) {
+    if ([subview isKindOfClass:[TrueSheetOverlayContainerView class]]) {
+      [containers addObject:subview];
+    }
+  }
+  return containers;
+}
+
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps = std::make_shared<const TrueSheetOverlayViewProps>();
@@ -100,6 +112,8 @@ static NSHashTable<TrueSheetOverlayView *> *gOverlayViews;
     [_containerView removeFromSuperview];
     [_containerController removeFromParentViewController];
   }
+
+  [[NSNotificationCenter defaultCenter] postNotificationName:TrueSheetOverlayWindowDidChangeNotification object:nil];
 }
 
 #pragma mark - State

package/ios/TrueSheetViewController.mm

@@ -9,6 +9,7 @@
 #import "TrueSheetViewController.h"
 #import "TrueSheetContainerView.h"
 #import "TrueSheetContentView.h"
+#import "TrueSheetOverlayView.h"
 #import "core/TrueSheetBlurView.h"
 #import "core/TrueSheetDetentCalculator.h"
 #import "core/TrueSheetDimView.h"
@@ -172,6 +173,11 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
     _hingeOffsets = [NSMutableDictionary dictionary];
     _detentCalculator = [[TrueSheetDetentCalculator alloc] init];
     _detentCalculator.delegate = self;
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(overlayWindowDidChange)
+                                                 name:TrueSheetOverlayWindowDidChangeNotification
+                                               object:nil];
   }
   return self;
 }
@@ -686,6 +692,15 @@ static BOOL TrueSheetIsPhoneIdiom(void) {
   UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, nil);
 }
 
+- (void)overlayWindowDidChange {
+  if (!self.canRefreshAccessibilityContainer) {
+    return;
+  }
+
+  [self setupAccessibilityContainer];
+  UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, nil);
+}
+
 - (UIViewController *)accessibilityPresentingViewController {
   UIViewController *presentingViewController = self.presentingViewController;
   while ([presentingViewController isKindOfClass:[TrueSheetViewController class]] &&
@@ -807,8 +822,12 @@ static BOOL TrueSheetIsPhoneIdiom(void) {
       }
       objc_setAssociatedObject(window, &TrueSheetAccessibilityWindowOwnerKey, [NSValue valueWithNonretainedObject:self],
         OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-      window.accessibilityElements =
+      NSArray *sheetElements =
         isAccessibilityModal ? @[ presentedView ] : @[ presentingViewController.view, presentedView ];
+      // Overlays render above every sheet. Listed first, since accessibility
+      // hit testing takes the first element containing the point.
+      window.accessibilityElements =
+        [[TrueSheetOverlayView overlayContainersInWindow:window] arrayByAddingObjectsFromArray:sheetElements];
       return;
     }
   }

package/ios/core/TrueSheetKeyboardObserver.h

@@ -26,6 +26,13 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, weak, nullable) TrueSheetViewController *viewController;
 @property (nonatomic, readonly) CGFloat currentHeight;
 
+/**
+ * What's left of the keyboard's last show/hide animation, so a change landing
+ * outside it (e.g. after a React commit) can finish on the same curve.
+ */
+@property (nonatomic, readonly) NSTimeInterval remainingAnimationDuration;
+@property (nonatomic, readonly) UIViewAnimationOptions animationCurve;
+
 - (void)addDelegate:(id<TrueSheetKeyboardObserverDelegate>)delegate;
 - (void)removeDelegate:(id<TrueSheetKeyboardObserverDelegate>)delegate;
 

package/ios/core/TrueSheetKeyboardObserver.mm

@@ -22,12 +22,17 @@ static const NSTimeInterval kUnanimatedKeyboardDuration = 0.25;
   NSHashTable<id<TrueSheetKeyboardObserverDelegate>> *_delegates;
   CGFloat _currentHeight;
   CGFloat _pendingMinimizedKeyboardOverlap;
+  CFTimeInterval _animationEndTime;
 }
 
 - (CGFloat)currentHeight {
   return _currentHeight;
 }
 
+- (NSTimeInterval)remainingAnimationDuration {
+  return MAX(0, _animationEndTime - CACurrentMediaTime());
+}
+
 - (instancetype)init {
   if (self = [super init]) {
     _delegates = [NSHashTable weakObjectsHashTable];
@@ -145,6 +150,8 @@ static const NSTimeInterval kUnanimatedKeyboardDuration = 0.25;
   }
 
   _currentHeight = keyboardHeight;
+  _animationEndTime = CACurrentMediaTime() + duration;
+  _animationCurve = curve;
 
   // UIKit also moves the sheet as the minimized keyboard comes and goes, by
   // whatever the detents couldn't absorb — settle again once it's done.

package/lib/module/navigation/createTrueSheetRouter.js

@@ -72,10 +72,11 @@ export const getTrueSheetStateForAction = (state, action) => {
         const closingIndex = targetIndex + 1;
 
         // Mark only the bottom-most route to pop as closing
-        // The sheet's dismiss() will handle dismissing sheets above it first
+        // The sheet's dismiss() will handle dismissing sheets above it first.
+        // The index stays on the top sheet until REMOVE: Expo Router 58 treats the routes
+        // after `index` as preloaded.
         return {
           ...state,
-          index: closingIndex,
           routes: state.routes.map((route, i) => {
             if (i === closingIndex) return {
               ...route,
@@ -133,6 +134,47 @@ export const getTrueSheetStateForAction = (state, action) => {
       return undefined;
   }
 };
+const BASE_ROUTE_ACTIONS = new Set(['NAVIGATE', 'NAVIGATE_DEPRECATED', 'PUSH', 'REPLACE', 'POP_TO']);
+
+/**
+ * Reduces an action that targets the base route by name. React Navigation 7 adds another base
+ * route for a `PUSH`, a `REPLACE` or a `NAVIGATE` without `pop`, which presents the base screen
+ * as a sheet, and this router's `POP_TO` drops the params and nested state. This goes back to it
+ * instead: `getPoppedState` reduces the action as a `NAVIGATE` with `pop` (a `PUSH` ignores
+ * `pop`) to update the base route (params, nested state), then the sheets above it are dismissed.
+ * Returns `undefined` for other actions, a `REPLACE` with no sheet (it swaps the base route), or
+ * when the base router doesn't land on the base route.
+ */
+export const getStateForNavigateToBase = (state, action, getPoppedState) => {
+  const {
+    type,
+    payload
+  } = action;
+  const baseRoute = state.routes[0];
+  const hasSheets = state.routes.length > 1;
+  if (!BASE_ROUTE_ACTIONS.has(type) || payload?.name !== baseRoute.name || type === 'REPLACE' && !hasSheets) {
+    return undefined;
+  }
+  const popped = getPoppedState({
+    ...action,
+    type: 'NAVIGATE',
+    payload: {
+      ...payload,
+      pop: true
+    }
+  });
+  const base = popped?.routes[popped.index];
+  if (base?.key !== baseRoute.key) {
+    return undefined;
+  }
+  if (!hasSheets) {
+    return popped;
+  }
+  return getTrueSheetStateForAction({
+    ...state,
+    routes: [base, ...state.routes.slice(1)]
+  }, TrueSheetActions.pop(state.routes.length - 1));
+};
 export const createTrueSheetRouter = stackRouter => routerOptions => {
   const baseRouter = stackRouter(routerOptions);
   return {
@@ -150,7 +192,9 @@ export const createTrueSheetRouter = stackRouter => routerOptions => {
       };
     },
     getStateForAction(state, action, options) {
-      const result = getTrueSheetStateForAction(state, action);
+      const result = getStateForNavigateToBase(state, action,
+      // NAVIGATE never returns a partial state
+      popAction => baseRouter.getStateForAction(state, popAction, options)) ?? getTrueSheetStateForAction(state, action);
       return result === undefined ? baseRouter.getStateForAction(state, action, options) : result;
     },
     getRehydratedState(partialState, {

package/lib/module/navigation/createTrueSheetRouter.js.map

@@ -1 +1 @@
-{"version":3,"names":["TrueSheetActions","uid","Math","random","toString","slice","ensureBaseRoute","state","baseRouteName","routeParamList","hasBaseRoute","routes","some","r","name","baseRoute","key","params","index","length","getResizeRouteIndex","action","target","source","findIndex","getTrueSheetStateForAction","type","routeIndex","map","route","i","resizeIndex","resizeKey","pop","count","payload","maxPopCount","actualCount","min","targetIndex","closingIndex","closing","dismissing","popCount","targetName","routeKey","removed","isPopped","filter","undefined","createTrueSheetRouter","stackRouter","routerOptions","baseRouter","getInitialState","options","initialRouteName","routeNames","stateWithBaseRoute","stale","getStateForAction","result","getRehydratedState","partialState","routeGetIdList","actionCreators"],"sourceRoot":"../../../src","sources":["navigation/createTrueSheetRouter.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["TrueSheetActions","uid","Math","random","toString","slice","ensureBaseRoute","state","baseRouteName","routeParamList","hasBaseRoute","routes","some","r","name","baseRoute","key","params","index","length","getResizeRouteIndex","action","target","source","findIndex","getTrueSheetStateForAction","type","routeIndex","map","route","i","resizeIndex","resizeKey","pop","count","payload","maxPopCount","actualCount","min","targetIndex","closingIndex","closing","dismissing","popCount","targetName","routeKey","removed","isPopped","filter","undefined","BASE_ROUTE_ACTIONS","Set","getStateForNavigateToBase","getPoppedState","hasSheets","has","popped","base","createTrueSheetRouter","stackRouter","routerOptions","baseRouter","getInitialState","options","initialRouteName","routeNames","stateWithBaseRoute","stale","getStateForAction","result","popAction","getRehydratedState","partialState","routeGetIdList","actionCreators"],"sourceRoot":"../../../src","sources":["navigation/createTrueSheetRouter.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/navigation/expo-router/extendTrueSheetRouter.js

@@ -1,7 +1,11 @@
 "use strict";
 
 import { TrueSheetActions } from "../actions.js";
-import { getResizeRouteIndex, getTrueSheetStateForAction } from "../createTrueSheetRouter.js";
+import { getResizeRouteIndex, getStateForNavigateToBase, getTrueSheetStateForAction } from "../createTrueSheetRouter.js";
+
+/**
+ * `RouterActionHandling.Unhandled` from Expo Router 58+, which deprecates `null`.
+ */
 
 /**
  * `extendRouter` from Expo Router 58+. Declared locally because the
@@ -13,7 +17,7 @@ import { getResizeRouteIndex, getTrueSheetStateForAction } from "../createTrueSh
  * (no `getInitialState`/`getRehydratedState`) and `getStateForAction` returns
  * `{ state, affectedRouteKey }`.
  */
-export const extendTrueSheetRouter = (extendRouter, stackRouter) => extendRouter(stackRouter, ({
+export const extendTrueSheetRouter = (extendRouter, stackRouter, unhandled) => extendRouter(stackRouter, ({
   baseRouter,
   options
 }) => {
@@ -22,12 +26,36 @@ export const extendTrueSheetRouter = (extendRouter, stackRouter) => extendRouter
   }
   return {
     getStateForAction(state, action, config) {
+      const {
+        type,
+        payload
+      } = action;
+
+      // Expo Router keeps preloaded routes in `routes`, and the navigator presents every
+      // route there as a sheet. A parent navigator's route bubbles up to it, as in a `Stack`.
+      if (type === 'PRELOAD') {
+        return payload?.name && state.routeNames.includes(payload.name) ? {
+          state
+        } : unhandled;
+      }
+      const navigated = getStateForNavigateToBase(state, action, popAction => {
+        const popped = baseRouter.getStateForAction(state, popAction, config);
+        return popped === unhandled ? undefined : popped.state;
+      });
+
+      // Expo Router resolves the destination's nested state in the affected route
+      if (navigated) {
+        return {
+          state: navigated,
+          affectedRouteKey: navigated.routes[0]?.key
+        };
+      }
       const result = getTrueSheetStateForAction(state, action);
       if (result === undefined) {
         return baseRouter.getStateForAction(state, action, config);
       }
       if (result === null) {
-        return null;
+        return unhandled;
       }
       const affectedIndex = action.type === 'RESIZE' ? getResizeRouteIndex(state, action) : result.index;
       return {

package/lib/module/navigation/expo-router/extendTrueSheetRouter.js.map

@@ -1 +1 @@
-{"version":3,"names":["TrueSheetActions","getResizeRouteIndex","getTrueSheetStateForAction","extendTrueSheetRouter","extendRouter","stackRouter","baseRouter","options","__DEV__","initialRouteName","undefined","console","warn","getStateForAction","state","action","config","result","affectedIndex","type","index","affectedRouteKey","routes","key","actionCreators"],"sourceRoot":"../../../../src","sources":["navigation/expo-router/extendTrueSheetRouter.ts"],"mappings":";;AAAA,SAASA,gBAAgB,QAAkC,eAAY;AACvE,SAASC,mBAAmB,EAAEC,0BAA0B,QAAQ,6BAA0B;;AAgB1F;AACA;AACA;AACA;;AAOA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,qBAAqB,GAAGA,CACnCC,YAA0B,EAC1BC,WAA+B,KAE/BD,YAAY,CACVC,WAAW,EACX,CAAC;EAAEC,UAAU;EAAEC;AAAQ,CAAC,KAAK;EAC3B,IAAIC,OAAO,IAAID,OAAO,CAACE,gBAAgB,KAAKC,SAAS,EAAE;IACrDC,OAAO,CAACC,IAAI,CACV,wQACF,CAAC;EACH;EAEA,OAAO;IACLC,iBAAiBA,CACfC,KAA2B,EAC3BC,MAA2B,EAC3BC,MAAc,EACO;MACrB,MAAMC,MAAM,GAAGf,0BAA0B,CAACY,KAAK,EAAEC,MAAM,CAAC;MAExD,IAAIE,MAAM,KAAKP,SAAS,EAAE;QACxB,OAAOJ,UAAU,CAACO,iBAAiB,CAACC,KAAK,EAAEC,MAAM,EAAEC,MAAM,CAAC;MAC5D;MAEA,IAAIC,MAAM,KAAK,IAAI,EAAE;QACnB,OAAO,IAAI;MACb;MAEA,MAAMC,aAAa,GACjBH,MAAM,CAACI,IAAI,KAAK,QAAQ,GAAGlB,mBAAmB,CAACa,KAAK,EAAEC,MAAM,CAAC,GAAGE,MAAM,CAACG,KAAK;MAE9E,OAAO;QAAEN,KAAK,EAAEG,MAAM;QAAEI,gBAAgB,EAAEJ,MAAM,CAACK,MAAM,CAACJ,aAAa,CAAC,EAAEK;MAAI,CAAC;IAC/E,CAAC;IACDC,cAAc,EAAExB;EAClB,CAAC;AACH,CAAC,EACD;EAAEmB,IAAI,EAAE;AAAa,CACvB,CAAC","ignoreList":[]}
+{"version":3,"names":["TrueSheetActions","getResizeRouteIndex","getStateForNavigateToBase","getTrueSheetStateForAction","extendTrueSheetRouter","extendRouter","stackRouter","unhandled","baseRouter","options","__DEV__","initialRouteName","undefined","console","warn","getStateForAction","state","action","config","type","payload","name","routeNames","includes","navigated","popAction","popped","affectedRouteKey","routes","key","result","affectedIndex","index","actionCreators"],"sourceRoot":"../../../../src","sources":["navigation/expo-router/extendTrueSheetRouter.ts"],"mappings":";;AAAA,SAASA,gBAAgB,QAAkC,eAAY;AACvE,SACEC,mBAAmB,EACnBC,yBAAyB,EACzBC,0BAA0B,QACrB,6BAA0B;;AAKjC;AACA;AACA;;AAcA;AACA;AACA;AACA;;AAOA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,qBAAqB,GAAGA,CACnCC,YAA0B,EAC1BC,WAA+B,EAC/BC,SAAoB,KAEpBF,YAAY,CACVC,WAAW,EACX,CAAC;EAAEE,UAAU;EAAEC;AAAQ,CAAC,KAAK;EAC3B,IAAIC,OAAO,IAAID,OAAO,CAACE,gBAAgB,KAAKC,SAAS,EAAE;IACrDC,OAAO,CAACC,IAAI,CACV,wQACF,CAAC;EACH;EAEA,OAAO;IACLC,iBAAiBA,CACfC,KAA2B,EAC3BC,MAA2B,EAC3BC,MAAc,EACY;MAC1B,MAAM;QAAEC,IAAI;QAAEC;MAAQ,CAAC,GAAGH,MAAuD;;MAEjF;MACA;MACA,IAAIE,IAAI,KAAK,SAAS,EAAE;QACtB,OAAOC,OAAO,EAAEC,IAAI,IAAIL,KAAK,CAACM,UAAU,CAACC,QAAQ,CAACH,OAAO,CAACC,IAAI,CAAC,GAAG;UAAEL;QAAM,CAAC,GAAGT,SAAS;MACzF;MAEA,MAAMiB,SAAS,GAAGtB,yBAAyB,CAACc,KAAK,EAAEC,MAAM,EAAGQ,SAAS,IAAK;QACxE,MAAMC,MAAM,GAAGlB,UAAU,CAACO,iBAAiB,CAACC,KAAK,EAAES,SAAS,EAAEP,MAAM,CAAC;QACrE,OAAOQ,MAAM,KAAKnB,SAAS,GAAGK,SAAS,GAAGc,MAAM,CAACV,KAAK;MACxD,CAAC,CAAC;;MAEF;MACA,IAAIQ,SAAS,EAAE;QACb,OAAO;UAAER,KAAK,EAAEQ,SAAS;UAAEG,gBAAgB,EAAEH,SAAS,CAACI,MAAM,CAAC,CAAC,CAAC,EAAEC;QAAI,CAAC;MACzE;MAEA,MAAMC,MAAM,GAAG3B,0BAA0B,CAACa,KAAK,EAAEC,MAAM,CAAC;MAExD,IAAIa,MAAM,KAAKlB,SAAS,EAAE;QACxB,OAAOJ,UAAU,CAACO,iBAAiB,CAACC,KAAK,EAAEC,MAAM,EAAEC,MAAM,CAAC;MAC5D;MAEA,IAAIY,MAAM,KAAK,IAAI,EAAE;QACnB,OAAOvB,SAAS;MAClB;MAEA,MAAMwB,aAAa,GACjBd,MAAM,CAACE,IAAI,KAAK,QAAQ,GAAGlB,mBAAmB,CAACe,KAAK,EAAEC,MAAM,CAAC,GAAGa,MAAM,CAACE,KAAK;MAE9E,OAAO;QAAEhB,KAAK,EAAEc,MAAM;QAAEH,gBAAgB,EAAEG,MAAM,CAACF,MAAM,CAACG,aAAa,CAAC,EAAEF;MAAI,CAAC;IAC/E,CAAC;IACDI,cAAc,EAAEjC;EAClB,CAAC;AACH,CAAC,EACD;EAAEmB,IAAI,EAAE;AAAa,CACvB,CAAC","ignoreList":[]}

package/lib/module/navigation/expo-router/index.js

@@ -6,12 +6,15 @@ import { createTrueSheetRouter } from "../createTrueSheetRouter.js";
 import { trueSheetNavigator } from "../navigator.js";
 import { extendTrueSheetRouter } from "./extendTrueSheetRouter.js";
 // Expo Router 58+ replaced the React Navigation router contract and ships `extendRouter`
-// for it. Before that, the vendored StackRouter is structurally identical to
-// @react-navigation's. Pinned to this entry's own router types: `createTrueSheetRouter` is
-// shared and typed against React Navigation, which resolves to `any` in apps that only
-// install expo-router.
-const extendRouter = ExpoRouter.extendRouter;
-const sheetRouter = extendRouter ? extendTrueSheetRouter(extendRouter, StackRouter) : createTrueSheetRouter(StackRouter);
+// and `RouterActionHandling` for it. Before that, the vendored StackRouter is structurally
+// identical to @react-navigation's. Pinned to this entry's own router types:
+// `createTrueSheetRouter` is shared and typed against React Navigation, which resolves to
+// `any` in apps that only install expo-router.
+const {
+  extendRouter,
+  RouterActionHandling
+} = ExpoRouter;
+const sheetRouter = extendRouter ? extendTrueSheetRouter(extendRouter, StackRouter, RouterActionHandling.Unhandled) : createTrueSheetRouter(StackRouter);
 
 // `routes`/`dispatch` are injected by `createProps`, so they are declared as
 // CreateProps (last generic) and excluded from the public navigator props

package/lib/module/navigation/expo-router/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["ExpoRouter","StackRouter","unstable_integrateWithRouter","useNavigation","createTrueSheetRouter","trueSheetNavigator","extendTrueSheetRouter","extendRouter","sheetRouter","SheetNavigator","createProps","state","dispatch","routes","Sheet","useTrueSheetNavigation","TrueSheetActions"],"sourceRoot":"../../../../src","sources":["navigation/expo-router/index.ts"],"mappings":";;AAAA,OAAO,KAAKA,UAAU,MAAM,aAAa;AACzC,SAASC,WAAW,EAAEC,4BAA4B,EAAEC,aAAa,QAAQ,aAAa;AAEtF,SAASC,qBAAqB,QAAQ,6BAA0B;AAChE,SAASC,kBAAkB,QAAQ,iBAAc;AAEjD,SAASC,qBAAqB,QAA2B,4BAAyB;AAalF;AACA;AACA;AACA;AACA;AACA,MAAMC,YAAY,GAAIP,UAAU,CAA6BO,YAEhD;AAEb,MAAMC,WAAmC,GAAGD,YAAY,GACpDD,qBAAqB,CAACC,YAAY,EAAEN,WAAiC,CAAC,GACtEG,qBAAqB,CAACH,WAAiC,CAAC;;AAE5D;AACA;AACA,MAAMQ,cAAc,GAAGP,4BAA4B,CAOjDG,kBAAkB,EAAEG,WAAW,EAAE;EACjCE,WAAW,EAAEA,CAAC;IAAEC,KAAK;IAAEC;EAAS,CAAC,MAAM;IACrCC,MAAM,EAAEF,KAAK,CAACE,MAAM;IACpBD;EACF,CAAC;AACH,CAAC,CAAC;;AAEF;AACA;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAME,KAAK,GAAGL,cAGpB;;AAED;AACA;AACA;AACA;AACA,OAAO,MAAMM,sBAAsB,GAAGA,CAAA,KAEHZ,aAAa,CAA6B,CAAC;AAE9E,SAASa,gBAAgB,QAAkC,eAAY","ignoreList":[]}
+{"version":3,"names":["ExpoRouter","StackRouter","unstable_integrateWithRouter","useNavigation","createTrueSheetRouter","trueSheetNavigator","extendTrueSheetRouter","extendRouter","RouterActionHandling","sheetRouter","Unhandled","SheetNavigator","createProps","state","dispatch","routes","Sheet","useTrueSheetNavigation","TrueSheetActions"],"sourceRoot":"../../../../src","sources":["navigation/expo-router/index.ts"],"mappings":";;AAAA,OAAO,KAAKA,UAAU,MAAM,aAAa;AACzC,SAASC,WAAW,EAAEC,4BAA4B,EAAEC,aAAa,QAAQ,aAAa;AAEtF,SAASC,qBAAqB,QAAQ,6BAA0B;AAChE,SAASC,kBAAkB,QAAQ,iBAAc;AAEjD,SAASC,qBAAqB,QAA2C,4BAAyB;AAalG;AACA;AACA;AACA;AACA;AACA,MAAM;EAAEC,YAAY;EAAEC;AAAqB,CAAC,GAAGR,UAG9C;AAED,MAAMS,WAAmC,GAAGF,YAAY,GACpDD,qBAAqB,CACnBC,YAAY,EACZN,WAAW,EACXO,oBAAoB,CAAEE,SACxB,CAAC,GACDN,qBAAqB,CAACH,WAAiC,CAAC;;AAE5D;AACA;AACA,MAAMU,cAAc,GAAGT,4BAA4B,CAOjDG,kBAAkB,EAAEI,WAAW,EAAE;EACjCG,WAAW,EAAEA,CAAC;IAAEC,KAAK;IAAEC;EAAS,CAAC,MAAM;IACrCC,MAAM,EAAEF,KAAK,CAACE,MAAM;IACpBD;EACF,CAAC;AACH,CAAC,CAAC;;AAEF;AACA;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAME,KAAK,GAAGL,cAGpB;;AAED;AACA;AACA;AACA;AACA,OAAO,MAAMM,sBAAsB,GAAGA,CAAA,KAEHd,aAAa,CAA6B,CAAC;AAE9E,SAASe,gBAAgB,QAAkC,eAAY","ignoreList":[]}

package/lib/typescript/src/navigation/createTrueSheetRouter.d.ts

@@ -25,6 +25,16 @@ export declare const getResizeRouteIndex: (state: SheetState, action: {
  * Returns `undefined` for actions the base `StackRouter` should handle.
  */
 export declare const getTrueSheetStateForAction: <State extends SheetState>(state: State, action: TrueSheetActionType) => State | null | undefined;
+/**
+ * Reduces an action that targets the base route by name. React Navigation 7 adds another base
+ * route for a `PUSH`, a `REPLACE` or a `NAVIGATE` without `pop`, which presents the base screen
+ * as a sheet, and this router's `POP_TO` drops the params and nested state. This goes back to it
+ * instead: `getPoppedState` reduces the action as a `NAVIGATE` with `pop` (a `PUSH` ignores
+ * `pop`) to update the base route (params, nested state), then the sheets above it are dismissed.
+ * Returns `undefined` for other actions, a `REPLACE` with no sheet (it swaps the base route), or
+ * when the base router doesn't land on the base route.
+ */
+export declare const getStateForNavigateToBase: <State extends SheetState>(state: State, action: TrueSheetActionType, getPoppedState: (action: TrueSheetActionType) => State | null | undefined) => State | undefined;
 export declare const createTrueSheetRouter: (stackRouter: TrueSheetRouterFactory) => (routerOptions: TrueSheetRouterOptions) => TrueSheetRouter;
 export {};
 //# sourceMappingURL=createTrueSheetRouter.d.ts.map

package/lib/typescript/src/navigation/createTrueSheetRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createTrueSheetRouter.d.ts","sourceRoot":"","sources":["../../../../src/navigation/createTrueSheetRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAgC/F,KAAK,UAAU,GAAG;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,KAAK,UAAU,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,UAAU,EAAE,CAAA;CAAE,CAAC;AAEvE;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC9B,OAAO,UAAU,EACjB,QAAQ;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,KAC3C,MAGc,CAAC;AAElB;;;GAGG;AACH,eAAO,MAAM,0BAA0B,GAAI,KAAK,SAAS,UAAU,EACjE,OAAO,KAAK,EACZ,QAAQ,mBAAmB,KAC1B,KAAK,GAAG,IAAI,GAAG,SAmHjB,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAC/B,aAAa,sBAAsB,MACnC,eAAe,sBAAsB,KAAG,eAiDxC,CAAC"}
+{"version":3,"file":"createTrueSheetRouter.d.ts","sourceRoot":"","sources":["../../../../src/navigation/createTrueSheetRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,KAAK,EACV,eAAe,EACf,sBAAsB,EACtB,sBAAsB,EAEvB,MAAM,SAAS,CAAC;AAgCjB,KAAK,UAAU,GAAG;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,KAAK,UAAU,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,UAAU,EAAE,CAAA;CAAE,CAAC;AAEvE;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC9B,OAAO,UAAU,EACjB,QAAQ;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,KAC3C,MAGc,CAAC;AAElB;;;GAGG;AACH,eAAO,MAAM,0BAA0B,GAAI,KAAK,SAAS,UAAU,EACjE,OAAO,KAAK,EACZ,QAAQ,mBAAmB,KAC1B,KAAK,GAAG,IAAI,GAAG,SAoHjB,CAAC;AAUF;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,GAAI,KAAK,SAAS,UAAU,EAChE,OAAO,KAAK,EACZ,QAAQ,mBAAmB,EAC3B,gBAAgB,CAAC,MAAM,EAAE,mBAAmB,KAAK,KAAK,GAAG,IAAI,GAAG,SAAS,KACxE,KAAK,GAAG,SAgCV,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAC/B,aAAa,sBAAsB,MACnC,eAAe,sBAAsB,KAAG,eAwDxC,CAAC"}

package/lib/typescript/src/navigation/expo-router/extendTrueSheetRouter.d.ts

@@ -4,9 +4,13 @@ type ActionResult = {
     state: TrueSheetRouterState;
     affectedRouteKey?: string;
 };
+/**
+ * `RouterActionHandling.Unhandled` from Expo Router 58+, which deprecates `null`.
+ */
+export type Unhandled = 'UNHANDLED';
 type RouterExtension = (context: {
     baseRouter: {
-        getStateForAction(state: TrueSheetRouterState, action: TrueSheetActionType, options: object): ActionResult | null;
+        getStateForAction(state: TrueSheetRouterState, action: TrueSheetActionType, options: object): ActionResult | Unhandled;
     };
     options: {
         initialRouteName?: string;
@@ -24,6 +28,6 @@ export type ExtendRouter = (base: StackRouterFactory, extension: RouterExtension
  * (no `getInitialState`/`getRehydratedState`) and `getStateForAction` returns
  * `{ state, affectedRouteKey }`.
  */
-export declare const extendTrueSheetRouter: (extendRouter: ExtendRouter, stackRouter: StackRouterFactory) => TrueSheetRouterFactory;
+export declare const extendTrueSheetRouter: (extendRouter: ExtendRouter, stackRouter: StackRouterFactory, unhandled: Unhandled) => TrueSheetRouterFactory;
 export {};
 //# sourceMappingURL=extendTrueSheetRouter.d.ts.map

package/lib/typescript/src/navigation/expo-router/extendTrueSheetRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extendTrueSheetRouter.d.ts","sourceRoot":"","sources":["../../../../../src/navigation/expo-router/extendTrueSheetRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAExE,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAEhG,KAAK,YAAY,GAAG;IAAE,KAAK,EAAE,oBAAoB,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,KAAK,eAAe,GAAG,CAAC,OAAO,EAAE;IAC/B,UAAU,EAAE;QACV,iBAAiB,CACf,KAAK,EAAE,oBAAoB,EAC3B,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,GACd,YAAY,GAAG,IAAI,CAAC;KACxB,CAAC;IACF,OAAO,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACxC,KAAK,MAAM,CAAC;AAEb;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,CACzB,IAAI,EAAE,kBAAkB,EACxB,SAAS,EAAE,eAAe,EAC1B,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,KACtB,sBAAsB,CAAC;AAE5B;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAChC,cAAc,YAAY,EAC1B,aAAa,kBAAkB,KAC9B,sBAmCA,CAAC"}
+{"version":3,"file":"extendTrueSheetRouter.d.ts","sourceRoot":"","sources":["../../../../../src/navigation/expo-router/extendTrueSheetRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAMxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAEhG,KAAK,YAAY,GAAG;IAAE,KAAK,EAAE,oBAAoB,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,WAAW,CAAC;AAEpC,KAAK,eAAe,GAAG,CAAC,OAAO,EAAE;IAC/B,UAAU,EAAE;QACV,iBAAiB,CACf,KAAK,EAAE,oBAAoB,EAC3B,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,GACd,YAAY,GAAG,SAAS,CAAC;KAC7B,CAAC;IACF,OAAO,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACxC,KAAK,MAAM,CAAC;AAEb;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,CACzB,IAAI,EAAE,kBAAkB,EACxB,SAAS,EAAE,eAAe,EAC1B,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,KACtB,sBAAsB,CAAC;AAE5B;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAChC,cAAc,YAAY,EAC1B,aAAa,kBAAkB,EAC/B,WAAW,SAAS,KACnB,sBAqDA,CAAC"}

package/lib/typescript/src/navigation/expo-router/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/navigation/expo-router/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAK1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,KAAK,EAEV,0BAA0B,EAC1B,uBAAuB,EACvB,wBAAwB,EAExB,uBAAuB,EAGvB,yBAAyB,EAC1B,MAAM,SAAS,CAAC;AAiBjB,QAAA,MAAM,cAAc;;;;;CAYlB,CAAC;AAIH,KAAK,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,cAAc,CAAC,EAAE,iBAAiB,CAAC,GACpF,IAAI,CAAC,uBAAuB,EAAE,iBAAiB,CAAC,CAAC;AAEnD;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,KAAK,EAAqB,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG;IACvE,MAAM,EAAE,OAAO,cAAc,CAAC,MAAM,CAAC;IACrC,SAAS,EAAE,OAAO,cAAc,CAAC,SAAS,CAAC;CAC5C,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GACjC,CAAC,SAAS,aAAa,GAAG,aAAa,OACpC,uBAAuB,CAAC,CAAC,CAAgD,CAAC;AAE/E,OAAO,EAAE,gBAAgB,EAAE,KAAK,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAExE,YAAY,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEhG,YAAY,EACV,2BAA2B,EAC3B,0BAA0B,EAC1B,0BAA0B,EAC1B,uBAAuB,EACvB,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/navigation/expo-router/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAK1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,KAAK,EAEV,0BAA0B,EAC1B,uBAAuB,EACvB,wBAAwB,EAExB,uBAAuB,EAGvB,yBAAyB,EAC1B,MAAM,SAAS,CAAC;AAsBjB,QAAA,MAAM,cAAc;;;;;CAYlB,CAAC;AAIH,KAAK,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,cAAc,CAAC,EAAE,iBAAiB,CAAC,GACpF,IAAI,CAAC,uBAAuB,EAAE,iBAAiB,CAAC,CAAC;AAEnD;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,KAAK,EAAqB,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG;IACvE,MAAM,EAAE,OAAO,cAAc,CAAC,MAAM,CAAC;IACrC,SAAS,EAAE,OAAO,cAAc,CAAC,SAAS,CAAC;CAC5C,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GACjC,CAAC,SAAS,aAAa,GAAG,aAAa,OACpC,uBAAuB,CAAC,CAAC,CAAgD,CAAC;AAE/E,OAAO,EAAE,gBAAgB,EAAE,KAAK,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAExE,YAAY,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEhG,YAAY,EACV,2BAA2B,EAC3B,0BAA0B,EAC1B,0BAA0B,EAC1B,uBAAuB,EACvB,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,SAAS,CAAC"}

package/package.json

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

package/src/navigation/createTrueSheetRouter.ts

@@ -1,5 +1,10 @@
 import { TrueSheetActions, type TrueSheetActionType } from './actions';
-import type { TrueSheetRouter, TrueSheetRouterFactory, TrueSheetRouterOptions } from './types';
+import type {
+  TrueSheetRouter,
+  TrueSheetRouterFactory,
+  TrueSheetRouterOptions,
+  TrueSheetRouterState,
+} from './types';
 
 const uid = () => Math.random().toString(36).slice(2, 10);
 
@@ -107,10 +112,11 @@ export const getTrueSheetStateForAction = <State extends SheetState>(
       const closingIndex = targetIndex + 1;
 
       // Mark only the bottom-most route to pop as closing
-      // The sheet's dismiss() will handle dismissing sheets above it first
+      // The sheet's dismiss() will handle dismissing sheets above it first.
+      // The index stays on the top sheet until REMOVE: Expo Router 58 treats the routes
+      // after `index` as preloaded.
       return {
         ...state,
-        index: closingIndex,
         routes: state.routes.map((route, i) => {
           if (i === closingIndex) return { ...route, closing: true };
           if (i > closingIndex) return { ...route, dismissing: true };
@@ -176,6 +182,61 @@ export const getTrueSheetStateForAction = <State extends SheetState>(
   }
 };
 
+const BASE_ROUTE_ACTIONS = new Set([
+  'NAVIGATE',
+  'NAVIGATE_DEPRECATED',
+  'PUSH',
+  'REPLACE',
+  'POP_TO',
+]);
+
+/**
+ * Reduces an action that targets the base route by name. React Navigation 7 adds another base
+ * route for a `PUSH`, a `REPLACE` or a `NAVIGATE` without `pop`, which presents the base screen
+ * as a sheet, and this router's `POP_TO` drops the params and nested state. This goes back to it
+ * instead: `getPoppedState` reduces the action as a `NAVIGATE` with `pop` (a `PUSH` ignores
+ * `pop`) to update the base route (params, nested state), then the sheets above it are dismissed.
+ * Returns `undefined` for other actions, a `REPLACE` with no sheet (it swaps the base route), or
+ * when the base router doesn't land on the base route.
+ */
+export const getStateForNavigateToBase = <State extends SheetState>(
+  state: State,
+  action: TrueSheetActionType,
+  getPoppedState: (action: TrueSheetActionType) => State | null | undefined
+): State | undefined => {
+  const { type, payload } = action as { type: string; payload?: { name?: string } };
+  const baseRoute = state.routes[0]!;
+  const hasSheets = state.routes.length > 1;
+
+  if (
+    !BASE_ROUTE_ACTIONS.has(type) ||
+    payload?.name !== baseRoute.name ||
+    (type === 'REPLACE' && !hasSheets)
+  ) {
+    return undefined;
+  }
+
+  const popped = getPoppedState({
+    ...action,
+    type: 'NAVIGATE',
+    payload: { ...payload, pop: true },
+  } as unknown as TrueSheetActionType);
+  const base = popped?.routes[popped.index];
+
+  if (base?.key !== baseRoute.key) {
+    return undefined;
+  }
+
+  if (!hasSheets) {
+    return popped!;
+  }
+
+  return getTrueSheetStateForAction(
+    { ...state, routes: [base, ...state.routes.slice(1)] },
+    TrueSheetActions.pop(state.routes.length - 1)
+  )!;
+};
+
 export const createTrueSheetRouter =
   (stackRouter: TrueSheetRouterFactory) =>
   (routerOptions: TrueSheetRouterOptions): TrueSheetRouter => {
@@ -199,7 +260,14 @@ export const createTrueSheetRouter =
       },
 
       getStateForAction(state, action, options) {
-        const result = getTrueSheetStateForAction(state, action);
+        const result =
+          getStateForNavigateToBase(
+            state,
+            action,
+            // NAVIGATE never returns a partial state
+            (popAction) =>
+              baseRouter.getStateForAction(state, popAction, options) as TrueSheetRouterState | null
+          ) ?? getTrueSheetStateForAction(state, action);
 
         return result === undefined ? baseRouter.getStateForAction(state, action, options) : result;
       },

package/src/navigation/expo-router/extendTrueSheetRouter.ts

@@ -1,16 +1,25 @@
 import { TrueSheetActions, type TrueSheetActionType } from '../actions';
-import { getResizeRouteIndex, getTrueSheetStateForAction } from '../createTrueSheetRouter';
+import {
+  getResizeRouteIndex,
+  getStateForNavigateToBase,
+  getTrueSheetStateForAction,
+} from '../createTrueSheetRouter';
 import type { StackRouterFactory, TrueSheetRouterFactory, TrueSheetRouterState } from './types';
 
 type ActionResult = { state: TrueSheetRouterState; affectedRouteKey?: string };
 
+/**
+ * `RouterActionHandling.Unhandled` from Expo Router 58+, which deprecates `null`.
+ */
+export type Unhandled = 'UNHANDLED';
+
 type RouterExtension = (context: {
   baseRouter: {
     getStateForAction(
       state: TrueSheetRouterState,
       action: TrueSheetActionType,
       options: object
-    ): ActionResult | null;
+    ): ActionResult | Unhandled;
   };
   options: { initialRouteName?: string };
 }) => object;
@@ -32,7 +41,8 @@ export type ExtendRouter = (
  */
 export const extendTrueSheetRouter = (
   extendRouter: ExtendRouter,
-  stackRouter: StackRouterFactory
+  stackRouter: StackRouterFactory,
+  unhandled: Unhandled
 ): TrueSheetRouterFactory =>
   extendRouter(
     stackRouter,
@@ -48,7 +58,25 @@ export const extendTrueSheetRouter = (
           state: TrueSheetRouterState,
           action: TrueSheetActionType,
           config: object
-        ): ActionResult | null {
+        ): ActionResult | Unhandled {
+          const { type, payload } = action as { type: string; payload?: { name?: string } };
+
+          // Expo Router keeps preloaded routes in `routes`, and the navigator presents every
+          // route there as a sheet. A parent navigator's route bubbles up to it, as in a `Stack`.
+          if (type === 'PRELOAD') {
+            return payload?.name && state.routeNames.includes(payload.name) ? { state } : unhandled;
+          }
+
+          const navigated = getStateForNavigateToBase(state, action, (popAction) => {
+            const popped = baseRouter.getStateForAction(state, popAction, config);
+            return popped === unhandled ? undefined : popped.state;
+          });
+
+          // Expo Router resolves the destination's nested state in the affected route
+          if (navigated) {
+            return { state: navigated, affectedRouteKey: navigated.routes[0]?.key };
+          }
+
           const result = getTrueSheetStateForAction(state, action);
 
           if (result === undefined) {
@@ -56,7 +84,7 @@ export const extendTrueSheetRouter = (
           }
 
           if (result === null) {
-            return null;
+            return unhandled;
           }
 
           const affectedIndex =

package/src/navigation/expo-router/index.ts

@@ -4,7 +4,7 @@ import { StackRouter, unstable_integrateWithRouter, useNavigation } from 'expo-r
 import { createTrueSheetRouter } from '../createTrueSheetRouter';
 import { trueSheetNavigator } from '../navigator';
 import type { ParamListBase } from './base-types';
-import { extendTrueSheetRouter, type ExtendRouter } from './extendTrueSheetRouter';
+import { extendTrueSheetRouter, type ExtendRouter, type Unhandled } from './extendTrueSheetRouter';
 import type {
   StackRouterFactory,
   TrueSheetNavigationOptions,
@@ -18,16 +18,21 @@ import type {
 } from './types';
 
 // Expo Router 58+ replaced the React Navigation router contract and ships `extendRouter`
-// for it. Before that, the vendored StackRouter is structurally identical to
-// @react-navigation's. Pinned to this entry's own router types: `createTrueSheetRouter` is
-// shared and typed against React Navigation, which resolves to `any` in apps that only
-// install expo-router.
-const extendRouter = (ExpoRouter as Record<string, unknown>).extendRouter as
-  | ExtendRouter
-  | undefined;
+// and `RouterActionHandling` for it. Before that, the vendored StackRouter is structurally
+// identical to @react-navigation's. Pinned to this entry's own router types:
+// `createTrueSheetRouter` is shared and typed against React Navigation, which resolves to
+// `any` in apps that only install expo-router.
+const { extendRouter, RouterActionHandling } = ExpoRouter as {
+  extendRouter?: ExtendRouter;
+  RouterActionHandling?: { Unhandled: Unhandled };
+};
 
 const sheetRouter: TrueSheetRouterFactory = extendRouter
-  ? extendTrueSheetRouter(extendRouter, StackRouter as StackRouterFactory)
+  ? extendTrueSheetRouter(
+      extendRouter,
+      StackRouter as StackRouterFactory,
+      RouterActionHandling!.Unhandled
+    )
   : createTrueSheetRouter(StackRouter as StackRouterFactory);
 
 // `routes`/`dispatch` are injected by `createProps`, so they are declared as