react-native-screen-transitions 4.0.0-alpha.8 → 4.0.0

package/src/providers/screen/gestures/types.ts

@@ -114,6 +114,7 @@ export interface PanGesturePolicy {
 	gestureReleaseVelocityScale: number;
 	gestureActivationArea: ResolvedGestureActivationArea;
 	gestureSnapLocked: boolean;
+	sheetSnapBehavior: NonNullable<ScreenTransitionConfig["sheetSnapBehavior"]>;
 	sheetScrollGestureBehavior: NonNullable<
 		ScreenTransitionConfig["sheetScrollGestureBehavior"]
 	>;
@@ -129,6 +130,7 @@ export interface PinchGesturePolicy {
 	gestureSensitivity: NonNullable<ScreenTransitionConfig["gestureSensitivity"]>;
 	gestureSnapVelocityImpact: number;
 	gestureSnapLocked: boolean;
+	sheetSnapBehavior: NonNullable<ScreenTransitionConfig["sheetSnapBehavior"]>;
 	gestureReleaseVelocityScale: number;
 	transitionSpec: TransitionSpec | undefined;
 }

package/src/providers/screen/options/helpers.ts

@@ -7,6 +7,7 @@ import {
 	DEFAULT_GESTURE_TRACKING,
 	DEFAULT_GESTURE_VELOCITY_IMPACT,
 	DEFAULT_SHEET_SCROLL_GESTURE_BEHAVIOR,
+	DEFAULT_SHEET_SNAP_BEHAVIOR,
 } from "../../../constants";
 import type {
 	GestureDirection,
@@ -129,6 +130,14 @@ const resolveSheetScrollGestureBehaviorOption = (
 		: fallback;
 };
 
+const resolveSheetSnapBehaviorOption = (
+	value: unknown,
+	fallback: RequiredScreenOption<"sheetSnapBehavior">,
+): RequiredScreenOption<"sheetSnapBehavior"> => {
+	"worklet";
+	return value === "continuous" || value === "step" ? value : fallback;
+};
+
 const resolveGestureTrackingOption = (
 	value: unknown,
 	fallback: RequiredScreenOption<"gestureTracking">,
@@ -205,6 +214,7 @@ const areScreenOptionsEqual = (
 		left.gestureSnapVelocityImpact === right.gestureSnapVelocityImpact &&
 		left.gestureReleaseVelocityScale === right.gestureReleaseVelocityScale &&
 		left.gestureSnapLocked === right.gestureSnapLocked &&
+		left.sheetSnapBehavior === right.sheetSnapBehavior &&
 		left.sheetScrollGestureBehavior === right.sheetScrollGestureBehavior &&
 		left.backdropBehavior === right.backdropBehavior &&
 		left.transitionSpec === right.transitionSpec &&
@@ -249,6 +259,10 @@ export const resolveBaseScreenOptions = (
 			options.gestureSnapLocked,
 			DEFAULT_GESTURE_SNAP_LOCKED,
 		),
+		sheetSnapBehavior: resolveSheetSnapBehaviorOption(
+			options.sheetSnapBehavior,
+			DEFAULT_SHEET_SNAP_BEHAVIOR,
+		),
 		sheetScrollGestureBehavior: resolveSheetScrollGestureBehaviorOption(
 			resolveSheetScrollGestureBehavior(options),
 			DEFAULT_SHEET_SCROLL_GESTURE_BEHAVIOR,
@@ -315,6 +329,10 @@ export const syncScreenOptionsOverrides = (
 			options?.gestureSnapLocked,
 			base.gestureSnapLocked,
 		),
+		sheetSnapBehavior: resolveSheetSnapBehaviorOption(
+			options?.sheetSnapBehavior,
+			base.sheetSnapBehavior,
+		),
 		sheetScrollGestureBehavior: resolveSheetScrollGestureBehaviorOption(
 			options?.sheetScrollGestureBehavior,
 			base.sheetScrollGestureBehavior,

package/src/providers/screen/options/types.ts

@@ -18,6 +18,7 @@ export type ScreenOptionsSnapshot = {
 	gestureSnapVelocityImpact: RequiredScreenOption<"gestureSnapVelocityImpact">;
 	gestureReleaseVelocityScale: RequiredScreenOption<"gestureReleaseVelocityScale">;
 	gestureSnapLocked: RequiredScreenOption<"gestureSnapLocked">;
+	sheetSnapBehavior: RequiredScreenOption<"sheetSnapBehavior">;
 	sheetScrollGestureBehavior: RequiredScreenOption<"sheetScrollGestureBehavior">;
 	backdropBehavior: OptionalScreenOption<"backdropBehavior">;
 	transitionSpec: OptionalScreenOption<"transitionSpec">;

package/src/providers/screen/styles/constants.ts

@@ -22,6 +22,7 @@ const IDENTITY_TRANSFORM = [
  * please add its identity value here in a PR.
  */
 export const STYLE_RESET_VALUES: Record<string, unknown> = {
+	filter: [{ blur: 0.01 }],
 	transform: IDENTITY_TRANSFORM,
 	translateX: 0,
 	translateY: 0,
@@ -67,8 +68,8 @@ export const PROP_RESET_VALUES: Record<string, unknown> = {
 const RESERVED_STYLE_SLOT_IDS = {
 	overlay: true,
 	content: true,
-	backdrop: true,
 	surface: true,
+	backdrop: true,
 	[NAVIGATION_MASK_ELEMENT_STYLE_ID]: true,
 	[NAVIGATION_MASK_CONTAINER_STYLE_ID]: true,
 } as const;

package/src/providers/screen/styles/hooks/slot-resolvers.tsx

@@ -1,29 +1,14 @@
 import { useMemo } from "react";
 import { useAnimatedProps, useAnimatedStyle } from "react-native-reanimated";
 import { NO_PROPS, NO_STYLES } from "../../../../constants";
-import { useNavigationRoute } from "../../../navigation/navigation-host.provider";
 import {
 	composeSlotStyleWithLocalTransform,
 	getLocalTransformForSlotComposition,
 } from "../helpers/compose-slot-style";
-import { useOptionalScreenSlotStore } from "../slot.provider";
+import { useScreenSlotStore } from "../slot.provider";
 
 const useCurrentScreenSlotsMap = () => {
-	const routeKey = useNavigationRoute().key;
-	const localSlotsMap = useOptionalScreenSlotStore(
-		(store) => store?.slotsMap ?? null,
-	);
-	const keyedSlotsMap = useOptionalScreenSlotStore(
-		localSlotsMap ? null : routeKey,
-		(store) => store.slotsMap,
-	);
-	const slotsMap = localSlotsMap ?? keyedSlotsMap;
-
-	if (!slotsMap) {
-		throw new Error(`ScreenSlotStore is unavailable for route "${routeKey}"`);
-	}
-
-	return slotsMap;
+	return useScreenSlotStore((store) => store.slotsMap);
 };
 
 export const useSlotStyles = (slotId: string | undefined) => {

package/src/providers/screen/styles/slot.provider.tsx

@@ -18,8 +18,8 @@ type Props = { children: ReactNode };
 export type ScreenSlotName =
 	| "overlay"
 	| "content"
-	| "backdrop"
 	| "surface"
+	| "backdrop"
 	| typeof NAVIGATION_MASK_CONTAINER_STYLE_ID
 	| typeof NAVIGATION_MASK_ELEMENT_STYLE_ID;
 
@@ -34,6 +34,7 @@ const createScreenSlotProvider = createProvider("ScreenSlot", {
 })<Props, ScreenSlotContextValue>;
 
 export const {
+	StoreProvider: ScreenSlotStoreProvider,
 	ScreenSlotProvider,
 	useOptionalScreenSlotStore,
 	useScreenSlotStore,

package/src/providers/stack/blank-stack-state/helpers/build-blank-stack-state.ts

@@ -1,5 +1,9 @@
 import type { BlankStackDescriptor } from "../../../../types/blank-stack.types";
-import type { BlankStackProviderProps } from "../../../../types/providers/blank-stack-provider.types";
+import type {
+	BlankStackDescriptorSource,
+	BlankStackDescriptorSources,
+	BlankStackProviderProps,
+} from "../../../../types/providers/blank-stack-provider.types";
 import type {
 	BaseStackScene,
 	StackSceneActivity,
@@ -9,6 +13,7 @@ import { resolveSceneNeighbors } from "./navigation/resolve-scene-neighbors";
 import {
 	areDescriptorSourcesEquivalent,
 	areDescriptorsEqual,
+	areRecordsShallowEqual,
 	areRouteChildStateMapsEqual,
 	getRouteChildState,
 	routeKeyListsAreEqual,
@@ -24,7 +29,7 @@ import type {
 type BuildBlankStackStateParams = {
 	props: BlankStackProviderProps;
 	routes: BlankStackRoutes;
-	descriptors: BlankStackDescriptors;
+	descriptors: BlankStackDescriptorSources;
 	closingRouteKeys: ReadonlySet<string>;
 	previousState?: LocalRoutesState;
 };
@@ -35,9 +40,9 @@ const resolveStableDescriptorSource = ({
 	previousState,
 }: {
 	routeKey: string;
-	sourceDescriptor: BlankStackDescriptor;
+	sourceDescriptor: BlankStackDescriptorSource;
 	previousState?: LocalRoutesState;
-}): BlankStackDescriptor => {
+}): BlankStackDescriptorSource => {
 	const previousSourceDescriptor = previousState?.sourceDescriptors[routeKey];
 
 	if (
@@ -125,6 +130,7 @@ const getSceneActivityWindow = ({
 };
 
 const buildBaseScenes = ({
+	props,
 	routes,
 	descriptors,
 	closingRouteKeys,
@@ -136,7 +142,7 @@ const buildBaseScenes = ({
 	const routeKeys: string[] = [];
 	const scenes: BaseStackScene<BlankStackDescriptor>[] = [];
 	const routeChildStates: Record<string, unknown> = {};
-	const sourceDescriptors: BlankStackDescriptors = {};
+	const sourceDescriptors: BlankStackDescriptorSources = {};
 	const blankStackDescriptors: BlankStackDescriptors = {};
 	let shouldShowFloatOverlay = false;
 
@@ -169,14 +175,28 @@ const buildBaseScenes = ({
 		});
 
 		const previousDescriptor = previousState?.descriptors[route.key];
+		const descriptorRoute =
+			previousDescriptor &&
+			childStateUnchanged &&
+			areRecordsShallowEqual(
+				previousDescriptor.route as unknown as Record<string, unknown>,
+				route as unknown as Record<string, unknown>,
+			)
+				? previousDescriptor.route
+				: route;
 		const descriptor =
 			previousDescriptor &&
 			childStateUnchanged &&
-			previousDescriptor.route === sourceDescriptor.route &&
-			previousDescriptor.navigation === sourceDescriptor.navigation &&
+			previousDescriptor.route === descriptorRoute &&
+			previousDescriptor.navigation === props.navigation &&
 			previousDescriptor.options === sourceDescriptor.options
 				? previousDescriptor
-				: sourceDescriptor;
+				: ({
+						route: descriptorRoute,
+						navigation: props.navigation,
+						options: sourceDescriptor.options,
+						render: sourceDescriptor.render,
+					} as BlankStackDescriptor);
 
 		routeKeys.push(route.key);
 		routeChildStates[route.key] = routeChildState;
@@ -206,12 +226,10 @@ const buildBaseScenes = ({
 
 const withSceneRelationships = ({
 	scenes,
-	sourceDescriptors,
 	closingRouteKeys,
 	previousState,
 }: {
 	scenes: BaseStackScene<BlankStackDescriptor>[];
-	sourceDescriptors: BlankStackDescriptors;
 	closingRouteKeys: ReadonlySet<string>;
 	previousState?: LocalRoutesState;
 }): BaseStackScene<BlankStackDescriptor>[] => {
@@ -231,7 +249,7 @@ const withSceneRelationships = ({
 
 	const relationshipScenes = scenes.map((scene) => ({
 		route: scene.route,
-		descriptor: sourceDescriptors[scene.route.key] ?? scene.descriptor,
+		descriptor: scene.descriptor,
 	}));
 
 	const nextScenes = scenes.map((scene, sceneIndex) => {
@@ -296,7 +314,6 @@ export const buildBlankStackState = (
 
 	const scenes = withSceneRelationships({
 		scenes: baseScenes,
-		sourceDescriptors,
 		closingRouteKeys: params.closingRouteKeys,
 		previousState: params.previousState,
 	});
@@ -305,6 +322,7 @@ export const buildBlankStackState = (
 
 	return {
 		routes: params.routes,
+		navigation: params.props.navigation,
 		descriptors:
 			params.previousState &&
 			areDescriptorsEqual(

package/src/providers/stack/blank-stack-state/helpers/derive-blank-stack-state.ts

@@ -7,7 +7,7 @@ import {
 	areDescriptorsEqual,
 	areRouteChildStateMapsEqual,
 	getRouteChildStateMap,
-	routesHaveSameKeys,
+	routesAreShallowlyEqual,
 	setsAreEqual,
 } from "./state-equality";
 import type { BlankStackRoutes, LocalRoutesState } from "./types";
@@ -39,6 +39,7 @@ export const deriveBlankStackState = ({
 	const nextDescriptors = props.descriptors;
 	const nextRouteChildStates = getRouteChildStateMap(nextRoutesSnapshot);
 	const nextFocusedRouteKey = nextRoutesSnapshot[props.state.index]?.key;
+	const navigationUnchanged = current.navigation === props.navigation;
 	const focusedRouteUnchanged = current.focusedRouteKey === nextFocusedRouteKey;
 	const closingRouteKeysUnchanged = setsAreEqual(
 		current.closingRouteKeys,
@@ -50,6 +51,7 @@ export const deriveBlankStackState = ({
 	);
 
 	const alreadyAligned =
+		navigationUnchanged &&
 		focusedRouteUnchanged &&
 		closingRouteKeysUnchanged &&
 		routeChildStatesUnchanged &&
@@ -61,10 +63,11 @@ export const deriveBlankStackState = ({
 	}
 
 	const logicallyAligned =
+		navigationUnchanged &&
 		focusedRouteUnchanged &&
 		closingRouteKeysUnchanged &&
 		routeChildStatesUnchanged &&
-		routesHaveSameKeys(current.routes, nextRoutesSnapshot) &&
+		routesAreShallowlyEqual(current.routes, nextRoutesSnapshot) &&
 		areDescriptorSourceMapsEquivalent(
 			current.sourceDescriptors,
 			nextDescriptors,
@@ -92,7 +95,12 @@ export const deriveBlankStackState = ({
 		closingRouteKeys,
 	);
 
-	if (!routesChanged && !descriptorsChanged && !closingRouteKeysChanged) {
+	if (
+		navigationUnchanged &&
+		!routesChanged &&
+		!descriptorsChanged &&
+		!closingRouteKeysChanged
+	) {
 		return current;
 	}
 

package/src/providers/stack/blank-stack-state/helpers/reconcile-blank-stack-routes.ts

@@ -1,9 +1,9 @@
+import type { BlankStackDescriptorSources } from "../../../../types/providers/blank-stack-provider.types";
 import type { RouteWithKey } from "../../../../types/stack.types";
 import { composeDescriptors } from "./navigation/compose-descriptors";
 import { syncRoutesWithRemoved } from "./navigation/sync-routes-with-removed";
 import { routesHaveSameKeys } from "./state-equality";
 import type {
-	BlankStackDescriptors,
 	BlankStackRoutes,
 	LocalRoutesState,
 	ReconciledRoutes,
@@ -13,7 +13,7 @@ type ReconcileBlankStackRoutesParams = {
 	current: LocalRoutesState;
 	previousRoutesSnapshot: BlankStackRoutes;
 	nextRoutesSnapshot: BlankStackRoutes;
-	nextDescriptors: BlankStackDescriptors;
+	nextDescriptors: BlankStackDescriptorSources;
 	closingRouteKeys: Set<string>;
 };
 

package/src/providers/stack/blank-stack-state/helpers/state-equality.ts

@@ -1,6 +1,8 @@
-import type { BlankStackDescriptor } from "../../../../types/blank-stack.types";
+import type {
+	BlankStackDescriptorSource,
+	BlankStackDescriptorSources,
+} from "../../../../types/providers/blank-stack-provider.types";
 import type { RouteWithKey } from "../../../../types/stack.types";
-import type { BlankStackDescriptors } from "./types";
 
 export const areDescriptorsEqual = <
 	DescriptorMap extends Record<string, unknown>,
@@ -54,6 +56,22 @@ export const routesHaveSameKeys = <Route extends RouteWithKey>(
 	return a.every((route, index) => route.key === b[index]?.key);
 };
 
+export const routesAreShallowlyEqual = <Route extends RouteWithKey>(
+	previous: readonly Route[],
+	next: readonly Route[],
+): boolean => {
+	if (!routesHaveSameKeys(previous, next)) {
+		return false;
+	}
+
+	return previous.every((route, index) =>
+		areRecordsShallowEqual(
+			route as unknown as Record<string, unknown>,
+			next[index] as unknown as Record<string, unknown>,
+		),
+	);
+};
+
 export const getRouteChildState = (route: RouteWithKey): unknown => {
 	if (!route || typeof route !== "object") {
 		return undefined;
@@ -111,25 +129,18 @@ export const areRecordsShallowEqual = (
 };
 
 export const areDescriptorSourcesEquivalent = (
-	previous: BlankStackDescriptor,
-	next: BlankStackDescriptor,
+	previous: BlankStackDescriptorSource,
+	next: BlankStackDescriptorSource,
 ): boolean => {
-	return (
-		previous.navigation === next.navigation &&
-		areRecordsShallowEqual(
-			previous.route as unknown as Record<string, unknown>,
-			next.route as unknown as Record<string, unknown>,
-		) &&
-		areRecordsShallowEqual(
-			previous.options as unknown as Record<string, unknown>,
-			next.options as unknown as Record<string, unknown>,
-		)
+	return areRecordsShallowEqual(
+		previous.options as unknown as Record<string, unknown>,
+		next.options as unknown as Record<string, unknown>,
 	);
 };
 
 export const areDescriptorSourceMapsEquivalent = (
-	previous: BlankStackDescriptors,
-	next: BlankStackDescriptors,
+	previous: BlankStackDescriptorSources,
+	next: BlankStackDescriptorSources,
 ): boolean => {
 	if (previous === next) return true;
 

package/src/providers/stack/blank-stack-state/helpers/types.ts

@@ -1,18 +1,23 @@
 import type { BlankStackDescriptor } from "../../../../types/blank-stack.types";
-import type { BlankStackProviderProps } from "../../../../types/providers/blank-stack-provider.types";
 import type {
+	BlankStackDescriptorSources,
+	BlankStackProviderProps,
+} from "../../../../types/providers/blank-stack-provider.types";
+import type {
+	BaseStackNavigation,
 	BaseStackRoute,
 	BaseStackScene,
 } from "../../../../types/stack.types";
 
-export type BlankStackRoutes = BlankStackDescriptor["route"][];
+export type BlankStackRoutes = BaseStackRoute[];
 
 export type BlankStackDescriptors = Record<string, BlankStackDescriptor>;
 
 export type LocalRoutesState = {
 	routes: BlankStackRoutes;
 	descriptors: BlankStackDescriptors;
-	sourceDescriptors: BlankStackDescriptors;
+	sourceDescriptors: BlankStackDescriptorSources;
+	navigation: BaseStackNavigation;
 	focusedRouteKey?: string;
 	routeChildStates: Record<string, unknown>;
 	scenes: BaseStackScene<BlankStackDescriptor>[];
@@ -35,7 +40,7 @@ export type BlankStackController = {
 
 export type ReconciledRoutes = {
 	routes: BlankStackRoutes;
-	descriptors: BlankStackDescriptors;
+	descriptors: BlankStackDescriptorSources;
 };
 
 export type SceneActivityWindow = {

package/src/types/animation.types.ts

@@ -29,6 +29,7 @@ export type ScreenTransitionOptions = Pick<
 	| "gestureSnapVelocityImpact"
 	| "gestureReleaseVelocityScale"
 	| "gestureSnapLocked"
+	| "sheetSnapBehavior"
 	| "sheetScrollGestureBehavior"
 	| "backdropBehavior"
 >;
@@ -278,19 +279,25 @@ export type ScreenStyleInterpolator = (
  */
 export type AnimatedViewStyle = ViewStyle & TextStyle;
 
-export type BoundaryTeleportControl =
-	| boolean
-	| {
-			enabled?: boolean;
-	  };
+/**
+ * Selects which matched boundary owns handoff content during a transition.
+ *
+ * `"auto"` follows the navigator's default ownership lifecycle. Use an
+ * explicit target when ownership needs to change at a precise interpolator
+ * frame, such as returning content to its source as soon as dismissal begins.
+ *
+ * @default "auto"
+ */
+export type BoundaryHandoffTarget = "auto" | "source" | "destination";
 
 export type TransitionSlotProps = Record<string, unknown> & {
 	/**
-	 * Controls whether a handoff or clipping-escape boundary should attach for
-	 * the current interpolator frame. `false` detaches the portal while keeping
-	 * hostName ownership internal.
+	 * Selects which matched boundary owns handoff content for the current
+	 * interpolator frame.
+	 *
+	 * @default "auto"
 	 */
-	teleport?: BoundaryTeleportControl;
+	handoffTarget?: BoundaryHandoffTarget;
 };
 
 type TransitionSlotDefinition = {
@@ -344,8 +351,6 @@ export type NormalizedTransitionInterpolatedStyle = {
 	content?: NormalizedTransitionSlotStyle;
 	/** Animated style and props for the backdrop layer between screens. */
 	backdrop?: NormalizedTransitionSlotStyle;
-	/** Animated style and props for the surface component layer within the screen. */
-	surface?: NormalizedTransitionSlotStyle;
 	/** Animated style and props for the navigation mask container layer. */
 	[NAVIGATION_MASK_CONTAINER_STYLE_ID]?: NormalizedTransitionSlotStyle;
 	/** Animated style and props for the navigation mask element layer. */
@@ -376,8 +381,6 @@ export type TransitionInterpolatedStyle = {
 	content?: TransitionSlotStyle;
 	/** Animated style and props for the backdrop layer between screens. */
 	backdrop?: TransitionSlotStyle;
-	/** Animated style and props for the surface component layer within the screen. */
-	surface?: TransitionSlotStyle;
 	/** Animated style and props for the navigation mask container layer. */
 	[NAVIGATION_MASK_CONTAINER_STYLE_ID]?: TransitionSlotStyle;
 	/** Animated style and props for the navigation mask element layer. */

package/src/types/blank-stack.types.ts

@@ -1,7 +1,6 @@
 import type {
 	DefaultNavigatorOptions,
 	Descriptor,
-	NavigationHelpers,
 	NavigationProp,
 	ParamListBase,
 	RouteProp,
@@ -48,32 +47,6 @@ export type BlankStackOptionsArgs<
 	theme: Theme;
 };
 
-export type BlankStackNavigationHelpers = NavigationHelpers<
-	ParamListBase,
-	BlankStackNavigationEventMap
->;
-
-/**
- * Additional props accepted by the blank stack navigator.
- *
- * These can be passed to `<BlankStack.Navigator />` in the dynamic API, and
- * they are also supported as top-level keys in static navigator config.
- */
-export interface BlankStackFactoryOptions {
-	/**
-	 * Creates an isolated navigation tree for embedded flows.
-	 *
-	 * Use this when the blank stack needs to live inside another screen or host
-	 * application without joining the parent React Navigation tree.
-	 *
-	 * When enabled, the navigator:
-	 * - wraps itself in `NavigationIndependentTree` + `NavigationContainer`
-	 *
-	 * Leave this disabled for normal top-level app stacks.
-	 */
-	independent?: boolean;
-}
-
 /**
  * Props passed to overlay components in blank-stack.
  * Uses the shared OverlayProps type with blank-stack's navigation type.
@@ -121,8 +94,7 @@ export type BlankStackNavigatorProps = DefaultNavigatorOptions<
 	BlankStackNavigationEventMap,
 	BlankStackNavigationProp<ParamListBase>
 > &
-	StackRouterOptions &
-	BlankStackFactoryOptions;
+	StackRouterOptions;
 
 export type BlankStackDescriptor = Descriptor<
 	BlankStackNavigationOptions,

package/src/types/index.ts

@@ -2,7 +2,7 @@ export { FALSE, TRUE } from "../constants";
 export type {
 	AnimatedViewStyle,
 	AnimationConfig,
-	BoundaryTeleportControl,
+	BoundaryHandoffTarget,
 	ScreenInterpolationProps,
 	ScreenStyleInterpolator,
 	ScreenTransitionAccessor,
@@ -60,7 +60,10 @@ export type {
 	ScreenContentComponentProps,
 	ScreenKey,
 	ScreenLayerComponentProps,
+	ScreenSurfaceComponent,
+	ScreenSurfaceComponentProps,
 	ScreenTransitionConfig,
+	SheetSnapBehavior,
 	TransitionAwareProps,
 } from "./screen.types";
 export type {

package/src/types/providers/blank-stack-provider.types.ts

@@ -1,24 +1,27 @@
-import type {
-	BlankStackDescriptor,
-	BlankStackNavigationHelpers,
-} from "../blank-stack.types";
+import type { NavigatorDescriptor } from "standard-navigation";
+import type { BlankStackNavigationOptions } from "../blank-stack.types";
 import type {
 	BaseStackDescriptor,
+	BaseStackNavigation,
 	BaseStackRoute,
 	BaseStackScene,
 	BaseStackState,
 } from "../stack.types";
 
 export interface BlankStackProviderProps {
-	state: BaseStackState<BlankStackDescriptor["route"]>;
-	navigation: BlankStackNavigationHelpers;
-	descriptors: Record<string, BlankStackDescriptor>;
-	describe: (
-		route: BlankStackDescriptor["route"],
-		placeholder: boolean,
-	) => BlankStackDescriptor;
+	state: BaseStackState<BaseStackRoute>;
+	navigation: BaseStackNavigation;
+	descriptors: BlankStackDescriptorSources;
 }
 
+export type BlankStackDescriptorSource =
+	NavigatorDescriptor<BlankStackNavigationOptions>;
+
+export type BlankStackDescriptorSources = Record<
+	string,
+	BlankStackDescriptorSource
+>;
+
 export interface BlankStackStoreValue {
 	navigatorKey: string;
 	routeKeys: string[];