@lodev09/react-native-true-sheet 4.0.0-beta.22 → 4.0.0-beta.24

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

@@ -1,8 +1,10 @@
+import * as ExpoRouter from 'expo-router';
 import { StackRouter, unstable_integrateWithRouter, useNavigation } from 'expo-router';
 
 import { createTrueSheetRouter } from '../createTrueSheetRouter';
 import { trueSheetNavigator } from '../navigator';
 import type { ParamListBase } from './base-types';
+import { extendTrueSheetRouter, type ExtendRouter } from './extendTrueSheetRouter';
 import type {
   StackRouterFactory,
   TrueSheetNavigationOptions,
@@ -15,12 +17,18 @@ import type {
   TrueSheetStandardEventMap,
 } from './types';
 
-// expo-router's 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 sheetRouter: TrueSheetRouterFactory = createTrueSheetRouter(
-  StackRouter as StackRouterFactory
-);
+// 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;
+
+const sheetRouter: TrueSheetRouterFactory = extendRouter
+  ? extendTrueSheetRouter(extendRouter, StackRouter as StackRouterFactory)
+  : createTrueSheetRouter(StackRouter as StackRouterFactory);
 
 // `routes`/`dispatch` are injected by `createProps`, so they are declared as
 // CreateProps (last generic) and excluded from the public navigator props

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

@@ -50,7 +50,7 @@ export type TrueSheetRoute = TrueSheetNavigationState<ParamListBase>['routes'][n
 
 /**
  * Props injected into the navigator content by Expo Router's `createProps`.
- * Raw routes carry the custom fields (`closing`, `resizeIndex`, `resizeKey`)
+ * Raw routes carry the custom fields (`closing`, `dismissing`, `resizeIndex`, `resizeKey`)
  * that the standard state strips out.
  */
 export interface TrueSheetNavigatorContentExtraProps {

package/src/navigation/types.ts

@@ -96,6 +96,8 @@ export type TrueSheetStateOf<State extends { routes: readonly unknown[] }> = Omi
     resizeIndex?: number;
     resizeKey?: number;
     closing?: boolean;
+    // Stacked above a `closing` route and dismissed natively with it
+    dismissing?: boolean;
   })[];
 };
 
@@ -151,7 +153,7 @@ export type TrueSheetEmitFn = NavigatorArgs<
 /**
  * Props injected into the navigator content by each adapter
  * (React Navigation's `mapper` / Expo Router's `createProps`).
- * Raw routes carry the custom fields (`closing`, `resizeIndex`, `resizeKey`)
+ * Raw routes carry the custom fields (`closing`, `dismissing`, `resizeIndex`, `resizeKey`)
  * that the standard state strips out.
  */
 export interface TrueSheetNavigatorContentExtraProps {