react-native-screen-transitions 4.0.0-alpha.4 → 4.0.0-alpha.6

package/src/providers/screen/styles/helpers/create-interpolator-scope.ts

@@ -0,0 +1,45 @@
+import type {
+	ScreenInterpolationProps,
+	ScreenTransitionAccessor,
+} from "../../../../types/animation.types";
+import { createBoundsAccessor } from "../../../../utils/bounds";
+import type { ScreenInterpolatorFrame } from "../../animation/helpers/pipeline";
+import type { SelectedInterpolatorFrame } from "./select-interpolator-frame";
+
+export const createInterpolatorScope = ({
+	frame,
+	selectedFrame,
+	transition,
+}: {
+	frame: ScreenInterpolatorFrame;
+	selectedFrame: SelectedInterpolatorFrame;
+	transition: ScreenTransitionAccessor;
+}): ScreenInterpolationProps => {
+	"worklet";
+
+	const selectedProps = {
+		...frame,
+		...selectedFrame,
+	};
+	let scope: ScreenInterpolationProps;
+	const scopedTransition: ScreenTransitionAccessor = (target) => {
+		"worklet";
+
+		if ((target?.depth ?? 0) === 0) {
+			return scope;
+		}
+
+		return transition(target);
+	};
+
+	scope = {
+		...selectedProps,
+		bounds: createBoundsAccessor(() => {
+			"worklet";
+			return selectedProps;
+		}),
+		transition: scopedTransition,
+	};
+
+	return scope;
+};

package/src/providers/screen/styles/helpers/resolve-interpolator-style-handoff.ts

@@ -81,18 +81,18 @@ const mergeSlots = (
 	return merged;
 };
 
