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

package/lib/commonjs/components/screen-lifecycle/hooks/use-close-completion.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useCloseCompletion = void 0;
+var _reactNativeReanimated = require("react-native-reanimated");
+var _reactNativeWorklets = require("react-native-worklets");
+const useCloseCompletion = ({
+  closing,
+  animationProgress,
+  onComplete
+}) => {
+  (0, _reactNativeReanimated.useAnimatedReaction)(() => {
+    "worklet";
+
+    return !!closing.get() && animationProgress.get() <= 0;
+  }, (complete, previouslyComplete) => {
+    "worklet";
+
+    if (complete && !previouslyComplete) {
+      (0, _reactNativeWorklets.scheduleOnRN)(onComplete);
+    }
+  });
+};
+exports.useCloseCompletion = useCloseCompletion;
+//# sourceMappingURL=use-close-completion.js.map

package/lib/commonjs/components/screen-lifecycle/hooks/use-close-completion.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_reactNativeReanimated","require","_reactNativeWorklets","useCloseCompletion","closing","animationProgress","onComplete","useAnimatedReaction","get","complete","previouslyComplete","scheduleOnRN","exports"],"sourceRoot":"../../../../../src","sources":["components/screen-lifecycle/hooks/use-close-completion.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,oBAAA,GAAAD,OAAA;AAEO,MAAME,kBAAkB,GAAGA,CAAC;EAClCC,OAAO;EACPC,iBAAiB;EACjBC;AAKD,CAAC,KAAK;EACL,IAAAC,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,OAAO,CAAC,CAACH,OAAO,CAACI,GAAG,CAAC,CAAC,IAAIH,iBAAiB,CAACG,GAAG,CAAC,CAAC,IAAI,CAAC;EACvD,CAAC,EACD,CAACC,QAAQ,EAAEC,kBAAkB,KAAK;IACjC,SAAS;;IACT,IAAID,QAAQ,IAAI,CAACC,kBAAkB,EAAE;MACpC,IAAAC,iCAAY,EAACL,UAAU,CAAC;IACzB;EACD,CACD,CAAC;AACF,CAAC;AAACM,OAAA,CAAAT,kBAAA,GAAAA,kBAAA","ignoreList":[]}

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

@@ -5,121 +5,91 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useCloseTransitionIntent = useCloseTransitionIntent;
 var _react = require("react");
+var _useNavigationHelpers = require("../../../hooks/navigation/use-navigation-helpers");
 var _useStableCallback = _interopRequireDefault(require("../../../hooks/use-stable-callback"));
-var _descriptors = require("../../../providers/screen/descriptors");
+var _hasTransitionsEnabled = require("../../../providers/screen/animation/helpers/has-transitions-enabled");
+var _useCurrentScreenRelationships = require("../../../providers/screen/use-current-screen-relationships");
 var _blankStack = require("../../../providers/stack/blank-stack.provider");
 var _core = require("../../../providers/stack/core.provider");
 var _gesture = require("../../../stores/gesture.store");
-var _system = require("../../../stores/system.store");
-var _stack = require("../../../types/stack.types");
+var _closeActionReplay = require("../../../utils/navigation/close-action-replay");
+var _closeInterceptionRules = require("./helpers/close-interception-rules");
 var _resetStoresForScreen = require("./helpers/reset-stores-for-screen");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/** biome-ignore-all lint/correctness/useHookAtTopLevel: STACK_TYPE is stable per navigator */
