react-native-screen-transitions 3.4.0 → 3.5.0

package/src/shared/stores/bounds/index.ts

@@ -1,60 +1,53 @@
 import { clear, clearByAncestor, clearByBranch } from "./internals/clear";
-import {
-	getBoundaryConfig,
-	getBoundaryPresence,
-	getGroupActiveId,
-	getGroups,
-	hasBoundaryPresence,
-	registerBoundaryPresence,
-	setGroupActiveId,
-	unregisterBoundaryPresence,
-} from "./internals/presence";
+import { getGroupActiveId, setGroupActiveId } from "./internals/groups";
 import {
 	getActiveLink,
-	getLatestPendingSourceScreenKey,
-	getSnapshot,
+	getEntry,
+	getEntryConfig,
+	getMeasuredEntry,
+	getPendingLink,
 	hasDestinationLink,
-	hasPendingLink,
-	hasPendingLinkFromSource,
 	hasSourceLink,
-	registerSnapshot,
-	setLinkDestination,
-	setLinkSource,
-	updateLinkDestination,
-	updateLinkSource,
+	removeEntry,
+	setDestination,
+	setEntry,
+	setSource,
 } from "./internals/registry";
 import { resolveTransitionPair } from "./internals/resolver";
 
 export type {
 	BoundaryConfig,
+	Entry,
+	EntryPatch,
+	MeasuredEntry,
 	ResolvedTransitionPair,
 	ResolveTransitionContext,
-	Snapshot,
 } from "./types";
 
 export const BoundStore = {
-	registerSnapshot,
-	setLinkSource,
-	setLinkDestination,
-	updateLinkSource,
-	updateLinkDestination,
-	getActiveLink,
-	registerBoundaryPresence,
-	unregisterBoundaryPresence,
-	hasBoundaryPresence,
-	getBoundaryPresence,
-	getBoundaryConfig,
-	hasPendingLink,
-	hasPendingLinkFromSource,
-	getLatestPendingSourceScreenKey,
-	hasSourceLink,
-	hasDestinationLink,
-	getSnapshot,
-	resolveTransitionPair,
-	setGroupActiveId,
-	getGroupActiveId,
-	clear,
-	clearByAncestor,
-	clearByBranch,
-	getGroups,
+	entry: {
+		set: setEntry,
+		get: getEntry,
+		getMeasured: getMeasuredEntry,
+		getConfig: getEntryConfig,
+		remove: removeEntry,
+	},
+	link: {
+		setSource,
+		setDestination,
+		getActive: getActiveLink,
+		getPair: resolveTransitionPair,
+		getPending: getPendingLink,
+		hasSource: hasSourceLink,
+		hasDestination: hasDestinationLink,
+	},
+	group: {
+		setActiveId: setGroupActiveId,
+		getActiveId: getGroupActiveId,
+	},
+	cleanup: {
+		byScreen: clear,
+		byAncestor: clearByAncestor,
+		byBranch: clearByBranch,
+	},
 };

package/src/shared/stores/bounds/internals/clear.ts

@@ -1,36 +1,17 @@
+import { hasAnyKeys } from "../helpers/keys";
 import { matchesNavigatorKey, matchesScreenKey } from "../helpers/matching";
-import type {
-	NavigatorKey,
-	PresenceEntry,
-	PresenceState,
-	ScreenKey,
-	SnapshotEntry,
-	TagLink,
-} from "../types";
-import { presence, type RegistryState, registry } from "./state";
-
-const hasAnyKeys = (record: Record<string, unknown>) => {
-	"worklet";
-	for (const _key in record) {
-		return true;
-	}
-	return false;
-};
-
-type SnapshotPredicate = (
-	screenKey: ScreenKey,
-	snapshot: SnapshotEntry,
-) => boolean;
+import type { NavigatorKey, ScreenEntry, ScreenKey, TagLink } from "../types";
+import { type RegistryState, registry } from "./state";
 
 type LinkPredicate = (link: TagLink) => boolean;
 