-const composeFrozenAndLiveStyles = (
-	frozen: NormalizedTransitionInterpolatedStyle,
-	live: NormalizedTransitionInterpolatedStyle,
+const composeCurrentAndNextStyles = (
+	current: NormalizedTransitionInterpolatedStyle,
+	next: NormalizedTransitionInterpolatedStyle,
 ) => {
 	"worklet";
-	const composed: NormalizedTransitionInterpolatedStyle = { ...frozen };
+	const composed: NormalizedTransitionInterpolatedStyle = { ...current };
 
-	for (const slotId in live) {
-		const liveSlot = live[slotId];
+	for (const slotId in next) {
+		const nextSlot = next[slotId];
 
-		if (liveSlot) {
-			composed[slotId] = mergeSlots(frozen[slotId], liveSlot);
+		if (nextSlot) {
+			composed[slotId] = mergeSlots(current[slotId], nextSlot);
 		}
 	}
 
@@ -103,36 +103,36 @@ export const resolveInterpolatorStyleHandoff = ({
 	currentOwnsInterpolator,
 	currentStylesMap,
 	nextStylesMap,
-	frozenCurrentStylesMap,
 }: {
 	currentOwnsInterpolator: boolean;
 	currentStylesMap: NormalizedTransitionInterpolatedStyle | undefined;
 	nextStylesMap: NormalizedTransitionInterpolatedStyle | undefined;
-	frozenCurrentStylesMap: NormalizedTransitionInterpolatedStyle;
 }): {
 	localStylesMaps: LocalStyleLayers;
-	nextFrozenCurrentStylesMap: NormalizedTransitionInterpolatedStyle;
 } => {
 	"worklet";
 
 	if (currentOwnsInterpolator) {
 		return {
 			localStylesMaps: currentStylesMap ? [currentStylesMap] : [],
-			nextFrozenCurrentStylesMap: currentStylesMap ?? frozenCurrentStylesMap,
 		};
 	}
 
 	if (!nextStylesMap) {
 		return {
-			localStylesMaps: frozenCurrentStylesMap ? [frozenCurrentStylesMap] : [],
-			nextFrozenCurrentStylesMap: frozenCurrentStylesMap,
+			localStylesMaps: currentStylesMap ? [currentStylesMap] : [],
+		};
+	}
+
+	if (!currentStylesMap) {
+		return {
+			localStylesMaps: [nextStylesMap],
 		};
 	}
 
 	return {
 		localStylesMaps: [
-			composeFrozenAndLiveStyles(frozenCurrentStylesMap, nextStylesMap),
+			composeCurrentAndNextStyles(currentStylesMap, nextStylesMap),
 		],
-		nextFrozenCurrentStylesMap: frozenCurrentStylesMap,
 	};
 };

package/src/providers/screen/styles/hooks/use-interpolated-style-maps.tsx

@@ -18,7 +18,6 @@ import type {
 } from "../../../../types/animation.types";
 import { logger } from "../../../../utils/logger";
 import { useScreenAnimationStore } from "../../animation";
-import { useBuildBoundsAccessor } from "../../animation/helpers/accessors/use-build-bounds-accessor";
 import { useBuildTransitionAccessor } from "../../animation/helpers/accessors/use-build-transition-accessor";
 import type { ScreenInterpolatorFrame } from "../../animation/helpers/pipeline";
 import { readScreenAnimationRevisions } from "../../animation/helpers/read-screen-animation-revisions";
@@ -29,6 +28,7 @@ import {
 	useScreenOptionsStore,
 } from "../../options";
 import { collectInterpolatorSharedValues } from "../helpers/collect-interpolator-shared-values";
+import { createInterpolatorScope } from "../helpers/create-interpolator-scope";
 import { normalizeSlots } from "../helpers/normalize-slots";
 import { resolveInterpolatorStyleHandoff } from "../helpers/resolve-interpolator-style-handoff";
 import type { LocalStyleLayers } from "../helpers/resolve-slot-styles";
@@ -54,7 +54,6 @@ type RunInterpolatorParams = {
 	interpolator: ScreenStyleInterpolator | undefined;
 	props: ScreenInterpolatorFrame;
 	selectedFrame: SelectedInterpolatorFrame;
-	bounds: Parameters<ScreenStyleInterpolator>[0]["bounds"];
 	transition: Parameters<ScreenStyleInterpolator>[0]["transition"];
 };
 
@@ -76,7 +75,6 @@ const runInterpolator = ({
 	interpolator,
 	props,
 	selectedFrame,
-	bounds,
 	transition,
 }: RunInterpolatorParams): InterpolatorResult | undefined => {
 	"worklet";
@@ -86,12 +84,13 @@ const runInterpolator = ({
 	}
 
 	try {
-		const raw = interpolator({
-			...props,
-			...selectedFrame,
-			bounds,
-			transition,
-		});
+		const raw = interpolator(
+			createInterpolatorScope({
+				frame: props,
+				selectedFrame,
+				transition,
+			}),
+		);
 
 		const rawStyleMap: TransitionInterpolatedStyle | undefined =
 			typeof raw === "object" && raw != null ? raw : undefined;
@@ -125,10 +124,10 @@ const runInterpolator = ({
  * normal interpolator selection once the gesture-driven close is no longer in
  * play.
  *
- * At an ownership handoff, the last current-owner styles are frozen. The next
- * owner replaces matching scalar keys and composes its live transforms after
- * the frozen transforms. The previous interpolator is not evaluated again until
- * it regains ownership.
+ * At an ownership handoff, the current interpolator remains live but is
+ * evaluated without the next-screen relationship. The next owner replaces
+ * matching scalar keys and composes its live transforms after the current
+ * screen's self-owned transforms.
  */
 export const useInterpolatedStylesMap = ({
 	enabled,
@@ -154,7 +153,6 @@ export const useInterpolatedStylesMap = ({
 		ancestorScreenAnimationSources,
 		descendantScreenAnimationSources,
 	} = useScreenAnimationStore();
-	const boundsAccessor = useBuildBoundsAccessor();
 	const transition = useBuildTransitionAccessor();
 	const nextInterpolatorReady = useSharedValue(0);
 
@@ -177,8 +175,6 @@ export const useInterpolatedStylesMap = ({
 
 	const isGesturingDuringCloseAnimation = useSharedValue(false);
 	const initialDestinationStylesReady = useSharedValue(0);
-	const frozenCurrentStylesMap =
-		useSharedValue<NormalizedTransitionInterpolatedStyle>(NO_STYLES);
 	const shouldPrepareInitialDestinationStyles =
 		enabled && !!destinationPairKey && !nextScreenKey && !!currentInterpolator;
 
@@ -261,17 +257,20 @@ export const useInterpolatedStylesMap = ({
 			? "current"
 			: "next";
 
-		const selectedFrame = selectInterpolatorFrame(props, isInGestureMode);
-
-		const currentResult = currentOwnsInterpolator
-			? runInterpolator({
-					interpolator: currentInterpolator,
-					props,
-					selectedFrame,
-					bounds: boundsAccessor,
-					transition,
-				})
-			: undefined;
+		// Once the next interpolator owns the relationship, the current
+		// interpolator remains responsible only for its own live presentation.
+		// This preserves snap-point transforms without letting current-screen
+		// unfocus rules compete with the next screen's outgoing transition.
+		const currentSelectedFrame = selectInterpolatorFrame(
+			props,
+			isInGestureMode || !!nextInterpolator,
+		);
+		const currentResult = runInterpolator({
+			interpolator: currentInterpolator,
+			props,
+			selectedFrame: currentSelectedFrame,
+			transition,
+		});
 
 		const initialDestinationStyleGate = resolveInitialDestinationStyleGate({
 			shouldPrepareStyles: shouldPrepareInitialDestinationStyles,
@@ -295,23 +294,18 @@ export const useInterpolatedStylesMap = ({
 				currentOwnsInterpolator: true,
 				currentStylesMap: currentResult?.stylesMap,
 				nextStylesMap: undefined,
-				frozenCurrentStylesMap: frozenCurrentStylesMap.get(),
 			});
 
-			if (handoff.nextFrozenCurrentStylesMap !== frozenCurrentStylesMap.get()) {
-				frozenCurrentStylesMap.set(handoff.nextFrozenCurrentStylesMap);
-			}
-
 			return handoff.localStylesMaps.length
 				? handoff.localStylesMaps
 				: NO_STYLE_LAYERS;
 		}
 
+		const nextSelectedFrame = selectInterpolatorFrame(props, false);
 		const nextResult = runInterpolator({
 			interpolator: nextInterpolator,
 			props,
-			selectedFrame,
-			bounds: boundsAccessor,
+			selectedFrame: nextSelectedFrame,
 			transition,
 		});
 
@@ -326,7 +320,6 @@ export const useInterpolatedStylesMap = ({
 			currentOwnsInterpolator: false,
 			currentStylesMap: currentResult?.stylesMap,
 			nextStylesMap: nextResult?.stylesMap,
-			frozenCurrentStylesMap: frozenCurrentStylesMap.get(),
 		});
 
 		return handoff.localStylesMaps.length

package/src/stores/bounds/internals/entries.ts

@@ -66,13 +66,24 @@ function getMatchingSourceScreenKey(
 	tag: TagID,
 	destinationScreenKey: ScreenKey,
 	preferredScreenKey?: ScreenKey,
+	excludedScreenKeys?: readonly ScreenKey[],
 ): ScreenKey | null {
 	"worklet";
 	const screens = boundaryRegistry.get()[tag]?.screens;
 	if (!screens) return null;
+	const isExcluded = (screenKey: ScreenKey) => {
+		"worklet";
+		for (let index = 0; index < (excludedScreenKeys?.length ?? 0); index++) {
+			if (excludedScreenKeys?.[index] === screenKey) {
+				return true;
+			}
+		}
+		return false;
+	};
 	if (
 		preferredScreenKey &&
 		preferredScreenKey !== destinationScreenKey &&
+		!isExcluded(preferredScreenKey) &&
 		screens[preferredScreenKey]
 	) {
 		return preferredScreenKey;
@@ -80,7 +91,7 @@ function getMatchingSourceScreenKey(
 
 	let latestScreenKey: ScreenKey | null = null;
 	for (const screenKey in screens) {
-		if (screenKey !== destinationScreenKey) {
+		if (screenKey !== destinationScreenKey && !isExcluded(screenKey)) {
 			latestScreenKey = screenKey;
 		}
 	}

package/lib/commonjs/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.js

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.hasLocalSlot = void 0;
-const hasLocalSlot = (localStylesMaps, slotId) => {
-  "worklet";
-
-  for (let index = 0; index < localStylesMaps.length; index++) {
-    if (localStylesMaps[index]?.[slotId] !== undefined) {
-      return true;
-    }
-  }
-  return false;
-};
-exports.hasLocalSlot = hasLocalSlot;
-//# sourceMappingURL=has-local-slot.js.map

package/lib/commonjs/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["hasLocalSlot","localStylesMaps","slotId","index","length","undefined","exports"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/helpers/has-local-slot.ts"],"mappings":";;;;;;AAEO,MAAMA,YAAY,GAAGA,CAC3BC,eAAiC,EACjCC,MAAc,KACV;EACJ,SAAS;;EAET,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGF,eAAe,CAACG,MAAM,EAAED,KAAK,EAAE,EAAE;IAC5D,IAAIF,eAAe,CAACE,KAAK,CAAC,GAAGD,MAAM,CAAC,KAAKG,SAAS,EAAE;MACnD,OAAO,IAAI;IACZ;EACD;EAEA,OAAO,KAAK;AACb,CAAC;AAACC,OAAA,CAAAN,YAAA,GAAAA,YAAA","ignoreList":[]}

package/lib/commonjs/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.js

@@ -1,21 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useBuildBoundsAccessor = void 0;
-var _react = require("react");
-var _bounds = require("../../../../../utils/bounds");
-var _animation = require("../../animation.provider");
-const useBuildBoundsAccessor = () => {
-  const screenInterpolatorProps = (0, _animation.useScreenAnimationStore)(store => store.screenInterpolatorProps);
-  return (0, _react.useMemo)(() => {
-    return (0, _bounds.createBoundsAccessor)(() => {
-      "worklet";
-
-      return screenInterpolatorProps.get();
-    });
-  }, [screenInterpolatorProps]);
-};
-exports.useBuildBoundsAccessor = useBuildBoundsAccessor;
-//# sourceMappingURL=use-build-bounds-accessor.js.map

package/lib/commonjs/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_react","require","_bounds","_animation","useBuildBoundsAccessor","screenInterpolatorProps","useScreenAnimationStore","store","useMemo","createBoundsAccessor","get","exports"],"sourceRoot":"../../../../../../../src","sources":["providers/screen/animation/helpers/accessors/use-build-bounds-accessor.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AAEO,MAAMG,sBAAsB,GAAGA,CAAA,KAAM;EAC3C,MAAMC,uBAAuB,GAAG,IAAAC,kCAAuB,EACrDC,KAAK,IAAKA,KAAK,CAACF,uBAClB,CAAC;EACD,OAAO,IAAAG,cAAO,EAAC,MAAM;IACpB,OAAO,IAAAC,4BAAoB,EAAC,MAAM;MACjC,SAAS;;MACT,OAAOJ,uBAAuB,CAACK,GAAG,CAAC,CAAC;IACrC,CAAC,CAAC;EACH,CAAC,EAAE,CAACL,uBAAuB,CAAC,CAAC;AAC9B,CAAC;AAACM,OAAA,CAAAP,sBAAA,GAAAA,sBAAA","ignoreList":[]}

package/lib/module/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.js

@@ -1,13 +0,0 @@
-"use strict";
-
-export const hasLocalSlot = (localStylesMaps, slotId) => {
-  "worklet";
-
-  for (let index = 0; index < localStylesMaps.length; index++) {
-    if (localStylesMaps[index]?.[slotId] !== undefined) {
-      return true;
-    }
-  }
-  return false;
-};
-//# sourceMappingURL=has-local-slot.js.map

package/lib/module/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["hasLocalSlot","localStylesMaps","slotId","index","length","undefined"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/helpers/has-local-slot.ts"],"mappings":";;AAEA,OAAO,MAAMA,YAAY,GAAGA,CAC3BC,eAAiC,EACjCC,MAAc,KACV;EACJ,SAAS;;EAET,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGF,eAAe,CAACG,MAAM,EAAED,KAAK,EAAE,EAAE;IAC5D,IAAIF,eAAe,CAACE,KAAK,CAAC,GAAGD,MAAM,CAAC,KAAKG,SAAS,EAAE;MACnD,OAAO,IAAI;IACZ;EACD;EAEA,OAAO,KAAK;AACb,CAAC","ignoreList":[]}

package/lib/module/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.js

@@ -1,16 +0,0 @@
-"use strict";
-
-import { useMemo } from "react";
-import { createBoundsAccessor } from "../../../../../utils/bounds";
-import { useScreenAnimationStore } from "../../animation.provider";
-export const useBuildBoundsAccessor = () => {
-  const screenInterpolatorProps = useScreenAnimationStore(store => store.screenInterpolatorProps);
-  return useMemo(() => {
-    return createBoundsAccessor(() => {
-      "worklet";
-
-      return screenInterpolatorProps.get();
-    });
-  }, [screenInterpolatorProps]);
-};
-//# sourceMappingURL=use-build-bounds-accessor.js.map

package/lib/module/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["useMemo","createBoundsAccessor","useScreenAnimationStore","useBuildBoundsAccessor","screenInterpolatorProps","store","get"],"sourceRoot":"../../../../../../../src","sources":["providers/screen/animation/helpers/accessors/use-build-bounds-accessor.tsx"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,oBAAoB,QAAQ,6BAA6B;AAClE,SAASC,uBAAuB,QAAQ,0BAA0B;AAElE,OAAO,MAAMC,sBAAsB,GAAGA,CAAA,KAAM;EAC3C,MAAMC,uBAAuB,GAAGF,uBAAuB,CACrDG,KAAK,IAAKA,KAAK,CAACD,uBAClB,CAAC;EACD,OAAOJ,OAAO,CAAC,MAAM;IACpB,OAAOC,oBAAoB,CAAC,MAAM;MACjC,SAAS;;MACT,OAAOG,uBAAuB,CAACE,GAAG,CAAC,CAAC;IACrC,CAAC,CAAC;EACH,CAAC,EAAE,CAACF,uBAAuB,CAAC,CAAC;AAC9B,CAAC","ignoreList":[]}

package/lib/typescript/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.d.ts

@@ -1,3 +0,0 @@
-import type { LocalStyleLayers } from "../../../../../../providers/screen/styles/helpers/resolve-slot-styles";
-export declare const hasLocalSlot: (localStylesMaps: LocalStyleLayers, slotId: string) => boolean;
-//# sourceMappingURL=has-local-slot.d.ts.map

package/lib/typescript/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"has-local-slot.d.ts","sourceRoot":"","sources":["../../../../../../../../src/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uEAAuE,CAAC;AAE9G,eAAO,MAAM,YAAY,GACxB,iBAAiB,gBAAgB,EACjC,QAAQ,MAAM,YAWd,CAAC"}

package/lib/typescript/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.d.ts

@@ -1,2 +0,0 @@
-export declare const useBuildBoundsAccessor: () => import("../../../../../types").BoundsAccessor;
-//# sourceMappingURL=use-build-bounds-accessor.d.ts.map

package/lib/typescript/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"use-build-bounds-accessor.d.ts","sourceRoot":"","sources":["../../../../../../../src/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,sBAAsB,qDAUlC,CAAC"}

package/src/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.ts

@@ -1,16 +0,0 @@
-import type { LocalStyleLayers } from "../../../../../../providers/screen/styles/helpers/resolve-slot-styles";
-
-export const hasLocalSlot = (
-	localStylesMaps: LocalStyleLayers,
-	slotId: string,
-) => {
-	"worklet";
-
-	for (let index = 0; index < localStylesMaps.length; index++) {
-		if (localStylesMaps[index]?.[slotId] !== undefined) {
-			return true;
-		}
-	}
-
-	return false;
-};

package/src/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.tsx

@@ -1,15 +0,0 @@
-import { useMemo } from "react";
-import { createBoundsAccessor } from "../../../../../utils/bounds";
-import { useScreenAnimationStore } from "../../animation.provider";
-
-export const useBuildBoundsAccessor = () => {
-	const screenInterpolatorProps = useScreenAnimationStore(
-		(store) => store.screenInterpolatorProps,
-	);
-	return useMemo(() => {
-		return createBoundsAccessor(() => {
-			"worklet";
-			return screenInterpolatorProps.get();
-		});
-	}, [screenInterpolatorProps]);
-};