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

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

@@ -1,48 +1,46 @@
 "use strict";
 
-import { memo, useMemo } from "react";
-import Animated, { useAnimatedRef } from "react-native-reanimated";
+import { memo, useLayoutEffect } from "react";
+import Animated from "react-native-reanimated";
 import { useComposedSlotStyles, useSlotLayoutStyles } from "../../../providers/screen/styles";
-import { prepareStyleForBounds } from "../../../utils/bounds/helpers/styles/styles";
-import { useRegisterTarget } from "../hooks/use-register-target";
+import { logger } from "../../../utils/logger";
 import { BoundaryContentPortal, BoundaryContentPortalHost } from "../portal/components/boundary-content-portal";
 import { BoundaryPortal } from "../portal/components/boundary-portal";
-import { useBoundaryRootContext } from "../providers/boundary-root.provider";
+import { TARGET_OUTSIDE_ROOT_WARNING, useOptionalBoundaryRootStore } from "../providers/boundary-root.provider";
 import { jsx as _jsx } from "react/jsx-runtime";
-export const BoundaryTarget = /*#__PURE__*/memo(function BoundaryTarget(props) {
+export const BOUNDARY_TARGET_ACTIVE_PROP = "__boundaryTargetActive";
+const BoundaryTargetInner = props => {
   const {
+    [BOUNDARY_TARGET_ACTIVE_PROP]: active,
     children,
     pointerEvents,
     style,
     ...rest
   } = props;
-  const targetAnimatedRef = useAnimatedRef();
-  const targetEscapePlaceholderRef = useAnimatedRef();
-  const rootContext = useBoundaryRootContext();
+  const rootContext = useOptionalBoundaryRootStore();
   const boundaryId = rootContext?.boundTag.tag;
-  const isActiveTarget = rootContext?.activeTargetRef === targetAnimatedRef;
+  const isActiveTarget = active === true && rootContext !== null;
   const portalRuntime = rootContext?.portalRuntime;
   const handoffEnabled = isActiveTarget && rootContext?.handoffEnabled === true;
-  const shouldEscapeTargetToScreenHost = portalRuntime?.escapeClipping === true && boundaryId !== undefined;
+  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 preparedStyles = useMemo(() => prepareStyleForBounds(style), [style]);
-  const measurementRef = shouldEscapeTargetToScreenHost ? targetEscapePlaceholderRef : targetAnimatedRef;
-  useRegisterTarget({
-    preparedStyles,
-    measurementRef,
-    targetAnimatedRef
-  });
+  const measurementRef = isActiveTarget ? rootContext.measurementRef : undefined;
+  useLayoutEffect(() => {
+    if (__DEV__ && rootContext === null) {
+      logger.warn(TARGET_OUTSIDE_ROOT_WARNING);
+    }
+  }, [rootContext]);
   return /*#__PURE__*/_jsx(BoundaryPortal, {
     boundaryId: boundaryId ?? "",
     enabled: shouldEscapeTargetToScreenHost,
-    placeholderRef: targetEscapePlaceholderRef,
+    placeholderRef: measurementRef,
     children: /*#__PURE__*/_jsx(Animated.View, {
       ...rest,
       pointerEvents: pointerEvents,
-      ref: targetAnimatedRef,
+      ref: shouldEscapeTargetToScreenHost ? undefined : measurementRef,
       style: [style, shouldApplyAssociatedStyleInline ? associatedTargetStyles : undefined, shouldApplyPortalLayoutStyle ? portalLayoutStyle : undefined],
       collapsable: false,
       children: /*#__PURE__*/_jsx(BoundaryContentPortalHost, {
@@ -57,5 +55,6 @@ export const BoundaryTarget = /*#__PURE__*/memo(function BoundaryTarget(props) {
       })
     })
   });
-});
+};
+export const BoundaryTarget = /*#__PURE__*/memo(BoundaryTargetInner);
 //# sourceMappingURL=boundary-target.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["memo","useMemo","Animated","useAnimatedRef","useComposedSlotStyles","useSlotLayoutStyles","prepareStyleForBounds","useRegisterTarget","BoundaryContentPortal","BoundaryContentPortalHost","BoundaryPortal","useBoundaryRootContext","jsx","_jsx","BoundaryTarget","props","children","pointerEvents","style","rest","targetAnimatedRef","targetEscapePlaceholderRef","rootContext","boundaryId","boundTag","tag","isActiveTarget","activeTargetRef","portalRuntime","handoffEnabled","shouldEscapeTargetToScreenHost","escapeClipping","undefined","shouldApplyAssociatedStyleInline","shouldApplyPortalLayoutStyle","associatedTargetStyles","portalLayoutStyle","preparedStyles","measurementRef","enabled","placeholderRef","View","ref","collapsable","screenKey","currentScreenKey"],"sourceRoot":"../../../../../src","sources":["components/boundary/components/boundary-target.tsx"],"mappings":"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","ignoreList":[]}
+{"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":[]}

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

@@ -1,10 +1,12 @@
 "use strict";
 
-import { forwardRef, memo } from "react";
+import { cloneElement, forwardRef, memo, useMemo } from "react";
 import Animated from "react-native-reanimated";
-import { BoundaryContentPortalHost } from "./portal/components/boundary-content-portal";
+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 { BoundaryRootProvider } from "./providers/boundary-root.provider";
+import { resolveBoundaryTarget } from "./utils/resolve-boundary-target";
 import { jsx as _jsx } from "react/jsx-runtime";
 export function createBoundaryComponent(Wrapped, options = {}) {
   const {
@@ -26,6 +28,15 @@ export function createBoundaryComponent(Wrapped, options = {}) {
       children,
       ...rest
     } = props;
+    const targetResolution = useMemo(() => {
+      return resolveBoundaryTarget(children, {
+        isTarget: element => element.type === BoundaryTarget,
+        mapTarget: (element, selected) => /*#__PURE__*/cloneElement(element, {
+          [BOUNDARY_TARGET_ACTIVE_PROP]: selected
+        })
+      });
+    }, [children]);
+    const targetStyle = targetResolution.target?.props?.style;
     return /*#__PURE__*/_jsx(BoundaryRootProvider, {
       config: {
         anchor,
@@ -38,12 +49,15 @@ export function createBoundaryComponent(Wrapped, options = {}) {
       forwardedRef: forwardedRef,
       group: group,
       handoff: handoff,
+      hasTarget: targetResolution.target !== null,
       id: id,
       style: style,
+      targetCount: targetResolution.targetCount,
+      targetStyle: targetStyle,
       children: root => /*#__PURE__*/_jsx(BoundaryPortal, {
         boundaryId: root.boundTag.tag,
         enabled: root.shouldRenderBoundaryRootThroughPortal,
-        placeholderRef: root.rootEscapePlaceholderRef,
+        placeholderRef: root.measurementRef,
         children: /*#__PURE__*/_jsx(AnimatedComponent, {
           ...rest,
           ref: root.ref,
@@ -53,7 +67,11 @@ export function createBoundaryComponent(Wrapped, options = {}) {
             boundaryId: root.boundTag.tag,
             enabled: root.shouldRenderHandoffHost,
             screenKey: root.currentScreenKey,
-            children: children
+            children: /*#__PURE__*/_jsx(BoundaryContentPortal, {
+              boundaryId: root.boundTag.tag,
+              enabled: root.shouldRenderHandoffHost,
+              children: targetResolution.children
+            })
           })
         })
       })

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

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","memo","Animated","BoundaryContentPortalHost","BoundaryPortal","BoundaryRootProvider","jsx","_jsx","createBoundaryComponent","Wrapped","options","alreadyAnimated","AnimatedComponent","createAnimatedComponent","Inner","props","forwardedRef","enabled","group","id","anchor","scaleMode","target","method","style","handoff","escapeClipping","children","rest","config","root","boundaryId","boundTag","tag","shouldRenderBoundaryRootThroughPortal","placeholderRef","rootEscapePlaceholderRef","ref","attachedStyle","collapsable","shouldRenderHandoffHost","screenKey","currentScreenKey"],"sourceRoot":"../../../../src","sources":["components/boundary/create-boundary-component.tsx"],"mappings":";;AAAA,SAA6BA,UAAU,EAAEC,IAAI,QAAQ,OAAO;AAC5D,OAAOC,QAAQ,MAAM,yBAAyB;AAC9C,SAASC,yBAAyB,QAAQ,6CAA6C;AACvF,SAASC,cAAc,QAAQ,qCAAqC;AACpE,SAASC,oBAAoB,QAAQ,oCAAoC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAO1E,OAAO,SAASC,uBAAuBA,CACtCC,OAAyB,EACzBC,OAAuC,GAAG,CAAC,CAAC,EAC3C;EACD,MAAM;IAAEC,eAAe,GAAG;EAAM,CAAC,GAAGD,OAAO;EAC3C,MAAME,iBAAiB,GAAGD,eAAe,GACtCF,OAAO,GACPP,QAAQ,CAACW,uBAAuB,CAACJ,OAAO,CAAC;EAE5C,MAAMK,KAAK,gBAAGd,UAAU,CAGtB,CAACe,KAAK,EAAEC,YAAY,KAAK;IAC1B,MAAM;MACLC,OAAO,GAAG,IAAI;MACdC,KAAK;MACLC,EAAE;MACFC,MAAM;MACNC,SAAS;MACTC,MAAM;MACNC,MAAM;MACNC,KAAK;MACLC,OAAO;MACPC,cAAc;MACdC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGb,KAAY;IAEhB,oBACCR,IAAA,CAACF,oBAAoB;MACpBwB,MAAM,EAAE;QAAET,MAAM;QAAEC,SAAS;QAAEC,MAAM;QAAEC;MAAO,CAAE;MAC9CN,OAAO,EAAEA,OAAQ;MACjBS,cAAc,EAAEA,cAAe;MAC/BV,YAAY,EAAEA,YAAa;MAC3BE,KAAK,EAAEA,KAAM;MACbO,OAAO,EAAEA,OAAQ;MACjBN,EAAE,EAAEA,EAAG;MACPK,KAAK,EAAEA,KAAM;MAAAG,QAAA,EAEXG,IAAI,iBACLvB,IAAA,CAACH,cAAc;QACd2B,UAAU,EAAED,IAAI,CAACE,QAAQ,CAACC,GAAI;QAC9BhB,OAAO,EAAEa,IAAI,CAACI,qCAAsC;QACpDC,cAAc,EAAEL,IAAI,CAACM,wBAAyB;QAAAT,QAAA,eAE9CpB,IAAA,CAACK,iBAAiB;UAAA,GACbgB,IAAI;UACRS,GAAG,EAAEP,IAAI,CAACO,GAAI;UACdb,KAAK,EAAE,CAACA,KAAK,EAAEM,IAAI,CAACQ,aAAa,CAAE;UACnCC,WAAW,EAAE,KAAM;UAAAZ,QAAA,eAEnBpB,IAAA,CAACJ,yBAAyB;YACzB4B,UAAU,EAAED,IAAI,CAACE,QAAQ,CAACC,GAAI;YAC9BhB,OAAO,EAAEa,IAAI,CAACU,uBAAwB;YACtCC,SAAS,EAAEX,IAAI,CAACY,gBAAiB;YAAAf,QAAA,EAEhCA;UAAQ,CACiB;QAAC,CACV;MAAC,CACL;IAChB,CACoB,CAAC;EAEzB,CAAC,CAAC;;EAEF;EACA;EACA,oBAAO1B,IAAI,CAACa,KAAK,CAAC;AAMnB","ignoreList":[]}
+{"version":3,"names":["cloneElement","forwardRef","memo","useMemo","Animated","BOUNDARY_TARGET_ACTIVE_PROP","BoundaryTarget","BoundaryContentPortal","BoundaryContentPortalHost","BoundaryPortal","BoundaryRootProvider","resolveBoundaryTarget","jsx","_jsx","createBoundaryComponent","Wrapped","options","alreadyAnimated","AnimatedComponent","createAnimatedComponent","Inner","props","forwardedRef","enabled","group","id","anchor","scaleMode","target","method","style","handoff","escapeClipping","children","rest","targetResolution","isTarget","element","type","mapTarget","selected","targetStyle","config","hasTarget","targetCount","root","boundaryId","boundTag","tag","shouldRenderBoundaryRootThroughPortal","placeholderRef","measurementRef","ref","attachedStyle","collapsable","shouldRenderHandoffHost","screenKey","currentScreenKey"],"sourceRoot":"../../../../src","sources":["components/boundary/create-boundary-component.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js

@@ -1,18 +1,22 @@
 "use strict";
 
-import { useCallback, useLayoutEffect } from "react";
+import { useCallback, useLayoutEffect, useMemo } from "react";
 import { cancelAnimation, useAnimatedReaction, useSharedValue, withDelay, withTiming } from "react-native-reanimated";
 import { scheduleOnUI } from "react-native-worklets";
 import { useDescriptorsStore } from "../../../../providers/screen/descriptors";
+import { useBlankStackStore } from "../../../../providers/stack/blank-stack.provider";
 import { AnimationStore } from "../../../../stores/animation.store";
-import { getSourceScreenKeyFromPairKey } from "../../../../stores/bounds/helpers/link-pairs.helpers";
-import { getEntry } from "../../../../stores/bounds/internals/entries";
+import { createScreenPairKey, getSourceScreenKeyFromPairKey } from "../../../../stores/bounds/helpers/link-pairs.helpers";
+import { getEntry, getMatchingSourceScreenKey } from "../../../../stores/bounds/internals/entries";
 import { getLink } from "../../../../stores/bounds/internals/links";
 import { pairs } from "../../../../stores/bounds/internals/state";
 import { SystemStore } from "../../../../stores/system.store";
 import { logger } from "../../../../utils/logger";
 import { getInitialDestinationMeasurementSignal } from "../../utils/destination-signals";
-const HANDSHAKE_RETRY_DELAY_MS = 100;
+
+// A missed layout should be retried on the next frame. The previous 100 ms
+// interval made each ordinary Android layout miss visibly delay navigation.
+const HANDSHAKE_RETRY_DELAY_MS = 16;
 /**
  * A destination whose initial handshake never completes must not hold the
  * transition gate forever. After this budget, release the block with a warning
@@ -22,7 +26,6 @@ const MAX_HANDSHAKE_RETRIES = 20;
 export const useInitialDestinationMeasurement = ({
   boundTag,
   enabled,
-  escapeClipping,
   measureBoundary
 }) => {
   const {
@@ -33,9 +36,13 @@ export const useInitialDestinationMeasurement = ({
   const currentScreenKey = useDescriptorsStore(s => s.derivations.currentScreenKey);
   const nextScreenKey = useDescriptorsStore(s => s.derivations.nextScreenKey);
   const destinationPairKey = useDescriptorsStore(s => s.derivations.destinationPairKey);
-  const ancestorDestinationPairKey = useDescriptorsStore(s => s.derivations.ancestorDestinationPairKey);
   const destinationEnabled = enabled && !nextScreenKey;
-  const initialDestinationPairKey = destinationPairKey ?? ancestorDestinationPairKey;
+  const canReceiveDestination = destinationEnabled && !!destinationPairKey;
+  const preferredSourceScreenKey = destinationPairKey ? getSourceScreenKeyFromPairKey(destinationPairKey) : undefined;
+  const stackScenes = useBlankStackStore(store => store.scenes);
+  // A retained closing screen can still have registered boundaries, but it
+  // cannot own a new transition link.
+  const closingSourceScreenKeys = useMemo(() => stackScenes.filter(scene => scene.activity === "closing").map(scene => scene.route.key), [stackScenes]);
   const progress = AnimationStore.getValue(currentScreenKey, "transitionProgress");
   const {
     actions: {
@@ -47,6 +54,7 @@ export const useInitialDestinationMeasurement = ({
   const retryToken = useSharedValue(0);
   const handshakeRetries = useSharedValue(0);
   const hasGivenUp = useSharedValue(0);
+  const hasFinishedInitialMeasurement = useSharedValue(0);
   const releaseLifecycleStartBlock = useCallback(() => {
     "worklet";
 
@@ -54,12 +62,17 @@ export const useInitialDestinationMeasurement = ({
     if (!isBlockingLifecycleStart.get()) {
       return;
     }
+    hasFinishedInitialMeasurement.set(1);
     isBlockingLifecycleStart.set(0);
     unblockLifecycleStart();
-  }, [isBlockingLifecycleStart, retryToken, unblockLifecycleStart]);
+  }, [hasFinishedInitialMeasurement, isBlockingLifecycleStart, retryToken, unblockLifecycleStart]);
   const claimLifecycleStartBlock = useCallback(() => {
     "worklet";
 
+    if (!canReceiveDestination || hasFinishedInitialMeasurement.get() || !getMatchingSourceScreenKey(tag, currentScreenKey)) {
+      return;
+    }
+
     // The progress check and block claim must share one UI-thread operation.
     // Otherwise a JS-thread layout effect can observe zero, enqueue the block,
     // and let the opening animation start before that block reaches the UI thread.
@@ -68,44 +81,48 @@ export const useInitialDestinationMeasurement = ({
     }
     blockLifecycleStart();
     isBlockingLifecycleStart.set(1);
-  }, [blockLifecycleStart, isBlockingLifecycleStart, progress]);
+  }, [blockLifecycleStart, canReceiveDestination, currentScreenKey, hasFinishedInitialMeasurement, isBlockingLifecycleStart, progress, tag]);
   useLayoutEffect(() => {
-    if (!destinationEnabled || !initialDestinationPairKey) {
+    if (!canReceiveDestination) {
       return;
     }
     scheduleOnUI(claimLifecycleStartBlock);
     return () => {
-      if (escapeClipping) {
-        // The portal host owns the release after this boundary hands off.
-        return;
-      }
-
       // This is an abandonment fallback, not a second release. Run it on the UI
       // runtime so it serializes with the handshake's guarded release.
       scheduleOnUI(releaseLifecycleStartBlock);
     };
-  }, [claimLifecycleStartBlock, destinationEnabled, escapeClipping, initialDestinationPairKey, releaseLifecycleStartBlock]);
+  }, [claimLifecycleStartBlock, canReceiveDestination, releaseLifecycleStartBlock]);
   useAnimatedReaction(() => {
     "worklet";
 
+    if (!canReceiveDestination || hasFinishedInitialMeasurement.get() || isBlockingLifecycleStart.get() <= 0) {
+      return null;
+    }
+    if (progress.get() > 0) {
+      return null;
+    }
     const retryTick = retryToken.get();
-    const isWaitingForOpenToStart = progress.get() <= 0;
-    const sourceScreenKey = initialDestinationPairKey ? getSourceScreenKeyFromPairKey(initialDestinationPairKey) : undefined;
+    const sourceScreenKey = getMatchingSourceScreenKey(tag, currentScreenKey, preferredSourceScreenKey, closingSourceScreenKeys);
+    const pairKey = sourceScreenKey ? createScreenPairKey(sourceScreenKey, currentScreenKey) : undefined;
     const signal = getInitialDestinationMeasurementSignal({
-      enabled: destinationEnabled && isWaitingForOpenToStart && isBlockingLifecycleStart.get() > 0,
-      destinationPairKey,
-      ancestorDestinationPairKey,
+      enabled: destinationEnabled,
+      pairKey,
       linkId: linkKey,
       group,
       destinationPresent: getEntry(tag, currentScreenKey) !== null,
-      sourcePresent: sourceScreenKey !== undefined && getEntry(tag, sourceScreenKey) !== null,
-      linkState: initialDestinationPairKey ? pairs.get() : undefined
+      sourcePresent: sourceScreenKey !== null,
+      linkState: pairs.get()
     });
     return [signal?.pairKey ?? null, signal?.action ?? null, retryTick];
-  }, ([measurePairKey, action, retryTick], previous) => {
+  }, (next, previous) => {
     "worklet";
 
-    if (!measurePairKey || !action) {
+    if (!next || hasFinishedInitialMeasurement.get()) {
+      return;
+    }
+    const [measurePairKey, action, retryTick] = next;
+    if (!action) {
       return;
     }
     const previousMeasurePairKey = previous?.[0];
@@ -123,23 +140,18 @@ export const useInitialDestinationMeasurement = ({
       handshakeRetries.set(0);
       return;
     }
-    if (action === "measure") {
+    if (action === "measure" && measurePairKey) {
       measureBoundary({
         type: "destination",
         pairKey: measurePairKey
       });
     }
-    const link = getLink(measurePairKey, linkKey);
+    const link = measurePairKey ? getLink(measurePairKey, linkKey) : null;
     const linkComplete = !!link?.source && !!link.destination;
     if (linkComplete || action === "complete") {
       cancelAnimation(retryToken);
       handshakeRetries.set(0);
-      if (escapeClipping) {
-        // Screen-level escape has a second readiness phase after destination
-        // matching: the host must commit before the transition starts, or
-        // the payload can disappear for a frame.
-        return;
-      }
+      hasFinishedInitialMeasurement.set(1);
       releaseLifecycleStartBlock();
       return;
     }

package/lib/module/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useLayoutEffect","cancelAnimation","useAnimatedReaction","useSharedValue","withDelay","withTiming","scheduleOnUI","useDescriptorsStore","AnimationStore","getSourceScreenKeyFromPairKey","getEntry","getLink","pairs","SystemStore","logger","getInitialDestinationMeasurementSignal","HANDSHAKE_RETRY_DELAY_MS","MAX_HANDSHAKE_RETRIES","useInitialDestinationMeasurement","boundTag","enabled","escapeClipping","measureBoundary","tag","linkKey","group","currentScreenKey","s","derivations","nextScreenKey","destinationPairKey","ancestorDestinationPairKey","destinationEnabled","initialDestinationPairKey","progress","getValue","actions","blockLifecycleStart","unblockLifecycleStart","getBag","isBlockingLifecycleStart","retryToken","handshakeRetries","hasGivenUp","releaseLifecycleStartBlock","get","set","claimLifecycleStartBlock","retryTick","isWaitingForOpenToStart","sourceScreenKey","undefined","signal","linkId","destinationPresent","sourcePresent","linkState","pairKey","action","measurePairKey","previous","previousMeasurePairKey","previousAction","previousRetryTick","shouldHandleSignal","type","link","linkComplete","source","destination","warn","duration"],"sourceRoot":"../../../../../../src","sources":["components/boundary/hooks/lifecycles/use-initial-destination-measurement.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useLayoutEffect","useMemo","cancelAnimation","useAnimatedReaction","useSharedValue","withDelay","withTiming","scheduleOnUI","useDescriptorsStore","useBlankStackStore","AnimationStore","createScreenPairKey","getSourceScreenKeyFromPairKey","getEntry","getMatchingSourceScreenKey","getLink","pairs","SystemStore","logger","getInitialDestinationMeasurementSignal","HANDSHAKE_RETRY_DELAY_MS","MAX_HANDSHAKE_RETRIES","useInitialDestinationMeasurement","boundTag","enabled","measureBoundary","tag","linkKey","group","currentScreenKey","s","derivations","nextScreenKey","destinationPairKey","destinationEnabled","canReceiveDestination","preferredSourceScreenKey","undefined","stackScenes","store","scenes","closingSourceScreenKeys","filter","scene","activity","map","route","key","progress","getValue","actions","blockLifecycleStart","unblockLifecycleStart","getBag","isBlockingLifecycleStart","retryToken","handshakeRetries","hasGivenUp","hasFinishedInitialMeasurement","releaseLifecycleStartBlock","get","set","claimLifecycleStartBlock","retryTick","sourceScreenKey","pairKey","signal","linkId","destinationPresent","sourcePresent","linkState","action","next","previous","measurePairKey","previousMeasurePairKey","previousAction","previousRetryTick","shouldHandleSignal","type","link","linkComplete","source","destination","warn","duration"],"sourceRoot":"../../../../../../src","sources":["components/boundary/hooks/lifecycles/use-initial-destination-measurement.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,eAAe,EAAEC,OAAO,QAAQ,OAAO;AAC7D,SACCC,eAAe,EACfC,mBAAmB,EACnBC,cAAc,EACdC,SAAS,EACTC,UAAU,QACJ,yBAAyB;AAChC,SAASC,YAAY,QAAQ,uBAAuB;AACpD,SAASC,mBAAmB,QAAQ,0CAA0C;AAC9E,SAASC,kBAAkB,QAAQ,kDAAkD;AACrF,SAASC,cAAc,QAAQ,oCAAoC;AACnE,SACCC,mBAAmB,EACnBC,6BAA6B,QACvB,sDAAsD;AAC7D,SACCC,QAAQ,EACRC,0BAA0B,QACpB,6CAA6C;AACpD,SAASC,OAAO,QAAQ,2CAA2C;AACnE,SAASC,KAAK,QAAQ,2CAA2C;AAEjE,SAASC,WAAW,QAAQ,iCAAiC;AAC7D,SAASC,MAAM,QAAQ,0BAA0B;AAEjD,SAASC,sCAAsC,QAAQ,iCAAiC;;AAExF;AACA;AACA,MAAMC,wBAAwB,GAAG,EAAE;AACnC;AACA;AACA;AACA;AACA;AACA,MAAMC,qBAAqB,GAAG,EAAE;AAQhC,OAAO,MAAMC,gCAAgC,GAAGA,CAAC;EAChDC,QAAQ;EACRC,OAAO;EACPC;AACuC,CAAC,KAAK;EAC7C,MAAM;IAAEC,GAAG;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGL,QAAQ;EACxC,MAAMM,gBAAgB,GAAGrB,mBAAmB,CAC1CsB,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,gBACtB,CAAC;EACD,MAAMG,aAAa,GAAGxB,mBAAmB,CAAEsB,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACC,aAAa,CAAC;EAC7E,MAAMC,kBAAkB,GAAGzB,mBAAmB,CAC5CsB,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACE,kBACtB,CAAC;EACD,MAAMC,kBAAkB,GAAGV,OAAO,IAAI,CAACQ,aAAa;EACpD,MAAMG,qBAAqB,GAAGD,kBAAkB,IAAI,CAAC,CAACD,kBAAkB;EACxE,MAAMG,wBAAwB,GAAGH,kBAAkB,GAChDrB,6BAA6B,CAACqB,kBAAkB,CAAC,GACjDI,SAAS;EACZ,MAAMC,WAAW,GAAG7B,kBAAkB,CAAE8B,KAAK,IAAKA,KAAK,CAACC,MAAM,CAAC;EAC/D;EACA;EACA,MAAMC,uBAAuB,GAAGxC,OAAO,CACtC,MACCqC,WAAW,CACTI,MAAM,CAAEC,KAAK,IAAKA,KAAK,CAACC,QAAQ,KAAK,SAAS,CAAC,CAC/CC,GAAG,CAAEF,KAAK,IAAKA,KAAK,CAACG,KAAK,CAACC,GAAG,CAAC,EAClC,CAACT,WAAW,CACb,CAAC;EACD,MAAMU,QAAQ,GAAGtC,cAAc,CAACuC,QAAQ,CACvCpB,gBAAgB,EAChB,oBACD,CAAC;EAED,MAAM;IACLqB,OAAO,EAAE;MAAEC,mBAAmB;MAAEC;IAAsB;EACvD,CAAC,GAAGnC,WAAW,CAACoC,MAAM,CAACxB,gBAAgB,CAAC;EAExC,MAAMyB,wBAAwB,GAAGlD,cAAc,CAAC,CAAC,CAAC;EAClD,MAAMmD,UAAU,GAAGnD,cAAc,CAAC,CAAC,CAAC;EACpC,MAAMoD,gBAAgB,GAAGpD,cAAc,CAAC,CAAC,CAAC;EAC1C,MAAMqD,UAAU,GAAGrD,cAAc,CAAC,CAAC,CAAC;EACpC,MAAMsD,6BAA6B,GAAGtD,cAAc,CAAC,CAAC,CAAC;EAEvD,MAAMuD,0BAA0B,GAAG5D,WAAW,CAAC,MAAM;IACpD,SAAS;;IACTG,eAAe,CAACqD,UAAU,CAAC;IAE3B,IAAI,CAACD,wBAAwB,CAACM,GAAG,CAAC,CAAC,EAAE;MACpC;IACD;IAEAF,6BAA6B,CAACG,GAAG,CAAC,CAAC,CAAC;IACpCP,wBAAwB,CAACO,GAAG,CAAC,CAAC,CAAC;IAC/BT,qBAAqB,CAAC,CAAC;EACxB,CAAC,EAAE,CACFM,6BAA6B,EAC7BJ,wBAAwB,EACxBC,UAAU,EACVH,qBAAqB,CACrB,CAAC;EAEF,MAAMU,wBAAwB,GAAG/D,WAAW,CAAC,MAAM;IAClD,SAAS;;IACT,IACC,CAACoC,qBAAqB,IACtBuB,6BAA6B,CAACE,GAAG,CAAC,CAAC,IACnC,CAAC9C,0BAA0B,CAACY,GAAG,EAAEG,gBAAgB,CAAC,EACjD;MACD;IACD;;IAEA;IACA;IACA;IACA,IAAImB,QAAQ,CAACY,GAAG,CAAC,CAAC,GAAG,CAAC,IAAIN,wBAAwB,CAACM,GAAG,CAAC,CAAC,EAAE;MACzD;IACD;IAEAT,mBAAmB,CAAC,CAAC;IACrBG,wBAAwB,CAACO,GAAG,CAAC,CAAC,CAAC;EAChC,CAAC,EAAE,CACFV,mBAAmB,EACnBhB,qBAAqB,EACrBN,gBAAgB,EAChB6B,6BAA6B,EAC7BJ,wBAAwB,EACxBN,QAAQ,EACRtB,GAAG,CACH,CAAC;EAEF1B,eAAe,CAAC,MAAM;IACrB,IAAI,CAACmC,qBAAqB,EAAE;MAC3B;IACD;IAEA5B,YAAY,CAACuD,wBAAwB,CAAC;IAEtC,OAAO,MAAM;MACZ;MACA;MACAvD,YAAY,CAACoD,0BAA0B,CAAC;IACzC,CAAC;EACF,CAAC,EAAE,CACFG,wBAAwB,EACxB3B,qBAAqB,EACrBwB,0BAA0B,CAC1B,CAAC;EAEFxD,mBAAmB,CAClB,MAAM;IACL,SAAS;;IAET,IACC,CAACgC,qBAAqB,IACtBuB,6BAA6B,CAACE,GAAG,CAAC,CAAC,IACnCN,wBAAwB,CAACM,GAAG,CAAC,CAAC,IAAI,CAAC,EAClC;MACD,OAAO,IAAI;IACZ;IAEA,IAAIZ,QAAQ,CAACY,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE;MACvB,OAAO,IAAI;IACZ;IAEA,MAAMG,SAAS,GAAGR,UAAU,CAACK,GAAG,CAAC,CAAC;IAClC,MAAMI,eAAe,GAAGlD,0BAA0B,CACjDY,GAAG,EACHG,gBAAgB,EAChBO,wBAAwB,EACxBK,uBACD,CAAC;IACD,MAAMwB,OAAO,GAAGD,eAAe,GAC5BrD,mBAAmB,CAACqD,eAAe,EAAEnC,gBAAgB,CAAC,GACtDQ,SAAS;IACZ,MAAM6B,MAAM,GAAG/C,sCAAsC,CAAC;MACrDK,OAAO,EAAEU,kBAAkB;MAC3B+B,OAAO;MACPE,MAAM,EAAExC,OAAO;MACfC,KAAK;MACLwC,kBAAkB,EAAEvD,QAAQ,CAACa,GAAG,EAAEG,gBAAgB,CAAC,KAAK,IAAI;MAC5DwC,aAAa,EAAEL,eAAe,KAAK,IAAI;MACvCM,SAAS,EAAEtD,KAAK,CAAC4C,GAAG,CAAC;IACtB,CAAC,CAAC;IAEF,OAAO,CACNM,MAAM,EAAED,OAAO,IAAI,IAAI,EACvBC,MAAM,EAAEK,MAAM,IAAI,IAAI,EACtBR,SAAS,CACT;EACF,CAAC,EACD,CAACS,IAAI,EAAEC,QAAQ,KAAK;IACnB,SAAS;;IACT,IAAI,CAACD,IAAI,IAAId,6BAA6B,CAACE,GAAG,CAAC,CAAC,EAAE;MACjD;IACD;IAEA,MAAM,CAACc,cAAc,EAAEH,MAAM,EAAER,SAAS,CAAC,GAAGS,IAAI;IAChD,IAAI,CAACD,MAAM,EAAE;MACZ;IACD;IAEA,MAAMI,sBAAsB,GAAGF,QAAQ,GAAG,CAAC,CAAC;IAC5C,MAAMG,cAAc,GAAGH,QAAQ,GAAG,CAAC,CAAC;IACpC,MAAMI,iBAAiB,GAAGJ,QAAQ,GAAG,CAAC,CAAC;IACvC,MAAMK,kBAAkB,GACvBJ,cAAc,KAAKC,sBAAsB,IACzCJ,MAAM,KAAKK,cAAc,IACzBb,SAAS,KAAKc,iBAAiB;IAEhC,IAAI,CAACC,kBAAkB,EAAE;MACxB;IACD;IAEA,IAAIrB,UAAU,CAACG,GAAG,CAAC,CAAC,EAAE;MACrB;IACD;IAEA,IAAIW,MAAM,KAAK,SAAS,EAAE;MACzBZ,0BAA0B,CAAC,CAAC;MAC5BH,gBAAgB,CAACK,GAAG,CAAC,CAAC,CAAC;MACvB;IACD;IAEA,IAAIU,MAAM,KAAK,SAAS,IAAIG,cAAc,EAAE;MAC3CjD,eAAe,CAAC;QACfsD,IAAI,EAAE,aAAa;QACnBd,OAAO,EAAES;MACV,CAAC,CAAC;IACH;IAEA,MAAMM,IAAI,GAAGN,cAAc,GAAG3D,OAAO,CAAC2D,cAAc,EAAE/C,OAAO,CAAC,GAAG,IAAI;IACrE,MAAMsD,YAAY,GAAG,CAAC,CAACD,IAAI,EAAEE,MAAM,IAAI,CAAC,CAACF,IAAI,CAACG,WAAW;IAEzD,IAAIF,YAAY,IAAIV,MAAM,KAAK,UAAU,EAAE;MAC1CrE,eAAe,CAACqD,UAAU,CAAC;MAC3BC,gBAAgB,CAACK,GAAG,CAAC,CAAC,CAAC;MACvBH,6BAA6B,CAACG,GAAG,CAAC,CAAC,CAAC;MACpCF,0BAA0B,CAAC,CAAC;MAC5B;IACD;IAEA,IAAIH,gBAAgB,CAACI,GAAG,CAAC,CAAC,IAAIvC,qBAAqB,EAAE;MACpDoC,UAAU,CAACI,GAAG,CAAC,CAAC,CAAC;MACjBF,0BAA0B,CAAC,CAAC;MAC5BzC,MAAM,CAACkE,IAAI,CACV,aAAazD,OAAO,2DAA2DN,qBAAqB,oGACrG,CAAC;MACD;IACD;;IAEA;IACA;IACAmC,gBAAgB,CAACK,GAAG,CAACL,gBAAgB,CAACI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IAChD1D,eAAe,CAACqD,UAAU,CAAC;IAC3BA,UAAU,CAACM,GAAG,CACbxD,SAAS,CACRe,wBAAwB,EACxBd,UAAU,CAACiD,UAAU,CAACK,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE;MAAEyB,QAAQ,EAAE;IAAE,CAAC,CACjD,CACD,CAAC;EACF,CACD,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/components/boundary/hooks/lifecycles/use-initial-source-measurement.js

@@ -2,6 +2,7 @@
 
 import { useAnimatedReaction, useSharedValue } from "react-native-reanimated";
 import { useDescriptorsStore } from "../../../../providers/screen/descriptors";
+import { getPairKeyForSource } from "../../../../stores/bounds/internals/links";
 import { pairs } from "../../../../stores/bounds/internals/state";
 import { getInitialSourceCaptureSignal } from "../../utils/source-signals";
 export const useInitialSourceMeasurement = params => {
@@ -10,11 +11,12 @@ export const useInitialSourceMeasurement = params => {
     measureBoundary,
     boundTag
   } = params;
-  const sourcePairKey = useDescriptorsStore(s => s.derivations.sourcePairKey);
+  const currentScreenKey = useDescriptorsStore(s => s.derivations.currentScreenKey);
   const lastSourceCaptureSignal = useSharedValue(null);
   useAnimatedReaction(() => {
     "worklet";
 
+    const sourcePairKey = getPairKeyForSource(boundTag.tag, currentScreenKey) ?? undefined;
     return getInitialSourceCaptureSignal({
       enabled,
       sourcePairKey,

package/lib/module/components/boundary/hooks/lifecycles/use-initial-source-measurement.js.map

@@ -1 +1 @@
-{"version":3,"names":["useAnimatedReaction","useSharedValue","useDescriptorsStore","pairs","getInitialSourceCaptureSignal","useInitialSourceMeasurement","params","enabled","measureBoundary","boundTag","sourcePairKey","s","derivations","lastSourceCaptureSignal","linkId","linkKey","group","linkState","get","undefined","captureSignal","set","signal","type","pairKey"],"sourceRoot":"../../../../../../src","sources":["components/boundary/hooks/lifecycles/use-initial-source-measurement.ts"],"mappings":";;AAAA,SAASA,mBAAmB,EAAEC,cAAc,QAAQ,yBAAyB;AAC7E,SAASC,mBAAmB,QAAQ,0CAA0C;AAC9E,SAASC,KAAK,QAAQ,2CAA2C;AAGjE,SAASC,6BAA6B,QAAQ,4BAA4B;AAE1E,OAAO,MAAMC,2BAA2B,GAAIC,MAI3C,IAAK;EACL,MAAM;IAAEC,OAAO;IAAEC,eAAe;IAAEC;EAAS,CAAC,GAAGH,MAAM;EACrD,MAAMI,aAAa,GAAGR,mBAAmB,CAAES,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,aAAa,CAAC;EAC7E,MAAMG,uBAAuB,GAAGZ,cAAc,CAAgB,IAAI,CAAC;EAEnED,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,OAAOI,6BAA6B,CAAC;MACpCG,OAAO;MACPG,aAAa;MACbI,MAAM,EAAEL,QAAQ,CAACM,OAAO;MACxBC,KAAK,EAAEP,QAAQ,CAACO,KAAK;MACrBC,SAAS,EAAEP,aAAa,GAAGP,KAAK,CAACe,GAAG,CAAC,CAAC,GAAGC;IAC1C,CAAC,CAAC;EACH,CAAC,EACAC,aAAa,IAAK;IAClB,SAAS;;IACT,IAAI,CAACb,OAAO,IAAI,CAACa,aAAa,EAAE;MAC/BP,uBAAuB,CAACQ,GAAG,CAAC,IAAI,CAAC;MACjC;IACD;IAEA,IAAIR,uBAAuB,CAACK,GAAG,CAAC,CAAC,KAAKE,aAAa,CAACE,MAAM,EAAE;MAC3D;IACD;IAEAT,uBAAuB,CAACQ,GAAG,CAACD,aAAa,CAACE,MAAM,CAAC;IACjDd,eAAe,CAAC;MACfe,IAAI,EAAE,QAAQ;MACdC,OAAO,EAAEJ,aAAa,CAACI;IACxB,CAAC,CAAC;EACH,CACD,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useAnimatedReaction","useSharedValue","useDescriptorsStore","getPairKeyForSource","pairs","getInitialSourceCaptureSignal","useInitialSourceMeasurement","params","enabled","measureBoundary","boundTag","currentScreenKey","s","derivations","lastSourceCaptureSignal","sourcePairKey","tag","undefined","linkId","linkKey","group","linkState","get","captureSignal","set","signal","type","pairKey"],"sourceRoot":"../../../../../../src","sources":["components/boundary/hooks/lifecycles/use-initial-source-measurement.ts"],"mappings":";;AAAA,SAASA,mBAAmB,EAAEC,cAAc,QAAQ,yBAAyB;AAC7E,SAASC,mBAAmB,QAAQ,0CAA0C;AAC9E,SAASC,mBAAmB,QAAQ,2CAA2C;AAC/E,SAASC,KAAK,QAAQ,2CAA2C;AAGjE,SAASC,6BAA6B,QAAQ,4BAA4B;AAE1E,OAAO,MAAMC,2BAA2B,GAAIC,MAI3C,IAAK;EACL,MAAM;IAAEC,OAAO;IAAEC,eAAe;IAAEC;EAAS,CAAC,GAAGH,MAAM;EACrD,MAAMI,gBAAgB,GAAGT,mBAAmB,CAC1CU,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,gBACtB,CAAC;EACD,MAAMG,uBAAuB,GAAGb,cAAc,CAAgB,IAAI,CAAC;EAEnED,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,MAAMe,aAAa,GAClBZ,mBAAmB,CAACO,QAAQ,CAACM,GAAG,EAAEL,gBAAgB,CAAC,IAAIM,SAAS;IACjE,OAAOZ,6BAA6B,CAAC;MACpCG,OAAO;MACPO,aAAa;MACbG,MAAM,EAAER,QAAQ,CAACS,OAAO;MACxBC,KAAK,EAAEV,QAAQ,CAACU,KAAK;MACrBC,SAAS,EAAEN,aAAa,GAAGX,KAAK,CAACkB,GAAG,CAAC,CAAC,GAAGL;IAC1C,CAAC,CAAC;EACH,CAAC,EACAM,aAAa,IAAK;IAClB,SAAS;;IACT,IAAI,CAACf,OAAO,IAAI,CAACe,aAAa,EAAE;MAC/BT,uBAAuB,CAACU,GAAG,CAAC,IAAI,CAAC;MACjC;IACD;IAEA,IAAIV,uBAAuB,CAACQ,GAAG,CAAC,CAAC,KAAKC,aAAa,CAACE,MAAM,EAAE;MAC3D;IACD;IAEAX,uBAAuB,CAACU,GAAG,CAACD,aAAa,CAACE,MAAM,CAAC;IACjDhB,eAAe,CAAC;MACfiB,IAAI,EAAE,QAAQ;MACdC,OAAO,EAAEJ,aAAa,CAACI;IACxB,CAAC,CAAC;EACH,CACD,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/components/boundary/hooks/lifecycles/use-refresh-boundary.js

@@ -3,6 +3,7 @@
 import { useAnimatedReaction } from "react-native-reanimated";
 import { useDescriptorsStore } from "../../../../providers/screen/descriptors";
 import { AnimationStore } from "../../../../stores/animation.store";
+import { getPairKeyForDestination, getPairKeyForSource } from "../../../../stores/bounds/internals/links";
 import { pairs } from "../../../../stores/bounds/internals/state";
 import { getRefreshBoundarySignal } from "../../utils/refresh-signals";
 export const useRefreshBoundary = ({
@@ -16,34 +17,36 @@ export const useRefreshBoundary = ({
   } = boundTag;
   const currentScreenKey = useDescriptorsStore(s => s.derivations.currentScreenKey);
   const nextScreenKey = useDescriptorsStore(s => s.derivations.nextScreenKey);
-  const sourcePairKey = useDescriptorsStore(s => s.derivations.sourcePairKey);
-  const destinationPairKey = useDescriptorsStore(s => s.derivations.destinationPairKey);
-  const ancestorDestinationPairKey = useDescriptorsStore(s => s.derivations.ancestorDestinationPairKey);
   // Source-side boundaries refresh from the next screen's lifecycle pulse.
   // Destination-side boundaries have no next screen, so they refresh from self.
   const refreshScreenKey = nextScreenKey ?? currentScreenKey;
   const refreshWillAnimate = AnimationStore.getValue(refreshScreenKey, "willAnimate");
+  const refreshSettled = AnimationStore.getValue(refreshScreenKey, "progressSettled");
   const refreshClosing = AnimationStore.getValue(refreshScreenKey, "closing");
-  const refreshEntering = AnimationStore.getValue(refreshScreenKey, "entering");
-  const refreshAnimating = AnimationStore.getValue(refreshScreenKey, "progressAnimating");
-  const refreshProgress = AnimationStore.getValue(refreshScreenKey, "transitionProgress");
   useAnimatedReaction(() => {
     "worklet";
 
+    if (!enabled) return null;
+    const shouldRefresh = !!refreshWillAnimate.get();
+    const settled = !!refreshSettled.get();
+    // A group's active member can change while the transition is settled
+    // (for example, paging a destination gallery). Let that member publish
+    // fresh bounds even though there is no willAnimate lifecycle pulse yet.
+    if (!shouldRefresh && (!group || !settled)) {
+      return null;
+    }
+    const sourcePairKey = getPairKeyForSource(boundTag.tag, currentScreenKey) ?? undefined;
+    const destinationPairKey = getPairKeyForDestination(boundTag.tag, currentScreenKey) ?? undefined;
     return getRefreshBoundarySignal({
       enabled,
       currentScreenKey,
       sourcePairKey,
       destinationPairKey,
-      ancestorDestinationPairKey,
-      nextScreenKey,
       linkId: linkKey,
       group,
-      shouldRefresh: !!refreshWillAnimate.get(),
+      shouldRefresh,
+      settled,
       closing: !!refreshClosing.get(),
-      entering: !!refreshEntering.get(),
-      animating: !!refreshAnimating.get(),
-      progress: refreshProgress.get(),
       linkState: pairs.get()
     });
   }, (refreshSignal, prevRefreshSignal) => {

package/lib/module/components/boundary/hooks/lifecycles/use-refresh-boundary.js.map

@@ -1 +1 @@
-{"version":3,"names":["useAnimatedReaction","useDescriptorsStore","AnimationStore","pairs","getRefreshBoundarySignal","useRefreshBoundary","enabled","boundTag","measureBoundary","linkKey","group","currentScreenKey","s","derivations","nextScreenKey","sourcePairKey","destinationPairKey","ancestorDestinationPairKey","refreshScreenKey","refreshWillAnimate","getValue","refreshClosing","refreshEntering","refreshAnimating","refreshProgress","linkId","shouldRefresh","get","closing","entering","animating","progress","linkState","refreshSignal","prevRefreshSignal","signal","type","pairKey"],"sourceRoot":"../../../../../../src","sources":["components/boundary/hooks/lifecycles/use-refresh-boundary.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,yBAAyB;AAC7D,SAASC,mBAAmB,QAAQ,0CAA0C;AAC9E,SAASC,cAAc,QAAQ,oCAAoC;AACnE,SAASC,KAAK,QAAQ,2CAA2C;AAGjE,SAASC,wBAAwB,QAAQ,6BAA6B;AAQtE,OAAO,MAAMC,kBAAkB,GAAGA,CAAC;EAClCC,OAAO;EACPC,QAAQ;EACRC;AACyB,CAAC,KAAK;EAC/B,MAAM;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGH,QAAQ;EACnC,MAAMI,gBAAgB,GAAGV,mBAAmB,CAC1CW,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,gBACtB,CAAC;EACD,MAAMG,aAAa,GAAGb,mBAAmB,CAAEW,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACC,aAAa,CAAC;EAC7E,MAAMC,aAAa,GAAGd,mBAAmB,CAAEW,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACE,aAAa,CAAC;EAC7E,MAAMC,kBAAkB,GAAGf,mBAAmB,CAC5CW,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACG,kBACtB,CAAC;EACD,MAAMC,0BAA0B,GAAGhB,mBAAmB,CACpDW,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACI,0BACtB,CAAC;EACD;EACA;EACA,MAAMC,gBAAgB,GAAGJ,aAAa,IAAIH,gBAAgB;EAC1D,MAAMQ,kBAAkB,GAAGjB,cAAc,CAACkB,QAAQ,CACjDF,gBAAgB,EAChB,aACD,CAAC;EACD,MAAMG,cAAc,GAAGnB,cAAc,CAACkB,QAAQ,CAACF,gBAAgB,EAAE,SAAS,CAAC;EAC3E,MAAMI,eAAe,GAAGpB,cAAc,CAACkB,QAAQ,CAACF,gBAAgB,EAAE,UAAU,CAAC;EAC7E,MAAMK,gBAAgB,GAAGrB,cAAc,CAACkB,QAAQ,CAC/CF,gBAAgB,EAChB,mBACD,CAAC;EACD,MAAMM,eAAe,GAAGtB,cAAc,CAACkB,QAAQ,CAC9CF,gBAAgB,EAChB,oBACD,CAAC;EAEDlB,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,OAAOI,wBAAwB,CAAC;MAC/BE,OAAO;MACPK,gBAAgB;MAChBI,aAAa;MACbC,kBAAkB;MAClBC,0BAA0B;MAC1BH,aAAa;MACbW,MAAM,EAAEhB,OAAO;MACfC,KAAK;MACLgB,aAAa,EAAE,CAAC,CAACP,kBAAkB,CAACQ,GAAG,CAAC,CAAC;MACzCC,OAAO,EAAE,CAAC,CAACP,cAAc,CAACM,GAAG,CAAC,CAAC;MAC/BE,QAAQ,EAAE,CAAC,CAACP,eAAe,CAACK,GAAG,CAAC,CAAC;MACjCG,SAAS,EAAE,CAAC,CAACP,gBAAgB,CAACI,GAAG,CAAC,CAAC;MACnCI,QAAQ,EAAEP,eAAe,CAACG,GAAG,CAAC,CAAC;MAC/BK,SAAS,EAAE7B,KAAK,CAACwB,GAAG,CAAC;IACtB,CAAC,CAAC;EACH,CAAC,EACD,CAACM,aAAa,EAAEC,iBAAiB,KAAK;IACrC,SAAS;;IAET,IACC,CAACD,aAAa,IACdA,aAAa,CAACE,MAAM,KAAKD,iBAAiB,EAAEC,MAAM,EACjD;MACD;IACD;IAEA3B,eAAe,CAAC;MACf4B,IAAI,EAAEH,aAAa,CAACG,IAAI;MACxBC,OAAO,EAAEJ,aAAa,CAACI;IACxB,CAAC,CAAC;EACH,CACD,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useAnimatedReaction","useDescriptorsStore","AnimationStore","getPairKeyForDestination","getPairKeyForSource","pairs","getRefreshBoundarySignal","useRefreshBoundary","enabled","boundTag","measureBoundary","linkKey","group","currentScreenKey","s","derivations","nextScreenKey","refreshScreenKey","refreshWillAnimate","getValue","refreshSettled","refreshClosing","shouldRefresh","get","settled","sourcePairKey","tag","undefined","destinationPairKey","linkId","closing","linkState","refreshSignal","prevRefreshSignal","signal","type","pairKey"],"sourceRoot":"../../../../../../src","sources":["components/boundary/hooks/lifecycles/use-refresh-boundary.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,yBAAyB;AAC7D,SAASC,mBAAmB,QAAQ,0CAA0C;AAC9E,SAASC,cAAc,QAAQ,oCAAoC;AACnE,SACCC,wBAAwB,EACxBC,mBAAmB,QACb,2CAA2C;AAClD,SAASC,KAAK,QAAQ,2CAA2C;AAGjE,SAASC,wBAAwB,QAAQ,6BAA6B;AAQtE,OAAO,MAAMC,kBAAkB,GAAGA,CAAC;EAClCC,OAAO;EACPC,QAAQ;EACRC;AACyB,CAAC,KAAK;EAC/B,MAAM;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGH,QAAQ;EACnC,MAAMI,gBAAgB,GAAGZ,mBAAmB,CAC1Ca,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,gBACtB,CAAC;EACD,MAAMG,aAAa,GAAGf,mBAAmB,CAAEa,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACC,aAAa,CAAC;EAC7E;EACA;EACA,MAAMC,gBAAgB,GAAGD,aAAa,IAAIH,gBAAgB;EAC1D,MAAMK,kBAAkB,GAAGhB,cAAc,CAACiB,QAAQ,CACjDF,gBAAgB,EAChB,aACD,CAAC;EACD,MAAMG,cAAc,GAAGlB,cAAc,CAACiB,QAAQ,CAC7CF,gBAAgB,EAChB,iBACD,CAAC;EACD,MAAMI,cAAc,GAAGnB,cAAc,CAACiB,QAAQ,CAACF,gBAAgB,EAAE,SAAS,CAAC;EAE3EjB,mBAAmB,CAClB,MAAM;IACL,SAAS;;IAET,IAAI,CAACQ,OAAO,EAAE,OAAO,IAAI;IAEzB,MAAMc,aAAa,GAAG,CAAC,CAACJ,kBAAkB,CAACK,GAAG,CAAC,CAAC;IAChD,MAAMC,OAAO,GAAG,CAAC,CAACJ,cAAc,CAACG,GAAG,CAAC,CAAC;IACtC;IACA;IACA;IACA,IAAI,CAACD,aAAa,KAAK,CAACV,KAAK,IAAI,CAACY,OAAO,CAAC,EAAE;MAC3C,OAAO,IAAI;IACZ;IACA,MAAMC,aAAa,GAClBrB,mBAAmB,CAACK,QAAQ,CAACiB,GAAG,EAAEb,gBAAgB,CAAC,IAAIc,SAAS;IACjE,MAAMC,kBAAkB,GACvBzB,wBAAwB,CAACM,QAAQ,CAACiB,GAAG,EAAEb,gBAAgB,CAAC,IAAIc,SAAS;IAEtE,OAAOrB,wBAAwB,CAAC;MAC/BE,OAAO;MACPK,gBAAgB;MAChBY,aAAa;MACbG,kBAAkB;MAClBC,MAAM,EAAElB,OAAO;MACfC,KAAK;MACLU,aAAa;MACbE,OAAO;MACPM,OAAO,EAAE,CAAC,CAACT,cAAc,CAACE,GAAG,CAAC,CAAC;MAC/BQ,SAAS,EAAE1B,KAAK,CAACkB,GAAG,CAAC;IACtB,CAAC,CAAC;EACH,CAAC,EACD,CAACS,aAAa,EAAEC,iBAAiB,KAAK;IACrC,SAAS;;IAET,IACC,CAACD,aAAa,IACdA,aAAa,CAACE,MAAM,KAAKD,iBAAiB,EAAEC,MAAM,EACjD;MACD;IACD;IAEAxB,eAAe,CAAC;MACfyB,IAAI,EAAEH,aAAa,CAACG,IAAI;MACxBC,OAAO,EAAEJ,aAAa,CAACI;IACxB,CAAC,CAAC;EACH,CACD,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/components/boundary/hooks/use-boundary-measurement.js

@@ -19,9 +19,9 @@ export const useBoundaryMeasurement = ({
   currentScreenKey,
   measuredRef,
   style,
-  targetPreparedStyles,
   handoff,
   escapeClipping,
+  localMeasurement,
   config
 }) => {
   const {
@@ -36,8 +36,7 @@ export const useBoundaryMeasurement = ({
     target,
     method
   }), [anchor, scaleMode, target, method]);
-  const rootPreparedStyles = useMemo(() => prepareStyleForBounds(style), [style]);
-  const preparedStyles = targetPreparedStyles ?? rootPreparedStyles;
+  const preparedStyles = useMemo(() => prepareStyleForBounds(style), [style]);
   const measureBoundary = useMeasurer({
     enabled,
     boundTag,
@@ -45,13 +44,15 @@ export const useBoundaryMeasurement = ({
     preparedStyles,
     measuredAnimatedRef: measuredRef,
     handoff,
-    escapeClipping
+    escapeClipping,
+    localMeasurement
   });
 
-  // Register/unregister this boundary in the presence map so source/destination
-  // matching can resolve across concrete screen keys.
+  // 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: runtimeEnabled,
+    enabled,
     boundTag,
     currentScreenKey,
     boundaryConfig,
@@ -59,14 +60,13 @@ export const useBoundaryMeasurement = ({
     escapeClipping
   });
   useInitialSourceMeasurement({
-    enabled: runtimeEnabled,
+    enabled,
     measureBoundary,
     boundTag
   });
   useInitialDestinationMeasurement({
     boundTag,
     enabled: runtimeEnabled,
-    escapeClipping,
     measureBoundary
   });
   useRefreshBoundary({

package/lib/module/components/boundary/hooks/use-boundary-measurement.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","prepareStyleForBounds","useBoundaryPresence","useInitialDestinationMeasurement","useInitialSourceMeasurement","useRefreshBoundary","useMeasurer","useBoundaryMeasurement","boundTag","enabled","runtimeEnabled","currentScreenKey","measuredRef","style","targetPreparedStyles","handoff","escapeClipping","config","anchor","scaleMode","target","method","boundaryConfig","rootPreparedStyles","preparedStyles","measureBoundary","measuredAnimatedRef"],"sourceRoot":"../../../../../src","sources":["components/boundary/hooks/use-boundary-measurement.ts"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,OAAO;AAI/B,SAASC,qBAAqB,QAAQ,6CAA6C;AAEnF,SAASC,mBAAmB,QAAQ,oCAAoC;AACxE,SAASC,gCAAgC,QAAQ,kDAAkD;AACnG,SAASC,2BAA2B,QAAQ,6CAA6C;AACzF,SAASC,kBAAkB,QAAQ,mCAAmC;AACtE,SAASC,WAAW,QAAQ,gBAAgB;AAmB5C;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,sBAAsB,GAAGA,CAAC;EACtCC,QAAQ;EACRC,OAAO;EACPC,cAAc;EACdC,gBAAgB;EAChBC,WAAW;EACXC,KAAK;EACLC,oBAAoB;EACpBC,OAAO;EACPC,cAAc;EACdC;AAC6B,CAAC,KAAK;EACnC,MAAM;IAAEC,MAAM;IAAEC,SAAS;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGJ,MAAM;EACpD,MAAMK,cAAc,GAAGtB,OAAO,CAC7B,OAAO;IAAEkB,MAAM;IAAEC,SAAS;IAAEC,MAAM;IAAEC;EAAO,CAAC,CAAC,EAC7C,CAACH,MAAM,EAAEC,SAAS,EAAEC,MAAM,EAAEC,MAAM,CACnC,CAAC;EAED,MAAME,kBAAkB,GAAGvB,OAAO,CACjC,MAAMC,qBAAqB,CAACY,KAAK,CAAC,EAClC,CAACA,KAAK,CACP,CAAC;EACD,MAAMW,cAAc,GAAGV,oBAAoB,IAAIS,kBAAkB;EAEjE,MAAME,eAAe,GAAGnB,WAAW,CAAC;IACnCG,OAAO;IACPD,QAAQ;IACRG,gBAAgB;IAChBa,cAAc;IACdE,mBAAmB,EAAEd,WAAW;IAChCG,OAAO;IACPC;EACD,CAAC,CAAC;;EAEF;EACA;EACAd,mBAAmB,CAAC;IACnBO,OAAO,EAAEC,cAAc;IACvBF,QAAQ;IACRG,gBAAgB;IAChBW,cAAc;IACdP,OAAO;IACPC;EACD,CAAC,CAAC;EAEFZ,2BAA2B,CAAC;IAC3BK,OAAO,EAAEC,cAAc;IACvBe,eAAe;IACfjB;EACD,CAAC,CAAC;EAEFL,gCAAgC,CAAC;IAChCK,QAAQ;IACRC,OAAO,EAAEC,cAAc;IACvBM,cAAc;IACdS;EACD,CAAC,CAAC;EAEFpB,kBAAkB,CAAC;IAClBI,OAAO,EAAEC,cAAc;IACvBF,QAAQ;IACRiB;EACD,CAAC,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["useMemo","prepareStyleForBounds","useBoundaryPresence","useInitialDestinationMeasurement","useInitialSourceMeasurement","useRefreshBoundary","useMeasurer","useBoundaryMeasurement","boundTag","enabled","runtimeEnabled","currentScreenKey","measuredRef","style","handoff","escapeClipping","localMeasurement","config","anchor","scaleMode","target","method","boundaryConfig","preparedStyles","measureBoundary","measuredAnimatedRef"],"sourceRoot":"../../../../../src","sources":["components/boundary/hooks/use-boundary-measurement.ts"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,OAAO;AAI/B,SAASC,qBAAqB,QAAQ,6CAA6C;AAKnF,SAASC,mBAAmB,QAAQ,oCAAoC;AACxE,SAASC,gCAAgC,QAAQ,kDAAkD;AACnG,SAASC,2BAA2B,QAAQ,6CAA6C;AACzF,SAASC,kBAAkB,QAAQ,mCAAmC;AACtE,SAASC,WAAW,QAAQ,gBAAgB;AAmB5C;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,sBAAsB,GAAGA,CAAC;EACtCC,QAAQ;EACRC,OAAO;EACPC,cAAc;EACdC,gBAAgB;EAChBC,WAAW;EACXC,KAAK;EACLC,OAAO;EACPC,cAAc;EACdC,gBAAgB;EAChBC;AAC6B,CAAC,KAAK;EACnC,MAAM;IAAEC,MAAM;IAAEC,SAAS;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGJ,MAAM;EACpD,MAAMK,cAAc,GAAGtB,OAAO,CAC7B,OAAO;IAAEkB,MAAM;IAAEC,SAAS;IAAEC,MAAM;IAAEC;EAAO,CAAC,CAAC,EAC7C,CAACH,MAAM,EAAEC,SAAS,EAAEC,MAAM,EAAEC,MAAM,CACnC,CAAC;EAED,MAAME,cAAc,GAAGvB,OAAO,CAAC,MAAMC,qBAAqB,CAACY,KAAK,CAAC,EAAE,CAACA,KAAK,CAAC,CAAC;EAE3E,MAAMW,eAAe,GAAGlB,WAAW,CAAC;IACnCG,OAAO;IACPD,QAAQ;IACRG,gBAAgB;IAChBY,cAAc;IACdE,mBAAmB,EAAEb,WAAW;IAChCE,OAAO;IACPC,cAAc;IACdC;EACD,CAAC,CAAC;;EAEF;EACA;EACA;EACAd,mBAAmB,CAAC;IACnBO,OAAO;IACPD,QAAQ;IACRG,gBAAgB;IAChBW,cAAc;IACdR,OAAO;IACPC;EACD,CAAC,CAAC;EAEFX,2BAA2B,CAAC;IAC3BK,OAAO;IACPe,eAAe;IACfhB;EACD,CAAC,CAAC;EAEFL,gCAAgC,CAAC;IAChCK,QAAQ;IACRC,OAAO,EAAEC,cAAc;IACvBc;EACD,CAAC,CAAC;EAEFnB,kBAAkB,CAAC;IAClBI,OAAO,EAAEC,cAAc;IACvBF,QAAQ;IACRgB;EACD,CAAC,CAAC;AACH,CAAC","ignoreList":[]}