react-native-screen-transitions 4.1.0-alpha.0 → 4.1.0-beta.1

package/lib/module/adapters/with-screen-transitions/lifecycle/use-native-close-transition-intent.js

@@ -0,0 +1,69 @@
+"use strict";
+
+import { useLayoutEffect, useRef } from "react";
+import { resetStoresForScreen } from "../../../components/screen/lifecycle/hooks/helpers/reset-stores-for-screen";
+import { useNavigationHelpers } from "../../../hooks/navigation/use-navigation-helpers";
+import useStableCallback from "../../../hooks/use-stable-callback";
+import { useScreenRelationships } from "../../../providers/screen/builder/topology";
+import { useOptionalMotionStore } from "../../../providers/screen/motion";
+import { dispatchCloseAction, isCloseActionReplay } from "../../../utils/navigation/close-action-replay";
+import { doesNavigatorOwnCloseAction, shouldInterceptClose } from "./close-interception-rules";
+export function useNativeCloseTransitionIntent(current) {
+  const routeKey = current.route.key;
+  const {
+    parentScreenKey
+  } = useScreenRelationships();
+  const {
+    dismissScreen,
+    requestDismiss
+  } = useNavigationHelpers();
+  const pendingActionRef = useRef(null);
+  const nearestAncestorDismissing = useOptionalMotionStore(parentScreenKey ?? null, store => store.state.dismissing);
+  const completeClose = useStableCallback(() => {
+    const pendingAction = pendingActionRef.current;
+    pendingActionRef.current = null;
+    if (pendingAction) {
+      dispatchCloseAction(pendingAction, action => {
+        current.navigation.dispatch(action);
+      });
+    } else {
+      dismissScreen();
+    }
+    resetStoresForScreen(routeKey);
+  });
+  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 action = event.data.action;
+    const ownsAction = doesNavigatorOwnCloseAction({
+      state,
+      action
+    });
+    const shouldIntercept = shouldInterceptClose({
+      enabled: current.options.enableTransitions === true,
+      ownsAction,
+      ancestorDismissing: !!nearestAncestorDismissing?.get(),
+      routeIndex,
+      focusedIndex: state.index
+    });
+    if (!shouldIntercept) {
+      return;
+    }
+    pendingActionRef.current ??= event.data.action;
+    if (!requestDismiss()) {
+      pendingActionRef.current = null;
+      return;
+    }
+    event.preventDefault();
+  });
+  useLayoutEffect(() => {
+    return current.navigation.addListener?.("beforeRemove", handleBeforeRemove);
+  }, [current.navigation, handleBeforeRemove]);
+  return {
+    completeClose
+  };
+}
+//# sourceMappingURL=use-native-close-transition-intent.js.map

package/lib/module/adapters/with-screen-transitions/lifecycle/use-native-close-transition-intent.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useLayoutEffect","useRef","resetStoresForScreen","useNavigationHelpers","useStableCallback","useScreenRelationships","useOptionalMotionStore","dispatchCloseAction","isCloseActionReplay","doesNavigatorOwnCloseAction","shouldInterceptClose","useNativeCloseTransitionIntent","current","routeKey","route","key","parentScreenKey","dismissScreen","requestDismiss","pendingActionRef","nearestAncestorDismissing","store","state","dismissing","completeClose","pendingAction","action","navigation","dispatch","handleBeforeRemove","event","data","getState","routeIndex","routes","findIndex","ownsAction","shouldIntercept","enabled","options","enableTransitions","ancestorDismissing","get","focusedIndex","index","preventDefault","addListener"],"sourceRoot":"../../../../../src","sources":["adapters/with-screen-transitions/lifecycle/use-native-close-transition-intent.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/adapters/with-screen-transitions/stack-layout.js

@@ -1,12 +1,13 @@
 "use strict";
 
 import { useMemo } from "react";
+import { StyleSheet } from "react-native";
+import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { Overlay } from "../../components/overlay";
-import { ScreenComposer } from "../../providers/screen/screen-composer";
+import { Screen } from "../../components/screen/screen";
 import { BlankStackStoreProvider } from "../../providers/stack/blank-stack.provider";
-import { StackCoreProvider } from "../../providers/stack/core.provider";
-import { isOverlayVisible } from "../../utils/overlay/visibility";
 import { ScreenTransitionsAdapterProvider, useScreenTransitionsAdapterContext } from "./context";
+import { NativeStackLifecycle } from "./lifecycle";
 import { resolveAdapterTransitionOptions } from "./options";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const EMPTY_PRELOADED_ROUTES = [];
@@ -54,7 +55,7 @@ function buildTransitionStackState({
       previousDescriptor
     });
     routeIndexByKey.set(route.key, sceneIndex);
-    if (!shouldShowFloatOverlay && normalizedDescriptor.options.enableTransitions && isOverlayVisible(normalizedDescriptor.options)) {
+    if (!shouldShowFloatOverlay && normalizedDescriptor.options.overlay && normalizedDescriptor.options.overlayShown !== false) {
       shouldShowFloatOverlay = true;
     }
   }