-type PresencePredicate = (
+type ScreenPredicate = (
 	screenKey: ScreenKey,
-	entry: PresenceEntry,
+	screenEntry: ScreenEntry,
 ) => boolean;
 
 const clearRegistry = (
-	shouldClearSnapshot: SnapshotPredicate,
+	shouldClearScreen: ScreenPredicate,
 	shouldClearLink: LinkPredicate,
 ) => {
 	"worklet";
@@ -39,10 +20,10 @@ const clearRegistry = (
 		for (const tag in state) {
 			const tagState = state[tag];
 
-			for (const snapshotKey in tagState.snapshots) {
-				const snapshot = tagState.snapshots[snapshotKey];
-				if (shouldClearSnapshot(snapshotKey, snapshot)) {
-					delete tagState.snapshots[snapshotKey];
+			for (const entryScreenKey in tagState.screens) {
+				const screenEntry = tagState.screens[entryScreenKey];
+				if (shouldClearScreen(entryScreenKey, screenEntry)) {
+					delete tagState.screens[entryScreenKey];
 				}
 			}
 
@@ -53,30 +34,7 @@ const clearRegistry = (
 				}
 			}
 
-			if (!hasAnyKeys(tagState.snapshots) && tagState.linkStack.length === 0) {
-				delete state[tag];
-			}
-		}
-
-		return state;
-	});
-};
-
-const clearPresence = (shouldClearPresence: PresencePredicate) => {
-	"worklet";
-	presence.modify(<T extends PresenceState>(state: T): T => {
-		"worklet";
-		for (const tag in state) {
-			const tagEntries = state[tag];
-
-			for (const entryScreenKey in tagEntries) {
-				const entry = tagEntries[entryScreenKey];
-				if (shouldClearPresence(entryScreenKey, entry)) {
-					delete tagEntries[entryScreenKey];
-				}
-			}
-
-			if (!hasAnyKeys(tagEntries)) {
+			if (!hasAnyKeys(tagState.screens) && tagState.linkStack.length === 0) {
 				delete state[tag];
 			}
 		}
@@ -85,37 +43,26 @@ const clearPresence = (shouldClearPresence: PresencePredicate) => {
 	});
 };
 
-const performClear = (
-	shouldClearSnapshot: SnapshotPredicate,
-	shouldClearLink: LinkPredicate,
-	shouldClearPresence: PresencePredicate,
-) => {
-	"worklet";
-	clearRegistry(shouldClearSnapshot, shouldClearLink);
-	clearPresence(shouldClearPresence);
-};
-
 function clear(screenKey: ScreenKey) {
 	"worklet";
-	performClear(
-		(snapshotKey) => snapshotKey === screenKey,
+	clearRegistry(
+		(entryScreenKey) => entryScreenKey === screenKey,
 		(link) => {
 			return (
 				matchesScreenKey(link.source, screenKey) ||
 				matchesScreenKey(link.destination, screenKey)
 			);
 		},
-		(entryScreenKey) => entryScreenKey === screenKey,
 	);
 }
 
 function clearByAncestor(ancestorKey: ScreenKey) {
 	"worklet";
-	performClear(
-		(snapshotKey, snapshot) => {
+	clearRegistry(
+		(entryScreenKey, screenEntry) => {
 			return (
-				snapshotKey === ancestorKey ||
-				(snapshot.ancestorKeys?.includes(ancestorKey) ?? false)
+				entryScreenKey === ancestorKey ||
+				(screenEntry.ancestorKeys?.includes(ancestorKey) ?? false)
 			);
 		},
 		(link) => {
@@ -124,12 +71,6 @@ function clearByAncestor(ancestorKey: ScreenKey) {
 				matchesScreenKey(link.destination, ancestorKey)
 			);
 		},
-		(entryScreenKey, entry) => {
-			return (
-				entryScreenKey === ancestorKey ||
-				(entry.ancestorKeys?.includes(ancestorKey) ?? false)
-			);
-		},
 	);
 }
 
@@ -137,11 +78,12 @@ function clearByBranch(branchNavigatorKey: NavigatorKey) {
 	"worklet";
 	if (!branchNavigatorKey) return;
 
-	performClear(
-		(_snapshotKey, snapshot) => {
+	clearRegistry(
+		(_entryScreenKey, screenEntry) => {
 			return (
-				snapshot.navigatorKey === branchNavigatorKey ||
-				(snapshot.ancestorNavigatorKeys?.includes(branchNavigatorKey) ?? false)
+				screenEntry.navigatorKey === branchNavigatorKey ||
+				(screenEntry.ancestorNavigatorKeys?.includes(branchNavigatorKey) ??
+					false)
 			);
 		},
 		(link) => {
@@ -150,12 +92,6 @@ function clearByBranch(branchNavigatorKey: NavigatorKey) {
 				matchesNavigatorKey(link.destination, branchNavigatorKey)
 			);
 		},
-		(_entryScreenKey, entry) => {
-			return (
-				entry.navigatorKey === branchNavigatorKey ||
-				(entry.ancestorNavigatorKeys?.includes(branchNavigatorKey) ?? false)
-			);
-		},
 	);
 }
 

package/src/shared/stores/bounds/internals/groups.ts

@@ -0,0 +1,20 @@
+import { type GroupsState, groups } from "./state";
+
+function setGroupActiveId(group: string, id: string) {
+	"worklet";
+	groups.modify(<T extends GroupsState>(state: T): T => {
+		"worklet";
+		const mutableState = state as GroupsState;
+		mutableState[group] = {
+			activeId: id,
+		};
+		return state;
+	});
+}
+
+function getGroupActiveId(group: string): string | null {
+	"worklet";
+	return groups.get()[group]?.activeId ?? null;
+}
+
+export { getGroupActiveId, setGroupActiveId };