react-native-screen-transitions 3.0.0-rc.2 → 3.0.0-rc.3

package/lib/module/shared/providers/register-bounds.provider.js

@@ -11,23 +11,24 @@ import { prepareStyleForBounds } from "../utils/bounds/helpers/styles";
 import createProvider from "../utils/create-provider";
 import { useKeys } from "./keys.provider";
 /**
- * Gets the parent screen's route key for nested navigators.
- * Returns undefined if we're not inside a nested navigator.
+ * Builds the full ancestor key chain for nested navigators.
+ * Returns an array of screen keys from immediate parent to root.
+ * [parentKey, grandparentKey, greatGrandparentKey, ...]
  */
-const getParentScreenKey = current => {
-  const parent = current.navigation.getParent();
-  if (!parent) return undefined;
-  const parentState = parent.getState();
-  if (!parentState?.routes) return undefined;
-
-  // Check if our route key exists directly in parent's routes
-  const existsInParent = parentState.routes.some(r => r.key === current.route.key);
-
-  // If we don't exist in parent's routes, we're nested inside the focused route
-  if (!existsInParent && parentState.index !== undefined) {
-    return parentState.routes[parentState.index]?.key;
+const getAncestorKeys = current => {
+  const ancestors = [];
+  let nav = current.navigation.getParent();
+  while (nav) {
+    const state = nav.getState();
+    if (state?.routes && state.index !== undefined) {
+      const focusedRoute = state.routes[state.index];
+      if (focusedRoute?.key) {
+        ancestors.push(focusedRoute.key);
+      }
+    }
+    nav = nav.getParent();
   }
-  return undefined;
+  return ancestors;
 };
 
 /**
@@ -38,48 +39,72 @@ const useInitialLayoutHandler = params => {
   const {
     sharedBoundTag,
     currentScreenKey,
-    parentScreenKey,
+    ancestorKeys,
     maybeMeasureAndStore
   } = params;
   const isAnimating = AnimationStore.getAnimation(currentScreenKey, "animating");
-  const isParentAnimating = parentScreenKey ? AnimationStore.getAnimation(parentScreenKey, "animating") : null;
+
+  // Check if any ancestor is animating
+  const ancestorAnimations = ancestorKeys.map(key => AnimationStore.getAnimation(key, "animating"));
   const hasMeasuredOnLayout = useSharedValue(false);
   return useCallback(() => {
     "worklet";
 
-    if (!sharedBoundTag || hasMeasuredOnLayout.value) return;
-    if (!isAnimating.value && !isParentAnimating?.value) return;
+    if (!sharedBoundTag || hasMeasuredOnLayout.get()) return;
+
+    // Check if current or any ancestor is animating
+    let isAnyAnimating = isAnimating.get();
+    for (let i = 0; i < ancestorAnimations.length; i++) {
+      if (ancestorAnimations[i].get()) {
+        isAnyAnimating = 1;
+        break;
+      }
+    }
+    if (!isAnyAnimating) return;
     maybeMeasureAndStore({
       shouldSetSource: false,
       shouldSetDestination: true
     });
-    hasMeasuredOnLayout.value = true;
-  }, [sharedBoundTag, hasMeasuredOnLayout, isAnimating, isParentAnimating, maybeMeasureAndStore]);
+    hasMeasuredOnLayout.set(true);
+  }, [sharedBoundTag, hasMeasuredOnLayout, isAnimating, ancestorAnimations, maybeMeasureAndStore]);
 };
 
+/**
+ * Measures non-pressable elements when screen becomes blurred.
+ * Captures bounds right before transition starts.
+ */
 /**
  * Measures non-pressable elements when screen becomes blurred.
  * Captures bounds right before transition starts.
  */
 const useBlurMeasurement = params => {
+  const {
+    current
+  } = useKeys();
   const {
     sharedBoundTag,
+    ancestorKeys,
     maybeMeasureAndStore
   } = params;
-  const isFocused = useRef(true);
   const hasCapturedSource = useRef(false);
+  const ancestorClosing = [current.route.key, ...ancestorKeys].map(key => AnimationStore.getAnimation(key, "closing"));
+  const maybeMeasureOnBlur = useStableCallbackValue(() => {
+    "worklet";
+
+    // Don't measure if current / any ancestor is closing
+    const isOneClosing = ancestorClosing.some(closing => closing.get());
+    if (isOneClosing) return;
+    maybeMeasureAndStore({
+      shouldSetSource: true
+    });
+  });
   useFocusEffect(useCallback(() => {
-    isFocused.current = true;
     hasCapturedSource.current = false;
     return () => {
-      if (!sharedBoundTag) return;
-      if (hasCapturedSource.current) return;
-      isFocused.current = false;
-      runOnUI(maybeMeasureAndStore)({
-        shouldSetSource: true
-      });
+      if (!sharedBoundTag || hasCapturedSource.current) return;
+      runOnUI(maybeMeasureOnBlur)();
     };
-  }, [sharedBoundTag, maybeMeasureAndStore]));
+  }, [sharedBoundTag, maybeMeasureOnBlur]));
   return {
     markSourceCaptured: () => {
       hasCapturedSource.current = true;
@@ -95,7 +120,7 @@ const useParentSyncReaction = params => {
     parentContext,
     maybeMeasureAndStore
   } = params;
-  useAnimatedReaction(() => parentContext?.updateSignal.value, value => {
+  useAnimatedReaction(() => parentContext?.updateSignal.get(), value => {
     "worklet";
 
     if (value === 0 || value === undefined) return;
@@ -118,7 +143,7 @@ const {
     current
   } = useKeys();
   const currentScreenKey = current.route.key;
-  const parentScreenKey = getParentScreenKey(current);
+  const ancestorKeys = useMemo(() => getAncestorKeys(current), [current]);
 
   // Context & signals
   const parentContext = useRegisterBoundsContext();
@@ -130,7 +155,7 @@ const {
     "worklet";
 
     const isRoot = !parentContext;
-    if (isRoot) updateSignal.value = updateSignal.value + 1;
+    if (isRoot) updateSignal.set(updateSignal.get() + 1);
   });
   const maybeMeasureAndStore = useStableCallbackValue(({
     onPress,
@@ -143,30 +168,30 @@ const {
     const measured = measure(animatedRef);
     if (!measured) return;
     emitUpdate();
-
-    // Always register occurrence
-    BoundStore.registerOccurrence(sharedBoundTag, currentScreenKey, measured, preparedStyles);
-
-    // Set as source (on press or blur)
+    BoundStore.registerSnapshot(sharedBoundTag, currentScreenKey, measured, preparedStyles, ancestorKeys);
     if (shouldSetSource) {
-      if (isAnimating.value) {
-        const existing = BoundStore.getOccurrence(sharedBoundTag, currentScreenKey);
-        BoundStore.setLinkSource(sharedBoundTag, currentScreenKey, existing.bounds, preparedStyles, parentScreenKey);
+      if (isAnimating.get()) {
+        // If animation is already in progress,
+        // lets use the existing measuremenets.
+        const existing = BoundStore.getSnapshot(sharedBoundTag, currentScreenKey);
+        if (existing) {
+          BoundStore.setLinkSource(sharedBoundTag, currentScreenKey, existing.bounds, preparedStyles, ancestorKeys);
+        }
         return;
       }
-      BoundStore.setLinkSource(sharedBoundTag, currentScreenKey, measured, preparedStyles, parentScreenKey);
+      BoundStore.setLinkSource(sharedBoundTag, currentScreenKey, measured, preparedStyles, ancestorKeys);
     }
 
     // Set as destination (on mount during animation)
     if (shouldSetDestination) {
-      BoundStore.setLinkDestination(sharedBoundTag, currentScreenKey, measured, preparedStyles, parentScreenKey);
+      BoundStore.setLinkDestination(sharedBoundTag, currentScreenKey, measured, preparedStyles, ancestorKeys);
     }
     if (onPress) runOnJS(onPress)();
   });
   const handleInitialLayout = useInitialLayoutHandler({
     sharedBoundTag,
     currentScreenKey,
-    parentScreenKey,
+    ancestorKeys,
     maybeMeasureAndStore
   });
 
@@ -175,7 +200,8 @@ const {
     markSourceCaptured
   } = useBlurMeasurement({
     sharedBoundTag,
-    maybeMeasureAndStore
+    maybeMeasureAndStore,
+    ancestorKeys
   });
   useParentSyncReaction({
     parentContext,

package/lib/module/shared/providers/register-bounds.provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["useFocusEffect","useCallback","useMemo","useRef","measure","runOnJS","runOnUI","useAnimatedReaction","useSharedValue","useStableCallback","useStableCallbackValue","AnimationStore","BoundStore","prepareStyleForBounds","createProvider","useKeys","getParentScreenKey","current","parent","navigation","getParent","undefined","parentState","getState","routes","existsInParent","some","r","key","route","index","useInitialLayoutHandler","params","sharedBoundTag","currentScreenKey","parentScreenKey","maybeMeasureAndStore","isAnimating","getAnimation","isParentAnimating","hasMeasuredOnLayout","value","shouldSetSource","shouldSetDestination","useBlurMeasurement","isFocused","hasCapturedSource","markSourceCaptured","useParentSyncReaction","parentContext","updateSignal","RegisterBoundsProvider","useRegisterBoundsContext","guarded","style","onPress","animatedRef","children","ownSignal","preparedStyles","emitUpdate","isRoot","measured","registerOccurrence","existing","getOccurrence","setLinkSource","bounds","setLinkDestination","handleInitialLayout","captureActiveOnPress"],"sourceRoot":"../../../../src","sources":["shared/providers/register-bounds.provider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useFocusEffect","useCallback","useMemo","useRef","measure","runOnJS","runOnUI","useAnimatedReaction","useSharedValue","useStableCallback","useStableCallbackValue","AnimationStore","BoundStore","prepareStyleForBounds","createProvider","useKeys","getAncestorKeys","current","ancestors","nav","navigation","getParent","state","getState","routes","index","undefined","focusedRoute","key","push","useInitialLayoutHandler","params","sharedBoundTag","currentScreenKey","ancestorKeys","maybeMeasureAndStore","isAnimating","getAnimation","ancestorAnimations","map","hasMeasuredOnLayout","get","isAnyAnimating","i","length","shouldSetSource","shouldSetDestination","set","useBlurMeasurement","hasCapturedSource","ancestorClosing","route","maybeMeasureOnBlur","isOneClosing","some","closing","markSourceCaptured","useParentSyncReaction","parentContext","updateSignal","value","RegisterBoundsProvider","useRegisterBoundsContext","guarded","style","onPress","animatedRef","children","ownSignal","preparedStyles","emitUpdate","isRoot","measured","registerSnapshot","existing","getSnapshot","setLinkSource","bounds","setLinkDestination","handleInitialLayout","captureActiveOnPress"],"sourceRoot":"../../../../src","sources":["shared/providers/register-bounds.provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/stores/bounds.store.js

@@ -1,18 +1,8 @@
 "use strict";
 
 import { makeMutable } from "react-native-reanimated";
-/**
- * Note on cleanup: We intentionally skip automatic cleanup of old links.
- * The linkStack grows by one entry per navigation, but `getActiveLink`
- * finds the correct link via screenKey matching regardless of stack size.
- * This is unlikely to cause performance issues in typical apps, but if
- * memory becomes a concern in apps with heavy navigation (hundreds of
- * transitions), we should consider implementing cleanup on screen unmount using
- * screenKey filtering.
- */
-
 const registry = makeMutable({});
-function registerOccurrence(tag, screenKey, bounds, styles = {}) {
+function registerSnapshot(tag, screenKey, bounds, styles = {}, ancestorKeys) {
   "worklet";
 
   registry.modify(state => {
@@ -20,33 +10,32 @@ function registerOccurrence(tag, screenKey, bounds, styles = {}) {
 
     if (!state[tag]) {
       state[tag] = {
-        occurrences: {},
+        snapshots: {},
         linkStack: []
       };
     }
-    state[tag].occurrences[screenKey] = {
+    state[tag].snapshots[screenKey] = {
       bounds,
-      styles
+      styles,
+      ancestorKeys
     };
     return state;
   });
 }
-function setLinkSource(tag, screenKey, bounds, styles = {}, parentScreenKey) {
+function setLinkSource(tag, screenKey, bounds, styles = {}, ancestorKeys) {
   "worklet";
 
   registry.modify(state => {
     "worklet";
 
     if (!state[tag]) state[tag] = {
-      occurrences: {},
+      snapshots: {},
       linkStack: []
     };
-
-    // Push new link onto stack
     state[tag].linkStack.push({
       source: {
         screenKey,
-        parentScreenKey,
+        ancestorKeys,
         bounds,
         styles
       },
@@ -55,7 +44,7 @@ function setLinkSource(tag, screenKey, bounds, styles = {}, parentScreenKey) {
     return state;
   });
 }
-function setLinkDestination(tag, screenKey, bounds, styles = {}, parentScreenKey) {
+function setLinkDestination(tag, screenKey, bounds, styles = {}, ancestorKeys) {
   "worklet";
 
   registry.modify(state => {
@@ -69,7 +58,7 @@ function setLinkDestination(tag, screenKey, bounds, styles = {}, parentScreenKey
       if (stack[i].destination === null) {
         stack[i].destination = {
           screenKey,
-          parentScreenKey,
+          ancestorKeys,
           bounds,
           styles
         };
@@ -79,20 +68,57 @@ function setLinkDestination(tag, screenKey, bounds, styles = {}, parentScreenKey
     return state;
   });
 }
-function getOccurrence(tag, key) {
+
+/**
+ * Helper to check if a screen identifier matches a given key.
+ * Checks both direct screenKey match and ancestor chain.
+ */
+function matchesScreenKey(identifier, key) {
   "worklet";
 
-  return registry.value[tag]?.occurrences[key] ?? null;
+  if (!identifier) return false;
+
+  // Direct match
+  if (identifier.screenKey === key) return true;
+
+  // Check ancestor chain
+  return identifier.ancestorKeys?.includes(key) ?? false;
 }
 
-// Helper to check if a screen identifier matches a given key
-function matchesScreenKey(identifier, key) {
+/**
+ * Get snapshot by tag and optional key.
+ * If key is provided, supports ancestor matching - if the key matches any ancestor
+ * of a stored snapshot, that snapshot will be returned.
+ * If key is omitted, returns the most recently registered snapshot.
+ */
+function getSnapshot(tag, key) {
   "worklet";
 
-  if (!identifier) return false;
-  return identifier.screenKey === key || identifier.parentScreenKey === key;
+  const tagState = registry.value[tag];
+  if (!tagState) return null;
+
+  // Direct match in occurrences
+  if (tagState.snapshots[key]) {
+    const snap = tagState.snapshots[key];
+    return {
+      bounds: snap.bounds,
+      styles: snap.styles
+    };
+  }
+
+  // Ancestor match
+  for (const screenKey in tagState.snapshots) {
+    const snap = tagState.snapshots[screenKey];
+    if (snap.ancestorKeys?.includes(key)) {
+      return {
+        bounds: snap.bounds,
+        styles: snap.styles
+      };
+    }
+  }
+  return null;
 }
-function getActiveLink(tag, screenKey, isClosing) {
+function getActiveLink(tag, screenKey) {
   "worklet";
 
   const stack = registry.value[tag]?.linkStack;
@@ -102,36 +128,54 @@ function getActiveLink(tag, screenKey, isClosing) {
 
   // If screenKey provided, find link involving that screen
   if (screenKey) {
-    // When closing (backward nav), we want the link where this screen is the DESTINATION
-    // When opening (forward nav), we want the link where this screen is the DESTINATION too
-    // The source is always the "from" screen, destination is the "to" screen
-
-    if (isClosing) {
-      // Backward: find link where I am the destination (I'm going back to source)
-      for (let i = stack.length - 1; i >= 0; i--) {
-        const link = stack[i];
-        if (matchesScreenKey(link.destination, screenKey)) {
-          return link;
-        }
-      }
-    }
-
-    // Forward or fallback: find any link involving this screen
     for (let i = stack.length - 1; i >= 0; i--) {
       const link = stack[i];
-      if (matchesScreenKey(link.source, screenKey) || matchesScreenKey(link.destination, screenKey)) {
+      if (!link.destination) continue;
+      const isSource = matchesScreenKey(link.source, screenKey);
+      const isDestination = matchesScreenKey(link.destination, screenKey);
+      if (isSource || isDestination) {
+        // If I match the source, I'm closing (going back to where I came from)
         return link;
       }
     }
     return null;
   }
-  return stack[stack.length - 1] ?? null;
+  const lastLink = stack[stack.length - 1];
+  return lastLink ? lastLink : null;
+}
+
+/**
+ * Clear all snapshots and links for a screen across all tags.
+ * Called when a screen unmounts.
+ */
+function clear(screenKey) {
+  "worklet";
+
+  registry.modify(state => {
+    "worklet";
+
+    for (const tag in state) {
+      // Remove snapshot
+      if (state[tag].snapshots[screenKey]) {
+        delete state[tag].snapshots[screenKey];
+      }
+
+      // Remove links involving this screen
+      state[tag].linkStack = state[tag].linkStack.filter(link => {
+        const sourceMatches = matchesScreenKey(link.source, screenKey);
+        const destMatches = matchesScreenKey(link.destination, screenKey);
+        return !sourceMatches && !destMatches;
+      });
+    }
+    return state;
+  });
 }
 export const BoundStore = {
-  registerOccurrence,
+  registerSnapshot,
   setLinkSource,
   setLinkDestination,
   getActiveLink,
-  getOccurrence
+  getSnapshot,
+  clear
 };
 //# sourceMappingURL=bounds.store.js.map

package/lib/module/shared/stores/bounds.store.js.map

@@ -1 +1 @@
-{"version":3,"names":["makeMutable","registry","registerOccurrence","tag","screenKey","bounds","styles","modify","state","occurrences","linkStack","setLinkSource","parentScreenKey","push","source","destination","setLinkDestination","stack","length","i","getOccurrence","key","value","matchesScreenKey","identifier","getActiveLink","isClosing","link","BoundStore"],"sourceRoot":"../../../../src","sources":["shared/stores/bounds.store.ts"],"mappings":";;AAAA,SAECA,WAAW,QAEL,yBAAyB;AA0BhC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,MAAMC,QAAQ,GAAGD,WAAW,CAA0B,CAAC,CAAC,CAAC;AAEzD,SAASE,kBAAkBA,CAC1BC,GAAU,EACVC,SAAoB,EACpBC,MAA0B,EAC1BC,MAAkB,GAAG,CAAC,CAAC,EACtB;EACD,SAAS;;EACTL,QAAQ,CAACM,MAAM,CAAEC,KAAU,IAAK;IAC/B,SAAS;;IACT,IAAI,CAACA,KAAK,CAACL,GAAG,CAAC,EAAE;MAChBK,KAAK,CAACL,GAAG,CAAC,GAAG;QAAEM,WAAW,EAAE,CAAC,CAAC;QAAEC,SAAS,EAAE;MAAG,CAAC;IAChD;IACAF,KAAK,CAACL,GAAG,CAAC,CAACM,WAAW,CAACL,SAAS,CAAC,GAAG;MAAEC,MAAM;MAAEC;IAAO,CAAC;IACtD,OAAOE,KAAK;EACb,CAAC,CAAC;AACH;AAEA,SAASG,aAAaA,CACrBR,GAAU,EACVC,SAAoB,EACpBC,MAA0B,EAC1BC,MAAkB,GAAG,CAAC,CAAC,EACvBM,eAA2B,EAC1B;EACD,SAAS;;EACTX,QAAQ,CAACM,MAAM,CAAEC,KAAU,IAAK;IAC/B,SAAS;;IACT,IAAI,CAACA,KAAK,CAACL,GAAG,CAAC,EAAEK,KAAK,CAACL,GAAG,CAAC,GAAG;MAAEM,WAAW,EAAE,CAAC,CAAC;MAAEC,SAAS,EAAE;IAAG,CAAC;;IAEhE;IACAF,KAAK,CAACL,GAAG,CAAC,CAACO,SAAS,CAACG,IAAI,CAAC;MACzBC,MAAM,EAAE;QAAEV,SAAS;QAAEQ,eAAe;QAAEP,MAAM;QAAEC;MAAO,CAAC;MACtDS,WAAW,EAAE;IACd,CAAC,CAAC;IACF,OAAOP,KAAK;EACb,CAAC,CAAC;AACH;AAEA,SAASQ,kBAAkBA,CAC1Bb,GAAU,EACVC,SAAoB,EACpBC,MAA0B,EAC1BC,MAAkB,GAAG,CAAC,CAAC,EACvBM,eAA2B,EAC1B;EACD,SAAS;;EACTX,QAAQ,CAACM,MAAM,CAAEC,KAAU,IAAK;IAC/B,SAAS;;IACT,MAAMS,KAAK,GAAGT,KAAK,CAACL,GAAG,CAAC,EAAEO,SAAS;IACnC,IAAI,CAACO,KAAK,IAAIA,KAAK,CAACC,MAAM,KAAK,CAAC,EAAE,OAAOV,KAAK;;IAE9C;IACA,KAAK,IAAIW,CAAC,GAAGF,KAAK,CAACC,MAAM,GAAG,CAAC,EAAEC,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;MAC3C,IAAIF,KAAK,CAACE,CAAC,CAAC,CAACJ,WAAW,KAAK,IAAI,EAAE;QAClCE,KAAK,CAACE,CAAC,CAAC,CAACJ,WAAW,GAAG;UAAEX,SAAS;UAAEQ,eAAe;UAAEP,MAAM;UAAEC;QAAO,CAAC;QACrE;MACD;IACD;IACA,OAAOE,KAAK;EACb,CAAC,CAAC;AACH;AAEA,SAASY,aAAaA,CAACjB,GAAU,EAAEkB,GAAc,EAAE;EAClD,SAAS;;EACT,OAAOpB,QAAQ,CAACqB,KAAK,CAACnB,GAAG,CAAC,EAAEM,WAAW,CAACY,GAAG,CAAC,IAAI,IAAI;AACrD;;AAEA;AACA,SAASE,gBAAgBA,CACxBC,UAA+C,EAC/CH,GAAc,EACJ;EACV,SAAS;;EACT,IAAI,CAACG,UAAU,EAAE,OAAO,KAAK;EAC7B,OAAOA,UAAU,CAACpB,SAAS,KAAKiB,GAAG,IAAIG,UAAU,CAACZ,eAAe,KAAKS,GAAG;AAC1E;AAEA,SAASI,aAAaA,CAACtB,GAAU,EAAEC,SAAqB,EAAEsB,SAAmB,EAAE;EAC9E,SAAS;;EACT,MAAMT,KAAK,GAAGhB,QAAQ,CAACqB,KAAK,CAACnB,GAAG,CAAC,EAAEO,SAAS;EAE5C,IAAI,CAACO,KAAK,IAAIA,KAAK,CAACC,MAAM,KAAK,CAAC,EAAE;IACjC,OAAO,IAAI;EACZ;;EAEA;EACA,IAAId,SAAS,EAAE;IACd;IACA;IACA;;IAEA,IAAIsB,SAAS,EAAE;MACd;MACA,KAAK,IAAIP,CAAC,GAAGF,KAAK,CAACC,MAAM,GAAG,CAAC,EAAEC,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;QAC3C,MAAMQ,IAAI,GAAGV,KAAK,CAACE,CAAC,CAAC;QACrB,IAAII,gBAAgB,CAACI,IAAI,CAACZ,WAAW,EAAEX,SAAS,CAAC,EAAE;UAClD,OAAOuB,IAAI;QACZ;MACD;IACD;;IAEA;IACA,KAAK,IAAIR,CAAC,GAAGF,KAAK,CAACC,MAAM,GAAG,CAAC,EAAEC,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;MAC3C,MAAMQ,IAAI,GAAGV,KAAK,CAACE,CAAC,CAAC;MACrB,IACCI,gBAAgB,CAACI,IAAI,CAACb,MAAM,EAAEV,SAAS,CAAC,IACxCmB,gBAAgB,CAACI,IAAI,CAACZ,WAAW,EAAEX,SAAS,CAAC,EAC5C;QACD,OAAOuB,IAAI;MACZ;IACD;IACA,OAAO,IAAI;EACZ;EAEA,OAAOV,KAAK,CAACA,KAAK,CAACC,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI;AACvC;AAEA,OAAO,MAAMU,UAAU,GAAG;EACzB1B,kBAAkB;EAClBS,aAAa;EACbK,kBAAkB;EAClBS,aAAa;EACbL;AACD,CAAC","ignoreList":[]}
+{"version":3,"names":["makeMutable","registry","registerSnapshot","tag","screenKey","bounds","styles","ancestorKeys","modify","state","snapshots","linkStack","setLinkSource","push","source","destination","setLinkDestination","stack","length","i","matchesScreenKey","identifier","key","includes","getSnapshot","tagState","value","snap","getActiveLink","link","isSource","isDestination","lastLink","clear","filter","sourceMatches","destMatches","BoundStore"],"sourceRoot":"../../../../src","sources":["shared/stores/bounds.store.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/utils/bounds/helpers/is-bounds-equal.js

@@ -8,7 +8,7 @@ export const isBoundsEqual = ({
 }) => {
   "worklet";
 
-  const existing = BoundStore.getOccurrence(sharedBoundTag, key)?.bounds;
+  const existing = BoundStore.getSnapshot(sharedBoundTag, key)?.bounds;
   return !!existing && existing.width === measured.width && existing.height === measured.height && existing.pageX === measured.pageX && existing.pageY === measured.pageY && existing.x === measured.x && existing.y === measured.y;
 };
 //# sourceMappingURL=is-bounds-equal.js.map

package/lib/module/shared/utils/bounds/helpers/is-bounds-equal.js.map

@@ -1 +1 @@
-{"version":3,"names":["BoundStore","isBoundsEqual","measured","key","sharedBoundTag","existing","getOccurrence","bounds","width","height","pageX","pageY","x","y"],"sourceRoot":"../../../../../../src","sources":["shared/utils/bounds/helpers/is-bounds-equal.ts"],"mappings":";;AACA,SAASA,UAAU,QAAQ,8BAA8B;AAEzD,OAAO,MAAMC,aAAa,GAAGA,CAAC;EAC7BC,QAAQ;EACRC,GAAG;EACHC;AAKD,CAAC,KAAK;EACL,SAAS;;EACT,MAAMC,QAAQ,GAAGL,UAAU,CAACM,aAAa,CAACF,cAAc,EAAED,GAAG,CAAC,EAAEI,MAAM;EACtE,OACC,CAAC,CAACF,QAAQ,IACVA,QAAQ,CAACG,KAAK,KAAKN,QAAQ,CAACM,KAAK,IACjCH,QAAQ,CAACI,MAAM,KAAKP,QAAQ,CAACO,MAAM,IACnCJ,QAAQ,CAACK,KAAK,KAAKR,QAAQ,CAACQ,KAAK,IACjCL,QAAQ,CAACM,KAAK,KAAKT,QAAQ,CAACS,KAAK,IACjCN,QAAQ,CAACO,CAAC,KAAKV,QAAQ,CAACU,CAAC,IACzBP,QAAQ,CAACQ,CAAC,KAAKX,QAAQ,CAACW,CAAC;AAE3B,CAAC","ignoreList":[]}
+{"version":3,"names":["BoundStore","isBoundsEqual","measured","key","sharedBoundTag","existing","getSnapshot","bounds","width","height","pageX","pageY","x","y"],"sourceRoot":"../../../../../../src","sources":["shared/utils/bounds/helpers/is-bounds-equal.ts"],"mappings":";;AACA,SAASA,UAAU,QAAQ,8BAA8B;AAEzD,OAAO,MAAMC,aAAa,GAAGA,CAAC;EAC7BC,QAAQ;EACRC,GAAG;EACHC;AAKD,CAAC,KAAK;EACL,SAAS;;EACT,MAAMC,QAAQ,GAAGL,UAAU,CAACM,WAAW,CAACF,cAAc,EAAED,GAAG,CAAC,EAAEI,MAAM;EACpE,OACC,CAAC,CAACF,QAAQ,IACVA,QAAQ,CAACG,KAAK,KAAKN,QAAQ,CAACM,KAAK,IACjCH,QAAQ,CAACI,MAAM,KAAKP,QAAQ,CAACO,MAAM,IACnCJ,QAAQ,CAACK,KAAK,KAAKR,QAAQ,CAACQ,KAAK,IACjCL,QAAQ,CAACM,KAAK,KAAKT,QAAQ,CAACS,KAAK,IACjCN,QAAQ,CAACO,CAAC,KAAKV,QAAQ,CAACU,CAAC,IACzBP,QAAQ,CAACQ,CAAC,KAAKX,QAAQ,CAACW,CAAC;AAE3B,CAAC","ignoreList":[]}

package/lib/module/shared/utils/bounds/index.js

@@ -9,11 +9,10 @@ const resolveBounds = props => {
 
   const entering = !props.next;
   const fullscreen = FULLSCREEN_DIMENSIONS(props.dimensions);
-  const isClosing = props.current?.closing === 1;
   const isFullscreenTarget = props.computeOptions.target === "fullscreen";
 
   // Try exact match first (strict matching for nested stacks)
-  let link = BoundStore.getActiveLink(props.id, props.current?.route.key, isClosing);
+  let link = BoundStore.getActiveLink(props.id, props.current?.route.key);
 
   // For fullscreen target, fall back to most recent link for this tag
   // (destination screen might not have a matching element)
@@ -145,13 +144,13 @@ export const createBounds = props => {
       dimensions: props.layouts.screen
     }, params);
   };
-  const getOccurrence = (tag, key) => {
+  const getSnapshot = (tag, key) => {
     "worklet";
 
-    return BoundStore.getOccurrence(tag, key);
+    return BoundStore.getSnapshot(tag, key);
   };
   return Object.assign(boundsFunction, {
-    getOccurrence
+    getSnapshot
   });
 };
 //# sourceMappingURL=index.js.map

package/lib/module/shared/utils/bounds/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["EMPTY_BOUND_HELPER_RESULT","EMPTY_BOUND_HELPER_RESULT_RAW","ENTER_RANGE","EXIT_RANGE","FULLSCREEN_DIMENSIONS","BoundStore","computeContentTransformGeometry","computeRelativeGeometry","composeContentStyle","composeSizeAbsolute","composeSizeRelative","composeTransformAbsolute","composeTransformRelative","resolveBounds","props","entering","next","fullscreen","dimensions","isClosing","current","closing","isFullscreenTarget","computeOptions","target","link","getActiveLink","id","route","key","source","start","end","destination","bounds","customTarget","computeBoundStyles","previous","progress","raw","ranges","method","geometry","anchor","scaleMode","common","isSize","isAbs","space","createBounds","boundsFunction","params","layouts","screen","getOccurrence","tag","Object","assign"],"sourceRoot":"../../../../../src","sources":["shared/utils/bounds/index.ts"],"mappings":";;AACA,SACCA,yBAAyB,EACzBC,6BAA6B,EAC7BC,WAAW,EACXC,UAAU,EACVC,qBAAqB,QACf,iBAAiB;AACxB,SAASC,UAAU,QAAsB,2BAA2B;AAOpE,SACCC,+BAA+B,EAC/BC,uBAAuB,QACjB,oBAAoB;AAC3B,SACCC,mBAAmB,EACnBC,mBAAmB,EACnBC,mBAAmB,EACnBC,wBAAwB,EACxBC,wBAAwB,QAElB,2BAA2B;AAclC,MAAMC,aAAa,GAAIC,KAQtB,IAAK;EACL,SAAS;;EACT,MAAMC,QAAQ,GAAG,CAACD,KAAK,CAACE,IAAI;EAC5B,MAAMC,UAAU,GAAGb,qBAAqB,CAACU,KAAK,CAACI,UAAU,CAAC;EAC1D,MAAMC,SAAS,GAAGL,KAAK,CAACM,OAAO,EAAEC,OAAO,KAAK,CAAC;EAE9C,MAAMC,kBAAkB,GAAGR,KAAK,CAACS,cAAc,CAACC,MAAM,KAAK,YAAY;;EAEvE;EACA,IAAIC,IAAI,GAAGpB,UAAU,CAACqB,aAAa,CAClCZ,KAAK,CAACa,EAAE,EACRb,KAAK,CAACM,OAAO,EAAEQ,KAAK,CAACC,GAAG,EACxBV,SACD,CAAC;;EAED;EACA;EACA,IAAI,CAACM,IAAI,IAAIH,kBAAkB,EAAE;IAChCG,IAAI,GAAGpB,UAAU,CAACqB,aAAa,CAACZ,KAAK,CAACa,EAAE,CAAC,CAAC,CAAC;EAC5C;EAEA,IAAI,CAACF,IAAI,IAAI,CAACA,IAAI,CAACK,MAAM,EAAE;IAC1B,OAAO;MACNC,KAAK,EAAE,IAAI;MACXC,GAAG,EAAE,IAAI;MACTjB;IACD,CAAC;EACF;;EAEA;EACA,IAAI,CAACO,kBAAkB,IAAI,CAACG,IAAI,CAACQ,WAAW,EAAE;IAC7C,OAAO;MACNF,KAAK,EAAE,IAAI;MACXC,GAAG,EAAE,IAAI;MACTjB;IACD,CAAC;EACF;EAEA,MAAM;IAAEkB,WAAW;IAAEH;EAAO,CAAC,GAAGL,IAAI;EAEpC,MAAMM,KAAK,GAAGD,MAAM,CAACI,MAAM;EAC3B,IAAIF,GAAG,GAAGC,WAAW,EAAEC,MAAM,IAAIjB,UAAU;EAE3C,IAAIK,kBAAkB,EAAE;IACvBU,GAAG,GAAGf,UAAU;EACjB;EAEA,MAAMkB,YAAY,GAAGrB,KAAK,CAACS,cAAc,CAACC,MAAM;EAEhD,IAAI,OAAOW,YAAY,KAAK,QAAQ,EAAE;IACrCH,GAAG,GAAGG,YAAY;EACnB;EAEA,OAAO;IACNJ,KAAK;IACLC,GAAG;IACHjB;EACD,CAAC;AACF,CAAC;AAED,MAAMqB,kBAAkB,GAAGA,CAC1B;EAAET,EAAE;EAAEU,QAAQ;EAAEjB,OAAO;EAAEJ,IAAI;EAAEsB,QAAQ;EAAEpB;AAAgC,CAAC,EAC1EK,cAAoC,GAAG;EAAEI,EAAE,EAAE;AAAW,CAAC,KACrD;EACJ,SAAS;;EACT,IAAI,CAACA,EAAE,EAAE;IACR,IAAIJ,cAAc,CAACgB,GAAG,EAAE;MACvB,OAAOtC,6BAA6B;IACrC;IACA,OAAOD,yBAAyB;EACjC;EAEA,MAAM;IAAE+B,KAAK;IAAEC,GAAG;IAAEjB;EAAS,CAAC,GAAGF,aAAa,CAAC;IAC9Cc,EAAE;IACFU,QAAQ;IACRjB,OAAO;IACPJ,IAAI;IACJO,cAAc;IACdL;EACD,CAAC,CAAC;EAEF,IAAI,CAACa,KAAK,IAAI,CAACC,GAAG,EAAE;IACnB,IAAIT,cAAc,CAACgB,GAAG,EAAE;MACvB,OAAOtC,6BAA6B;IACrC;IACA,OAAOD,yBAAyB;EACjC;EAEA,MAAMwC,MAAiC,GAAGzB,QAAQ,GAAGb,WAAW,GAAGC,UAAU;EAE7E,IAAIoB,cAAc,CAACkB,MAAM,KAAK,SAAS,EAAE;IACxC,MAAMC,QAAQ,GAAGpC,+BAA+B,CAAC;MAChDyB,KAAK;MACLC,GAAG;MACHjB,QAAQ;MACRG,UAAU;MACVyB,MAAM,EAAEpB,cAAc,CAACoB,MAAM;MAC7BC,SAAS,EAAErB,cAAc,CAACqB;IAC3B,CAAC,CAAC;IAEF,OAAOpC,mBAAmB,CAAC;MAC1BuB,KAAK;MACLO,QAAQ;MACRE,MAAM;MACNR,GAAG;MACHU,QAAQ;MACRnB;IACD,CAAC,CAAC;EACH;EAEA,MAAMmB,QAAQ,GAAGnC,uBAAuB,CAAC;IACxCwB,KAAK;IACLC,GAAG;IACHjB,QAAQ;IACR4B,MAAM,EAAEpB,cAAc,CAACoB,MAAM;IAC7BC,SAAS,EAAErB,cAAc,CAACqB;EAC3B,CAAC,CAAC;EAEF,MAAMC,MAA4B,GAAG;IACpCd,KAAK;IACLC,GAAG;IACHM,QAAQ;IACRE,MAAM;IACNE,QAAQ;IACRnB;EACD,CAAC;EAED,MAAMuB,MAAM,GAAGvB,cAAc,CAACkB,MAAM,KAAK,MAAM;EAC/C,MAAMM,KAAK,GAAGxB,cAAc,CAACyB,KAAK,KAAK,UAAU;EAEjD,OAAOF,MAAM,GACVC,KAAK,GACJtC,mBAAmB,CAACoC,MAAM,CAAC,GAC3BnC,mBAAmB,CAACmC,MAAM,CAAC,GAC5BE,KAAK,GACJpC,wBAAwB,CAACkC,MAAM,CAAC,GAChCjC,wBAAwB,CAACiC,MAAM,CAAC;AACrC,CAAC;AAED,OAAO,MAAMI,YAAY,GACxBnC,KAA+C,IAC3B;EACpB,SAAS;;EAET,MAAMoC,cAAc,GAAIC,MAA6B,IAAK;IACzD,SAAS;;IACT,MAAMxB,EAAE,GAAGwB,MAAM,EAAExB,EAAE;IAErB,OAAOS,kBAAkB,CACxB;MACCT,EAAE;MACFU,QAAQ,EAAEvB,KAAK,CAACuB,QAAQ;MACxBjB,OAAO,EAAEN,KAAK,CAACM,OAAO;MACtBJ,IAAI,EAAEF,KAAK,CAACE,IAAI;MAChBsB,QAAQ,EAAExB,KAAK,CAACwB,QAAQ;MACxBpB,UAAU,EAAEJ,KAAK,CAACsC,OAAO,CAACC;IAC3B,CAAC,EACDF,MACD,CAAC;EACF,CAAC;EAED,MAAMG,aAAa,GAAGA,CAACC,GAAW,EAAE1B,GAAW,KAAc;IAC5D,SAAS;;IACT,OAAOxB,UAAU,CAACiD,aAAa,CAACC,GAAG,EAAE1B,GAAG,CAAC;EAC1C,CAAC;EAED,OAAO2B,MAAM,CAACC,MAAM,CAACP,cAAc,EAAE;IAAEI;EAAc,CAAC,CAAC;AACxD,CAAC","ignoreList":[]}
+{"version":3,"names":["EMPTY_BOUND_HELPER_RESULT","EMPTY_BOUND_HELPER_RESULT_RAW","ENTER_RANGE","EXIT_RANGE","FULLSCREEN_DIMENSIONS","BoundStore","computeContentTransformGeometry","computeRelativeGeometry","composeContentStyle","composeSizeAbsolute","composeSizeRelative","composeTransformAbsolute","composeTransformRelative","resolveBounds","props","entering","next","fullscreen","dimensions","isFullscreenTarget","computeOptions","target","link","getActiveLink","id","current","route","key","source","start","end","destination","bounds","customTarget","computeBoundStyles","previous","progress","raw","ranges","method","geometry","anchor","scaleMode","common","isSize","isAbs","space","createBounds","boundsFunction","params","layouts","screen","getSnapshot","tag","Object","assign"],"sourceRoot":"../../../../../src","sources":["shared/utils/bounds/index.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/utils/create-provider.js

@@ -36,10 +36,29 @@ export default function createProvider(name, options) {
       }
       return context;
     };
+    const withProvider = Component => {
+      return function WithProviderWrapper(props) {
+        const {
+          enabled = true,
+          value
+        } = factory(props);
+        if (!value) {
+          throw new Error(`${name}Context value must be provided. You likely forgot to return it from the factory function.`);
+        }
+        const memoValue = useMemo(() => enabled ? value : null, [enabled, value]);
+        return /*#__PURE__*/_jsx(Context.Provider, {
+          value: memoValue,
+          children: /*#__PURE__*/_jsx(Component, {
+            ...value
+          })
+        });
+      };
+    };
     return {
       [`${name}Context`]: Context,
       [`${name}Provider`]: Provider,
-      [`use${name}Context`]: useEnhancedContext
+      [`use${name}Context`]: useEnhancedContext,
+      [`with${name}Provider`]: withProvider
     };
   };
 }

package/lib/module/shared/utils/create-provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["createContext","useContext","useMemo","jsx","_jsx","createProvider","name","options","factory","guarded","Context","displayName","Provider","props","children","enabled","value","Error","memoValue","useEnhancedContext","context"],"sourceRoot":"../../../../src","sources":["shared/utils/create-provider.tsx"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA,SAASA,aAAa,EAAkBC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAE3E,eAAe,SAASC,cAAcA,CAGpCC,IAAkB,EAAEC,OAA+B,EAAE;EACtD,OACCC,OAIC,IACG;IACJ,MAAM;MAAEC,OAAO,GAAG;IAAK,CAAC,GAAGF,OAAO,IAAI,CAAC,CAAC;IAExC,MAAMG,OAAO,gBAAGV,aAAa,CAAsB,IAAI,CAAC;IACxDU,OAAO,CAACC,WAAW,GAAGL,IAAI;IAE1B,MAAMM,QAAiC,GAAIC,KAAK,IAAK;MACpD,MAAM;QACLC,QAAQ,GAAID,KAAK,CAA8BC,QAAQ;QACvDC,OAAO,GAAG,IAAI;QACdC;MACD,CAAC,GAAGR,OAAO,CAACK,KAAK,CAAC;MAElB,IAAI,CAACG,KAAK,EAAE;QACX,MAAM,IAAIC,KAAK,CACd,GAAGX,IAAI,2FACR,CAAC;MACF;MAEA,MAAMY,SAAS,GAAGhB,OAAO,CACxB,MAAOa,OAAO,GAAGC,KAAK,GAAG,IAAK,EAC9B,CAACD,OAAO,EAAEC,KAAK,CAChB,CAAC;MAED,oBAAOZ,IAAA,CAACM,OAAO,CAACE,QAAQ;QAACI,KAAK,EAAEE,SAAU;QAAAJ,QAAA,EAAEA;MAAQ,CAAmB,CAAC;IACzE,CAAC;IAED,MAAMK,kBAAkB,GAAGA,CAAA,KAA2B;MACrD,MAAMC,OAAO,GAAGnB,UAAU,CAACS,OAAO,CAAC;MAEnC,IAAID,OAAO,IAAIW,OAAO,KAAK,IAAI,EAAE;QAChC,MAAM,IAAIH,KAAK,CACd,GAAGX,IAAI,kCAAkCA,IAAI,UAC9C,CAAC;MACF;MAEA,OAAOc,OAAO;IACf,CAAC;IAED,OAAO;MACN,CAAC,GAAGd,IAAI,SAAS,GAAGI,OAAO;MAC3B,CAAC,GAAGJ,IAAI,UAAU,GAAGM,QAAQ;MAC7B,CAAC,MAAMN,IAAI,SAAS,GAAGa;IACxB,CAAC;EASF,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["createContext","useContext","useMemo","jsx","_jsx","createProvider","name","options","factory","guarded","Context","displayName","Provider","props","children","enabled","value","Error","memoValue","useEnhancedContext","context","withProvider","Component","WithProviderWrapper"],"sourceRoot":"../../../../src","sources":["shared/utils/create-provider.tsx"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA,SAECA,aAAa,EAEbC,UAAU,EACVC,OAAO,QACD,OAAO;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEf,eAAe,SAASC,cAAcA,CAGpCC,IAAkB,EAAEC,OAA+B,EAAE;EACtD,OACCC,OAIC,IACG;IACJ,MAAM;MAAEC,OAAO,GAAG;IAAK,CAAC,GAAGF,OAAO,IAAI,CAAC,CAAC;IAExC,MAAMG,OAAO,gBAAGV,aAAa,CAAsB,IAAI,CAAC;IACxDU,OAAO,CAACC,WAAW,GAAGL,IAAI;IAE1B,MAAMM,QAAiC,GAAIC,KAAK,IAAK;MACpD,MAAM;QACLC,QAAQ,GAAID,KAAK,CAA8BC,QAAQ;QACvDC,OAAO,GAAG,IAAI;QACdC;MACD,CAAC,GAAGR,OAAO,CAACK,KAAK,CAAC;MAElB,IAAI,CAACG,KAAK,EAAE;QACX,MAAM,IAAIC,KAAK,CACd,GAAGX,IAAI,2FACR,CAAC;MACF;MAEA,MAAMY,SAAS,GAAGhB,OAAO,CACxB,MAAOa,OAAO,GAAGC,KAAK,GAAG,IAAK,EAC9B,CAACD,OAAO,EAAEC,KAAK,CAChB,CAAC;MAED,oBAAOZ,IAAA,CAACM,OAAO,CAACE,QAAQ;QAACI,KAAK,EAAEE,SAAU;QAAAJ,QAAA,EAAEA;MAAQ,CAAmB,CAAC;IACzE,CAAC;IAED,MAAMK,kBAAkB,GAAGA,CAAA,KAA2B;MACrD,MAAMC,OAAO,GAAGnB,UAAU,CAACS,OAAO,CAAC;MAEnC,IAAID,OAAO,IAAIW,OAAO,KAAK,IAAI,EAAE;QAChC,MAAM,IAAIH,KAAK,CACd,GAAGX,IAAI,kCAAkCA,IAAI,UAC9C,CAAC;MACF;MAEA,OAAOc,OAAO;IACf,CAAC;IAED,MAAMC,YAAY,GAAIC,SAAsC,IAAK;MAChE,OAAO,SAASC,mBAAmBA,CAACV,KAAoB,EAAE;QACzD,MAAM;UAAEE,OAAO,GAAG,IAAI;UAAEC;QAAM,CAAC,GAAGR,OAAO,CAACK,KAAK,CAAC;QAEhD,IAAI,CAACG,KAAK,EAAE;UACX,MAAM,IAAIC,KAAK,CACd,GAAGX,IAAI,2FACR,CAAC;QACF;QAEA,MAAMY,SAAS,GAAGhB,OAAO,CACxB,MAAOa,OAAO,GAAGC,KAAK,GAAG,IAAK,EAC9B,CAACD,OAAO,EAAEC,KAAK,CAChB,CAAC;QAED,oBACCZ,IAAA,CAACM,OAAO,CAACE,QAAQ;UAACI,KAAK,EAAEE,SAAU;UAAAJ,QAAA,eAClCV,IAAA,CAACkB,SAAS;YAAA,GAAKN;UAAK,CAAG;QAAC,CACP,CAAC;MAErB,CAAC;IACF,CAAC;IAED,OAAO;MACN,CAAC,GAAGV,IAAI,SAAS,GAAGI,OAAO;MAC3B,CAAC,GAAGJ,IAAI,UAAU,GAAGM,QAAQ;MAC7B,CAAC,MAAMN,IAAI,SAAS,GAAGa,kBAAkB;MACzC,CAAC,OAAOb,IAAI,UAAU,GAAGe;IAC1B,CAAC;EAaF,CAAC;AACF","ignoreList":[]}

package/lib/module/shared/utils/reset-stores-for-screen.js

@@ -1,6 +1,7 @@
 "use strict";
 
 import { AnimationStore } from "../stores/animation.store";
+import { BoundStore } from "../stores/bounds.store";
 import { GestureStore } from "../stores/gesture.store";
 
 /**
@@ -9,5 +10,6 @@ import { GestureStore } from "../stores/gesture.store";
 export const resetStoresForScreen = current => {
   AnimationStore.clear(current.route.key);
   GestureStore.clear(current.route.key);
+  BoundStore.clear(current.route.key);
 };
 //# sourceMappingURL=reset-stores-for-screen.js.map

package/lib/module/shared/utils/reset-stores-for-screen.js.map

@@ -1 +1 @@
-{"version":3,"names":["AnimationStore","GestureStore","resetStoresForScreen","current","clear","route","key"],"sourceRoot":"../../../../src","sources":["shared/utils/reset-stores-for-screen.ts"],"mappings":";;AACA,SAASA,cAAc,QAAQ,2BAA2B;AAC1D,SAASC,YAAY,QAAQ,yBAAyB;;AAEtD;AACA;AACA;AACA,OAAO,MAAMC,oBAAoB,GAAIC,OAA6B,IAAK;EACtEH,cAAc,CAACI,KAAK,CAACD,OAAO,CAACE,KAAK,CAACC,GAAG,CAAC;EACvCL,YAAY,CAACG,KAAK,CAACD,OAAO,CAACE,KAAK,CAACC,GAAG,CAAC;AACtC,CAAC","ignoreList":[]}
+{"version":3,"names":["AnimationStore","BoundStore","GestureStore","resetStoresForScreen","current","clear","route","key"],"sourceRoot":"../../../../src","sources":["shared/utils/reset-stores-for-screen.ts"],"mappings":";;AACA,SAASA,cAAc,QAAQ,2BAA2B;AAC1D,SAASC,UAAU,QAAQ,wBAAwB;AACnD,SAASC,YAAY,QAAQ,yBAAyB;;AAEtD;AACA;AACA;AACA,OAAO,MAAMC,oBAAoB,GAAIC,OAA6B,IAAK;EACtEJ,cAAc,CAACK,KAAK,CAACD,OAAO,CAACE,KAAK,CAACC,GAAG,CAAC;EACvCL,YAAY,CAACG,KAAK,CAACD,OAAO,CAACE,KAAK,CAACC,GAAG,CAAC;EACrCN,UAAU,CAACI,KAAK,CAACD,OAAO,CAACE,KAAK,CAACC,GAAG,CAAC;AACpC,CAAC","ignoreList":[]}