@@ -101,10 +102,8 @@ function ScreenTransitionsStackContent({
   });
 }
 export function ScreenTransitionsStackLayout(props) {
-  return /*#__PURE__*/_jsx(StackCoreProvider, {
-    config: {
-      TRANSITIONS_ALWAYS_ON: false
-    },
+  return /*#__PURE__*/_jsx(GestureHandlerRootView, {
+    style: styles.container,
     children: /*#__PURE__*/_jsx(ScreenTransitionsStackContent, {
       ...props
     })
@@ -126,9 +125,15 @@ export function ScreenTransitionsScreenLayout({
     });
   }
   const scene = scenes[sceneIndex];
-  return /*#__PURE__*/_jsx(ScreenComposer, {
+  return /*#__PURE__*/_jsx(Screen, {
     routeKey: scene.route.key,
+    lifecycle: NativeStackLifecycle,
     children: children
   });
 }
+const styles = StyleSheet.create({
+  container: {
+    flex: 1
+  }
+});
 //# sourceMappingURL=stack-layout.js.map

package/lib/module/adapters/with-screen-transitions/stack-layout.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","Overlay","ScreenComposer","BlankStackStoreProvider","StackCoreProvider","isOverlayVisible","ScreenTransitionsAdapterProvider","useScreenTransitionsAdapterContext","resolveAdapterTransitionOptions","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","EMPTY_PRELOADED_ROUTES","getPreloadedRoutes","state","preloadedRoutes","normalizeDescriptor","descriptor","options","buildTransitionStackState","descriptors","routes","allRoutes","concat","routeKeys","map","route","key","scenes","routeIndexByKey","Map","shouldShowFloatOverlay","includes","Error","normalizedDescriptor","sceneIndex","length","previousDescriptor","nextDescriptor","push","activity","index","set","enableTransitions","ScreenTransitionsStackContent","layout","layoutArgs","transitionState","adapterContextValue","blankStackValue","scenesByKey","Object","fromEntries","scene","navigatorKey","paintDriverRouteKeyByRouteKey","focusedIndex","children","value","Float","ScreenTransitionsStackLayout","props","config","TRANSITIONS_ALWAYS_ON","ScreenTransitionsScreenLayout","screenLayout","screenLayoutArgs","get","undefined","routeKey"],"sourceRoot":"../../../../src","sources":["adapters/with-screen-transitions/stack-layout.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useMemo","StyleSheet","GestureHandlerRootView","Overlay","Screen","BlankStackStoreProvider","ScreenTransitionsAdapterProvider","useScreenTransitionsAdapterContext","NativeStackLifecycle","resolveAdapterTransitionOptions","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","EMPTY_PRELOADED_ROUTES","getPreloadedRoutes","state","preloadedRoutes","normalizeDescriptor","descriptor","options","buildTransitionStackState","descriptors","routes","allRoutes","concat","routeKeys","map","route","key","scenes","routeIndexByKey","Map","shouldShowFloatOverlay","includes","Error","normalizedDescriptor","sceneIndex","length","previousDescriptor","nextDescriptor","push","activity","index","set","overlay","overlayShown","ScreenTransitionsStackContent","layout","layoutArgs","transitionState","adapterContextValue","blankStackValue","scenesByKey","Object","fromEntries","scene","navigatorKey","paintDriverRouteKeyByRouteKey","focusedIndex","children","value","Float","ScreenTransitionsStackLayout","props","style","styles","container","ScreenTransitionsScreenLayout","screenLayout","screenLayoutArgs","get","undefined","routeKey","lifecycle","create","flex"],"sourceRoot":"../../../../src","sources":["adapters/with-screen-transitions/stack-layout.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/animation/snap-to.js

@@ -1,8 +1,7 @@
 "use strict";
 
 import { scheduleOnUI } from "react-native-worklets";
-import { AnimationStore } from "../stores/animation.store";
-import { SystemStore } from "../stores/system.store";
+import { getMotionStore } from "../providers/screen/motion";
 import { animateToProgress } from "../utils/animation/animate-to-progress";
 import { resolveSnapTransitionSpec } from "../utils/animation/resolve-snap-transition-spec";
 import { logger } from "../utils/logger";
@@ -11,9 +10,9 @@ const getSortedSnapPoints = descriptor => {
   const snapPoints = descriptor.options?.snapPoints;
   if (!snapPoints || snapPoints.length === 0) return null;
 
-  // Resolve 'auto' to the measured fraction stored in SystemStore
-  const autoVal = SystemStore.getValue(descriptor.route.key, "resolvedAutoSnapPoint").get();
-  const resolved = snapPoints.map(p => p === "auto" ? autoVal : p).filter(p => typeof p === "number" && p > 0);
+  // Resolve 'auto' to the measured fraction owned by Motion
+  const autoVal = getMotionStore(descriptor.route.key).state.resolvedAutoSnapPoint.get();
+  const resolved = snapPoints.map(p => typeof p === "string" ? autoVal : p).filter(p => typeof p === "number" && p > 0);
   return resolved.length > 0 ? resolved.sort((a, b) => a - b) : null;
 };
 export function snapDescriptorToIndex(descriptor, index) {
@@ -27,9 +26,11 @@ export function snapDescriptorToIndex(descriptor, index) {
     return false;
   }
   const targetProgress = sorted[index];
-  const animations = AnimationStore.getBag(descriptor.route.key);
-  const targetProgressValue = SystemStore.getValue(descriptor.route.key, "targetProgress");
-  const animationProgressValue = SystemStore.getValue(descriptor.route.key, "animationProgress");
+  const animations = getMotionStore(descriptor.route.key).state;
+  const {
+    targetProgress: targetProgressValue,
+    animationProgress: animationProgressValue
+  } = animations;
   scheduleOnUI(() => {
     "worklet";
 

package/lib/module/animation/snap-to.js.map

@@ -1 +1 @@
-{"version":3,"names":["scheduleOnUI","AnimationStore","SystemStore","animateToProgress","resolveSnapTransitionSpec","logger","resolveSnapTargetEntry","getSortedSnapPoints","descriptor","snapPoints","options","length","autoVal","getValue","route","key","get","resolved","map","p","filter","sort","a","b","snapDescriptorToIndex","index","sorted","warn","targetProgress","animations","getBag","targetProgressValue","animationProgressValue","currentProgress","transitionProgress","target","markEntering","animationProgress","spec","transitionSpec","snapTo","screenWithSnapPoints"],"sourceRoot":"../../../src","sources":["animation/snap-to.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["scheduleOnUI","getMotionStore","animateToProgress","resolveSnapTransitionSpec","logger","resolveSnapTargetEntry","getSortedSnapPoints","descriptor","snapPoints","options","length","autoVal","route","key","state","resolvedAutoSnapPoint","get","resolved","map","p","filter","sort","a","b","snapDescriptorToIndex","index","sorted","warn","targetProgress","animations","targetProgressValue","animationProgress","animationProgressValue","currentProgress","transitionProgress","target","markEntering","spec","transitionSpec","snapTo","screenWithSnapPoints"],"sourceRoot":"../../../src","sources":["animation/snap-to.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/animation/transition-blocking.js

@@ -1,7 +1,7 @@
 "use strict";
 
+import { getMotionStore } from "../providers/screen/motion";
 import { HistoryStore } from "../stores/history.store";
-import { SystemStore } from "../stores/system.store";
 import { logger } from "../utils/logger";
 const resolveTransitionRouteKey = (routeKey, actionName) => {
   if (routeKey !== undefined) {
@@ -42,7 +42,7 @@ export function blockTransition(routeKey) {
   if (!resolvedRouteKey) {
     return;
   }
-  SystemStore.getBag(resolvedRouteKey).actions.blockLifecycleStart();
+  getMotionStore(resolvedRouteKey).state.actions.blockLifecycleStart();
 }
 
 /**
@@ -61,6 +61,6 @@ export function unblockTransition(routeKey) {
   if (!resolvedRouteKey) {
     return;
   }
-  SystemStore.getBag(resolvedRouteKey).actions.unblockLifecycleStart();
+  getMotionStore(resolvedRouteKey).state.actions.unblockLifecycleStart();
 }
 //# sourceMappingURL=transition-blocking.js.map

package/lib/module/animation/transition-blocking.js.map

@@ -1 +1 @@
-{"version":3,"names":["HistoryStore","SystemStore","logger","resolveTransitionRouteKey","routeKey","actionName","undefined","length","warn","entry","getMostRecent","descriptor","route","key","blockTransition","resolvedRouteKey","getBag","actions","blockLifecycleStart","unblockTransition","unblockLifecycleStart"],"sourceRoot":"../../../src","sources":["animation/transition-blocking.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,yBAAyB;AACtD,SAASC,WAAW,QAAQ,wBAAwB;AAEpD,SAASC,MAAM,QAAQ,iBAAiB;AAExC,MAAMC,yBAAyB,GAAGA,CACjCC,QAA+B,EAC/BC,UAAmD,KACxB;EAC3B,IAAID,QAAQ,KAAKE,SAAS,EAAE;IAC3B,IAAIF,QAAQ,CAACG,MAAM,KAAK,CAAC,EAAE;MAC1BL,MAAM,CAACM,IAAI,CAAC,GAAGH,UAAU,8BAA8B,CAAC;MACxD,OAAOC,SAAS;IACjB;IAEA,OAAOF,QAAQ;EAChB;EAEA,MAAMK,KAAK,GAAGT,YAAY,CAACU,aAAa,CAAC,CAAC;EAC1C,IAAI,CAACD,KAAK,EAAE;IACXP,MAAM,CAACM,IAAI,CAAC,GAAGH,UAAU,yBAAyB,CAAC;IACnD,OAAOC,SAAS;EACjB;EAEA,OAAOG,KAAK,CAACE,UAAU,CAACC,KAAK,CAACC,GAAG;AAClC,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAACV,QAAoB,EAAQ;EAC3D,MAAMW,gBAAgB,GAAGZ,yBAAyB,CACjDC,QAAQ,EACR,iBACD,CAAC;EACD,IAAI,CAACW,gBAAgB,EAAE;IACtB;EACD;EAEAd,WAAW,CAACe,MAAM,CAACD,gBAAgB,CAAC,CAACE,OAAO,CAACC,mBAAmB,CAAC,CAAC;AACnE;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAACf,QAAoB,EAAQ;EAC7D,MAAMW,gBAAgB,GAAGZ,yBAAyB,CACjDC,QAAQ,EACR,mBACD,CAAC;EACD,IAAI,CAACW,gBAAgB,EAAE;IACtB;EACD;EAEAd,WAAW,CAACe,MAAM,CAACD,gBAAgB,CAAC,CAACE,OAAO,CAACG,qBAAqB,CAAC,CAAC;AACrE","ignoreList":[]}
+{"version":3,"names":["getMotionStore","HistoryStore","logger","resolveTransitionRouteKey","routeKey","actionName","undefined","length","warn","entry","getMostRecent","descriptor","route","key","blockTransition","resolvedRouteKey","state","actions","blockLifecycleStart","unblockTransition","unblockLifecycleStart"],"sourceRoot":"../../../src","sources":["animation/transition-blocking.ts"],"mappings":";;AAAA,SAASA,cAAc,QAAQ,4BAA4B;AAC3D,SAASC,YAAY,QAAQ,yBAAyB;AAEtD,SAASC,MAAM,QAAQ,iBAAiB;AAExC,MAAMC,yBAAyB,GAAGA,CACjCC,QAA+B,EAC/BC,UAAmD,KACxB;EAC3B,IAAID,QAAQ,KAAKE,SAAS,EAAE;IAC3B,IAAIF,QAAQ,CAACG,MAAM,KAAK,CAAC,EAAE;MAC1BL,MAAM,CAACM,IAAI,CAAC,GAAGH,UAAU,8BAA8B,CAAC;MACxD,OAAOC,SAAS;IACjB;IAEA,OAAOF,QAAQ;EAChB;EAEA,MAAMK,KAAK,GAAGR,YAAY,CAACS,aAAa,CAAC,CAAC;EAC1C,IAAI,CAACD,KAAK,EAAE;IACXP,MAAM,CAACM,IAAI,CAAC,GAAGH,UAAU,yBAAyB,CAAC;IACnD,OAAOC,SAAS;EACjB;EAEA,OAAOG,KAAK,CAACE,UAAU,CAACC,KAAK,CAACC,GAAG;AAClC,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAACV,QAAoB,EAAQ;EAC3D,MAAMW,gBAAgB,GAAGZ,yBAAyB,CACjDC,QAAQ,EACR,iBACD,CAAC;EACD,IAAI,CAACW,gBAAgB,EAAE;IACtB;EACD;EAEAf,cAAc,CAACe,gBAAgB,CAAC,CAACC,KAAK,CAACC,OAAO,CAACC,mBAAmB,CAAC,CAAC;AACrE;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAACf,QAAoB,EAAQ;EAC7D,MAAMW,gBAAgB,GAAGZ,yBAAyB,CACjDC,QAAQ,EACR,mBACD,CAAC;EACD,IAAI,CAACW,gBAAgB,EAAE;IACtB;EACD;EAEAf,cAAc,CAACe,gBAAgB,CAAC,CAACC,KAAK,CAACC,OAAO,CAACG,qBAAqB,CAAC,CAAC;AACvE","ignoreList":[]}

package/lib/module/components/activity/variants/activity-screen.js

@@ -1,34 +1,44 @@
 "use strict";
 
-import { memo } from "react";
+import { memo, useState } from "react";
 import { StyleSheet, View } from "react-native";
 import { useDerivedValue } from "react-native-reanimated";
 import { useSharedValueState } from "../../../hooks/reanimated/use-shared-value-state";
+import { useOptionalMotionStore } from "../../../providers/screen/motion";
 import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
-import { AnimationStore } from "../../../stores/animation.store";
 import { ActivityView } from "../activity-view";
 import { DEFAULT_INACTIVE_BEHAVIOR } from "../helpers";
+
+// Let the content and backdrop layers decide whether to capture touches.
 import { jsx as _jsx } from "react/jsx-runtime";
 const PointerEventsByActivity = {
-  active: "auto",
-  inert: "auto",
+  active: "box-none",
+  inert: "box-none",
   inactive: "none",
   closing: "none"
 };
 export const ActivityScreen = /*#__PURE__*/memo(function ActivityScreen({
   children,
-  inactiveBehavior,
-  paintDriverRouteKey,
-  hasNestedState,
   routeKey
 }) {
   const scene = useBlankStackStore(store => store.scenesByKey[routeKey]);
-  const stackPaintDriverRouteKey = useBlankStackStore(store => store.paintDriverRouteKeyByRouteKey.get(routeKey));
-  const stackInactiveBehavior = scene.descriptor.options.inactiveBehavior;
-  const resolvedInactiveBehavior = inactiveBehavior ?? stackInactiveBehavior ?? DEFAULT_INACTIVE_BEHAVIOR;
-  const resolvedPaintDriverRouteKey = paintDriverRouteKey ?? stackPaintDriverRouteKey;
-  const resolvedHasNestedState = hasNestedState ?? "state" in scene.route;
-  const paintDriverAnimations = resolvedPaintDriverRouteKey ? AnimationStore.getBag(resolvedPaintDriverRouteKey) : undefined;
+  const paintDriverRouteKey = useBlankStackStore(store => store.paintDriverRouteKeyByRouteKey.get(routeKey));
+  const inactiveBehavior = scene.descriptor.options.inactiveBehavior ?? DEFAULT_INACTIVE_BEHAVIOR;
+  const hasNestedState = "state" in scene.route;
+  const registeredPaintDriverProgress = useOptionalMotionStore(paintDriverRouteKey ?? null, store => store.state.transitionProgress);
+  const [paintDriver, setPaintDriver] = useState({
+    key: paintDriverRouteKey,
+    progress: registeredPaintDriverProgress
+  });
+  // Activity disconnects the driver's provider when it pauses. Keep observing
+  // the same progress value so that pausing it doesn't wake older screens.
+  if (paintDriver.key !== paintDriverRouteKey || registeredPaintDriverProgress !== null && paintDriver.progress !== registeredPaintDriverProgress) {
+    setPaintDriver({
+      key: paintDriverRouteKey,
+      progress: registeredPaintDriverProgress
+    });
+  }
+  const paintDriverProgress = registeredPaintDriverProgress ?? (paintDriver.key === paintDriverRouteKey ? paintDriver.progress : null);
 
   /**
    * Avoid hiding inactive content until the screen that exposes it has settled.
@@ -40,18 +50,18 @@ export const ActivityScreen = /*#__PURE__*/memo(function ActivityScreen({
   const isPaintDriverSettled = useDerivedValue(() => {
     "worklet";
 
-    if (!paintDriverAnimations) {
+    if (!paintDriverProgress) {
       return false;
     }
-    return paintDriverAnimations.transitionProgress.get() >= 1;
+    return paintDriverProgress.get() >= 1;
   });
   const isPaintDriverSettledOnJS = useSharedValueState(isPaintDriverSettled);
   let activityViewMode = scene.activity === "active" ? "normal" : "inert";
   let visible = scene.activity !== "inactive";
   if (scene.activity === "inactive") {
-    if (resolvedInactiveBehavior === "keep" || !isPaintDriverSettledOnJS) {
+    if (inactiveBehavior === "keep" || !isPaintDriverSettledOnJS) {
       visible = true;
-    } else if (resolvedInactiveBehavior === "pause") {
+    } else if (inactiveBehavior === "pause") {
       activityViewMode = "paused";
       visible = true;
     } else {
@@ -59,7 +69,7 @@ export const ActivityScreen = /*#__PURE__*/memo(function ActivityScreen({
       visible = false;
     }
   }
-  const shouldUnmount = resolvedInactiveBehavior === "unmount" && scene.activity === "inactive" && !resolvedHasNestedState && isPaintDriverSettledOnJS;
+  const shouldUnmount = inactiveBehavior === "unmount" && scene.activity === "inactive" && !hasNestedState && isPaintDriverSettledOnJS;
   if (shouldUnmount) {
     return null;
   }

package/lib/module/components/activity/variants/activity-screen.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","StyleSheet","View","useDerivedValue","useSharedValueState","useBlankStackStore","AnimationStore","ActivityView","DEFAULT_INACTIVE_BEHAVIOR","jsx","_jsx","PointerEventsByActivity","active","inert","inactive","closing","ActivityScreen","children","inactiveBehavior","paintDriverRouteKey","hasNestedState","routeKey","scene","store","scenesByKey","stackPaintDriverRouteKey","paintDriverRouteKeyByRouteKey","get","stackInactiveBehavior","descriptor","options","resolvedInactiveBehavior","resolvedPaintDriverRouteKey","resolvedHasNestedState","route","paintDriverAnimations","getBag","undefined","isPaintDriverSettled","transitionProgress","isPaintDriverSettledOnJS","activityViewMode","activity","visible","shouldUnmount","style","absoluteFill","pointerEvents","collapsable","mode"],"sourceRoot":"../../../../../src","sources":["components/activity/variants/activity-screen.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["memo","useState","StyleSheet","View","useDerivedValue","useSharedValueState","useOptionalMotionStore","useBlankStackStore","ActivityView","DEFAULT_INACTIVE_BEHAVIOR","jsx","_jsx","PointerEventsByActivity","active","inert","inactive","closing","ActivityScreen","children","routeKey","scene","store","scenesByKey","paintDriverRouteKey","paintDriverRouteKeyByRouteKey","get","inactiveBehavior","descriptor","options","hasNestedState","route","registeredPaintDriverProgress","state","transitionProgress","paintDriver","setPaintDriver","key","progress","paintDriverProgress","isPaintDriverSettled","isPaintDriverSettledOnJS","activityViewMode","activity","visible","shouldUnmount","style","absoluteFill","pointerEvents","collapsable","mode"],"sourceRoot":"../../../../../src","sources":["components/activity/variants/activity-screen.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/boundary/components/boundary-lifecycle.js

@@ -1,8 +1,13 @@
 "use strict";
 
-import { memo } from "react";
-import { useDescriptorsStore } from "../../../providers/screen/descriptors";
-import { useBoundaryMeasurement } from "../hooks/use-boundary-measurement";
+import { memo, useMemo } from "react";
+import { useBuilderStore } from "../../../providers/screen/builder";
+import { prepareStyleForBounds } from "../../../utils/bounds/helpers/styles/styles";
+import { useBoundaryPresence } from "../hooks/lifecycles/use-boundary-presence";
+import { useInitialDestinationMeasurement } from "../hooks/lifecycles/use-initial-destination-measurement";
+import { useInitialSourceMeasurement } from "../hooks/lifecycles/use-initial-source-measurement";
+import { useRefreshBoundary } from "../hooks/lifecycles/use-refresh-boundary";
+import { useMeasurer } from "../hooks/use-measurer";
 export const BoundaryLifecycle = /*#__PURE__*/memo(function BoundaryLifecycle({
   boundTag,
   config,
@@ -14,18 +19,45 @@ export const BoundaryLifecycle = /*#__PURE__*/memo(function BoundaryLifecycle({
   measuredRef,
   style
 }) {
-  const hasConfiguredInterpolator = useDescriptorsStore(s => s.derivations.hasConfiguredInterpolator);
-  useBoundaryMeasurement({
-    boundTag,
+  const hasConfiguredInterpolator = useBuilderStore(s => s.derivations.hasConfiguredInterpolator);
+  const runtimeEnabled = enabled && hasConfiguredInterpolator;
+  const preparedStyles = useMemo(() => prepareStyleForBounds(style), [style]);
+  const measureBoundary = useMeasurer({
     enabled,
-    runtimeEnabled: enabled && hasConfiguredInterpolator,
+    boundTag,
     currentScreenKey,
-    measuredRef,
-    style,
+    preparedStyles,
+    measuredAnimatedRef: measuredRef,
     handoff,
     escapeClipping,
-    localMeasurement,
-    config
+    localMeasurement
+  });
+
+  // Presence and source capture must not depend on this screen owning an
+  // interpolator: a nested source can participate in a transition owned by a
+  // different navigator.
+  useBoundaryPresence({
+    enabled,
+    boundTag,
+    currentScreenKey,
+    boundaryConfig: config,
+    handoff,
+    escapeClipping
+  });
+  useInitialSourceMeasurement({
+    enabled,
+    measureBoundary,
+    boundTag
+  });
+  useInitialDestinationMeasurement({
+    boundTag,
+    enabled: runtimeEnabled,
+    measureBoundary
+  });
+  useRefreshBoundary({
+    enabled: runtimeEnabled,
+    boundTag,
+    measureBoundary
   });
   return null;
 });

package/lib/module/components/boundary/components/boundary-lifecycle.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","useDescriptorsStore","useBoundaryMeasurement","BoundaryLifecycle","boundTag","config","currentScreenKey","enabled","escapeClipping","handoff","localMeasurement","measuredRef","style","hasConfiguredInterpolator","s","derivations","runtimeEnabled"],"sourceRoot":"../../../../../src","sources":["components/boundary/components/boundary-lifecycle.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,OAAO;AAG5B,SAASC,mBAAmB,QAAQ,uCAAuC;AAE3E,SAASC,sBAAsB,QAAQ,mCAAmC;AAkB1E,OAAO,MAAMC,iBAAiB,gBAAGH,IAAI,CAAC,SAASG,iBAAiBA,CAAC;EAChEC,QAAQ;EACRC,MAAM;EACNC,gBAAgB;EAChBC,OAAO;EACPC,cAAc;EACdC,OAAO;EACPC,gBAAgB;EAChBC,WAAW;EACXC;AACuB,CAAC,EAAE;EAC1B,MAAMC,yBAAyB,GAAGZ,mBAAmB,CACnDa,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,yBACtB,CAAC;EAEDX,sBAAsB,CAAC;IACtBE,QAAQ;IACRG,OAAO;IACPS,cAAc,EAAET,OAAO,IAAIM,yBAAyB;IACpDP,gBAAgB;IAChBK,WAAW;IACXC,KAAK;IACLH,OAAO;IACPD,cAAc;IACdE,gBAAgB;IAChBL;EACD,CAAC,CAAC;EAEF,OAAO,IAAI;AACZ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["memo","useMemo","useBuilderStore","prepareStyleForBounds","useBoundaryPresence","useInitialDestinationMeasurement","useInitialSourceMeasurement","useRefreshBoundary","useMeasurer","BoundaryLifecycle","boundTag","config","currentScreenKey","enabled","escapeClipping","handoff","localMeasurement","measuredRef","style","hasConfiguredInterpolator","s","derivations","runtimeEnabled","preparedStyles","measureBoundary","measuredAnimatedRef","boundaryConfig"],"sourceRoot":"../../../../../src","sources":["components/boundary/components/boundary-lifecycle.tsx"],"mappings":";;AAAA,SAASA,IAAI,EAAEC,OAAO,QAAQ,OAAO;AAGrC,SAASC,eAAe,QAAQ,mCAAmC;AAEnE,SAASC,qBAAqB,QAAQ,6CAA6C;AACnF,SAASC,mBAAmB,QAAQ,2CAA2C;AAC/E,SAASC,gCAAgC,QAAQ,yDAAyD;AAC1G,SAASC,2BAA2B,QAAQ,oDAAoD;AAChG,SAASC,kBAAkB,QAAQ,0CAA0C;AAC7E,SAASC,WAAW,QAAQ,uBAAuB;AAkBnD,OAAO,MAAMC,iBAAiB,gBAAGT,IAAI,CAAC,SAASS,iBAAiBA,CAAC;EAChEC,QAAQ;EACRC,MAAM;EACNC,gBAAgB;EAChBC,OAAO;EACPC,cAAc;EACdC,OAAO;EACPC,gBAAgB;EAChBC,WAAW;EACXC;AACuB,CAAC,EAAE;EAC1B,MAAMC,yBAAyB,GAAGjB,eAAe,CAC/CkB,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,yBACtB,CAAC;EAED,MAAMG,cAAc,GAAGT,OAAO,IAAIM,yBAAyB;EAC3D,MAAMI,cAAc,GAAGtB,OAAO,CAAC,MAAME,qBAAqB,CAACe,KAAK,CAAC,EAAE,CAACA,KAAK,CAAC,CAAC;EAE3E,MAAMM,eAAe,GAAGhB,WAAW,CAAC;IACnCK,OAAO;IACPH,QAAQ;IACRE,gBAAgB;IAChBW,cAAc;IACdE,mBAAmB,EAAER,WAAW;IAChCF,OAAO;IACPD,cAAc;IACdE;EACD,CAAC,CAAC;;EAEF;EACA;EACA;EACAZ,mBAAmB,CAAC;IACnBS,OAAO;IACPH,QAAQ;IACRE,gBAAgB;IAChBc,cAAc,EAAEf,MAAM;IACtBI,OAAO;IACPD;EACD,CAAC,CAAC;EAEFR,2BAA2B,CAAC;IAC3BO,OAAO;IACPW,eAAe;IACfd;EACD,CAAC,CAAC;EAEFL,gCAAgC,CAAC;IAChCK,QAAQ;IACRG,OAAO,EAAES,cAAc;IACvBE;EACD,CAAC,CAAC;EAEFjB,kBAAkB,CAAC;IAClBM,OAAO,EAAES,cAAc;IACvBZ,QAAQ;IACRc;EACD,CAAC,CAAC;EAEF,OAAO,IAAI;AACZ,CAAC,CAAC","ignoreList":[]}

package/lib/module/components/boundary/components/boundary-target.js

@@ -2,10 +2,9 @@
 
 import { memo, useLayoutEffect } from "react";
 import Animated from "react-native-reanimated";
-import { useComposedSlotStyles, useSlotLayoutStyles } from "../../../providers/screen/styles";
 import { logger } from "../../../utils/logger";
-import { BoundaryContentPortal, BoundaryContentPortalHost } from "../portal/components/boundary-content-portal";
-import { BoundaryPortal } from "../portal/components/boundary-portal";
+import { useComposedBoundaryStyle } from "../hooks/use-composed-boundary-style";
+import { Portal } from "../portal/components/portal";
 import { TARGET_OUTSIDE_ROOT_WARNING, useOptionalBoundaryRootStore } from "../providers/boundary-root.provider";
 import { jsx as _jsx } from "react/jsx-runtime";
 export const BOUNDARY_TARGET_ACTIVE_PROP = "__boundaryTargetActive";
@@ -23,17 +22,15 @@ const BoundaryTargetInner = props => {
   const portalRuntime = rootContext?.portalRuntime;
   const handoffEnabled = isActiveTarget && rootContext?.handoffEnabled === true;
   const shouldEscapeTargetToScreenHost = isActiveTarget && portalRuntime?.escapeClipping === true;
-  const shouldApplyAssociatedStyleInline = isActiveTarget && portalRuntime?.escapeClipping !== true;
-  const shouldApplyPortalLayoutStyle = isActiveTarget && portalRuntime?.escapeClipping === true;
-  const associatedTargetStyles = useComposedSlotStyles(rootContext?.boundTag.tag, style);
-  const portalLayoutStyle = useSlotLayoutStyles(rootContext?.boundTag.tag);
+  const associatedTargetStyles = useComposedBoundaryStyle(rootContext?.slotsMap, boundaryId, style, shouldEscapeTargetToScreenHost ? "layout" : "full");
   const measurementRef = isActiveTarget ? rootContext.measurementRef : undefined;
   useLayoutEffect(() => {
     if (__DEV__ && rootContext === null) {
       logger.warn(TARGET_OUTSIDE_ROOT_WARNING);
     }
   }, [rootContext]);
-  return /*#__PURE__*/_jsx(BoundaryPortal, {
+  return /*#__PURE__*/_jsx(Portal, {
+    mode: "escapeClipping",
     boundaryId: boundaryId ?? "",
     enabled: shouldEscapeTargetToScreenHost,
     placeholderRef: measurementRef,
@@ -41,17 +38,13 @@ const BoundaryTargetInner = props => {
       ...rest,
       pointerEvents: pointerEvents,
       ref: shouldEscapeTargetToScreenHost ? undefined : measurementRef,
-      style: [style, shouldApplyAssociatedStyleInline ? associatedTargetStyles : undefined, shouldApplyPortalLayoutStyle ? portalLayoutStyle : undefined],
+      style: [style, isActiveTarget ? associatedTargetStyles : undefined],
       collapsable: false,
-      children: /*#__PURE__*/_jsx(BoundaryContentPortalHost, {
-        boundaryId: boundaryId ?? "",
+      children: /*#__PURE__*/_jsx(Portal, {
+        mode: "handoff",
+        boundaryId: boundaryId,
         enabled: handoffEnabled,
-        screenKey: rootContext?.currentScreenKey ?? "",
-        children: /*#__PURE__*/_jsx(BoundaryContentPortal, {
-          boundaryId: boundaryId,
-          enabled: handoffEnabled,
-          children: children
-        })
+        children: children
       })
     })
   });

package/lib/module/components/boundary/components/boundary-target.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","useLayoutEffect","Animated","useComposedSlotStyles","useSlotLayoutStyles","logger","BoundaryContentPortal","BoundaryContentPortalHost","BoundaryPortal","TARGET_OUTSIDE_ROOT_WARNING","useOptionalBoundaryRootStore","jsx","_jsx","BOUNDARY_TARGET_ACTIVE_PROP","BoundaryTargetInner","props","active","children","pointerEvents","style","rest","rootContext","boundaryId","boundTag","tag","isActiveTarget","portalRuntime","handoffEnabled","shouldEscapeTargetToScreenHost","escapeClipping","shouldApplyAssociatedStyleInline","shouldApplyPortalLayoutStyle","associatedTargetStyles","portalLayoutStyle","measurementRef","undefined","__DEV__","warn","enabled","placeholderRef","View","ref","collapsable","screenKey","currentScreenKey","BoundaryTarget"],"sourceRoot":"../../../../../src","sources":["components/boundary/components/boundary-target.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["memo","useLayoutEffect","Animated","logger","useComposedBoundaryStyle","Portal","TARGET_OUTSIDE_ROOT_WARNING","useOptionalBoundaryRootStore","jsx","_jsx","BOUNDARY_TARGET_ACTIVE_PROP","BoundaryTargetInner","props","active","children","pointerEvents","style","rest","rootContext","boundaryId","boundTag","tag","isActiveTarget","portalRuntime","handoffEnabled","shouldEscapeTargetToScreenHost","escapeClipping","associatedTargetStyles","slotsMap","measurementRef","undefined","__DEV__","warn","mode","enabled","placeholderRef","View","ref","collapsable","BoundaryTarget"],"sourceRoot":"../../../../../src","sources":["components/boundary/components/boundary-target.tsx"],"mappings":";;AACA,SAASA,IAAI,EAAEC,eAAe,QAAQ,OAAO;AAC7C,OAAOC,QAAQ,MAAM,yBAAyB;AAC9C,SAASC,MAAM,QAAQ,uBAAuB;AAC9C,SAASC,wBAAwB,QAAQ,sCAAsC;AAC/E,SAASC,MAAM,QAAQ,6BAA6B;AACpD,SACCC,2BAA2B,EAC3BC,4BAA4B,QACtB,qCAAqC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAS7C,OAAO,MAAMC,2BAA2B,GAAG,wBAAiC;AAK5E,MAAMC,mBAAmB,GAAIC,KAAkC,IAAK;EACnE,MAAM;IACL,CAACF,2BAA2B,GAAGG,MAAM;IACrCC,QAAQ;IACRC,aAAa;IACbC,KAAK;IACL,GAAGC;EACJ,CAAC,GAAGL,KAAK;EACT,MAAMM,WAAW,GAAGX,4BAA4B,CAAC,CAAC;EAClD,MAAMY,UAAU,GAAGD,WAAW,EAAEE,QAAQ,CAACC,GAAG;EAC5C,MAAMC,cAAc,GAAGT,MAAM,KAAK,IAAI,IAAIK,WAAW,KAAK,IAAI;EAC9D,MAAMK,aAAa,GAAGL,WAAW,EAAEK,aAAa;EAChD,MAAMC,cAAc,GAAGF,cAAc,IAAIJ,WAAW,EAAEM,cAAc,KAAK,IAAI;EAC7E,MAAMC,8BAA8B,GACnCH,cAAc,IAAIC,aAAa,EAAEG,cAAc,KAAK,IAAI;EAEzD,MAAMC,sBAAsB,GAAGvB,wBAAwB,CACtDc,WAAW,EAAEU,QAAQ,EACrBT,UAAU,EACVH,KAAK,EACLS,8BAA8B,GAAG,QAAQ,GAAG,MAC7C,CAAC;EAED,MAAMI,cAAc,GAAGP,cAAc,GAClCJ,WAAW,CAACW,cAAc,GAC1BC,SAAS;EAEZ7B,eAAe,CAAC,MAAM;IACrB,IAAI8B,OAAO,IAAIb,WAAW,KAAK,IAAI,EAAE;MACpCf,MAAM,CAAC6B,IAAI,CAAC1B,2BAA2B,CAAC;IACzC;EACD,CAAC,EAAE,CAACY,WAAW,CAAC,CAAC;EAEjB,oBACCT,IAAA,CAACJ,MAAM;IACN4B,IAAI,EAAC,gBAAgB;IACrBd,UAAU,EAAEA,UAAU,IAAI,EAAG;IAC7Be,OAAO,EAAET,8BAA+B;IACxCU,cAAc,EAAEN,cAAe;IAAAf,QAAA,eAE/BL,IAAA,CAACP,QAAQ,CAACkC,IAAI;MAAA,GACTnB,IAAI;MACRF,aAAa,EAAEA,aAAc;MAC7BsB,GAAG,EAAEZ,8BAA8B,GAAGK,SAAS,GAAGD,cAAe;MACjEb,KAAK,EAAE,CAACA,KAAK,EAAEM,cAAc,GAAGK,sBAAsB,GAAGG,SAAS,CAAE;MACpEQ,WAAW,EAAE,KAAM;MAAAxB,QAAA,eAEnBL,IAAA,CAACJ,MAAM;QAAC4B,IAAI,EAAC,SAAS;QAACd,UAAU,EAAEA,UAAW;QAACe,OAAO,EAAEV,cAAe;QAAAV,QAAA,EACrEA;MAAQ,CACF;IAAC,CACK;EAAC,CACT,CAAC;AAEX,CAAC;AAED,OAAO,MAAMyB,cAAc,gBAAGvC,IAAI,CACjCW,mBACD,CAAoD","ignoreList":[]}

package/lib/module/components/boundary/create-boundary-component.js

@@ -3,8 +3,7 @@
 import { cloneElement, forwardRef, memo, useMemo } from "react";
 import Animated from "react-native-reanimated";
 import { BOUNDARY_TARGET_ACTIVE_PROP, BoundaryTarget } from "./components/boundary-target";
-import { BoundaryContentPortal, BoundaryContentPortalHost } from "./portal/components/boundary-content-portal";
-import { BoundaryPortal } from "./portal/components/boundary-portal";
+import { Portal } from "./portal/components/portal";
 import { BoundaryRootProvider } from "./providers/boundary-root.provider";
 import { resolveBoundaryTarget } from "./utils/resolve-boundary-target";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -28,6 +27,12 @@ export function createBoundaryComponent(Wrapped, options = {}) {
       children,
       ...rest
     } = props;
+    const config = useMemo(() => ({
+      anchor,
+      scaleMode,
+      target,
+      method
+    }), [anchor, scaleMode, target, method]);
     const targetResolution = useMemo(() => {
       return resolveBoundaryTarget(children, {
         isTarget: element => element.type === BoundaryTarget,
@@ -38,12 +43,7 @@ export function createBoundaryComponent(Wrapped, options = {}) {
     }, [children]);
     const targetStyle = targetResolution.target?.props?.style;
     return /*#__PURE__*/_jsx(BoundaryRootProvider, {
-      config: {
-        anchor,
-        scaleMode,
-        target,
-        method
-      },
+      config: config,
       enabled: enabled,
       escapeClipping: escapeClipping,
       forwardedRef: forwardedRef,
@@ -54,7 +54,8 @@ export function createBoundaryComponent(Wrapped, options = {}) {
       style: style,
       targetCount: targetResolution.targetCount,
       targetStyle: targetStyle,
-      children: root => /*#__PURE__*/_jsx(BoundaryPortal, {
+      children: root => /*#__PURE__*/_jsx(Portal, {
+        mode: "escapeClipping",
         boundaryId: root.boundTag.tag,
         enabled: root.shouldRenderBoundaryRootThroughPortal,
         placeholderRef: root.measurementRef,
@@ -63,15 +64,11 @@ export function createBoundaryComponent(Wrapped, options = {}) {
           ref: root.ref,
           style: [style, root.attachedStyle],
           collapsable: false,
-          children: /*#__PURE__*/_jsx(BoundaryContentPortalHost, {
+          children: /*#__PURE__*/_jsx(Portal, {
+            mode: "handoff",
             boundaryId: root.boundTag.tag,
             enabled: root.shouldRenderHandoffHost,
-            screenKey: root.currentScreenKey,
-            children: /*#__PURE__*/_jsx(BoundaryContentPortal, {
-              boundaryId: root.boundTag.tag,
-              enabled: root.shouldRenderHandoffHost,
-              children: targetResolution.children
-            })
+            children: targetResolution.children
           })
         })
       })