react-native-screen-transitions 4.0.0-alpha.0 → 4.0.0-alpha.10

package/lib/module/components/screen-lifecycle/hooks/use-close-transition-intent.js

@@ -1,119 +1,90 @@
 "use strict";
 
-/** biome-ignore-all lint/correctness/useHookAtTopLevel: STACK_TYPE is stable per navigator */
 import { useLayoutEffect, useMemo, useRef } from "react";
+import { useNavigationHelpers } from "../../../hooks/navigation/use-navigation-helpers";
 import useStableCallback from "../../../hooks/use-stable-callback";
-import { useDescriptorDerivations } from "../../../providers/screen/descriptors";
-import { useBlankStackContext } from "../../../providers/stack/blank-stack.provider";
-import { useStackCoreContext } from "../../../providers/stack/core.provider";
+import { hasTransitionsEnabled } from "../../../providers/screen/animation/helpers/has-transitions-enabled";
+import { useCurrentScreenRelationships } from "../../../providers/screen/use-current-screen-relationships";
+import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
+import { useStackCoreStore } from "../../../providers/stack/core.provider";
 import { GestureStore } from "../../../stores/gesture.store";
-import { LifecycleTransitionRequestKind } from "../../../stores/system.store";
-import { StackType } from "../../../types/stack.types";
+import { dispatchCloseAction, isCloseActionReplay } from "../../../utils/navigation/close-action-replay";
+import { doesNavigatorOwnCloseAction, shouldInterceptClose } from "./helpers/close-interception-rules";
 import { resetStoresForScreen } from "./helpers/reset-stores-for-screen";