-
-const useBlankStackClose = ({
-  current,
-  requestLifecycleTransition,
-  resetStores
-}) => {
-  const {
-    handleCloseRoute
-  } = (0, _blankStack.useBlankStackContext)();
-  (0, _react.useLayoutEffect)(() => {
-    if (current.activity !== "closing") {
-      return;
-    }
-    requestLifecycleTransition(_system.LifecycleTransitionRequestKind.BlankStackClose, 0);
-  }, [current.activity, requestLifecycleTransition]);
-  const handleBlankStackCloseEnd = (0, _useStableCallback.default)(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
-}) => {
+function useCloseTransitionIntent(current) {
+  const routeKey = current.route.key;
+  const transitionsAlwaysOn = (0, _core.useStackCoreStore)(store => store.flags.TRANSITIONS_ALWAYS_ON);
+  const handleCloseRoute = (0, _blankStack.useBlankStackStore)(store => store.handleCloseRoute);
+  const isBlankStackClosing = (0, _blankStack.useBlankStackStore)(store => store.scenesByKey[routeKey]?.activity === "closing");
   const {
     parentScreenKey
-  } = (0, _descriptors.useDescriptorDerivations)();
+  } = (0, _useCurrentScreenRelationships.useCurrentScreenRelationships)();
+  const {
+    dismissScreen,
+    requestDismiss
+  } = (0, _useNavigationHelpers.useNavigationHelpers)();
   const pendingActionRef = (0, _react.useRef)(null);
   const nearestAncestorDismissing = (0, _react.useMemo)(() => {
     if (!parentScreenKey) return null;
     return _gesture.GestureStore.peekBag(parentScreenKey)?.dismissing ?? null;
   }, [parentScreenKey]);
-  const handleNativeCloseEnd = (0, _useStableCallback.default)(finished => {
-    if (!finished || !pendingActionRef.current) {
-      pendingActionRef.current = null;
-      return;
+  (0, _react.useLayoutEffect)(() => {
+    if (isBlankStackClosing) {
+      requestDismiss();
     }
-    current.navigation.dispatch(pendingActionRef.current);
+  }, [isBlankStackClosing, requestDismiss]);
+  const completeClose = (0, _useStableCallback.default)(() => {
+    const pendingAction = pendingActionRef.current;
     pendingActionRef.current = null;
-    requestAnimationFrame(() => {
-      resetStores();
-    });
+    if (pendingAction) {
+      (0, _closeActionReplay.dispatchCloseAction)(pendingAction, action => {
+        current.navigation.dispatch(action);
+      });
+    } else if (handleCloseRoute) {
+      handleCloseRoute({
+        route: current.route
+      });
+    } else {
+      dismissScreen();
+    }
+    (0, _resetStoresForScreen.resetStoresForScreen)(routeKey);
   });
-  const handleBeforeRemove = (0, _useStableCallback.default)(e => {
-    const options = current.options;
-    const isEnabled = options.enableTransitions;
-    const navigation = current.navigation;
-    const routeKey = current.route.key;
-    const state = navigation.getState();
+  const handleBeforeRemove = (0, _useStableCallback.default)(event => {
+    if ((0, _closeActionReplay.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 = (0, _closeInterceptionRules.doesNavigatorOwnCloseAction)({
+      state,
+      action
+    });
+    const shouldIntercept = (0, _closeInterceptionRules.shouldInterceptClose)({
+      enabled: (0, _hasTransitionsEnabled.hasTransitionsEnabled)(current.options, transitionsAlwaysOn),
+      ownsAction,
+      ancestorDismissing: !!nearestAncestorDismissing?.get(),
+      routeIndex,
+      focusedIndex: state.index
+    });
+    if (!shouldIntercept) {
       return;
     }
-    e.preventDefault();
-    pendingActionRef.current = e.data.action;
-    requestLifecycleTransition(_system.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
   (0, _react.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.
- */
-function useCloseTransitionIntent(current, system) {
-  const routeKey = current.route.key;
-  const {
-    flags
-  } = (0, _core.useStackCoreContext)();
-  const isNativeStack = flags.STACK_TYPE === _stack.StackType.NATIVE;
-  const {
-    requestLifecycleTransition
-  } = system.actions;
-  const resetStores = (0, _useStableCallback.default)(() => {
-    (0, _resetStoresForScreen.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/commonjs/components/screen-lifecycle/hooks/use-close-transition-intent.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_useStableCallback","_interopRequireDefault","_descriptors","_blankStack","_core","_gesture","_system","_stack","_resetStoresForScreen","e","__esModule","default","useBlankStackClose","current","requestLifecycleTransition","resetStores","handleCloseRoute","useBlankStackContext","useLayoutEffect","activity","LifecycleTransitionRequestKind","BlankStackClose","handleBlankStackCloseEnd","useStableCallback","finished","route","requestAnimationFrame","useNativeStackClose","parentScreenKey","useDescriptorDerivations","pendingActionRef","useRef","nearestAncestorDismissing","useMemo","GestureStore","peekBag","dismissing","handleNativeCloseEnd","navigation","dispatch","handleBeforeRemove","options","isEnabled","enableTransitions","routeKey","key","state","getState","routeIndex","routes","findIndex","isFirstScreen","get","preventDefault","data","action","NativeClose","addListener","useCloseTransitionIntent","system","flags","useStackCoreContext","isNativeStack","STACK_TYPE","StackType","NATIVE","actions","resetStoresForScreen","closeParams"],"sourceRoot":"../../../../../src","sources":["components/screen-lifecycle/hooks/use-close-transition-intent.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_useNavigationHelpers","_useStableCallback","_interopRequireDefault","_hasTransitionsEnabled","_useCurrentScreenRelationships","_blankStack","_core","_gesture","_closeActionReplay","_closeInterceptionRules","_resetStoresForScreen","e","__esModule","default","useCloseTransitionIntent","current","routeKey","route","key","transitionsAlwaysOn","useStackCoreStore","store","flags","TRANSITIONS_ALWAYS_ON","handleCloseRoute","useBlankStackStore","isBlankStackClosing","scenesByKey","activity","parentScreenKey","useCurrentScreenRelationships","dismissScreen","requestDismiss","useNavigationHelpers","pendingActionRef","useRef","nearestAncestorDismissing","useMemo","GestureStore","peekBag","dismissing","useLayoutEffect","completeClose","useStableCallback","pendingAction","dispatchCloseAction","action","navigation","dispatch","resetStoresForScreen","handleBeforeRemove","event","isCloseActionReplay","data","state","getState","routeIndex","routes","findIndex","ownsAction","doesNavigatorOwnCloseAction","shouldIntercept","shouldInterceptClose","enabled","hasTransitionsEnabled","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/commonjs/components/screen-lifecycle/hooks/use-open-transition-intent.js

@@ -27,9 +27,7 @@ function getInitialProgress({
  * Handles opening transition intent on mount.
  */
 function useOpenTransitionIntent(current, animations, system) {
-  const {
-    isFirstKey
-  } = (0, _descriptors.useDescriptorDerivations)();
+  const isFirstKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.isFirstKey);
   const {
     requestLifecycleTransition
   } = system.actions;
@@ -65,6 +63,7 @@ function useOpenTransitionIntent(current, animations, system) {
     if (initialProgress === "auto") {
       return;
     }
+    animations.entering.set(1);
     requestLifecycleTransition(_system.LifecycleTransitionRequestKind.Open, initialProgress ?? 1);
   }, []);
 }

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_descriptors","_system","getInitialProgress","snapPoints","initialSnapIndex","undefined","clampedIndex","Math","min","max","length","useOpenTransitionIntent","current","animations","system","isFirstKey","useDescriptorDerivations","requestLifecycleTransition","actions","useLayoutEffect","experimental_animateOnInitialMount","options","initialProgress","targetProgress","set","transitionProgress","target","progressAnimating","closing","entering","LifecycleTransitionRequestKind","Open"],"sourceRoot":"../../../../../src","sources":["components/screen-lifecycle/hooks/use-open-transition-intent.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAKA,IAAAE,OAAA,GAAAF,OAAA;AAMA;AACA;AACA;AACA;AACA;AACA,SAASG,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;AACO,SAASK,uBAAuBA,CACtCC,OAAuB,EACvBC,UAA6B,EAC7BC,MAAsB,EACrB;EACD,MAAM;IAAEC;EAAW,CAAC,GAAG,IAAAC,qCAAwB,EAAC,CAAC;EACjD,MAAM;IAAEC;EAA2B,CAAC,GAAGH,MAAM,CAACI,OAAO;;EAErD;EACA,IAAAC,sBAAe,EAAC,MAAM;IACrB,MAAM;MACLhB,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;IAEAL,0BAA0B,CACzBa,sCAA8B,CAACC,IAAI,EACnCT,eAAe,IAAI,CACpB,CAAC;EACF,CAAC,EAAE,EAAE,CAAC;AACP","ignoreList":[]}
+{"version":3,"names":["_react","require","_descriptors","_system","getInitialProgress","snapPoints","initialSnapIndex","undefined","clampedIndex","Math","min","max","length","useOpenTransitionIntent","current","animations","system","isFirstKey","useDescriptorsStore","store","derivations","requestLifecycleTransition","actions","useLayoutEffect","experimental_animateOnInitialMount","options","initialProgress","targetProgress","set","transitionProgress","target","progressAnimating","closing","entering","LifecycleTransitionRequestKind","Open"],"sourceRoot":"../../../../../src","sources":["components/screen-lifecycle/hooks/use-open-transition-intent.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAKA,IAAAE,OAAA,GAAAF,OAAA;AAMA;AACA;AACA;AACA;AACA;AACA,SAASG,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;AACO,SAASK,uBAAuBA,CACtCC,OAAuB,EACvBC,UAA6B,EAC7BC,MAAsB,EACrB;EACD,MAAMC,UAAU,GAAG,IAAAC,gCAAmB,EACpCC,KAAK,IAAKA,KAAK,CAACC,WAAW,CAACH,UAC9B,CAAC;EACD,MAAM;IAAEI;EAA2B,CAAC,GAAGL,MAAM,CAACM,OAAO;;EAErD;EACA,IAAAC,sBAAe,EAAC,MAAM;IACrB,MAAM;MACLlB,UAAU;MACVC,gBAAgB,GAAG,CAAC;MACpBkB;IACD,CAAC,GAAGV,OAAO,CAACW,OAAO;IAEnB,MAAMC,eAAe,GAAGtB,kBAAkB,CAAC;MAC1CC,UAAU;MACVC;IACD,CAAC,CAAC;IAEF,IAAIW,UAAU,IAAI,CAACO,kCAAkC,EAAE;MACtD,IAAIE,eAAe,KAAK,MAAM,EAAE;QAC/BV,MAAM,CAACW,cAAc,CAACC,GAAG,CAAC,CAAC,CAAC;QAC5Bb,UAAU,CAACc,kBAAkB,CAACD,GAAG,CAAC,CAAC,CAAC;MACrC,CAAC,MAAM;QACN,MAAME,MAAM,GAAGJ,eAAe,IAAI,CAAC;QACnCV,MAAM,CAACW,cAAc,CAACC,GAAG,CAACE,MAAM,CAAC;QACjCf,UAAU,CAACc,kBAAkB,CAACD,GAAG,CAACE,MAAM,CAAC;MAC1C;MACAf,UAAU,CAACgB,iBAAiB,CAACH,GAAG,CAAC,CAAC,CAAC;MACnCb,UAAU,CAACiB,OAAO,CAACJ,GAAG,CAAC,CAAC,CAAC;MACzBb,UAAU,CAACkB,QAAQ,CAACL,GAAG,CAAC,CAAC,CAAC;MAC1B;IACD;;IAEA;IACA;IACA,IAAIF,eAAe,KAAK,MAAM,EAAE;MAC/B;IACD;IAEAX,UAAU,CAACkB,QAAQ,CAACL,GAAG,CAAC,CAAC,CAAC;IAC1BP,0BAA0B,CACzBa,sCAA8B,CAACC,IAAI,EACnCT,eAAe,IAAI,CACpB,CAAC;EACF,CAAC,EAAE,EAAE,CAAC;AACP","ignoreList":[]}

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

@@ -5,17 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useTransitionStartController = void 0;
 var _reactNativeReanimated = require("react-native-reanimated");
+var _gesture = require("../../../stores/gesture.store");
 var _system = require("../../../stores/system.store");
 var _animateToProgress = require("../../../utils/animation/animate-to-progress");
 const useTransitionStartController = ({
   current,
   animations,
-  system,
-  onBlankStackCloseFinish,
-  onNativeCloseFinish
+  system
 }) => {
   const {
     targetProgress,
+    animationProgress,
     pendingLifecycleRequestKind,
     pendingLifecycleRequestTarget,
     pendingLifecycleStartBlockCount
@@ -24,6 +24,7 @@ const useTransitionStartController = ({
     clearLifecycleTransitionRequest
   } = system.actions;
   const transitionSpec = current.options.transitionSpec;
+  const isDragging = _gesture.GestureStore.getValue(current.route.key, "dragging");
   (0, _reactNativeReanimated.useAnimatedReaction)(() => {
     "worklet";
 
@@ -38,13 +39,14 @@ const useTransitionStartController = ({
     if (blockCount > 0) {
       return;
     }
-    const onAnimationFinish = kind === _system.LifecycleTransitionRequestKind.BlankStackClose ? onBlankStackCloseFinish : kind === _system.LifecycleTransitionRequestKind.NativeClose ? onNativeCloseFinish : undefined;
     (0, _animateToProgress.animateToProgress)({
       target,
       spec: transitionSpec,
+      emitWillAnimate: kind !== _system.LifecycleTransitionRequestKind.Open || !animations.entering.get(),
       animations,
       targetProgress,
-      onAnimationFinish
+      animationProgress,
+      isDragging
     });
     clearLifecycleTransitionRequest();
   });

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_system","_animateToProgress","useTransitionStartController","current","animations","system","onBlankStackCloseFinish","onNativeCloseFinish","targetProgress","pendingLifecycleRequestKind","pendingLifecycleRequestTarget","pendingLifecycleStartBlockCount","clearLifecycleTransitionRequest","actions","transitionSpec","options","useAnimatedReaction","get","next","kind","target","blockCount","LifecycleTransitionRequestKind","None","onAnimationFinish","BlankStackClose","NativeClose","undefined","animateToProgress","spec","exports"],"sourceRoot":"../../../../../src","sources":["components/screen-lifecycle/hooks/use-transition-start-controller.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAGA,IAAAC,OAAA,GAAAD,OAAA;AAIA,IAAAE,kBAAA,GAAAF,OAAA;AAEO,MAAMG,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;EAErD,IAAAE,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,OAAO,CACNP,2BAA2B,CAACQ,GAAG,CAAC,CAAC,EACjCP,6BAA6B,CAACO,GAAG,CAAC,CAAC,EACnCN,+BAA+B,CAACM,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,KAAKG,sCAA8B,CAACC,IAAI,EAAE;MACjD;IACD;IAEA,IAAIF,UAAU,GAAG,CAAC,EAAE;MACnB;IACD;IAEA,MAAMG,iBAAiB,GACtBL,IAAI,KAAKG,sCAA8B,CAACG,eAAe,GACpDnB,uBAAuB,GACvBa,IAAI,KAAKG,sCAA8B,CAACI,WAAW,GAClDnB,mBAAmB,GACnBoB,SAAS;IAEd,IAAAC,oCAAiB,EAAC;MACjBR,MAAM;MACNS,IAAI,EAAEf,cAAc;MACpBV,UAAU;MACVI,cAAc;MACdgB;IACD,CAAC,CAAC;IAEFZ,+BAA+B,CAAC,CAAC;EAClC,CACD,CAAC;AACF,CAAC;AAACkB,OAAA,CAAA5B,4BAAA,GAAAA,4BAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_gesture","_system","_animateToProgress","useTransitionStartController","current","animations","system","targetProgress","animationProgress","pendingLifecycleRequestKind","pendingLifecycleRequestTarget","pendingLifecycleStartBlockCount","clearLifecycleTransitionRequest","actions","transitionSpec","options","isDragging","GestureStore","getValue","route","key","useAnimatedReaction","get","next","kind","target","blockCount","LifecycleTransitionRequestKind","None","animateToProgress","spec","emitWillAnimate","Open","entering","exports"],"sourceRoot":"../../../../../src","sources":["components/screen-lifecycle/hooks/use-transition-start-controller.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAGA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAIA,IAAAG,kBAAA,GAAAH,OAAA;AAEO,MAAMI,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,GAAGC,qBAAY,CAACC,QAAQ,CAACd,OAAO,CAACe,KAAK,CAACC,GAAG,EAAE,UAAU,CAAC;EAEvE,IAAAC,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,OAAO,CACNZ,2BAA2B,CAACa,GAAG,CAAC,CAAC,EACjCZ,6BAA6B,CAACY,GAAG,CAAC,CAAC,EACnCX,+BAA+B,CAACW,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,KAAKG,sCAA8B,CAACC,IAAI,EAAE;MACjD;IACD;IAEA,IAAIF,UAAU,GAAG,CAAC,EAAE;MACnB;IACD;IAEA,IAAAG,oCAAiB,EAAC;MACjBJ,MAAM;MACNK,IAAI,EAAEhB,cAAc;MACpBiB,eAAe,EACdP,IAAI,KAAKG,sCAA8B,CAACK,IAAI,IAC5C,CAAC3B,UAAU,CAAC4B,QAAQ,CAACX,GAAG,CAAC,CAAC;MAC3BjB,UAAU;MACVE,cAAc;MACdC,iBAAiB;MACjBQ;IACD,CAAC,CAAC;IAEFJ,+BAA+B,CAAC,CAAC;EAClC,CACD,CAAC;AACF,CAAC;AAACsB,OAAA,CAAA/B,4BAAA,GAAAA,4BAAA","ignoreList":[]}

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

@@ -8,6 +8,7 @@ var _descriptors = require("../../providers/screen/descriptors");
 var _animation = require("../../stores/animation.store");
 var _system = require("../../stores/system.store");
 var _useScreenHistory = require("./hooks/history/use-screen-history");
+var _useCloseCompletion = require("./hooks/use-close-completion");
 var _useCloseTransitionIntent = require("./hooks/use-close-transition-intent");
 var _useOpenTransitionIntent = require("./hooks/use-open-transition-intent");
 var _useTransitionStartController = require("./hooks/use-transition-start-controller");
@@ -18,23 +19,23 @@ var _useTransitionStartController = require("./hooks/use-transition-start-contro
 const ScreenLifecycle = ({
   children
 }) => {
-  const {
-    current,
-    previous
-  } = (0, _descriptors.useDescriptors)();
+  const current = (0, _descriptors.useDescriptorsStore)(store => store.current);
+  const previous = (0, _descriptors.useDescriptorsStore)(store => store.previous);
   const animations = _animation.AnimationStore.getBag(current.route.key);
   const system = _system.SystemStore.getBag(current.route.key);
   const {
-    handleBlankStackCloseEnd,
-    handleNativeCloseEnd
-  } = (0, _useCloseTransitionIntent.useCloseTransitionIntent)(current, system);
+    completeClose
+  } = (0, _useCloseTransitionIntent.useCloseTransitionIntent)(current);
   (0, _useOpenTransitionIntent.useOpenTransitionIntent)(current, animations, system);
   (0, _useTransitionStartController.useTransitionStartController)({
     current,
     animations,
-    system,
-    onBlankStackCloseFinish: handleBlankStackCloseEnd,
-    onNativeCloseFinish: handleNativeCloseEnd
+    system
+  });
+  (0, _useCloseCompletion.useCloseCompletion)({
+    closing: animations.closing,
+    animationProgress: system.animationProgress,
+    onComplete: completeClose
   });
   (0, _useScreenHistory.useScreenHistory)(current, previous, animations);
   return children;

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

@@ -1 +1 @@
-{"version":3,"names":["_descriptors","require","_animation","_system","_useScreenHistory","_useCloseTransitionIntent","_useOpenTransitionIntent","_useTransitionStartController","ScreenLifecycle","children","current","previous","useDescriptors","animations","AnimationStore","getBag","route","key","system","SystemStore","handleBlankStackCloseEnd","handleNativeCloseEnd","useCloseTransitionIntent","useOpenTransitionIntent","useTransitionStartController","onBlankStackCloseFinish","onNativeCloseFinish","useScreenHistory","exports"],"sourceRoot":"../../../../src","sources":["components/screen-lifecycle/index.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AACA,IAAAI,yBAAA,GAAAJ,OAAA;AACA,IAAAK,wBAAA,GAAAL,OAAA;AACA,IAAAM,6BAAA,GAAAN,OAAA;AAMA;AACA;AACA;AACA;AACO,MAAMO,eAAe,GAAGA,CAAC;EAAEC;AAAgB,CAAC,KAAK;EACvD,MAAM;IAAEC,OAAO;IAAEC;EAAS,CAAC,GAAG,IAAAC,2BAAc,EAAC,CAAC;EAE9C,MAAMC,UAAU,GAAGC,yBAAc,CAACC,MAAM,CAACL,OAAO,CAACM,KAAK,CAACC,GAAG,CAAC;EAC3D,MAAMC,MAAM,GAAGC,mBAAW,CAACJ,MAAM,CAACL,OAAO,CAACM,KAAK,CAACC,GAAG,CAAC;EAEpD,MAAM;IAAEG,wBAAwB;IAAEC;EAAqB,CAAC,GACvD,IAAAC,kDAAwB,EAACZ,OAAO,EAAEQ,MAAM,CAAC;EAE1C,IAAAK,gDAAuB,EAACb,OAAO,EAAEG,UAAU,EAAEK,MAAM,CAAC;EAEpD,IAAAM,0DAA4B,EAAC;IAC5Bd,OAAO;IACPG,UAAU;IACVK,MAAM;IACNO,uBAAuB,EAAEL,wBAAwB;IACjDM,mBAAmB,EAAEL;EACtB,CAAC,CAAC;EAEF,IAAAM,kCAAgB,EAACjB,OAAO,EAAEC,QAAQ,EAAEE,UAAU,CAAC;EAE/C,OAAOJ,QAAQ;AAChB,CAAC;AAACmB,OAAA,CAAApB,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"version":3,"names":["_descriptors","require","_animation","_system","_useScreenHistory","_useCloseCompletion","_useCloseTransitionIntent","_useOpenTransitionIntent","_useTransitionStartController","ScreenLifecycle","children","current","useDescriptorsStore","store","previous","animations","AnimationStore","getBag","route","key","system","SystemStore","completeClose","useCloseTransitionIntent","useOpenTransitionIntent","useTransitionStartController","useCloseCompletion","closing","animationProgress","onComplete","useScreenHistory","exports"],"sourceRoot":"../../../../src","sources":["components/screen-lifecycle/index.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AACA,IAAAI,mBAAA,GAAAJ,OAAA;AACA,IAAAK,yBAAA,GAAAL,OAAA;AACA,IAAAM,wBAAA,GAAAN,OAAA;AACA,IAAAO,6BAAA,GAAAP,OAAA;AAMA;AACA;AACA;AACA;AACO,MAAMQ,eAAe,GAAGA,CAAC;EAAEC;AAAgB,CAAC,KAAK;EACvD,MAAMC,OAAO,GAAG,IAAAC,gCAAmB,EAAEC,KAAK,IAAKA,KAAK,CAACF,OAAO,CAAC;EAC7D,MAAMG,QAAQ,GAAG,IAAAF,gCAAmB,EAAEC,KAAK,IAAKA,KAAK,CAACC,QAAQ,CAAC;EAE/D,MAAMC,UAAU,GAAGC,yBAAc,CAACC,MAAM,CAACN,OAAO,CAACO,KAAK,CAACC,GAAG,CAAC;EAC3D,MAAMC,MAAM,GAAGC,mBAAW,CAACJ,MAAM,CAACN,OAAO,CAACO,KAAK,CAACC,GAAG,CAAC;EAEpD,MAAM;IAAEG;EAAc,CAAC,GAAG,IAAAC,kDAAwB,EAACZ,OAAO,CAAC;EAE3D,IAAAa,gDAAuB,EAACb,OAAO,EAAEI,UAAU,EAAEK,MAAM,CAAC;EAEpD,IAAAK,0DAA4B,EAAC;IAC5Bd,OAAO;IACPI,UAAU;IACVK;EACD,CAAC,CAAC;EAEF,IAAAM,sCAAkB,EAAC;IAClBC,OAAO,EAAEZ,UAAU,CAACY,OAAO;IAC3BC,iBAAiB,EAAER,MAAM,CAACQ,iBAAiB;IAC3CC,UAAU,EAAEP;EACb,CAAC,CAAC;EAEF,IAAAQ,kCAAgB,EAACnB,OAAO,EAAEG,QAAQ,EAAEC,UAAU,CAAC;EAE/C,OAAOL,QAAQ;AAChB,CAAC;AAACqB,OAAA,CAAAtB,eAAA,GAAAA,eAAA","ignoreList":[]}

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

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

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_activity","_portal","_overlay","_navigationHost","_screenComposer","_blankStack","_core","_jsxRuntime","BlankSceneRow","memo","scene","paintDriverRouteKey","descriptor","route","jsx","NavigationScreenProvider","navigation","children","ActivityScreen","activity","inactiveBehavior","options","hasNestedState","ScreenComposer","previous","previousDescriptor","current","next","nextDescriptor","render","StackView","exports","withStackCore","TRANSITIONS_ALWAYS_ON","DISABLE_NATIVE_SCREENS","withBlankStack","scenes","shouldShowFloatOverlay","jsxs","PortalProvider","Overlay","Float","ActivityContainer","map","index","key"],"sourceRoot":"../../../src","sources":["components/stack-view.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,QAAA,GAAAH,OAAA;AACA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,eAAA,GAAAL,OAAA;AACA,IAAAM,WAAA,GAAAN,OAAA;AACA,IAAAO,KAAA,GAAAP,OAAA;AAAiE,IAAAQ,WAAA,GAAAR,OAAA;AAYjE,MAAMS,aAAa,gBAAG,IAAAC,WAAI,EAAC,SAASD,aAAaA,CAAC;EACjDE,KAAK;EACLC;AACmB,CAAC,EAAE;EACtB,MAAMC,UAAU,GAAGF,KAAK,CAACE,UAAU;EACnC,MAAMC,KAAK,GAAGH,KAAK,CAACG,KAAK;EAEzB,oBACC,IAAAN,WAAA,CAAAO,GAAA,EAACX,eAAA,CAAAY,wBAAwB;IAACC,UAAU,EAAEJ,UAAU,CAACI,UAAW;IAACH,KAAK,EAAEA,KAAM;IAAAI,QAAA,eACzE,IAAAV,WAAA,CAAAO,GAAA,EAACd,SAAA,CAAAkB,cAAc;MACdC,QAAQ,EAAEP,UAAU,CAACO,QAAS;MAC9BC,gBAAgB,EAAER,UAAU,CAACS,OAAO,CAACD,gBAAiB;MACtDT,mBAAmB,EAAEA,mBAAoB;MACzCW,cAAc,EAAE,OAAO,IAAIT,KAAM;MAAAI,QAAA,eAEjC,IAAAV,WAAA,CAAAO,GAAA,EAACV,eAAA,CAAAmB,cAAc;QACdC,QAAQ,EAAEd,KAAK,CAACe,kBAAmB;QACnCC,OAAO,EAAEd,UAAW;QACpBe,IAAI,EAAEjB,KAAK,CAACkB,cAAe;QAAAX,QAAA,EAE1BL,UAAU,CAACiB,MAAM,GAAG;MAAC,CACP;IAAC,CACF;EAAC,CACQ,CAAC;AAE7B,CAAC,CAAC;AAEK,MAAMC,SAAS,GAAAC,OAAA,CAAAD,SAAA,GAAG,IAAAE,mBAAa,EACrC;EAAEC,qBAAqB,EAAE,IAAI;EAAEC,sBAAsB,EAAE;AAAM,CAAC,EAC9D,IAAAC,0BAAc,EACb,CAAC;EAAEC,MAAM;EAAEC;AAAuB,CAAC,KAAK;EACvC,oBACC,IAAA9B,WAAA,CAAA+B,IAAA,EAACrC,OAAA,CAAAsC,cAAc;IAAAtB,QAAA,GACboB,sBAAsB,gBAAG,IAAA9B,WAAA,CAAAO,GAAA,EAACZ,QAAA,CAAAsC,OAAO,CAACC,KAAK,IAAE,CAAC,GAAG,IAAI,eAElD,IAAAlC,WAAA,CAAAO,GAAA,EAACd,SAAA,CAAA0C,iBAAiB;MAAAzB,QAAA,EAChBmB,MAAM,CAACO,GAAG,CAAC,CAACjC,KAAK,EAAEkC,KAAK,KAAK;QAC7B,MAAM/B,KAAK,GAAGH,KAAK,CAACG,KAAK;QACzB,MAAMF,mBAAmB,GAAGyB,MAAM,CAACQ,KAAK,GAAG,CAAC,CAAC,EAAE/B,KAAK,CAACgC,GAAG;QAExD,oBACC,IAAAtC,WAAA,CAAAO,GAAA,EAACN,aAAa;UAEbE,KAAK,EAAEA,KAAM;UACbC,mBAAmB,EAAEA;QAAoB,GAFpCE,KAAK,CAACgC,GAGX,CAAC;MAEJ,CAAC;IAAC,CACgB,CAAC;EAAA,CACL,CAAC;AAEnB,CACD,CACD,CAAC","ignoreList":[]}
+{"version":3,"names":["_react","require","_navigationHost","_screenComposer","_blankStack","_core","_activity","_portal","_overlay","_jsxRuntime","BlankNavigationProvider","memo","children","routeKey","navigation","useBlankStackStore","store","scenesByKey","descriptor","route","Error","jsx","NavigationScreenProvider","BlankSceneContent","render","BlankSceneRow","ActivityScreen","ScreenComposer","EMPTY_ROUTE_KEYS","StackViewContent","routeKeys","jsxs","PortalProvider","Overlay","Float","ActivityContainer","map","StackView","exports","TRANSITIONS_ALWAYS_ON","state","descriptors","describe","StackCoreProvider","config","BlankStackProvider"],"sourceRoot":"../../../src","sources":["components/stack-view.tsx"],"mappings":"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","ignoreList":[]}