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

package/src/navigators/create-blank-stack-navigator.tsx

@@ -1,19 +1,6 @@
-import * as React from "react";
-import {
-	createStandardNavigator,
-	type NavigatorDescriptor,
-} from "standard-navigation";
+import { createStandardNavigator } from "standard-navigation";
 import { StackView } from "../components/stack-view";
-import {
-	type NavigationHostContextValue,
-	NavigationHostProvider,
-} from "../providers/navigation/navigation-host.provider";
-import type {
-	BlankStackDescriptor,
-	BlankStackFactoryOptions,
-	BlankStackNavigationHelpers,
-	BlankStackNavigationOptions,
-} from "../types/blank-stack.types";
+import type { BlankStackNavigationOptions } from "../types/blank-stack.types";
 import type {
 	BaseStackNavigation,
 	BaseStackRoute,
@@ -22,122 +9,27 @@ import type {
 
 export type BlankStackStandardEventMap = {};
 
-export type BlankStackStandardNavigatorProps = BlankStackFactoryOptions & {
+export type BlankStackStandardNavigatorProps = {
 	navigationState?: BaseStackState<BaseStackRoute>;
 	navigation?: BaseStackNavigation;
-	navigationHost?: NavigationHostContextValue;
-};
-
-type StandardDescriptor = NavigatorDescriptor<BlankStackNavigationOptions> & {
-	navigation?: BaseStackNavigation;
-	route?: BaseStackRoute;
 };
 
-type StandardDescriptorMap = Record<string, StandardDescriptor>;
-type BlankStackDescriptorMap = Record<string, BlankStackDescriptor>;
-
-function createDescriptorMap({
-	routes,
-	descriptors,
-	navigation,
-}: {
-	routes: BaseStackRoute[];
-	descriptors: StandardDescriptorMap;
-	navigation: BaseStackNavigation;
-}): BlankStackDescriptorMap {
-	const result: BlankStackDescriptorMap = {};
-
-	for (const route of routes) {
-		const descriptor = descriptors[route.key];
-
-		if (!descriptor) {
-			continue;
-		}
-
-		result[route.key] = {
-			route: descriptor.route ?? route,
-			navigation: (descriptor.navigation ??
-				navigation) as BlankStackDescriptor["navigation"],
-			options: descriptor.options,
-			render: () => descriptor.render() as React.JSX.Element,
-		};
-	}
-
-	return result;
-}
-
 export const BlankStackNavigator = createStandardNavigator<
 	BlankStackNavigationOptions,
 	BlankStackStandardEventMap,
 	BlankStackStandardNavigatorProps
->(
-	({
-		actions,
-		descriptors,
-		state,
-		navigation,
-		navigationHost,
-		navigationState,
-	}) => {
-		const stackState = navigationState ?? {
-			key: "blank-stack",
-			index: state.index,
-			routes: state.routes as BaseStackRoute[],
-		};
-		const stackStateRef = React.useRef(stackState);
-		stackStateRef.current = stackState;
-
-		const fallbackNavigation = React.useMemo<BaseStackNavigation>(
-			() => ({
-				getState: () => stackStateRef.current,
-				dispatch: (action) => {
-					if (action?.type === "GO_BACK" || action?.type === "POP") {
-						actions.back();
-						return;
-					}
-
-					const name = action?.payload?.name;
-					if (action?.type === "NAVIGATE" && typeof name === "string") {
-						actions.navigate(name, action.payload.params);
-					}
-				},
-			}),
-			[actions],
-		);
-		const stackNavigation = navigation ?? fallbackNavigation;
-		const stackDescriptors = React.useMemo(
-			() =>
-				createDescriptorMap({
-					routes: stackState.routes,
-					descriptors,
-					navigation: stackNavigation,
-				}),
-			[descriptors, stackNavigation, stackState.routes],
-		);
-		const describe = React.useCallback(
-			(route: BlankStackDescriptor["route"]) => {
-				const descriptor = stackDescriptors[route.key];
-
-				if (!descriptor) {
-					throw new Error(
-						`BlankStack could not find a descriptor for route "${route.key}".`,
-					);
-				}
-
-				return descriptor;
-			},
-			[stackDescriptors],
+>(({ descriptors, navigation, navigationState }) => {
+	if (!navigationState || !navigation) {
+		throw new Error(
+			"BlankStack requires navigation state and helpers from its integration.",
 		);
+	}
 
-		return (
-			<NavigationHostProvider value={navigationHost}>
-				<StackView
-					state={stackState}
-					navigation={stackNavigation as BlankStackNavigationHelpers}
-					descriptors={stackDescriptors}
-					describe={describe}
-				/>
-			</NavigationHostProvider>
-		);
-	},
-);
+	return (
+		<StackView
+			state={navigationState}
+			navigation={navigation}
+			descriptors={descriptors}
+		/>
+	);
+});

package/src/navigators/expo-router/index.tsx

@@ -4,11 +4,6 @@ import {
 	type StackRouterOptions,
 	unstable_integrateWithRouter,
 } from "expo-router";
-import {
-	NavigationContext,
-	NavigationRouteContext,
-} from "expo-router/react-navigation";
-import type { NavigationScreenProviderComponent } from "../../providers/navigation/navigation-host.provider";
 import type { BlankStackNavigationOptions } from "../../types/blank-stack.types";
 import {
 	BlankStackNavigator,
@@ -18,22 +13,6 @@ import {
 
 type BlankStackExpoRouterParamList = Record<string, object | undefined>;
 
-const ExpoRouterScreenProvider: NavigationScreenProviderComponent = ({
-	children,
-	navigation,
-	route,
-}) => (
-	<NavigationContext.Provider value={navigation as never}>
-		<NavigationRouteContext.Provider value={route as never}>
-			{children}
-		</NavigationRouteContext.Provider>
-	</NavigationContext.Provider>
-);
-
-const expoRouterNavigationHost = {
-	ScreenProvider: ExpoRouterScreenProvider,
-};
-
 export const BlankStack = unstable_integrateWithRouter<
 	BlankStackNavigationOptions,
 	StackNavigationState<BlankStackExpoRouterParamList>,
@@ -44,14 +23,12 @@ export const BlankStack = unstable_integrateWithRouter<
 	createProps: ({ state, navigation }) => ({
 		navigationState: state,
 		navigation,
-		navigationHost: expoRouterNavigationHost,
 	}),
 });
 
 export const BlankStackScreen = BlankStack.Screen;
 
 export type {
-	BlankStackFactoryOptions,
 	BlankStackNavigationEventMap,
 	BlankStackNavigationOptions,
 	BlankStackNavigationProp,

package/src/navigators/react-navigation/index.tsx

@@ -6,7 +6,6 @@ import {
 	type StackRouterOptions,
 	type StandardNavigationTypeBagBase,
 } from "@react-navigation/native";
-import { reactNavigationHost } from "../../providers/navigation/react-navigation-host";
 import type {
 	BlankStackNavigationEventMap,
 	BlankStackNavigationOptions,
@@ -33,11 +32,9 @@ export const {
 >(BlankStackNavigator, StackRouter, ({ state, navigation }) => ({
 	navigationState: state,
 	navigation,
-	navigationHost: reactNavigationHost,
 }));
 
 export type {
-	BlankStackFactoryOptions,
 	BlankStackNavigationEventMap,
 	BlankStackNavigationOptions,
 	BlankStackNavigationProp,

package/src/providers/screen/animation/animation.provider.tsx

@@ -1,6 +1,7 @@
 import { type ReactNode, useMemo } from "react";
 import { createBoundsAccessor } from "../../../utils/bounds";
 import createProvider from "../../../utils/create-provider";
+import { useBlankStackStore } from "../../stack/blank-stack.provider";
 import { useDescriptorsStore } from "../descriptors";
 import { useCurrentScreenRelationships } from "../use-current-screen-relationships";
 import { useScreenAnimationPipeline } from "./helpers/pipeline";
@@ -26,63 +27,68 @@ const createScreenAnimationProvider = createProvider("ScreenAnimation", {
 })<Props, ScreenAnimationContextValue>;
 
 export const {
+	StoreProvider: ScreenAnimationStoreProvider,
 	ScreenAnimationProvider,
 	useOptionalScreenAnimationStore,
 	useScreenAnimationStore,
-}: ReturnType<typeof createScreenAnimationProvider> =
-	createScreenAnimationProvider((_props) => {
-		const currentScreenKey = useDescriptorsStore(
-			(store) => store.derivations.currentScreenKey,
-		);
-		const relationships = useCurrentScreenRelationships();
-		const pipeline = useScreenAnimationPipeline();
+}: ReturnType<
+	typeof createScreenAnimationProvider
+> = createScreenAnimationProvider((_props) => {
+	const currentScreenKey = useDescriptorsStore(
+		(store) => store.derivations.currentScreenKey,
+	);
+	const isClosing = useBlankStackStore(
+		(store) => store.scenesByKey[currentScreenKey]?.activity === "closing",
+	);
+	const relationships = useCurrentScreenRelationships();
+	const pipeline = useScreenAnimationPipeline();
 
-		const screenAnimationSource = useMemo<ScreenAnimationTransitionSource>(
-			() => ({
-				screenInterpolatorProps: pipeline.screenInterpolatorProps,
-				screenInterpolatorPropsRevision:
-					pipeline.screenInterpolatorPropsRevision,
-				boundsAccessor: createBoundsAccessor(() => {
-					"worklet";
-					return pipeline.screenInterpolatorProps.get();
-				}),
+	const screenAnimationSource = useMemo<ScreenAnimationTransitionSource>(
+		() => ({
+			screenInterpolatorProps: pipeline.screenInterpolatorProps,
+			screenInterpolatorPropsRevision: pipeline.screenInterpolatorPropsRevision,
+			boundsAccessor: createBoundsAccessor(() => {
+				"worklet";
+				return pipeline.screenInterpolatorProps.get();
 			}),
-			[
-				pipeline.screenInterpolatorProps,
-				pipeline.screenInterpolatorPropsRevision,
-			],
-		);
-		const ancestorSources =
-			useOptionalScreenAnimationStore(
-				relationships.parentScreenKey,
-				(store) => store.transitionSourcesThroughSelf,
-			) ?? EMPTY_TRANSITION_SOURCES;
-		const descendantSources =
-			useOptionalScreenAnimationStore(
-				relationships.activeChildScreenKey,
-				(store) => store.transitionSourcesFromSelf,
-			) ?? EMPTY_TRANSITION_SOURCES;
-		const transitionSourcesThroughSelf = useMemo(
-			() => [...ancestorSources, screenAnimationSource],
-			[ancestorSources, screenAnimationSource],
-		);
-		const transitionSourcesFromSelf = useMemo(
-			() => [screenAnimationSource, ...descendantSources],
-			[screenAnimationSource, descendantSources],
-		);
-		const transitionSources = useMemo(
-			() => [...transitionSourcesThroughSelf, ...descendantSources],
-			[transitionSourcesThroughSelf, descendantSources],
-		);
+		}),
+		[
+			pipeline.screenInterpolatorProps,
+			pipeline.screenInterpolatorPropsRevision,
+		],
+	);
+	const ancestorSources =
+		useOptionalScreenAnimationStore(
+			relationships.parentScreenKey,
+			(store) => store.transitionSourcesThroughSelf,
+		) ?? EMPTY_TRANSITION_SOURCES;
+	const descendantSources =
+		useOptionalScreenAnimationStore(
+			relationships.activeChildScreenKey,
+			(store) => store.transitionSourcesFromSelf,
+		) ?? EMPTY_TRANSITION_SOURCES;
+	const transitionSourcesThroughSelf = useMemo(
+		() => [...ancestorSources, screenAnimationSource],
+		[ancestorSources, screenAnimationSource],
+	);
+	const transitionSourcesFromSelf = useMemo(
+		() => [screenAnimationSource, ...descendantSources],
+		[screenAnimationSource, descendantSources],
+	);
+	const transitionSources = useMemo(
+		() => [...transitionSourcesThroughSelf, ...descendantSources],
+		[transitionSourcesThroughSelf, descendantSources],
+	);
 
-		return {
-			key: currentScreenKey,
-			value: {
-				...pipeline,
-				transitionSources,
-				transitionOriginIndex: ancestorSources.length,
-				transitionSourcesThroughSelf,
-				transitionSourcesFromSelf,
-			},
-		};
-	});
+	return {
+		key: currentScreenKey,
+		unregisterOnCleanup: isClosing,
+		value: {
+			...pipeline,
+			transitionSources,
+			transitionOriginIndex: ancestorSources.length,
+			transitionSourcesThroughSelf,
+			transitionSourcesFromSelf,
+		},
+	};
+});

package/src/providers/screen/animation/use-screen-animation.tsx

@@ -3,8 +3,7 @@ import type {
 	ScreenInterpolationProps,
 	ScreenTransitionTarget,
 } from "../../../types/animation.types";
-import { useNavigationRoute } from "../../navigation/navigation-host.provider";
-import { useOptionalScreenAnimationStore } from "./animation.provider";
+import { useScreenAnimationStore } from "./animation.provider";
 import { useBuildTransitionAccessor } from "./helpers/accessors/use-build-transition-accessor";
 import { readScreenAnimationRevisions } from "./helpers/read-screen-animation-revisions";
 import type { ScreenAnimationTarget } from "./types";
@@ -23,18 +22,7 @@ export function useScreenAnimation(
 ):
 	| DerivedValue<ScreenInterpolationProps>
 	| DerivedValue<ScreenInterpolationProps | null> {
-	const routeKey = useNavigationRoute().key;
-	const localAnimationStore = useOptionalScreenAnimationStore();
-	const keyedAnimationStore = useOptionalScreenAnimationStore(
-		localAnimationStore ? null : routeKey,
-	);
-	const screenAnimationStore = localAnimationStore ?? keyedAnimationStore;
-
-	if (!screenAnimationStore) {
-		throw new Error(
-			`ScreenAnimationStore is unavailable for route "${routeKey}"`,
-		);
-	}
+	const screenAnimationStore = useScreenAnimationStore();
 
 	const { transitionSources } = screenAnimationStore;
 	const transition = useBuildTransitionAccessor(screenAnimationStore);

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,6 +68,7 @@ export const PROP_RESET_VALUES: Record<string, unknown> = {
 const RESERVED_STYLE_SLOT_IDS = {
 	overlay: true,
 	content: true,
+	surface: true,
 	backdrop: true,
 	[NAVIGATION_MASK_ELEMENT_STYLE_ID]: true,
 	[NAVIGATION_MASK_CONTAINER_STYLE_ID]: true,

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,6 +18,7 @@ type Props = { children: ReactNode };
 export type ScreenSlotName =
 	| "overlay"
 	| "content"
+	| "surface"
 	| "backdrop"
 	| typeof NAVIGATION_MASK_CONTAINER_STYLE_ID
 	| typeof NAVIGATION_MASK_ELEMENT_STYLE_ID;
@@ -33,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>;
 };