react-native-screen-transitions 3.11.2 → 3.11.3

package/src/shared/utils/animation/animate-to-progress.ts

@@ -1,4 +1,4 @@
-import { runOnJS, type SharedValue } from "react-native-reanimated";
+import type { SharedValue } from "react-native-reanimated";
 import { FALSE, TRUE } from "../../constants";
 import {
 	type AnimationStoreMap,
@@ -16,7 +16,6 @@ interface AnimateToProgressProps {
 	 */
 	target: "open" | "close" | number;
 	spec?: TransitionSpec;
-	onAnimationFinish?: (finished: boolean) => void;
 	animations: AnimationStoreMap;
 	targetProgress: SharedValue<number>;
 	animationProgress: SharedValue<number>;
@@ -61,7 +60,6 @@ export const resolveAnimationProgressRange = (
 export const animateToProgress = ({
 	target,
 	spec,
-	onAnimationFinish,
 	animations,
 	targetProgress,
 	animationProgress,
@@ -112,9 +110,6 @@ export const animateToProgress = ({
 				entering.set(FALSE);
 			}
 
-			if (onAnimationFinish) {
-				runOnJS(onAnimationFinish)(true);
-			}
 			return;
 		}
 
@@ -141,23 +136,7 @@ export const animateToProgress = ({
 
 					if (isClosing) {
 						progressAnimating.set(FALSE);
-
-						if (onAnimationFinish) {
-							// Paint the terminal UI-thread host/style state before React
-							// removes the closing route and its native portal host.
-							requestAnimationFrame(() => {
-								"worklet";
-								requestAnimationFrame(() => {
-									"worklet";
-									runOnJS(onAnimationFinish)(state.finished);
-								});
-							});
-						}
 					} else {
-						if (onAnimationFinish) {
-							runOnJS(onAnimationFinish)(state.finished);
-						}
-
 						// Delay clearing progress animation by one frame to ensure final frame is painted
 						requestAnimationFrame(() => {
 							progressAnimating.set(FALSE);

package/src/shared/utils/navigation/close-action-replay.ts

@@ -0,0 +1,25 @@
+const CLOSE_ACTION_REPLAY = Symbol("screen-transition-close-action-replay");
+
+type MarkedCloseAction = {
+	[CLOSE_ACTION_REPLAY]?: true;
+};
+
+export const isCloseActionReplay = (action: unknown): boolean =>
+	typeof action === "object" &&
+	action !== null &&
+	(action as MarkedCloseAction)[CLOSE_ACTION_REPLAY] === true;
+
+/** Carries the terminal-removal bypass through React Navigation's action clones. */
+export const dispatchCloseAction = <TAction extends object>(
+	action: TAction,
+	dispatch: (action: TAction) => void,
+) => {
+	const markedAction = action as TAction & MarkedCloseAction;
+	markedAction[CLOSE_ACTION_REPLAY] = true;
+
+	try {
+		dispatch(action);
+	} finally {
+		delete markedAction[CLOSE_ACTION_REPLAY];
+	}
+};

package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.js

@@ -1,30 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.hasActiveBoundaryPortalLink = void 0;
-var _linkPairs = require("../../../../../../stores/bounds/helpers/link-pairs.helpers");
-const hasActiveBoundaryPortalLink = ({
-  boundaryId,
-  pairsState,
-  sourcePairKey
-}) => {
-  "worklet";
-
-  if (!sourcePairKey) {
-    return false;
-  }
-  const pair = pairsState[sourcePairKey];
-  const linkKey = (0, _linkPairs.getLinkKeyFromTag)(boundaryId);
-  const link = pair?.links[linkKey];
-  if (!link?.source) {
-    return false;
-  }
-  if (link.group && pair.groups[link.group]?.activeId !== linkKey) {
-    return false;
-  }
-  return true;
-};
-exports.hasActiveBoundaryPortalLink = hasActiveBoundaryPortalLink;
-//# sourceMappingURL=active-pair.js.map

package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_linkPairs","require","hasActiveBoundaryPortalLink","boundaryId","pairsState","sourcePairKey","pair","linkKey","getLinkKeyFromTag","link","links","source","group","groups","activeId","exports"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAYO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC,UAAU;EACVC,UAAU;EACVC;AACkC,CAAC,KAAc;EACjD,SAAS;;EACT,IAAI,CAACA,aAAa,EAAE;IACnB,OAAO,KAAK;EACb;EAEA,MAAMC,IAAI,GAAGF,UAAU,CAACC,aAAa,CAAC;EACtC,MAAME,OAAO,GAAG,IAAAC,4BAAiB,EAACL,UAAU,CAAC;EAC7C,MAAMM,IAAI,GAAGH,IAAI,EAAEI,KAAK,CAACH,OAAO,CAAC;EAEjC,IAAI,CAACE,IAAI,EAAEE,MAAM,EAAE;IAClB,OAAO,KAAK;EACb;EAEA,IAAIF,IAAI,CAACG,KAAK,IAAIN,IAAI,CAACO,MAAM,CAACJ,IAAI,CAACG,KAAK,CAAC,EAAEE,QAAQ,KAAKP,OAAO,EAAE;IAChE,OAAO,KAAK;EACb;EAEA,OAAO,IAAI;AACZ,CAAC;AAACQ,OAAA,CAAAb,2BAAA,GAAAA,2BAAA","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.js

@@ -1,47 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.setPortalHostBounds = exports.getPortalHostBounds = exports.clearPortalHostBounds = void 0;
-var _reactNativeReanimated = require("react-native-reanimated");
-var _scroll = require("../../../../../../stores/scroll.store");
-const portalHostBounds = (0, _reactNativeReanimated.makeMutable)({});
-const getPortalHostBounds = hostKey => {
-  "worklet";
-
-  return portalHostBounds.get()[hostKey] ?? null;
-};
-exports.getPortalHostBounds = getPortalHostBounds;
-const setPortalHostBounds = (hostKey, bounds) => {
-  "worklet";
-
-  const nextBounds = {
-    ...bounds,
-    scroll: (0, _scroll.cloneScrollMetadataState)(bounds.scroll)
-  };
-  portalHostBounds.set(state => {
-    "worklet";
-
-    return {
-      ...state,
-      [hostKey]: nextBounds
-    };
-  });
-};
-exports.setPortalHostBounds = setPortalHostBounds;
-const clearPortalHostBounds = hostKey => {
-  "worklet";
-
-  portalHostBounds.set(state => {
-    "worklet";
-
-    const nextState = {
-      ...state
-    };
-    delete nextState[hostKey];
-    return nextState;
-  });
-};
-exports.clearPortalHostBounds = clearPortalHostBounds;
-//# sourceMappingURL=host-bounds.store.js.map

package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_reactNativeReanimated","require","_scroll","portalHostBounds","makeMutable","getPortalHostBounds","hostKey","get","exports","setPortalHostBounds","bounds","nextBounds","scroll","cloneScrollMetadataState","set","state","clearPortalHostBounds","nextState"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AASA,MAAME,gBAAgB,GAAG,IAAAC,kCAAW,EAAwB,CAAC,CAAC,CAAC;AAExD,MAAMC,mBAAmB,GAAIC,OAAe,IAAK;EACvD,SAAS;;EACT,OAAOH,gBAAgB,CAACI,GAAG,CAAC,CAAC,CAACD,OAAO,CAAC,IAAI,IAAI;AAC/C,CAAC;AAACE,OAAA,CAAAH,mBAAA,GAAAA,mBAAA;AAEK,MAAMI,mBAAmB,GAAGA,CAClCH,OAAe,EACfI,MAAwB,KACpB;EACJ,SAAS;;EACT,MAAMC,UAA4B,GAAG;IACpC,GAAGD,MAAM;IACTE,MAAM,EAAE,IAAAC,gCAAwB,EAACH,MAAM,CAACE,MAAM;EAC/C,CAAC;EAEDT,gBAAgB,CAACW,GAAG,CAAEC,KAAK,IAAK;IAC/B,SAAS;;IACT,OAAO;MACN,GAAGA,KAAK;MACR,CAACT,OAAO,GAAGK;IACZ,CAAC;EACF,CAAC,CAAC;AACH,CAAC;AAACH,OAAA,CAAAC,mBAAA,GAAAA,mBAAA;AAEK,MAAMO,qBAAqB,GAAIV,OAAe,IAAK;EACzD,SAAS;;EACTH,gBAAgB,CAACW,GAAG,CAAEC,KAAK,IAAK;IAC/B,SAAS;;IACT,MAAME,SAAgC,GAAG;MAAE,GAAGF;IAAM,CAAC;IACrD,OAAOE,SAAS,CAACX,OAAO,CAAC;IACzB,OAAOW,SAAS;EACjB,CAAC,CAAC;AACH,CAAC;AAACT,OAAA,CAAAQ,qBAAA,GAAAA,qBAAA","ignoreList":[]}

package/lib/module/shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.js

@@ -1,25 +0,0 @@
-"use strict";
-
-import { getLinkKeyFromTag } from "../../../../../../stores/bounds/helpers/link-pairs.helpers";
-export const hasActiveBoundaryPortalLink = ({
-  boundaryId,
-  pairsState,
-  sourcePairKey
-}) => {
-  "worklet";
-
-  if (!sourcePairKey) {
-    return false;
-  }
-  const pair = pairsState[sourcePairKey];
-  const linkKey = getLinkKeyFromTag(boundaryId);
-  const link = pair?.links[linkKey];
-  if (!link?.source) {
-    return false;
-  }
-  if (link.group && pair.groups[link.group]?.activeId !== linkKey) {
-    return false;
-  }
-  return true;
-};
-//# sourceMappingURL=active-pair.js.map

package/lib/module/shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["getLinkKeyFromTag","hasActiveBoundaryPortalLink","boundaryId","pairsState","sourcePairKey","pair","linkKey","link","links","source","group","groups","activeId"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.ts"],"mappings":";;AAAA,SAASA,iBAAiB,QAAQ,4DAA4D;AAY9F,OAAO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC,UAAU;EACVC,UAAU;EACVC;AACkC,CAAC,KAAc;EACjD,SAAS;;EACT,IAAI,CAACA,aAAa,EAAE;IACnB,OAAO,KAAK;EACb;EAEA,MAAMC,IAAI,GAAGF,UAAU,CAACC,aAAa,CAAC;EACtC,MAAME,OAAO,GAAGN,iBAAiB,CAACE,UAAU,CAAC;EAC7C,MAAMK,IAAI,GAAGF,IAAI,EAAEG,KAAK,CAACF,OAAO,CAAC;EAEjC,IAAI,CAACC,IAAI,EAAEE,MAAM,EAAE;IAClB,OAAO,KAAK;EACb;EAEA,IAAIF,IAAI,CAACG,KAAK,IAAIL,IAAI,CAACM,MAAM,CAACJ,IAAI,CAACG,KAAK,CAAC,EAAEE,QAAQ,KAAKN,OAAO,EAAE;IAChE,OAAO,KAAK;EACb;EAEA,OAAO,IAAI;AACZ,CAAC","ignoreList":[]}

package/lib/module/shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.js

@@ -1,40 +0,0 @@
-"use strict";
-
-import { makeMutable } from "react-native-reanimated";
-import { cloneScrollMetadataState } from "../../../../../../stores/scroll.store";
-const portalHostBounds = makeMutable({});
-export const getPortalHostBounds = hostKey => {
-  "worklet";
-
-  return portalHostBounds.get()[hostKey] ?? null;
-};
-export const setPortalHostBounds = (hostKey, bounds) => {
-  "worklet";
-
-  const nextBounds = {
-    ...bounds,
-    scroll: cloneScrollMetadataState(bounds.scroll)
-  };
-  portalHostBounds.set(state => {
-    "worklet";
-
-    return {
-      ...state,
-      [hostKey]: nextBounds
-    };
-  });
-};
-export const clearPortalHostBounds = hostKey => {
-  "worklet";
-
-  portalHostBounds.set(state => {
-    "worklet";
-
-    const nextState = {
-      ...state
-    };
-    delete nextState[hostKey];
-    return nextState;
-  });
-};
-//# sourceMappingURL=host-bounds.store.js.map

package/lib/module/shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["makeMutable","cloneScrollMetadataState","portalHostBounds","getPortalHostBounds","hostKey","get","setPortalHostBounds","bounds","nextBounds","scroll","set","state","clearPortalHostBounds","nextState"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.ts"],"mappings":";;AAAA,SAAkCA,WAAW,QAAQ,yBAAyB;AAC9E,SAASC,wBAAwB,QAAQ,uCAAuC;AAShF,MAAMC,gBAAgB,GAAGF,WAAW,CAAwB,CAAC,CAAC,CAAC;AAE/D,OAAO,MAAMG,mBAAmB,GAAIC,OAAe,IAAK;EACvD,SAAS;;EACT,OAAOF,gBAAgB,CAACG,GAAG,CAAC,CAAC,CAACD,OAAO,CAAC,IAAI,IAAI;AAC/C,CAAC;AAED,OAAO,MAAME,mBAAmB,GAAGA,CAClCF,OAAe,EACfG,MAAwB,KACpB;EACJ,SAAS;;EACT,MAAMC,UAA4B,GAAG;IACpC,GAAGD,MAAM;IACTE,MAAM,EAAER,wBAAwB,CAACM,MAAM,CAACE,MAAM;EAC/C,CAAC;EAEDP,gBAAgB,CAACQ,GAAG,CAAEC,KAAK,IAAK;IAC/B,SAAS;;IACT,OAAO;MACN,GAAGA,KAAK;MACR,CAACP,OAAO,GAAGI;IACZ,CAAC;EACF,CAAC,CAAC;AACH,CAAC;AAED,OAAO,MAAMI,qBAAqB,GAAIR,OAAe,IAAK;EACzD,SAAS;;EACTF,gBAAgB,CAACQ,GAAG,CAAEC,KAAK,IAAK;IAC/B,SAAS;;IACT,MAAME,SAAgC,GAAG;MAAE,GAAGF;IAAM,CAAC;IACrD,OAAOE,SAAS,CAACT,OAAO,CAAC;IACzB,OAAOS,SAAS;EACjB,CAAC,CAAC;AACH,CAAC","ignoreList":[]}

package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.d.ts

@@ -1,9 +0,0 @@
-import type { LinkPairsState, ScreenPairKey } from "../../../../../../stores/bounds/types";
-type HasActiveBoundaryPortalLinkParams = {
-    boundaryId: string;
-    pairsState: LinkPairsState;
-    sourcePairKey?: ScreenPairKey;
-};
-export declare const hasActiveBoundaryPortalLink: ({ boundaryId, pairsState, sourcePairKey, }: HasActiveBoundaryPortalLinkParams) => boolean;
-export {};
-//# sourceMappingURL=active-pair.d.ts.map

package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"active-pair.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,cAAc,EACd,aAAa,EACb,MAAM,uCAAuC,CAAC;AAE/C,KAAK,iCAAiC,GAAG;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,cAAc,CAAC;IAC3B,aAAa,CAAC,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAI,4CAIzC,iCAAiC,KAAG,OAmBtC,CAAC"}

package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.d.ts

@@ -1,9 +0,0 @@
-import { type MeasuredDimensions } from "react-native-reanimated";
-import type { ScrollMetadataState } from "../../../../../../types/gesture.types";
-export type PortalHostBounds = MeasuredDimensions & {
-    scroll?: ScrollMetadataState | null;
-};
-export declare const getPortalHostBounds: (hostKey: string) => PortalHostBounds | null;
-export declare const setPortalHostBounds: (hostKey: string, bounds: PortalHostBounds) => void;
-export declare const clearPortalHostBounds: (hostKey: string) => void;
-//# sourceMappingURL=host-bounds.store.d.ts.map

package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"host-bounds.store.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAe,MAAM,yBAAyB,CAAC;AAE/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAEjF,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG;IACnD,MAAM,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;CACpC,CAAC;AAMF,eAAO,MAAM,mBAAmB,GAAI,SAAS,MAAM,4BAGlD,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC/B,SAAS,MAAM,EACf,QAAQ,gBAAgB,SAexB,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,SAAS,MAAM,SAQpD,CAAC"}

package/src/shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.ts

@@ -1,36 +0,0 @@
-import { getLinkKeyFromTag } from "../../../../../../stores/bounds/helpers/link-pairs.helpers";
-import type {
-	LinkPairsState,
-	ScreenPairKey,
-} from "../../../../../../stores/bounds/types";
-
-type HasActiveBoundaryPortalLinkParams = {
-	boundaryId: string;
-	pairsState: LinkPairsState;
-	sourcePairKey?: ScreenPairKey;
-};
-
-export const hasActiveBoundaryPortalLink = ({
-	boundaryId,
-	pairsState,
-	sourcePairKey,
-}: HasActiveBoundaryPortalLinkParams): boolean => {
-	"worklet";
-	if (!sourcePairKey) {
-		return false;
-	}
-
-	const pair = pairsState[sourcePairKey];
-	const linkKey = getLinkKeyFromTag(boundaryId);
-	const link = pair?.links[linkKey];
-
-	if (!link?.source) {
-		return false;
-	}
-
-	if (link.group && pair.groups[link.group]?.activeId !== linkKey) {
-		return false;
-	}
-
-	return true;
-};

package/src/shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.ts

@@ -1,45 +0,0 @@
-import { type MeasuredDimensions, makeMutable } from "react-native-reanimated";
-import { cloneScrollMetadataState } from "../../../../../../stores/scroll.store";
-import type { ScrollMetadataState } from "../../../../../../types/gesture.types";
-
-export type PortalHostBounds = MeasuredDimensions & {
-	scroll?: ScrollMetadataState | null;
-};
-
-type PortalHostBoundsState = Record<string, PortalHostBounds | null>;
-
-const portalHostBounds = makeMutable<PortalHostBoundsState>({});
-
-export const getPortalHostBounds = (hostKey: string) => {
-	"worklet";
-	return portalHostBounds.get()[hostKey] ?? null;
-};
-
-export const setPortalHostBounds = (
-	hostKey: string,
-	bounds: PortalHostBounds,
-) => {
-	"worklet";
-	const nextBounds: PortalHostBounds = {
-		...bounds,
-		scroll: cloneScrollMetadataState(bounds.scroll),
-	};
-
-	portalHostBounds.set((state) => {
-		"worklet";
-		return {
-			...state,
-			[hostKey]: nextBounds,
-		};
-	});
-};
-
-export const clearPortalHostBounds = (hostKey: string) => {
-	"worklet";
-	portalHostBounds.set((state) => {
-		"worklet";
-		const nextState: PortalHostBoundsState = { ...state };
-		delete nextState[hostKey];
-		return nextState;
-	});
-};