-const useBlankStackClose = ({
-  current,
-  requestLifecycleTransition,
-  resetStores
-}) => {
-  const {
-    handleCloseRoute
-  } = useBlankStackContext();
-  useLayoutEffect(() => {
-    if (current.activity !== "closing") {
-      return;
-    }
-    requestLifecycleTransition(LifecycleTransitionRequestKind.BlankStackClose, 0);
-  }, [current.activity, requestLifecycleTransition]);
-  const handleBlankStackCloseEnd = useStableCallback(finished => {
-    if (!finished) return;
-    handleCloseRoute({
-      route: current.route
-    });
-    requestAnimationFrame(() => {
-      resetStores();
-    });
-  });
-  return {
-    handleBlankStackCloseEnd
-  };
-};
-
-/**
- * Native stack close - listens to beforeRemove navigation event.
- */
-const useNativeStackClose = ({
-  current,
-  requestLifecycleTransition,
-  resetStores
-}) => {
+export function useCloseTransitionIntent(current) {
+  const routeKey = current.route.key;
+  const transitionsAlwaysOn = useStackCoreStore(store => store.flags.TRANSITIONS_ALWAYS_ON);
+  const handleCloseRoute = useBlankStackStore(store => store.handleCloseRoute);
+  const isBlankStackClosing = useBlankStackStore(store => store.scenesByKey[routeKey]?.activity === "closing");
   const {
     parentScreenKey
-  } = useDescriptorDerivations();
+  } = useCurrentScreenRelationships();
+  const {
+    dismissScreen,
+    requestDismiss
+  } = useNavigationHelpers();
   const pendingActionRef = useRef(null);
   const nearestAncestorDismissing = useMemo(() => {
     if (!parentScreenKey) return null;
     return GestureStore.peekBag(parentScreenKey)?.dismissing ?? null;
   }, [parentScreenKey]);
-  const handleNativeCloseEnd = useStableCallback(finished => {
-    if (!finished || !pendingActionRef.current) {
-      pendingActionRef.current = null;
-      return;
+  useLayoutEffect(() => {
+    if (isBlankStackClosing) {
+      requestDismiss();
     }
-    current.navigation.dispatch(pendingActionRef.current);
+  }, [isBlankStackClosing, requestDismiss]);
+  const completeClose = useStableCallback(() => {
+    const pendingAction = pendingActionRef.current;
     pendingActionRef.current = null;
-    requestAnimationFrame(() => {
-      resetStores();
-    });
+    if (pendingAction) {
+      dispatchCloseAction(pendingAction, action => {
+        current.navigation.dispatch(action);
+      });
+    } else if (handleCloseRoute) {
+      handleCloseRoute({
+        route: current.route
+      });
+    } else {
+      dismissScreen();
+    }
+    resetStoresForScreen(routeKey);
   });
-  const handleBeforeRemove = useStableCallback(e => {
-    const options = current.options;
-    const isEnabled = options.enableTransitions;
-    const navigation = current.navigation;
-    const routeKey = current.route.key;
-    const state = navigation.getState();
+  const handleBeforeRemove = useStableCallback(event => {
+    if (isCloseActionReplay(event.data.action)) {
+      return;
+    }
+    const state = current.navigation.getState();
     const routeIndex = state.routes.findIndex(route => route.key === routeKey);
-    const isFirstScreen = routeIndex <= 0;
-    if (!isEnabled || nearestAncestorDismissing?.get() || isFirstScreen) {
-      resetStores();
+    const action = event.data.action;
+    const ownsAction = doesNavigatorOwnCloseAction({
+      state,
+      action
+    });
+    const shouldIntercept = shouldInterceptClose({
+      enabled: hasTransitionsEnabled(current.options, transitionsAlwaysOn),
+      ownsAction,
+      ancestorDismissing: !!nearestAncestorDismissing?.get(),
+      routeIndex,
+      focusedIndex: state.index
+    });
+    if (!shouldIntercept) {
       return;
     }
-    e.preventDefault();
-    pendingActionRef.current = e.data.action;
-    requestLifecycleTransition(LifecycleTransitionRequestKind.NativeClose, 0);
+    pendingActionRef.current ??= event.data.action;
+    if (!requestDismiss()) {
+      pendingActionRef.current = null;
+      return;
+    }
+    event.preventDefault();
   });
-
-  // biome-ignore lint/correctness/useExhaustiveDependencies: navigation listener should only rebind when the navigator instance changes
   useLayoutEffect(() => {
+    if (handleCloseRoute) {
+      return;
+    }
     return current.navigation.addListener?.("beforeRemove", handleBeforeRemove);
-  }, [current.navigation]);
+  }, [current.navigation, handleBeforeRemove, handleCloseRoute]);
   return {
-    handleNativeCloseEnd
-  };
-};
-
-/**
- * Handles close transition intent and returns finish callbacks for cleanup.
- */
-export function useCloseTransitionIntent(current, system) {
-  const routeKey = current.route.key;
-  const {
-    flags
-  } = useStackCoreContext();
-  const isNativeStack = flags.STACK_TYPE === StackType.NATIVE;
-  const {
-    requestLifecycleTransition
-  } = system.actions;
-  const resetStores = useStableCallback(() => {
-    resetStoresForScreen(routeKey);
-  });
-  const closeParams = {
-    current,
-    requestLifecycleTransition,
-    resetStores
+    completeClose
   };
-  if (isNativeStack) {
-    return useNativeStackClose(closeParams);
-  }
-  return useBlankStackClose(closeParams);
 }
 //# sourceMappingURL=use-close-transition-intent.js.map

package/lib/module/components/screen-lifecycle/hooks/use-close-transition-intent.js.map

@@ -1 +1 @@
-{"version":3,"names":["useLayoutEffect","useMemo","useRef","useStableCallback","useDescriptorDerivations","useBlankStackContext","useStackCoreContext","GestureStore","LifecycleTransitionRequestKind","StackType","resetStoresForScreen","useBlankStackClose","current","requestLifecycleTransition","resetStores","handleCloseRoute","activity","BlankStackClose","handleBlankStackCloseEnd","finished","route","requestAnimationFrame","useNativeStackClose","parentScreenKey","pendingActionRef","nearestAncestorDismissing","peekBag","dismissing","handleNativeCloseEnd","navigation","dispatch","handleBeforeRemove","e","options","isEnabled","enableTransitions","routeKey","key","state","getState","routeIndex","routes","findIndex","isFirstScreen","get","preventDefault","data","action","NativeClose","addListener","useCloseTransitionIntent","system","flags","isNativeStack","STACK_TYPE","NATIVE","actions","closeParams"],"sourceRoot":"../../../../../src","sources":["components/screen-lifecycle/hooks/use-close-transition-intent.ts"],"mappings":";;AAAA;AACA,SAASA,eAAe,EAAEC,OAAO,EAAEC,MAAM,QAAQ,OAAO;AACxD,OAAOC,iBAAiB,MAAM,oCAAoC;AAClE,SAECC,wBAAwB,QAClB,uCAAuC;AAC9C,SAASC,oBAAoB,QAAQ,+CAA+C;AACpF,SAASC,mBAAmB,QAAQ,wCAAwC;AAC5E,SAASC,YAAY,QAAQ,+BAA+B;AAC5D,SACCC,8BAA8B,QAGxB,8BAA8B;AACrC,SAASC,SAAS,QAAQ,4BAA4B;AACtD,SAASC,oBAAoB,QAAQ,mCAAmC;AAQxE,MAAMC,kBAAkB,GAAGA,CAAC;EAC3BC,OAAO;EACPC,0BAA0B;EAC1BC;AACgB,CAAC,KAAK;EACtB,MAAM;IAAEC;EAAiB,CAAC,GAAGV,oBAAoB,CAAC,CAAC;EAEnDL,eAAe,CAAC,MAAM;IACrB,IAAIY,OAAO,CAACI,QAAQ,KAAK,SAAS,EAAE;MACnC;IACD;IAEAH,0BAA0B,CACzBL,8BAA8B,CAACS,eAAe,EAC9C,CACD,CAAC;EACF,CAAC,EAAE,CAACL,OAAO,CAACI,QAAQ,EAAEH,0BAA0B,CAAC,CAAC;EAElD,MAAMK,wBAAwB,GAAGf,iBAAiB,CAAEgB,QAAiB,IAAK;IACzE,IAAI,CAACA,QAAQ,EAAE;IACfJ,gBAAgB,CAAC;MAAEK,KAAK,EAAER,OAAO,CAACQ;IAAM,CAAC,CAAC;IAC1CC,qBAAqB,CAAC,MAAM;MAC3BP,WAAW,CAAC,CAAC;IACd,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,OAAO;IAAEI;EAAyB,CAAC;AACpC,CAAC;;AAED;AACA;AACA;AACA,MAAMI,mBAAmB,GAAGA,CAAC;EAC5BV,OAAO;EACPC,0BAA0B;EAC1BC;AACgB,CAAC,KAAK;EACtB,MAAM;IAAES;EAAgB,CAAC,GAAGnB,wBAAwB,CAAC,CAAC;EACtD,MAAMoB,gBAAgB,GAAGtB,MAAM,CAAM,IAAI,CAAC;EAE1C,MAAMuB,yBAAyB,GAAGxB,OAAO,CAAC,MAAM;IAC/C,IAAI,CAACsB,eAAe,EAAE,OAAO,IAAI;IAEjC,OAAOhB,YAAY,CAACmB,OAAO,CAACH,eAAe,CAAC,EAAEI,UAAU,IAAI,IAAI;EACjE,CAAC,EAAE,CAACJ,eAAe,CAAC,CAAC;EAErB,MAAMK,oBAAoB,GAAGzB,iBAAiB,CAAEgB,QAAiB,IAAK;IACrE,IAAI,CAACA,QAAQ,IAAI,CAACK,gBAAgB,CAACZ,OAAO,EAAE;MAC3CY,gBAAgB,CAACZ,OAAO,GAAG,IAAI;MAC/B;IACD;IAEAA,OAAO,CAACiB,UAAU,CAACC,QAAQ,CAACN,gBAAgB,CAACZ,OAAO,CAAC;IACrDY,gBAAgB,CAACZ,OAAO,GAAG,IAAI;IAC/BS,qBAAqB,CAAC,MAAM;MAC3BP,WAAW,CAAC,CAAC;IACd,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,MAAMiB,kBAAkB,GAAG5B,iBAAiB,CAAE6B,CAAM,IAAK;IACxD,MAAMC,OAAO,GAAGrB,OAAO,CAACqB,OAA0C;IAClE,MAAMC,SAAS,GAAGD,OAAO,CAACE,iBAAiB;IAC3C,MAAMN,UAAU,GAAGjB,OAAO,CAACiB,UAAU;IACrC,MAAMO,QAAQ,GAAGxB,OAAO,CAACQ,KAAK,CAACiB,GAAG;IAClC,MAAMC,KAAK,GAAGT,UAAU,CAACU,QAAQ,CAAC,CAAC;IACnC,MAAMC,UAAU,GAAGF,KAAK,CAACG,MAAM,CAACC,SAAS,CACvCtB,KAAK,IAAKA,KAAK,CAACiB,GAAG,KAAKD,QAC1B,CAAC;IACD,MAAMO,aAAa,GAAGH,UAAU,IAAI,CAAC;IAErC,IAAI,CAACN,SAAS,IAAIT,yBAAyB,EAAEmB,GAAG,CAAC,CAAC,IAAID,aAAa,EAAE;MACpE7B,WAAW,CAAC,CAAC;MACb;IACD;IAEAkB,CAAC,CAACa,cAAc,CAAC,CAAC;IAClBrB,gBAAgB,CAACZ,OAAO,GAAGoB,CAAC,CAACc,IAAI,CAACC,MAAM;IACxClC,0BAA0B,CAACL,8BAA8B,CAACwC,WAAW,EAAE,CAAC,CAAC;EAC1E,CAAC,CAAC;;EAEF;EACAhD,eAAe,CAAC,MAAM;IACrB,OAAOY,OAAO,CAACiB,UAAU,CAACoB,WAAW,GAAG,cAAc,EAAElB,kBAAkB,CAAC;EAC5E,CAAC,EAAE,CAACnB,OAAO,CAACiB,UAAU,CAAC,CAAC;EAExB,OAAO;IAAED;EAAqB,CAAC;AAChC,CAAC;;AAED;AACA;AACA;AACA,OAAO,SAASsB,wBAAwBA,CACvCtC,OAAuB,EACvBuC,MAAsB,EAIrB;EACD,MAAMf,QAAQ,GAAGxB,OAAO,CAACQ,KAAK,CAACiB,GAAG;EAClC,MAAM;IAAEe;EAAM,CAAC,GAAG9C,mBAAmB,CAAC,CAAC;EACvC,MAAM+C,aAAa,GAAGD,KAAK,CAACE,UAAU,KAAK7C,SAAS,CAAC8C,MAAM;EAC3D,MAAM;IAAE1C;EAA2B,CAAC,GAAGsC,MAAM,CAACK,OAAO;EAErD,MAAM1C,WAAW,GAAGX,iBAAiB,CAAC,MAAM;IAC3CO,oBAAoB,CAAC0B,QAAQ,CAAC;EAC/B,CAAC,CAAC;EAEF,MAAMqB,WAA4B,GAAG;IACpC7C,OAAO;IACPC,0BAA0B;IAC1BC;EACD,CAAC;EAED,IAAIuC,aAAa,EAAE;IAClB,OAAO/B,mBAAmB,CAACmC,WAAW,CAAC;EACxC;EAEA,OAAO9C,kBAAkB,CAAC8C,WAAW,CAAC;AACvC","ignoreList":[]}
+{"version":3,"names":["useLayoutEffect","useMemo","useRef","useNavigationHelpers","useStableCallback","hasTransitionsEnabled","useCurrentScreenRelationships","useBlankStackStore","useStackCoreStore","GestureStore","dispatchCloseAction","isCloseActionReplay","doesNavigatorOwnCloseAction","shouldInterceptClose","resetStoresForScreen","useCloseTransitionIntent","current","routeKey","route","key","transitionsAlwaysOn","store","flags","TRANSITIONS_ALWAYS_ON","handleCloseRoute","isBlankStackClosing","scenesByKey","activity","parentScreenKey","dismissScreen","requestDismiss","pendingActionRef","nearestAncestorDismissing","peekBag","dismissing","completeClose","pendingAction","action","navigation","dispatch","handleBeforeRemove","event","data","state","getState","routeIndex","routes","findIndex","ownsAction","shouldIntercept","enabled","options","ancestorDismissing","get","focusedIndex","index","preventDefault","addListener"],"sourceRoot":"../../../../../src","sources":["components/screen-lifecycle/hooks/use-close-transition-intent.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/components/screen-lifecycle/hooks/use-open-transition-intent.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import { useLayoutEffect } from "react";
-import { useDescriptorDerivations } from "../../../providers/screen/descriptors";
+import { useDescriptorsStore } from "../../../providers/screen/descriptors";
 import { LifecycleTransitionRequestKind } from "../../../stores/system.store";
 /**
  * Calculates the initial progress value based on snap points configuration.
@@ -23,9 +23,7 @@ function getInitialProgress({
  * Handles opening transition intent on mount.
  */
 export function useOpenTransitionIntent(current, animations, system) {
-  const {
-    isFirstKey
-  } = useDescriptorDerivations();
+  const isFirstKey = useDescriptorsStore(store => store.derivations.isFirstKey);
   const {
     requestLifecycleTransition
   } = system.actions;
@@ -61,6 +59,7 @@ export function useOpenTransitionIntent(current, animations, system) {
     if (initialProgress === "auto") {
       return;
     }
+    animations.entering.set(1);
     requestLifecycleTransition(LifecycleTransitionRequestKind.Open, initialProgress ?? 1);
   }, []);
 }

package/lib/module/components/screen-lifecycle/hooks/use-open-transition-intent.js.map

@@ -1 +1 @@
-{"version":3,"names":["useLayoutEffect","useDescriptorDerivations","LifecycleTransitionRequestKind","getInitialProgress","snapPoints","initialSnapIndex","undefined","clampedIndex","Math","min","max","length","useOpenTransitionIntent","current","animations","system","isFirstKey","requestLifecycleTransition","actions","experimental_animateOnInitialMount","options","initialProgress","targetProgress","set","transitionProgress","target","progressAnimating","closing","entering","Open"],"sourceRoot":"../../../../../src","sources":["components/screen-lifecycle/hooks/use-open-transition-intent.ts"],"mappings":";;AAAA,SAASA,eAAe,QAAQ,OAAO;AACvC,SAECC,wBAAwB,QAClB,uCAAuC;AAE9C,SACCC,8BAA8B,QAExB,8BAA8B;AAGrC;AACA;AACA;AACA;AACA;AACA,SAASC,kBAAkBA,CAAC;EAC3BC,UAAU;EACVC;AAID,CAAC,EAA+B;EAC/B,IAAI,CAACD,UAAU,EAAE;IAChB,OAAOE,SAAS;EACjB;EAEA,MAAMC,YAAY,GAAGC,IAAI,CAACC,GAAG,CAC5BD,IAAI,CAACE,GAAG,CAAC,CAAC,EAAEL,gBAAgB,CAAC,EAC7BD,UAAU,CAACO,MAAM,GAAG,CACrB,CAAC;EACD,OAAOP,UAAU,CAACG,YAAY,CAAC;AAChC;;AAEA;AACA;AACA;AACA,OAAO,SAASK,uBAAuBA,CACtCC,OAAuB,EACvBC,UAA6B,EAC7BC,MAAsB,EACrB;EACD,MAAM;IAAEC;EAAW,CAAC,GAAGf,wBAAwB,CAAC,CAAC;EACjD,MAAM;IAAEgB;EAA2B,CAAC,GAAGF,MAAM,CAACG,OAAO;;EAErD;EACAlB,eAAe,CAAC,MAAM;IACrB,MAAM;MACLI,UAAU;MACVC,gBAAgB,GAAG,CAAC;MACpBc;IACD,CAAC,GAAGN,OAAO,CAACO,OAAO;IAEnB,MAAMC,eAAe,GAAGlB,kBAAkB,CAAC;MAC1CC,UAAU;MACVC;IACD,CAAC,CAAC;IAEF,IAAIW,UAAU,IAAI,CAACG,kCAAkC,EAAE;MACtD,IAAIE,eAAe,KAAK,MAAM,EAAE;QAC/BN,MAAM,CAACO,cAAc,CAACC,GAAG,CAAC,CAAC,CAAC;QAC5BT,UAAU,CAACU,kBAAkB,CAACD,GAAG,CAAC,CAAC,CAAC;MACrC,CAAC,MAAM;QACN,MAAME,MAAM,GAAGJ,eAAe,IAAI,CAAC;QACnCN,MAAM,CAACO,cAAc,CAACC,GAAG,CAACE,MAAM,CAAC;QACjCX,UAAU,CAACU,kBAAkB,CAACD,GAAG,CAACE,MAAM,CAAC;MAC1C;MACAX,UAAU,CAACY,iBAAiB,CAACH,GAAG,CAAC,CAAC,CAAC;MACnCT,UAAU,CAACa,OAAO,CAACJ,GAAG,CAAC,CAAC,CAAC;MACzBT,UAAU,CAACc,QAAQ,CAACL,GAAG,CAAC,CAAC,CAAC;MAC1B;IACD;;IAEA;IACA;IACA,IAAIF,eAAe,KAAK,MAAM,EAAE;MAC/B;IACD;IAEAJ,0BAA0B,CACzBf,8BAA8B,CAAC2B,IAAI,EACnCR,eAAe,IAAI,CACpB,CAAC;EACF,CAAC,EAAE,EAAE,CAAC;AACP","ignoreList":[]}
+{"version":3,"names":["useLayoutEffect","useDescriptorsStore","LifecycleTransitionRequestKind","getInitialProgress","snapPoints","initialSnapIndex","undefined","clampedIndex","Math","min","max","length","useOpenTransitionIntent","current","animations","system","isFirstKey","store","derivations","requestLifecycleTransition","actions","experimental_animateOnInitialMount","options","initialProgress","targetProgress","set","transitionProgress","target","progressAnimating","closing","entering","Open"],"sourceRoot":"../../../../../src","sources":["components/screen-lifecycle/hooks/use-open-transition-intent.ts"],"mappings":";;AAAA,SAASA,eAAe,QAAQ,OAAO;AACvC,SAECC,mBAAmB,QACb,uCAAuC;AAE9C,SACCC,8BAA8B,QAExB,8BAA8B;AAGrC;AACA;AACA;AACA;AACA;AACA,SAASC,kBAAkBA,CAAC;EAC3BC,UAAU;EACVC;AAID,CAAC,EAA+B;EAC/B,IAAI,CAACD,UAAU,EAAE;IAChB,OAAOE,SAAS;EACjB;EAEA,MAAMC,YAAY,GAAGC,IAAI,CAACC,GAAG,CAC5BD,IAAI,CAACE,GAAG,CAAC,CAAC,EAAEL,gBAAgB,CAAC,EAC7BD,UAAU,CAACO,MAAM,GAAG,CACrB,CAAC;EACD,OAAOP,UAAU,CAACG,YAAY,CAAC;AAChC;;AAEA;AACA;AACA;AACA,OAAO,SAASK,uBAAuBA,CACtCC,OAAuB,EACvBC,UAA6B,EAC7BC,MAAsB,EACrB;EACD,MAAMC,UAAU,GAAGf,mBAAmB,CACpCgB,KAAK,IAAKA,KAAK,CAACC,WAAW,CAACF,UAC9B,CAAC;EACD,MAAM;IAAEG;EAA2B,CAAC,GAAGJ,MAAM,CAACK,OAAO;;EAErD;EACApB,eAAe,CAAC,MAAM;IACrB,MAAM;MACLI,UAAU;MACVC,gBAAgB,GAAG,CAAC;MACpBgB;IACD,CAAC,GAAGR,OAAO,CAACS,OAAO;IAEnB,MAAMC,eAAe,GAAGpB,kBAAkB,CAAC;MAC1CC,UAAU;MACVC;IACD,CAAC,CAAC;IAEF,IAAIW,UAAU,IAAI,CAACK,kCAAkC,EAAE;MACtD,IAAIE,eAAe,KAAK,MAAM,EAAE;QAC/BR,MAAM,CAACS,cAAc,CAACC,GAAG,CAAC,CAAC,CAAC;QAC5BX,UAAU,CAACY,kBAAkB,CAACD,GAAG,CAAC,CAAC,CAAC;MACrC,CAAC,MAAM;QACN,MAAME,MAAM,GAAGJ,eAAe,IAAI,CAAC;QACnCR,MAAM,CAACS,cAAc,CAACC,GAAG,CAACE,MAAM,CAAC;QACjCb,UAAU,CAACY,kBAAkB,CAACD,GAAG,CAACE,MAAM,CAAC;MAC1C;MACAb,UAAU,CAACc,iBAAiB,CAACH,GAAG,CAAC,CAAC,CAAC;MACnCX,UAAU,CAACe,OAAO,CAACJ,GAAG,CAAC,CAAC,CAAC;MACzBX,UAAU,CAACgB,QAAQ,CAACL,GAAG,CAAC,CAAC,CAAC;MAC1B;IACD;;IAEA;IACA;IACA,IAAIF,eAAe,KAAK,MAAM,EAAE;MAC/B;IACD;IAEAT,UAAU,CAACgB,QAAQ,CAACL,GAAG,CAAC,CAAC,CAAC;IAC1BN,0BAA0B,CACzBjB,8BAA8B,CAAC6B,IAAI,EACnCR,eAAe,IAAI,CACpB,CAAC;EACF,CAAC,EAAE,EAAE,CAAC;AACP","ignoreList":[]}

package/lib/module/components/screen-lifecycle/hooks/use-transition-start-controller.js

@@ -1,17 +1,17 @@
 "use strict";
 
 import { useAnimatedReaction } from "react-native-reanimated";
+import { GestureStore } from "../../../stores/gesture.store";
 import { LifecycleTransitionRequestKind } from "../../../stores/system.store";
 import { animateToProgress } from "../../../utils/animation/animate-to-progress";
 export const useTransitionStartController = ({
   current,
   animations,
-  system,
-  onBlankStackCloseFinish,
-  onNativeCloseFinish
+  system
 }) => {
   const {
     targetProgress,
+    animationProgress,
     pendingLifecycleRequestKind,
     pendingLifecycleRequestTarget,
     pendingLifecycleStartBlockCount
@@ -20,6 +20,7 @@ export const useTransitionStartController = ({
     clearLifecycleTransitionRequest
   } = system.actions;
   const transitionSpec = current.options.transitionSpec;
+  const isDragging = GestureStore.getValue(current.route.key, "dragging");
   useAnimatedReaction(() => {
     "worklet";
 
@@ -34,13 +35,14 @@ export const useTransitionStartController = ({
     if (blockCount > 0) {
       return;
     }
-    const onAnimationFinish = kind === LifecycleTransitionRequestKind.BlankStackClose ? onBlankStackCloseFinish : kind === LifecycleTransitionRequestKind.NativeClose ? onNativeCloseFinish : undefined;
     animateToProgress({
       target,
       spec: transitionSpec,
+      emitWillAnimate: kind !== LifecycleTransitionRequestKind.Open || !animations.entering.get(),
       animations,
       targetProgress,
-      onAnimationFinish
+      animationProgress,
+      isDragging
     });
     clearLifecycleTransitionRequest();
   });

package/lib/module/components/screen-lifecycle/hooks/use-transition-start-controller.js.map

@@ -1 +1 @@
-{"version":3,"names":["useAnimatedReaction","LifecycleTransitionRequestKind","animateToProgress","useTransitionStartController","current","animations","system","onBlankStackCloseFinish","onNativeCloseFinish","targetProgress","pendingLifecycleRequestKind","pendingLifecycleRequestTarget","pendingLifecycleStartBlockCount","clearLifecycleTransitionRequest","actions","transitionSpec","options","get","next","kind","target","blockCount","None","onAnimationFinish","BlankStackClose","NativeClose","undefined","spec"],"sourceRoot":"../../../../../src","sources":["components/screen-lifecycle/hooks/use-transition-start-controller.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,yBAAyB;AAG7D,SACCC,8BAA8B,QAExB,8BAA8B;AACrC,SAASC,iBAAiB,QAAQ,8CAA8C;AAEhF,OAAO,MAAMC,4BAA4B,GAAGA,CAAC;EAC5CC,OAAO;EACPC,UAAU;EACVC,MAAM;EACNC,uBAAuB;EACvBC;AAOD,CAAC,KAAK;EACL,MAAM;IACLC,cAAc;IACdC,2BAA2B;IAC3BC,6BAA6B;IAC7BC;EACD,CAAC,GAAGN,MAAM;EACV,MAAM;IAAEO;EAAgC,CAAC,GAAGP,MAAM,CAACQ,OAAO;EAC1D,MAAMC,cAAc,GAAGX,OAAO,CAACY,OAAO,CAACD,cAAc;EAErDf,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,OAAO,CACNU,2BAA2B,CAACO,GAAG,CAAC,CAAC,EACjCN,6BAA6B,CAACM,GAAG,CAAC,CAAC,EACnCL,+BAA+B,CAACK,GAAG,CAAC,CAAC,CACrC;EACF,CAAC,EACAC,IAAI,IAAK;IACT,SAAS;;IACT,MAAM,CAACC,IAAI,EAAEC,MAAM,EAAEC,UAAU,CAAC,GAAGH,IAAI;IAEvC,IAAIC,IAAI,KAAKlB,8BAA8B,CAACqB,IAAI,EAAE;MACjD;IACD;IAEA,IAAID,UAAU,GAAG,CAAC,EAAE;MACnB;IACD;IAEA,MAAME,iBAAiB,GACtBJ,IAAI,KAAKlB,8BAA8B,CAACuB,eAAe,GACpDjB,uBAAuB,GACvBY,IAAI,KAAKlB,8BAA8B,CAACwB,WAAW,GAClDjB,mBAAmB,GACnBkB,SAAS;IAEdxB,iBAAiB,CAAC;MACjBkB,MAAM;MACNO,IAAI,EAAEZ,cAAc;MACpBV,UAAU;MACVI,cAAc;MACdc;IACD,CAAC,CAAC;IAEFV,+BAA+B,CAAC,CAAC;EAClC,CACD,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useAnimatedReaction","GestureStore","LifecycleTransitionRequestKind","animateToProgress","useTransitionStartController","current","animations","system","targetProgress","animationProgress","pendingLifecycleRequestKind","pendingLifecycleRequestTarget","pendingLifecycleStartBlockCount","clearLifecycleTransitionRequest","actions","transitionSpec","options","isDragging","getValue","route","key","get","next","kind","target","blockCount","None","spec","emitWillAnimate","Open","entering"],"sourceRoot":"../../../../../src","sources":["components/screen-lifecycle/hooks/use-transition-start-controller.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,yBAAyB;AAG7D,SAASC,YAAY,QAAQ,+BAA+B;AAC5D,SACCC,8BAA8B,QAExB,8BAA8B;AACrC,SAASC,iBAAiB,QAAQ,8CAA8C;AAEhF,OAAO,MAAMC,4BAA4B,GAAGA,CAAC;EAC5CC,OAAO;EACPC,UAAU;EACVC;AAKD,CAAC,KAAK;EACL,MAAM;IACLC,cAAc;IACdC,iBAAiB;IACjBC,2BAA2B;IAC3BC,6BAA6B;IAC7BC;EACD,CAAC,GAAGL,MAAM;EACV,MAAM;IAAEM;EAAgC,CAAC,GAAGN,MAAM,CAACO,OAAO;EAC1D,MAAMC,cAAc,GAAGV,OAAO,CAACW,OAAO,CAACD,cAAc;EACrD,MAAME,UAAU,GAAGhB,YAAY,CAACiB,QAAQ,CAACb,OAAO,CAACc,KAAK,CAACC,GAAG,EAAE,UAAU,CAAC;EAEvEpB,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,OAAO,CACNU,2BAA2B,CAACW,GAAG,CAAC,CAAC,EACjCV,6BAA6B,CAACU,GAAG,CAAC,CAAC,EACnCT,+BAA+B,CAACS,GAAG,CAAC,CAAC,CACrC;EACF,CAAC,EACAC,IAAI,IAAK;IACT,SAAS;;IACT,MAAM,CAACC,IAAI,EAAEC,MAAM,EAAEC,UAAU,CAAC,GAAGH,IAAI;IAEvC,IAAIC,IAAI,KAAKrB,8BAA8B,CAACwB,IAAI,EAAE;MACjD;IACD;IAEA,IAAID,UAAU,GAAG,CAAC,EAAE;MACnB;IACD;IAEAtB,iBAAiB,CAAC;MACjBqB,MAAM;MACNG,IAAI,EAAEZ,cAAc;MACpBa,eAAe,EACdL,IAAI,KAAKrB,8BAA8B,CAAC2B,IAAI,IAC5C,CAACvB,UAAU,CAACwB,QAAQ,CAACT,GAAG,CAAC,CAAC;MAC3Bf,UAAU;MACVE,cAAc;MACdC,iBAAiB;MACjBQ;IACD,CAAC,CAAC;IAEFJ,+BAA+B,CAAC,CAAC;EAClC,CACD,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/components/screen-lifecycle/index.js

@@ -1,9 +1,10 @@
 "use strict";
 
-import { useDescriptors } from "../../providers/screen/descriptors";
+import { useDescriptorsStore } from "../../providers/screen/descriptors";
 import { AnimationStore } from "../../stores/animation.store";
 import { SystemStore } from "../../stores/system.store";
 import { useScreenHistory } from "./hooks/history/use-screen-history";
+import { useCloseCompletion } from "./hooks/use-close-completion";
 import { useCloseTransitionIntent } from "./hooks/use-close-transition-intent";
 import { useOpenTransitionIntent } from "./hooks/use-open-transition-intent";
 import { useTransitionStartController } from "./hooks/use-transition-start-controller";
@@ -14,23 +15,23 @@ import { useTransitionStartController } from "./hooks/use-transition-start-contr
 export const ScreenLifecycle = ({
   children
 }) => {
-  const {
-    current,
-    previous
-  } = useDescriptors();
+  const current = useDescriptorsStore(store => store.current);
+  const previous = useDescriptorsStore(store => store.previous);
   const animations = AnimationStore.getBag(current.route.key);
   const system = SystemStore.getBag(current.route.key);
   const {
-    handleBlankStackCloseEnd,
-    handleNativeCloseEnd
-  } = useCloseTransitionIntent(current, system);
+    completeClose
+  } = useCloseTransitionIntent(current);
   useOpenTransitionIntent(current, animations, system);
   useTransitionStartController({
     current,
     animations,
-    system,
-    onBlankStackCloseFinish: handleBlankStackCloseEnd,
-    onNativeCloseFinish: handleNativeCloseEnd
+    system
+  });
+  useCloseCompletion({
+    closing: animations.closing,
+    animationProgress: system.animationProgress,
+    onComplete: completeClose
   });
   useScreenHistory(current, previous, animations);
   return children;

package/lib/module/components/screen-lifecycle/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["useDescriptors","AnimationStore","SystemStore","useScreenHistory","useCloseTransitionIntent","useOpenTransitionIntent","useTransitionStartController","ScreenLifecycle","children","current","previous","animations","getBag","route","key","system","handleBlankStackCloseEnd","handleNativeCloseEnd","onBlankStackCloseFinish","onNativeCloseFinish"],"sourceRoot":"../../../../src","sources":["components/screen-lifecycle/index.tsx"],"mappings":";;AAAA,SAASA,cAAc,QAAQ,oCAAoC;AACnE,SAASC,cAAc,QAAQ,8BAA8B;AAC7D,SAASC,WAAW,QAAQ,2BAA2B;AACvD,SAASC,gBAAgB,QAAQ,oCAAoC;AACrE,SAASC,wBAAwB,QAAQ,qCAAqC;AAC9E,SAASC,uBAAuB,QAAQ,oCAAoC;AAC5E,SAASC,4BAA4B,QAAQ,yCAAyC;AAMtF;AACA;AACA;AACA;AACA,OAAO,MAAMC,eAAe,GAAGA,CAAC;EAAEC;AAAgB,CAAC,KAAK;EACvD,MAAM;IAAEC,OAAO;IAAEC;EAAS,CAAC,GAAGV,cAAc,CAAC,CAAC;EAE9C,MAAMW,UAAU,GAAGV,cAAc,CAACW,MAAM,CAACH,OAAO,CAACI,KAAK,CAACC,GAAG,CAAC;EAC3D,MAAMC,MAAM,GAAGb,WAAW,CAACU,MAAM,CAACH,OAAO,CAACI,KAAK,CAACC,GAAG,CAAC;EAEpD,MAAM;IAAEE,wBAAwB;IAAEC;EAAqB,CAAC,GACvDb,wBAAwB,CAACK,OAAO,EAAEM,MAAM,CAAC;EAE1CV,uBAAuB,CAACI,OAAO,EAAEE,UAAU,EAAEI,MAAM,CAAC;EAEpDT,4BAA4B,CAAC;IAC5BG,OAAO;IACPE,UAAU;IACVI,MAAM;IACNG,uBAAuB,EAAEF,wBAAwB;IACjDG,mBAAmB,EAAEF;EACtB,CAAC,CAAC;EAEFd,gBAAgB,CAACM,OAAO,EAAEC,QAAQ,EAAEC,UAAU,CAAC;EAE/C,OAAOH,QAAQ;AAChB,CAAC","ignoreList":[]}
+{"version":3,"names":["useDescriptorsStore","AnimationStore","SystemStore","useScreenHistory","useCloseCompletion","useCloseTransitionIntent","useOpenTransitionIntent","useTransitionStartController","ScreenLifecycle","children","current","store","previous","animations","getBag","route","key","system","completeClose","closing","animationProgress","onComplete"],"sourceRoot":"../../../../src","sources":["components/screen-lifecycle/index.tsx"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,oCAAoC;AACxE,SAASC,cAAc,QAAQ,8BAA8B;AAC7D,SAASC,WAAW,QAAQ,2BAA2B;AACvD,SAASC,gBAAgB,QAAQ,oCAAoC;AACrE,SAASC,kBAAkB,QAAQ,8BAA8B;AACjE,SAASC,wBAAwB,QAAQ,qCAAqC;AAC9E,SAASC,uBAAuB,QAAQ,oCAAoC;AAC5E,SAASC,4BAA4B,QAAQ,yCAAyC;AAMtF;AACA;AACA;AACA;AACA,OAAO,MAAMC,eAAe,GAAGA,CAAC;EAAEC;AAAgB,CAAC,KAAK;EACvD,MAAMC,OAAO,GAAGV,mBAAmB,CAAEW,KAAK,IAAKA,KAAK,CAACD,OAAO,CAAC;EAC7D,MAAME,QAAQ,GAAGZ,mBAAmB,CAAEW,KAAK,IAAKA,KAAK,CAACC,QAAQ,CAAC;EAE/D,MAAMC,UAAU,GAAGZ,cAAc,CAACa,MAAM,CAACJ,OAAO,CAACK,KAAK,CAACC,GAAG,CAAC;EAC3D,MAAMC,MAAM,GAAGf,WAAW,CAACY,MAAM,CAACJ,OAAO,CAACK,KAAK,CAACC,GAAG,CAAC;EAEpD,MAAM;IAAEE;EAAc,CAAC,GAAGb,wBAAwB,CAACK,OAAO,CAAC;EAE3DJ,uBAAuB,CAACI,OAAO,EAAEG,UAAU,EAAEI,MAAM,CAAC;EAEpDV,4BAA4B,CAAC;IAC5BG,OAAO;IACPG,UAAU;IACVI;EACD,CAAC,CAAC;EAEFb,kBAAkB,CAAC;IAClBe,OAAO,EAAEN,UAAU,CAACM,OAAO;IAC3BC,iBAAiB,EAAEH,MAAM,CAACG,iBAAiB;IAC3CC,UAAU,EAAEH;EACb,CAAC,CAAC;EAEFf,gBAAgB,CAACO,OAAO,EAAEE,QAAQ,EAAEC,UAAU,CAAC;EAE/C,OAAOJ,QAAQ;AAChB,CAAC","ignoreList":[]}

package/lib/module/components/stack-view.js

@@ -1,55 +1,80 @@
 "use strict";
 
 import { memo } from "react";
-import { ActivityContainer, ActivityScreen } from "../components/activity";
-import { PortalProvider } from "../components/boundary/portal";
-import { Overlay } from "../components/overlay";
 import { NavigationScreenProvider } from "../providers/navigation/navigation-host.provider";
 import { ScreenComposer } from "../providers/screen/screen-composer";
-import { withBlankStack } from "../providers/stack/blank-stack.provider";
-import { withStackCore } from "../providers/stack/core.provider";
+import { BlankStackProvider, useBlankStackStore } from "../providers/stack/blank-stack.provider";
+import { StackCoreProvider } from "../providers/stack/core.provider";
+import { ActivityContainer, ActivityScreen } from "./activity";
+import { PortalProvider } from "./boundary/portal";
+import { Overlay } from "./overlay";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const BlankSceneRow = /*#__PURE__*/memo(function BlankSceneRow({
-  scene,
-  paintDriverRouteKey
+const BlankNavigationProvider = /*#__PURE__*/memo(function BlankNavigationProvider({
+  children,
+  routeKey
 }) {
-  const descriptor = scene.descriptor;
-  const route = scene.route;
+  const navigation = useBlankStackStore(store => store.scenesByKey[routeKey]?.descriptor.navigation);
+  const route = useBlankStackStore(store => store.scenesByKey[routeKey]?.route);
+  if (!navigation || !route) {
+    throw new Error(`Blank stack scene "${routeKey}" was not found.`);
+  }
   return /*#__PURE__*/_jsx(NavigationScreenProvider, {
-    navigation: descriptor.navigation,
+    navigation: navigation,
     route: route,
+    children: children
+  });
+});
+const BlankSceneContent = /*#__PURE__*/memo(function BlankSceneContent({
+  routeKey
+}) {
+  const render = useBlankStackStore(store => store?.scenesByKey[routeKey]?.descriptor.render);
+  return render?.() ?? null;
+});
+const BlankSceneRow = /*#__PURE__*/memo(function BlankSceneRow({
+  routeKey
+}) {
+  return /*#__PURE__*/_jsx(BlankNavigationProvider, {
+    routeKey: routeKey,
     children: /*#__PURE__*/_jsx(ActivityScreen, {
-      activity: descriptor.activity,
-      inactiveBehavior: descriptor.options.inactiveBehavior,
-      paintDriverRouteKey: paintDriverRouteKey,
-      hasNestedState: "state" in route,
+      routeKey: routeKey,
       children: /*#__PURE__*/_jsx(ScreenComposer, {
-        previous: scene.previousDescriptor,
-        current: descriptor,
-        next: scene.nextDescriptor,
-        children: descriptor.render?.()
+        routeKey: routeKey,
+        children: /*#__PURE__*/_jsx(BlankSceneContent, {
+          routeKey: routeKey
+        })
       })
     })
   });
 });
-export const StackView = withStackCore({
-  TRANSITIONS_ALWAYS_ON: true,
-  DISABLE_NATIVE_SCREENS: false
-}, withBlankStack(({
-  scenes,
-  shouldShowFloatOverlay
-}) => {
+const EMPTY_ROUTE_KEYS = [];
+const StackViewContent = /*#__PURE__*/memo(function StackViewContent() {
+  const routeKeys = useBlankStackStore(store => store?.routeKeys ?? EMPTY_ROUTE_KEYS);
   return /*#__PURE__*/_jsxs(PortalProvider, {
-    children: [shouldShowFloatOverlay ? /*#__PURE__*/_jsx(Overlay.Float, {}) : null, /*#__PURE__*/_jsx(ActivityContainer, {
-      children: scenes.map((scene, index) => {
-        const route = scene.route;
-        const paintDriverRouteKey = scenes[index + 2]?.route.key;
-        return /*#__PURE__*/_jsx(BlankSceneRow, {
-          scene: scene,
-          paintDriverRouteKey: paintDriverRouteKey
-        }, route.key);
-      })
+    children: [/*#__PURE__*/_jsx(Overlay.Float, {}), /*#__PURE__*/_jsx(ActivityContainer, {
+      children: routeKeys.map(routeKey => /*#__PURE__*/_jsx(BlankSceneRow, {
+        routeKey: routeKey
+      }, routeKey))
     })]
   });
-}));
+});
+export const StackView = /*#__PURE__*/memo(function StackView({
+  TRANSITIONS_ALWAYS_ON,
+  state,
+  navigation,
+  descriptors,
+  describe
+}) {
+  return /*#__PURE__*/_jsx(StackCoreProvider, {
+    config: {
+      TRANSITIONS_ALWAYS_ON: TRANSITIONS_ALWAYS_ON ?? true
+    },
+    children: /*#__PURE__*/_jsx(BlankStackProvider, {
+      state: state,
+      navigation: navigation,
+      descriptors: descriptors,
+      describe: describe,
+      children: /*#__PURE__*/_jsx(StackViewContent, {})
+    })
+  });
+});
 //# sourceMappingURL=stack-view.js.map

package/lib/module/components/stack-view.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","ActivityContainer","ActivityScreen","PortalProvider","Overlay","NavigationScreenProvider","ScreenComposer","withBlankStack","withStackCore","jsx","_jsx","jsxs","_jsxs","BlankSceneRow","scene","paintDriverRouteKey","descriptor","route","navigation","children","activity","inactiveBehavior","options","hasNestedState","previous","previousDescriptor","current","next","nextDescriptor","render","StackView","TRANSITIONS_ALWAYS_ON","DISABLE_NATIVE_SCREENS","scenes","shouldShowFloatOverlay","Float","map","index","key"],"sourceRoot":"../../../src","sources":["components/stack-view.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,OAAO;AAC5B,SAASC,iBAAiB,EAAEC,cAAc,QAAQ,wBAAwB;AAC1E,SAASC,cAAc,QAAQ,+BAA+B;AAC9D,SAASC,OAAO,QAAQ,uBAAuB;AAC/C,SAASC,wBAAwB,QAAQ,kDAAkD;AAC3F,SAASC,cAAc,QAAQ,qCAAqC;AACpE,SAASC,cAAc,QAAQ,yCAAyC;AACxE,SAASC,aAAa,QAAQ,kCAAkC;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAYjE,MAAMC,aAAa,gBAAGb,IAAI,CAAC,SAASa,aAAaA,CAAC;EACjDC,KAAK;EACLC;AACmB,CAAC,EAAE;EACtB,MAAMC,UAAU,GAAGF,KAAK,CAACE,UAAU;EACnC,MAAMC,KAAK,GAAGH,KAAK,CAACG,KAAK;EAEzB,oBACCP,IAAA,CAACL,wBAAwB;IAACa,UAAU,EAAEF,UAAU,CAACE,UAAW;IAACD,KAAK,EAAEA,KAAM;IAAAE,QAAA,eACzET,IAAA,CAACR,cAAc;MACdkB,QAAQ,EAAEJ,UAAU,CAACI,QAAS;MAC9BC,gBAAgB,EAAEL,UAAU,CAACM,OAAO,CAACD,gBAAiB;MACtDN,mBAAmB,EAAEA,mBAAoB;MACzCQ,cAAc,EAAE,OAAO,IAAIN,KAAM;MAAAE,QAAA,eAEjCT,IAAA,CAACJ,cAAc;QACdkB,QAAQ,EAAEV,KAAK,CAACW,kBAAmB;QACnCC,OAAO,EAAEV,UAAW;QACpBW,IAAI,EAAEb,KAAK,CAACc,cAAe;QAAAT,QAAA,EAE1BH,UAAU,CAACa,MAAM,GAAG;MAAC,CACP;IAAC,CACF;EAAC,CACQ,CAAC;AAE7B,CAAC,CAAC;AAEF,OAAO,MAAMC,SAAS,GAAGtB,aAAa,CACrC;EAAEuB,qBAAqB,EAAE,IAAI;EAAEC,sBAAsB,EAAE;AAAM,CAAC,EAC9DzB,cAAc,CACb,CAAC;EAAE0B,MAAM;EAAEC;AAAuB,CAAC,KAAK;EACvC,oBACCtB,KAAA,CAACT,cAAc;IAAAgB,QAAA,GACbe,sBAAsB,gBAAGxB,IAAA,CAACN,OAAO,CAAC+B,KAAK,IAAE,CAAC,GAAG,IAAI,eAElDzB,IAAA,CAACT,iBAAiB;MAAAkB,QAAA,EAChBc,MAAM,CAACG,GAAG,CAAC,CAACtB,KAAK,EAAEuB,KAAK,KAAK;QAC7B,MAAMpB,KAAK,GAAGH,KAAK,CAACG,KAAK;QACzB,MAAMF,mBAAmB,GAAGkB,MAAM,CAACI,KAAK,GAAG,CAAC,CAAC,EAAEpB,KAAK,CAACqB,GAAG;QAExD,oBACC5B,IAAA,CAACG,aAAa;UAEbC,KAAK,EAAEA,KAAM;UACbC,mBAAmB,EAAEA;QAAoB,GAFpCE,KAAK,CAACqB,GAGX,CAAC;MAEJ,CAAC;IAAC,CACgB,CAAC;EAAA,CACL,CAAC;AAEnB,CACD,CACD,CAAC","ignoreList":[]}
+{"version":3,"names":["memo","NavigationScreenProvider","ScreenComposer","BlankStackProvider","useBlankStackStore","StackCoreProvider","ActivityContainer","ActivityScreen","PortalProvider","Overlay","jsx","_jsx","jsxs","_jsxs","BlankNavigationProvider","children","routeKey","navigation","store","scenesByKey","descriptor","route","Error","BlankSceneContent","render","BlankSceneRow","EMPTY_ROUTE_KEYS","StackViewContent","routeKeys","Float","map","StackView","TRANSITIONS_ALWAYS_ON","state","descriptors","describe","config"],"sourceRoot":"../../../src","sources":["components/stack-view.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/configs/presets.js

@@ -218,7 +218,7 @@ export const ElasticCard = (config = {
   };
 };
 export const SharedIGImage = ({
-  sharedBoundTag,
+  id,
   ...config
 }) => {
   return {
@@ -247,16 +247,14 @@ export const SharedIGImage = ({
       const dragXScale = interpolate(normX, [0, 1], [1, 0.8]);
       const dragYScale = interpolate(normY, [0, 1], [1, 0.8]);
       const navigationStyles = bounds({
-        id: sharedBoundTag
+        id
       }).navigation.zoom() ?? {};
 
-      // Extract raw style values from bounds result (legacy format)
-      const sourceStyle = navigationStyles[sharedBoundTag];
+      // Read the bound-specific slots before normalizing the full result.
+      const sourceStyle = navigationStyles[id];
       const containerStyle = navigationStyles[NAVIGATION_MASK_CONTAINER_STYLE_ID];
       const maskStyle = navigationStyles[NAVIGATION_MASK_ELEMENT_STYLE_ID];
-
-      // Normalize bounds result to new slot format for spreading
-      const normalizedNav = normalizeInterpolatedStyle(navigationStyles).result;
+      const normalizedNav = normalizeInterpolatedStyle(navigationStyles);
       if (focused) {
         return {
           ...normalizedNav,
@@ -305,7 +303,7 @@ export const SharedIGImage = ({
             pointerEvents: current.gesture.dismissing ? "none" : "auto"
           }
         },
-        [sharedBoundTag]: {
+        [id]: {
           style: {
             ...(sourceStyle ?? {}),
             transform: [{
@@ -343,7 +341,7 @@ export const SharedIGImage = ({
   };
 };
 export const SharedAppleMusic = ({
-  sharedBoundTag,
+  id,
   ...config
 }) => {
   return {
@@ -364,7 +362,7 @@ export const SharedAppleMusic = ({
 
       const normX = active.gesture.handoff.normX;
       const normY = active.gesture.handoff.normY;
-      const initialGesture = active.gesture.handoff.active ?? active.gesture.handoff.direction;
+      const initialGesture = active.gesture.handoff.active;
 
       /**
        * ===============================
@@ -380,7 +378,7 @@ export const SharedAppleMusic = ({
       const dragXScale = interpolate(normX, [0, 1], xScaleOuput);
       const dragYScale = interpolate(normY, [0, 1], yScaleOuput);
       const boundValues = bounds({
-        id: sharedBoundTag
+        id
       }).values({
         method: focused ? "content" : "transform",
         anchor: "top",
@@ -395,7 +393,7 @@ export const SharedAppleMusic = ({
        */
       if (focused) {
         const maskedValues = bounds({
-          id: sharedBoundTag
+          id
         }).values({
           space: "absolute",
           method: "size",
@@ -478,7 +476,7 @@ export const SharedAppleMusic = ({
       const scaledBoundScaleY = (boundValues.scaleY || 1) * dragYScale;
       const contentScale = interpolate(progress, [1, 2], [1, 0.9], "clamp");
       return {
-        [sharedBoundTag]: {
+        [id]: {
           style: {
             transform: [{
               translateX: dragX || 0
@@ -534,7 +532,7 @@ export const SharedAppleMusic = ({
   };
 };
 export const SharedXImage = ({
-  sharedBoundTag,
+  id,
   ...config
 }) => {
   return {
@@ -555,12 +553,10 @@ export const SharedXImage = ({
 
       if (!focused) return {};
       const navigationStyles = bounds({
-        id: sharedBoundTag
+        id
       }).navigation.zoom() ?? {};
       const maskStyle = navigationStyles[NAVIGATION_MASK_ELEMENT_STYLE_ID];
-
-      // Normalize bounds result to new slot format for spreading
-      const normalizedNav = normalizeInterpolatedStyle(navigationStyles).result;
+      const normalizedNav = normalizeInterpolatedStyle(navigationStyles);
       const dragY = interpolate(current.gesture.normY, [-1, 0, 1], [-screen.height, 0, screen.height]);
       const contentY = interpolate(progress, [0, 1], [dragY >= 0 ? screen.height : -screen.height, 0]);
       const overlayClr = interpolateColor(current.progress - Math.abs(current.gesture.normY), [0, 1], ["rgba(0,0,0,0)", "rgba(0,0,0,1)"]);