react-native-screen-transitions 3.10.0 → 3.11.0

package/lib/module/shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.js

@@ -1,19 +1,17 @@
 "use strict";
 
-import { useLayoutEffect } from "react";
 import { useAnimatedProps, useSharedValue } from "react-native-reanimated";
 import { useDescriptorsStore } from "../../../../../../providers/screen/descriptors";
 import { useScreenSlots } from "../../../../../../providers/screen/styles";
 import { hasCloseTransitionFinished } from "../../../../../../providers/screen/styles/helpers/transition-visual-state";
 import { AnimationStore } from "../../../../../../stores/animation.store";
-import { getLinkKeyFromTag } from "../../../../../../stores/bounds/helpers/link-pairs.helpers";
 import { pairs } from "../../../../../../stores/bounds/internals/state";
 import { SystemStore } from "../../../../../../stores/system.store";
 import { PORTAL_HOST_NAME_RESET_VALUE } from "../../../utils/naming";
 import { isTeleportEnabled } from "../../../utils/teleport-control";
-import { createBoundaryPortalHostName } from "../helpers/host-name";
+import { hasActiveBoundaryPortalLink } from "../helpers/active-pair";
 import { useActiveHostKey } from "../stores/host-registry.store";
-import { mountPortalBoundaryHost, unmountPortalBoundaryHostByName } from "../stores/portal-boundary-host.store";
+import { useActivePortalBoundaryHost } from "./use-active-portal-boundary-host";
 export const useBoundaryPortalAttachment = ({
   boundaryId
 }) => {
@@ -31,30 +29,16 @@ export const useBoundaryPortalAttachment = ({
   const portalHostReady = useSharedValue(false);
   const attachedDestination = useSharedValue(null);
   const escapeHostKey = useActiveHostKey(currentScreenKey);
-  useLayoutEffect(() => {
-    if (!sourcePairKey || !escapeHostKey) {
-      portalHostName.set(null);
-      portalHostReady.set(false);
-      return;
-    }
-    const nextPortalHostName = createBoundaryPortalHostName(escapeHostKey, boundaryId, sourcePairKey);
-    mountPortalBoundaryHost({
-      boundaryId,
-      hostKey: escapeHostKey,
-      localStylesMaps,
-      pairKey: sourcePairKey,
-      portalHostName: nextPortalHostName,
-      portalHostReady,
-      screenKey: currentScreenKey,
-      slotsMap
-    });
-    portalHostName.set(nextPortalHostName);
-    return () => {
-      portalHostName.set(null);
-      portalHostReady.set(false);
-      unmountPortalBoundaryHostByName(nextPortalHostName);
-    };
-  }, [boundaryId, currentScreenKey, escapeHostKey, localStylesMaps, portalHostName, portalHostReady, sourcePairKey, slotsMap]);
+  useActivePortalBoundaryHost({
+    boundaryId,
+    currentScreenKey,
+    escapeHostKey,
+    localStylesMaps,
+    portalHostName,
+    portalHostReady,
+    sourcePairKey,
+    slotsMap
+  });
   const teleportProps = useAnimatedProps(() => {
     "worklet";
 
@@ -66,10 +50,11 @@ export const useBoundaryPortalAttachment = ({
     } = slot?.props ?? {};
     const shouldTeleport = isTeleportEnabled(teleport);
     const hostName = portalHostName.get();
-    const pair = sourcePairKey ? pairs.get()[sourcePairKey] : undefined;
-    const linkKey = getLinkKeyFromTag(boundaryId);
-    const link = pair?.links[linkKey];
-    const hasActiveLink = link?.source !== null && link !== undefined && (!link.group || pair?.groups[link.group]?.activeId === linkKey);
+    const hasActiveLink = hasActiveBoundaryPortalLink({
+      boundaryId,
+      pairsState: pairs.get(),
+      sourcePairKey
+    });
     const hasAttachableHost = shouldTeleport && hasActiveLink && portalHostReady.get() && hostName;
     if (hasAttachableHost) {
       attachedDestination.set({

package/lib/module/shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.js.map

@@ -1 +1 @@
-{"version":3,"names":["useLayoutEffect","useAnimatedProps","useSharedValue","useDescriptorsStore","useScreenSlots","hasCloseTransitionFinished","AnimationStore","getLinkKeyFromTag","pairs","SystemStore","PORTAL_HOST_NAME_RESET_VALUE","isTeleportEnabled","createBoundaryPortalHostName","useActiveHostKey","mountPortalBoundaryHost","unmountPortalBoundaryHostByName","useBoundaryPortalAttachment","boundaryId","sourcePairKey","s","derivations","currentScreenKey","nextScreenKey","destinationScreenKey","destinationAnimationProgress","getValue","destinationClosing","localStylesMaps","slotsMap","portalHostName","portalHostReady","attachedDestination","escapeHostKey","set","nextPortalHostName","hostKey","pairKey","screenKey","teleportProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldTeleport","hostName","pair","undefined","linkKey","link","links","hasActiveLink","source","group","groups","activeId","hasAttachableHost","animationProgress","closing","attached","hasAttachedCloseFinished","canAttach","targetHostName"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useAnimatedProps","useSharedValue","useDescriptorsStore","useScreenSlots","hasCloseTransitionFinished","AnimationStore","pairs","SystemStore","PORTAL_HOST_NAME_RESET_VALUE","isTeleportEnabled","hasActiveBoundaryPortalLink","useActiveHostKey","useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","sourcePairKey","s","derivations","currentScreenKey","nextScreenKey","destinationScreenKey","destinationAnimationProgress","getValue","destinationClosing","localStylesMaps","slotsMap","portalHostName","portalHostReady","attachedDestination","escapeHostKey","teleportProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldTeleport","hostName","hasActiveLink","pairsState","hasAttachableHost","set","animationProgress","closing","attached","hasAttachedCloseFinished","canAttach","targetHostName"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts"],"mappings":";;AAAA,SAECA,gBAAgB,EAChBC,cAAc,QACR,yBAAyB;AAChC,SAASC,mBAAmB,QAAQ,gDAAgD;AACpF,SAASC,cAAc,QAAQ,2CAA2C;AAC1E,SAASC,0BAA0B,QAAQ,2EAA2E;AACtH,SAASC,cAAc,QAAQ,0CAA0C;AACzE,SAASC,KAAK,QAAQ,iDAAiD;AACvE,SAASC,WAAW,QAAQ,uCAAuC;AACnE,SAASC,4BAA4B,QAAQ,uBAAuB;AACpE,SAASC,iBAAiB,QAAQ,iCAAiC;AACnE,SAASC,2BAA2B,QAAQ,wBAAwB;AACpE,SAASC,gBAAgB,QAAQ,+BAA+B;AAChE,SAASC,2BAA2B,QAAQ,mCAAmC;AAW/E,OAAO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC;AACkC,CAAC,KAAK;EACxC,MAAMC,aAAa,GAAGb,mBAAmB,CAAEc,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,aAAa,CAAC;EAC7E,MAAMG,gBAAgB,GAAGhB,mBAAmB,CAC1Cc,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACC,gBACtB,CAAC;EACD,MAAMC,aAAa,GAAGjB,mBAAmB,CAAEc,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACE,aAAa,CAAC;EAC7E,MAAMC,oBAAoB,GAAGD,aAAa,IAAID,gBAAgB;EAC9D,MAAMG,4BAA4B,GAAGd,WAAW,CAACe,QAAQ,CACxDF,oBAAoB,EACpB,mBACD,CAAC;EACD,MAAMG,kBAAkB,GAAGlB,cAAc,CAACiB,QAAQ,CACjDF,oBAAoB,EACpB,SACD,CAAC;EACD,MAAM;IAAEI,eAAe;IAAEC;EAAS,CAAC,GAAGtB,cAAc,CAAC,CAAC;EACtD,MAAMuB,cAAc,GAAGzB,cAAc,CAAgB,IAAI,CAAC;EAC1D,MAAM0B,eAAe,GAAG1B,cAAc,CAAC,KAAK,CAAC;EAC7C,MAAM2B,mBAAmB,GAAG3B,cAAc,CAA6B,IAAI,CAAC;EAC5E,MAAM4B,aAAa,GAAGlB,gBAAgB,CAACO,gBAAgB,CAAC;EAExDN,2BAA2B,CAAC;IAC3BE,UAAU;IACVI,gBAAgB;IAChBW,aAAa;IACbL,eAAe;IACfE,cAAc;IACdC,eAAe;IACfZ,aAAa;IACbU;EACD,CAAC,CAAC;EAEF,MAAMK,aAAa,GAAG9B,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IAET,MAAM+B,IAAI,GAAGN,QAAQ,CAACO,GAAG,CAAC,CAAC,CAAClB,UAAU,CAAC;IACvC,MAAM;MACLmB,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IACrB,MAAMC,cAAc,GAAG7B,iBAAiB,CAAC0B,QAAQ,CAAC;IAClD,MAAMI,QAAQ,GAAGb,cAAc,CAACM,GAAG,CAAC,CAAC;IACrC,MAAMQ,aAAa,GAAG9B,2BAA2B,CAAC;MACjDI,UAAU;MACV2B,UAAU,EAAEnC,KAAK,CAAC0B,GAAG,CAAC,CAAC;MACvBjB;IACD,CAAC,CAAC;IACF,MAAM2B,iBAAiB,GACtBJ,cAAc,IAAIE,aAAa,IAAIb,eAAe,CAACK,GAAG,CAAC,CAAC,IAAIO,QAAQ;IAErE,IAAIG,iBAAiB,EAAE;MACtBd,mBAAmB,CAACe,GAAG,CAAC;QACvBC,iBAAiB,EAAEvB,4BAA4B;QAC/CwB,OAAO,EAAEtB;MACV,CAAC,CAAC;IACH;IAEA,MAAMuB,QAAQ,GAAGlB,mBAAmB,CAACI,GAAG,CAAC,CAAC;IAC1C,MAAMe,wBAAwB,GAC7BD,QAAQ,KAAK,IAAI,IACjB1C,0BAA0B,CAAC;MAC1BwC,iBAAiB,EAAEE,QAAQ,CAACF,iBAAiB,CAACZ,GAAG,CAAC,CAAC;MACnDa,OAAO,EAAEC,QAAQ,CAACD,OAAO,CAACb,GAAG,CAAC;IAC/B,CAAC,CAAC;IACH,MAAMgB,SAAS,GAAGN,iBAAiB,IAAI,CAACK,wBAAwB;IAChE,MAAME,cAAc,GAAGD,SAAS,GAAGT,QAAQ,GAAG/B,4BAA4B;IAE1E,OAAO;MACN,GAAG4B,SAAS;MACZG,QAAQ,EAAEU;IACX,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IAAEnB;EAAc,CAAC;AACzB,CAAC","ignoreList":[]}

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

@@ -1,11 +1,10 @@
 "use strict";
 
-import { useLayoutEffect, useState } from "react";
-import { cancelAnimation, measure, runOnJS, runOnUI, useAnimatedReaction, useAnimatedRef, useSharedValue, withDelay, withTiming } from "react-native-reanimated";
-import { useOriginContext } from "../../../../../../providers/screen/origin.provider";
+import { useLayoutEffect } from "react";
+import { cancelAnimation, measure, runOnUI, useAnimatedReaction, useAnimatedRef, useSharedValue, withDelay, withTiming } from "react-native-reanimated";
 import { ScrollStore } from "../../../../../../stores/scroll.store";
 import { getVisibilityBlockOffset } from "../../../../../../utils/visibility-block-offset";
-import { adjustedMeasuredBoundsForOverscrollDeltas, isMeasurementInViewport, normalizeMeasuredBoundsWithVisibilityGate } from "../../../../utils/measured-bounds";
+import { adjustedMeasuredBoundsForOverscrollDeltas, correctMeasuredBoundsForVisibilityGate, isMeasurementInViewport } from "../../../../utils/measured-bounds";
 import { clearPortalHostBounds, setPortalHostBounds } from "../stores/host-bounds.store";
 const HOST_MEASUREMENT_RETRY_DELAY_MS = 16;
 export const useHostMeasurement = ({
@@ -19,10 +18,6 @@ export const useHostMeasurement = ({
 }) => {
   const hostRef = useAnimatedRef();
   const scrollMetadata = ScrollStore.getValue(screenKey, "metadata");
-  const [canRenderHosts, setCanRenderHosts] = useState(false);
-  const {
-    originRef
-  } = useOriginContext();
   const hasMeasuredHost = useSharedValue(false);
   const retryToken = useSharedValue(0);
   useAnimatedReaction(() => {
@@ -44,8 +39,7 @@ export const useHostMeasurement = ({
       return;
     }
     const measured = measure(hostRef);
-    const measuredOrigin = measure(originRef);
-    if (!measured || !measuredOrigin) {
+    if (!measured) {
       cancelAnimation(retryToken);
       retryToken.set(withDelay(HOST_MEASUREMENT_RETRY_DELAY_MS, withTiming(retryToken.get() + 1, {
         duration: 0
@@ -53,22 +47,20 @@ export const useHostMeasurement = ({
       return;
     }
     cancelAnimation(retryToken);
-    hasMeasuredHost.set(true);
 
     // A measurement taken mid rubber-band would bake the transient
     // overscroll displacement into the host frame. Store the at-rest
     // position instead; clamped scroll deltas share that basis.
     const currentScroll = scrollMetadata.get();
     const overscrollNormalized = capturesScroll ? adjustedMeasuredBoundsForOverscrollDeltas(measured, currentScroll) : measured;
-    const normalizedMeasured = normalizeMeasuredBoundsWithVisibilityGate({
+    const correctedMeasured = correctMeasuredBoundsForVisibilityGate({
       measured: overscrollNormalized,
-      origin: measuredOrigin,
       visibilityBlocked: visibilityBlocked.get(),
       visibilityBlockOffset: getVisibilityBlockOffset(viewportHeight),
       viewportWidth,
       viewportHeight
     });
-    if (!isMeasurementInViewport(normalizedMeasured, viewportWidth, viewportHeight)) {
+    if (!isMeasurementInViewport(correctedMeasured, viewportWidth, viewportHeight)) {
       cancelAnimation(retryToken);
       retryToken.set(withDelay(HOST_MEASUREMENT_RETRY_DELAY_MS, withTiming(retryToken.get() + 1, {
         duration: 0
@@ -76,15 +68,15 @@ export const useHostMeasurement = ({
       return;
     }
     setPortalHostBounds(hostKey, {
-      x: normalizedMeasured.x,
-      y: normalizedMeasured.y,
-      width: normalizedMeasured.width,
-      height: normalizedMeasured.height,
-      pageX: normalizedMeasured.pageX,
-      pageY: normalizedMeasured.pageY,
+      x: correctedMeasured.x,
+      y: correctedMeasured.y,
+      width: correctedMeasured.width,
+      height: correctedMeasured.height,
+      pageX: correctedMeasured.pageX,
+      pageY: correctedMeasured.pageY,
       scroll: capturesScroll ? currentScroll : null
     });
-    runOnJS(setCanRenderHosts)(true);
+    hasMeasuredHost.set(true);
   });
   useLayoutEffect(() => {
     return () => {
@@ -92,7 +84,6 @@ export const useHostMeasurement = ({
     };
   }, [hostKey]);
   return {
-    canRenderHosts,
     hostRef
   };
 };

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

@@ -1 +1 @@
-{"version":3,"names":["useLayoutEffect","useState","cancelAnimation","measure","runOnJS","runOnUI","useAnimatedReaction","useAnimatedRef","useSharedValue","withDelay","withTiming","useOriginContext","ScrollStore","getVisibilityBlockOffset","adjustedMeasuredBoundsForOverscrollDeltas","isMeasurementInViewport","normalizeMeasuredBoundsWithVisibilityGate","clearPortalHostBounds","setPortalHostBounds","HOST_MEASUREMENT_RETRY_DELAY_MS","useHostMeasurement","capturesScroll","enabled","hostKey","screenKey","visibilityBlocked","viewportHeight","viewportWidth","hostRef","scrollMetadata","getValue","canRenderHosts","setCanRenderHosts","originRef","hasMeasuredHost","retryToken","get","state","hasAlreadyMeasured","measured","measuredOrigin","set","duration","currentScroll","overscrollNormalized","normalizedMeasured","origin","visibilityBlockOffset","x","y","width","height","pageX","pageY","scroll"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useLayoutEffect","cancelAnimation","measure","runOnUI","useAnimatedReaction","useAnimatedRef","useSharedValue","withDelay","withTiming","ScrollStore","getVisibilityBlockOffset","adjustedMeasuredBoundsForOverscrollDeltas","correctMeasuredBoundsForVisibilityGate","isMeasurementInViewport","clearPortalHostBounds","setPortalHostBounds","HOST_MEASUREMENT_RETRY_DELAY_MS","useHostMeasurement","capturesScroll","enabled","hostKey","screenKey","visibilityBlocked","viewportHeight","viewportWidth","hostRef","scrollMetadata","getValue","hasMeasuredHost","retryToken","get","state","hasAlreadyMeasured","measured","set","duration","currentScroll","overscrollNormalized","correctedMeasured","visibilityBlockOffset","x","y","width","height","pageX","pageY","scroll"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/boundary/portal/utils/naming.js

@@ -1,4 +1,10 @@
 "use strict";
 
+const BOUNDARY_PORTAL_HOST_NAME_SUFFIX = "-portal-host";
+export const createBoundaryPortalHostName = (hostKey, boundaryId, pairKey) => {
+  "worklet";
+
+  return `${hostKey}-${pairKey ? `${pairKey}-` : ""}${boundaryId}${BOUNDARY_PORTAL_HOST_NAME_SUFFIX}`;
+};
 export const PORTAL_HOST_NAME_RESET_VALUE = null;
 //# sourceMappingURL=naming.js.map

package/lib/module/shared/components/boundary/portal/utils/naming.js.map

@@ -1 +1 @@
-{"version":3,"names":["PORTAL_HOST_NAME_RESET_VALUE"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/portal/utils/naming.ts"],"mappings":";;AAAA,OAAO,MAAMA,4BAA4B,GAAG,IAAI","ignoreList":[]}
+{"version":3,"names":["BOUNDARY_PORTAL_HOST_NAME_SUFFIX","createBoundaryPortalHostName","hostKey","boundaryId","pairKey","PORTAL_HOST_NAME_RESET_VALUE"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/portal/utils/naming.ts"],"mappings":";;AAAA,MAAMA,gCAAgC,GAAG,cAAc;AAEvD,OAAO,MAAMC,4BAA4B,GAAGA,CAC3CC,OAAe,EACfC,UAAkB,EAClBC,OAAuB,KACnB;EACJ,SAAS;;EACT,OAAO,GAAGF,OAAO,IAAIE,OAAO,GAAG,GAAGA,OAAO,GAAG,GAAG,EAAE,GAAGD,UAAU,GAAGH,gCAAgC,EAAE;AACpG,CAAC;AAED,OAAO,MAAMK,4BAA4B,GAAG,IAAI","ignoreList":[]}

package/lib/module/shared/components/boundary/providers/boundary-root.provider.js

@@ -4,6 +4,7 @@ import { useImperativeHandle, useLayoutEffect, useMemo, useRef } from "react";
 import { useAnimatedRef } from "react-native-reanimated";
 import { useDescriptorsStore } from "../../../providers/screen/descriptors";
 import { useComposedSlotStyles, useSlotStackingStyles } from "../../../providers/screen/styles";
+import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
 import { createBoundTag } from "../../../stores/bounds/helpers/link-pairs.helpers";
 import createProvider from "../../../utils/create-provider";
 import { logger } from "../../../utils/logger";
@@ -14,7 +15,6 @@ const MULTIPLE_TARGETS_WARNING = "Multiple Boundary.Target elements were rendere
 export const TARGET_OUTSIDE_ROOT_WARNING = "Boundary.Target must be rendered inside Transition.Boundary or a component created by createBoundaryComponent.";
 export const {
   BoundaryRootProvider,
-  useBoundaryRootContext,
   useBoundaryRootStore
 } = createProvider("BoundaryRoot", {
   guarded: false
@@ -38,9 +38,9 @@ export const {
     escapeClipping
   });
   const currentScreenKey = useDescriptorsStore(s => s.derivations.currentScreenKey);
-  const currentActivity = useDescriptorsStore(s => s.descriptors.current.activity);
+  const isCurrentScreenClosing = useBlankStackStore(store => store?.scenesByKey[currentScreenKey]?.activity === "closing");
   const retainedBoundTagRef = useRef(requestedBoundTag);
-  const shouldRetainClosingBoundTag = portalRuntime.handoff && currentActivity === "closing";
+  const shouldRetainClosingBoundTag = portalRuntime.handoff && isCurrentScreenClosing;
 
   // Navigation can update a retained closing route's params before that
   // route leaves the stack. Keep its handoff identity stable so the payload

package/lib/module/shared/components/boundary/providers/boundary-root.provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["useImperativeHandle","useLayoutEffect","useMemo","useRef","useAnimatedRef","useDescriptorsStore","useComposedSlotStyles","useSlotStackingStyles","createBoundTag","createProvider","logger","useBoundaryMeasurement","resolveBoundaryPortal","MULTIPLE_TARGETS_WARNING","TARGET_OUTSIDE_ROOT_WARNING","BoundaryRootProvider","useBoundaryRootContext","useBoundaryRootStore","guarded","children","config","enabled","escapeClipping","forwardedRef","group","handoff","hasTarget","id","style","targetCount","targetStyle","requestedBoundTag","String","portalRuntime","currentScreenKey","s","derivations","currentActivity","descriptors","current","activity","retainedBoundTagRef","shouldRetainClosingBoundTag","boundTag","hasConfiguredInterpolator","runtimeEnabled","shouldAttachAssociatedStyles","shouldEscapeBoundaryRootToScreenHost","associatedStyles","tag","associatedStackingStyles","rootRef","measurementRef","__DEV__","warnOnce","measuredRef","shouldRenderBoundaryRootThroughPortal","handoffEnabled","attachedStyle","undefined","value","ref","shouldRenderHandoffHost"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/providers/boundary-root.provider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useImperativeHandle","useLayoutEffect","useMemo","useRef","useAnimatedRef","useDescriptorsStore","useComposedSlotStyles","useSlotStackingStyles","useBlankStackStore","createBoundTag","createProvider","logger","useBoundaryMeasurement","resolveBoundaryPortal","MULTIPLE_TARGETS_WARNING","TARGET_OUTSIDE_ROOT_WARNING","BoundaryRootProvider","useBoundaryRootStore","guarded","children","config","enabled","escapeClipping","forwardedRef","group","handoff","hasTarget","id","style","targetCount","targetStyle","requestedBoundTag","String","portalRuntime","currentScreenKey","s","derivations","isCurrentScreenClosing","store","scenesByKey","activity","retainedBoundTagRef","shouldRetainClosingBoundTag","current","boundTag","hasConfiguredInterpolator","runtimeEnabled","shouldAttachAssociatedStyles","shouldEscapeBoundaryRootToScreenHost","associatedStyles","tag","associatedStackingStyles","rootRef","measurementRef","__DEV__","warnOnce","measuredRef","shouldRenderBoundaryRootThroughPortal","handoffEnabled","attachedStyle","undefined","value","ref","shouldRenderHandoffHost"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/providers/boundary-root.provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/boundary/utils/measured-bounds.js

@@ -32,15 +32,6 @@ export const adjustedMeasuredBoundsForOverscrollDeltas = (measured, scrollState)
     pageY: measured.pageY + deltaY
   };
 };
-export const normalizeMeasuredBoundsToOrigin = (measured, origin) => {
-  "worklet";
-
-  return {
-    ...measured,
-    pageX: measured.pageX - origin.pageX,
-    pageY: measured.pageY - origin.pageY
-  };
-};
 export const isMeasurementInViewport = (measured, viewportWidth, viewportHeight) => {
   "worklet";
 
@@ -53,9 +44,8 @@ export const isMeasurementInViewport = (measured, viewportWidth, viewportHeight)
   const centerY = measured.pageY + measured.height / 2;
   return centerX >= -toleranceX && centerX <= viewportWidth + toleranceX && centerY >= -toleranceY && centerY <= viewportHeight + toleranceY;
 };
-export const normalizeMeasuredBoundsWithVisibilityGate = ({
+export const correctMeasuredBoundsForVisibilityGate = ({
   measured,
-  origin,
   visibilityBlocked,
   visibilityBlockOffset,
   viewportWidth,
@@ -63,29 +53,28 @@ export const normalizeMeasuredBoundsWithVisibilityGate = ({
 }) => {
   "worklet";
 
-  const normalized = normalizeMeasuredBoundsToOrigin(measured, origin);
-  if (!visibilityBlocked || visibilityBlockOffset <= 0 || isMeasurementInViewport(normalized, viewportWidth, viewportHeight)) {
-    return normalized;
+  if (!visibilityBlocked || visibilityBlockOffset <= 0 || isMeasurementInViewport(measured, viewportWidth, viewportHeight)) {
+    return measured;
   }
 
-  // Fabric can expose the visibility transform to one native measurement one
-  // frame before the other. Prefer normal origin-relative coordinates, then
-  // test either side of that known frame skew while the gate is active.
-  const measuredAhead = {
-    ...normalized,
-    pageY: normalized.pageY - visibilityBlockOffset
+  // A destination can still carry the internal visibility transform for one
+  // native frame. Correct only that known offset and preserve all other
+  // presentation transforms in the measured coordinates.
+  const visibilityOffsetApplied = {
+    ...measured,
+    pageY: measured.pageY - visibilityBlockOffset
   };
-  if (isMeasurementInViewport(measuredAhead, viewportWidth, viewportHeight)) {
-    return measuredAhead;
+  if (isMeasurementInViewport(visibilityOffsetApplied, viewportWidth, viewportHeight)) {
+    return visibilityOffsetApplied;
   }
-  const originAhead = {
-    ...normalized,
-    pageY: normalized.pageY + visibilityBlockOffset
+  const inverseVisibilityOffsetApplied = {
+    ...measured,
+    pageY: measured.pageY + visibilityBlockOffset
   };
-  if (isMeasurementInViewport(originAhead, viewportWidth, viewportHeight)) {
-    return originAhead;
+  if (isMeasurementInViewport(inverseVisibilityOffsetApplied, viewportWidth, viewportHeight)) {
+    return inverseVisibilityOffsetApplied;
   }
-  return normalized;
+  return measured;
 };
 export const measureWithOverscrollAwareness = (ref, scrollState) => {
   "worklet";

package/lib/module/shared/components/boundary/utils/measured-bounds.js.map

@@ -1 +1 @@
-{"version":3,"names":["measure","clampScrollAxisOffset","cloneScrollMetadataState","SCROLL_MEASUREMENT_EPSILON","getOverscrollDelta","axisState","clampedOffset","delta","offset","Math","abs","adjustedMeasuredBoundsForOverscrollDeltas","measured","scrollState","deltaX","horizontal","deltaY","vertical","x","y","pageX","pageY","normalizeMeasuredBoundsToOrigin","origin","isMeasurementInViewport","viewportWidth","viewportHeight","width","height","toleranceX","toleranceY","centerX","centerY","normalizeMeasuredBoundsWithVisibilityGate","visibilityBlocked","visibilityBlockOffset","normalized","measuredAhead","originAhead","measureWithOverscrollAwareness","ref","attachScrollSnapshotToMeasuredBounds","scroll"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/utils/measured-bounds.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["measure","clampScrollAxisOffset","cloneScrollMetadataState","SCROLL_MEASUREMENT_EPSILON","getOverscrollDelta","axisState","clampedOffset","delta","offset","Math","abs","adjustedMeasuredBoundsForOverscrollDeltas","measured","scrollState","deltaX","horizontal","deltaY","vertical","x","y","pageX","pageY","isMeasurementInViewport","viewportWidth","viewportHeight","width","height","toleranceX","toleranceY","centerX","centerY","correctMeasuredBoundsForVisibilityGate","visibilityBlocked","visibilityBlockOffset","visibilityOffsetApplied","inverseVisibilityOffsetApplied","measureWithOverscrollAwareness","ref","attachScrollSnapshotToMeasuredBounds","scroll"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/utils/measured-bounds.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/boundary/utils/refresh-signals.js

@@ -26,37 +26,31 @@ export const getRefreshBoundarySignal = params => {
     group,
     shouldRefresh,
     closing,
-    entering,
-    animating,
-    progress,
-    gestureInProgress,
     linkState
   } = params;
   if (!enabled) return null;
-
-  // This is temporary for a patch fix. However, this architecture should
-  // change: our signals aren't currently doing their intended job, so right
-  // now we'll add one more guard until the shape is much more tested and
-  // bulletproof.
-  if (gestureInProgress) return null;
-  const canRefreshPreCloseDestination = shouldRefresh && closing && !entering && !animating && progress >= 1;
-  const canRefreshSettledDestination = shouldRefresh && !closing && !entering;
-
-  // Guards:
-  // 1) A user may dismiss via back button, in this case, we should remeasure.
-  // 2) If a user drags during entering/closing animations we should NOT remeasure.
-  if (!canRefreshPreCloseDestination && !canRefreshSettledDestination) {
+  if (!shouldRefresh) {
     return null;
   }
 
-  // Non group:
-  // Since in typical group flows we would need to know the src, we don't need to do that for
-  // single a->b flows. So we just trigger the destination refresh.
+  // A source may move while its destination is active, so refresh whichever
+  // side of the pair this boundary currently represents.
   if (!group) {
+    if (sourcePairKey) {
+      const sourcePair = linkState?.[sourcePairKey];
+      const participates = !!sourcePair?.links?.[linkId] || !!sourcePair?.sourceRequests?.[linkId];
+      if (!participates) {
+        return null;
+      }
+      return buildRefreshSignal("source", sourcePairKey, [currentScreenKey, closing ? "closing" : "settled"].join("|"));
+    }
     const refreshDestinationPairKey = destinationPairKey ?? (nextScreenKey ? undefined : ancestorDestinationPairKey);
     if (!refreshDestinationPairKey) {
       return null;
     }
+    if (!linkState?.[refreshDestinationPairKey]?.links?.[linkId]) {
+      return null;
+    }
     return buildRefreshSignal("destination", refreshDestinationPairKey, [currentScreenKey, closing ? "closing" : "settled"].join("|"));
   }
 

package/lib/module/shared/components/boundary/utils/refresh-signals.js.map

@@ -1 +1 @@
-{"version":3,"names":["SOURCE_SIGNAL_PREFIX","DESTINATION_SIGNAL_PREFIX","buildRefreshSignal","type","pairKey","key","prefix","signal","getRefreshBoundarySignal","params","enabled","currentScreenKey","sourcePairKey","destinationPairKey","ancestorDestinationPairKey","nextScreenKey","linkId","group","shouldRefresh","closing","entering","animating","progress","gestureInProgress","linkState","canRefreshPreCloseDestination","canRefreshSettledDestination","refreshDestinationPairKey","undefined","join","activeId","groups"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/utils/refresh-signals.ts"],"mappings":";;AAMA,MAAMA,oBAAoB,GAAG,SAAS;AACtC,MAAMC,yBAAyB,GAAG,cAAc;AAMhD,MAAMC,kBAAkB,GAAGA,CAC1BC,IAA2B,EAC3BC,OAAsB,EACtBC,GAAW,KACgB;EAC3B,SAAS;;EACT,MAAMC,MAAM,GACXH,IAAI,KAAK,QAAQ,GAAGH,oBAAoB,GAAGC,yBAAyB;EACrE,OAAO;IACNE,IAAI;IACJC,OAAO;IACPG,MAAM,EAAE,GAAGD,MAAM,GAAGF,OAAO,IAAIC,GAAG;EACnC,CAAC;AACF,CAAC;AAED,OAAO,MAAMG,wBAAwB,GAAIC,MAgBxC,IAAmC;EACnC,SAAS;;EACT,MAAM;IACLC,OAAO;IACPC,gBAAgB;IAChBC,aAAa;IACbC,kBAAkB;IAClBC,0BAA0B;IAC1BC,aAAa;IACbC,MAAM;IACNC,KAAK;IACLC,aAAa;IACbC,OAAO;IACPC,QAAQ;IACRC,SAAS;IACTC,QAAQ;IACRC,iBAAiB;IACjBC;EACD,CAAC,GAAGf,MAAM;EAEV,IAAI,CAACC,OAAO,EAAE,OAAO,IAAI;;EAEzB;EACA;EACA;EACA;EACA,IAAIa,iBAAiB,EAAE,OAAO,IAAI;EAElC,MAAME,6BAA6B,GAClCP,aAAa,IAAIC,OAAO,IAAI,CAACC,QAAQ,IAAI,CAACC,SAAS,IAAIC,QAAQ,IAAI,CAAC;EAErE,MAAMI,4BAA4B,GAAGR,aAAa,IAAI,CAACC,OAAO,IAAI,CAACC,QAAQ;;EAE3E;EACA;EACA;EACA,IAAI,CAACK,6BAA6B,IAAI,CAACC,4BAA4B,EAAE;IACpE,OAAO,IAAI;EACZ;;EAEA;EACA;EACA;EACA,IAAI,CAACT,KAAK,EAAE;IACX,MAAMU,yBAAyB,GAC9Bd,kBAAkB,KACjBE,aAAa,GAAGa,SAAS,GAAGd,0BAA0B,CAAC;IAEzD,IAAI,CAACa,yBAAyB,EAAE;MAC/B,OAAO,IAAI;IACZ;IAEA,OAAOzB,kBAAkB,CACxB,aAAa,EACbyB,yBAAyB,EACzB,CAAChB,gBAAgB,EAAEQ,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACU,IAAI,CAAC,GAAG,CAC7D,CAAC;EACF;;EAEA;EACA;EACA,IAAIjB,aAAa,EAAE;IAClB,MAAMkB,QAAQ,GAAGN,SAAS,GAAGZ,aAAa,CAAC,EAAEmB,MAAM,GAAGd,KAAK,CAAC,EAAEa,QAAQ;IAEtE,IAAIA,QAAQ,KAAKd,MAAM,EAAE;MACxB,OAAO,IAAI;IACZ;IAEA,OAAOd,kBAAkB,CACxB,QAAQ,EACRU,aAAa,EACb,CAACK,KAAK,EAAED,MAAM,EAAEG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACU,IAAI,CAAC,GAAG,CAC1D,CAAC;EACF;EAEA,MAAMF,yBAAyB,GAC9Bd,kBAAkB,KACjBE,aAAa,GAAGa,SAAS,GAAGd,0BAA0B,CAAC;EAEzD,IAAI,CAACa,yBAAyB,EAAE,OAAO,IAAI;;EAE3C;EACA;EACA,MAAMG,QAAQ,GACbN,SAAS,GAAGG,yBAAyB,CAAC,EAAEI,MAAM,GAAGd,KAAK,CAAC,EAAEa,QAAQ;;EAElE;EACA;EACA,IAAIA,QAAQ,KAAKd,MAAM,EAAE;IACxB,OAAO,IAAI;EACZ;EAEA,OAAOd,kBAAkB,CACxB,aAAa,EACbyB,yBAAyB,EACzB,CAACV,KAAK,EAAED,MAAM,EAAEG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACU,IAAI,CAAC,GAAG,CAC1D,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["SOURCE_SIGNAL_PREFIX","DESTINATION_SIGNAL_PREFIX","buildRefreshSignal","type","pairKey","key","prefix","signal","getRefreshBoundarySignal","params","enabled","currentScreenKey","sourcePairKey","destinationPairKey","ancestorDestinationPairKey","nextScreenKey","linkId","group","shouldRefresh","closing","linkState","sourcePair","participates","links","sourceRequests","join","refreshDestinationPairKey","undefined","activeId","groups"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/utils/refresh-signals.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/create-transition-aware-component.js

@@ -4,8 +4,7 @@
 
 import { forwardRef, memo } from "react";
 import { GestureDetector } from "react-native-gesture-handler";
-import Animated, { runOnUI, useAnimatedRef, useComposedEventHandler } from "react-native-reanimated";
-import { RegisterBoundsProvider } from "../providers/register-bounds.provider";
+import Animated, { useComposedEventHandler } from "react-native-reanimated";
 import { ScrollMetadataOwnerProvider, useScrollGestureCoordination } from "../providers/screen/gestures/scroll-coordination";
 import { useSlotProps, useSlotStyles } from "../providers/screen/styles";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -17,7 +16,6 @@ export function createTransitionAwareComponent(Wrapped, options = {}) {
   const AnimatedComponent = alreadyAnimated ? Wrapped : Animated.createAnimatedComponent(Wrapped);
   const ScrollableInner = /*#__PURE__*/forwardRef((props, ref) => {
     const {
-      remeasureOnFocus: _remeasureOnFocus,
       onScroll: userOnScroll,
       onMomentumScrollEnd: userOnMomentumScrollEnd,
       onScrollEndDrag: userOnScrollEndDrag,
@@ -70,40 +68,22 @@ export function createTransitionAwareComponent(Wrapped, options = {}) {
       children: coordinatedScrollableComponent
     });
   });
-  const Inner = /*#__PURE__*/forwardRef((props, _) => {
+  const Inner = /*#__PURE__*/forwardRef((props, ref) => {
     const {
       children,
       style,
-      sharedBoundTag,
       styleId,
-      onPress,
-      remeasureOnFocus,
       animatedProps: userAnimatedProps,
       ...rest
     } = props;
-    const animatedRef = useAnimatedRef();
-    const associatedId = sharedBoundTag || styleId;
-    const associatedStyles = useSlotStyles(associatedId);
-    const associatedProps = useSlotProps(associatedId);
-    return /*#__PURE__*/_jsx(RegisterBoundsProvider, {
-      animatedRef: animatedRef,
-      style: style,
-      onPress: onPress,
-      sharedBoundTag: sharedBoundTag,
-      remeasureOnFocus: remeasureOnFocus,
-      children: ({
-        captureActiveOnPress,
-        handleInitialLayout
-      }) => /*#__PURE__*/_jsx(AnimatedComponent, {
-        ...rest,
-        ref: animatedRef,
-        style: [style, associatedStyles],
-        animatedProps: userAnimatedProps ?? associatedProps,
-        onPress: captureActiveOnPress,
-        onLayout: runOnUI(handleInitialLayout),
-        collapsable: !sharedBoundTag,
-        children: children
-      })
+    const associatedStyles = useSlotStyles(styleId);
+    const associatedProps = useSlotProps(styleId);
+    return /*#__PURE__*/_jsx(AnimatedComponent, {
+      ...rest,
+      ref: ref,
+      style: [style, associatedStyles],
+      animatedProps: userAnimatedProps ?? associatedProps,
+      children: children
     });
   });
   if (isScrollable) {

package/lib/module/shared/components/create-transition-aware-component.js.map

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","memo","GestureDetector","Animated","runOnUI","useAnimatedRef","useComposedEventHandler","RegisterBoundsProvider","ScrollMetadataOwnerProvider","useScrollGestureCoordination","useSlotProps","useSlotStyles","jsx","_jsx","createTransitionAwareComponent","Wrapped","options","isScrollable","alreadyAnimated","AnimatedComponent","createAnimatedComponent","ScrollableInner","props","ref","remeasureOnFocus","_remeasureOnFocus","onScroll","userOnScroll","onMomentumScrollEnd","userOnMomentumScrollEnd","onScrollEndDrag","userOnScrollEndDrag","children","contentContainerStyle","scrollableProps","scrollDirection","horizontal","scrollHandler","scrollEventsEnabled","onContentSizeChange","onLayout","nativeGesture","metadataOwnerProviderValue","direction","composedScrollHandler","scrollableComponent","undefined","scrollEventThrottle","coordinatedScrollableComponent","gesture","value","Inner","_","style","sharedBoundTag","styleId","onPress","animatedProps","userAnimatedProps","rest","animatedRef","associatedId","associatedStyles","associatedProps","captureActiveOnPress","handleInitialLayout","collapsable"],"sourceRoot":"../../../../src","sources":["shared/components/create-transition-aware-component.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["forwardRef","memo","GestureDetector","Animated","useComposedEventHandler","ScrollMetadataOwnerProvider","useScrollGestureCoordination","useSlotProps","useSlotStyles","jsx","_jsx","createTransitionAwareComponent","Wrapped","options","isScrollable","alreadyAnimated","AnimatedComponent","createAnimatedComponent","ScrollableInner","props","ref","onScroll","userOnScroll","onMomentumScrollEnd","userOnMomentumScrollEnd","onScrollEndDrag","userOnScrollEndDrag","children","contentContainerStyle","scrollableProps","scrollDirection","horizontal","scrollHandler","scrollEventsEnabled","onContentSizeChange","onLayout","nativeGesture","metadataOwnerProviderValue","direction","composedScrollHandler","scrollableComponent","undefined","scrollEventThrottle","coordinatedScrollableComponent","gesture","value","Inner","style","styleId","animatedProps","userAnimatedProps","rest","associatedStyles","associatedProps"],"sourceRoot":"../../../../src","sources":["shared/components/create-transition-aware-component.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/screen-container/hooks/use-backdrop-pointer-events.js

@@ -2,9 +2,9 @@
 
 import { useState } from "react";
 import { runOnJS, useAnimatedReaction } from "react-native-reanimated";
-import { useDescriptors } from "../../../providers/screen/descriptors";
-import { useScreenOptionsContext } from "../../../providers/screen/options";
-import { useStackCoreContext } from "../../../providers/stack/core.provider";
+import { useDescriptorsStore } from "../../../providers/screen/descriptors";
+import { useScreenOptionsStore } from "../../../providers/screen/options";
+import { useStackCoreStore } from "../../../providers/stack/core.provider";
 import { StackType } from "../../../types/stack.types";
 /**
  * Returns pointer events and backdrop behavior based on screen options.
@@ -15,13 +15,9 @@ import { StackType } from "../../../types/stack.types";
  * - Other stacks default to 'block' (undefined = normal touch handling)
  */
 export function useBackdropPointerEvents() {
-  const {
-    current
-  } = useDescriptors();
-  const screenOptions = useScreenOptionsContext();
-  const {
-    flags
-  } = useStackCoreContext();
+  const screenOptions = useScreenOptionsStore();
+  const descriptorBackdropBehavior = useDescriptorsStore(store => store.options.backdropBehavior);
+  const stackType = useStackCoreStore(store => store.flags.STACK_TYPE);
   const [runtimeBackdropBehavior, setRuntimeBackdropBehavior] = useState(undefined);
   useAnimatedReaction(() => screenOptions.get().backdropBehavior, (next, previous) => {
     "worklet";
@@ -30,8 +26,8 @@ export function useBackdropPointerEvents() {
       runOnJS(setRuntimeBackdropBehavior)(next);
     }
   }, [screenOptions]);
-  const isComponentStack = flags.STACK_TYPE === StackType.COMPONENT;
-  const backdropBehavior = runtimeBackdropBehavior ?? current.options.backdropBehavior ?? (isComponentStack ? "passthrough" : "block");
+  const isComponentStack = stackType === StackType.COMPONENT;
+  const backdropBehavior = runtimeBackdropBehavior ?? descriptorBackdropBehavior ?? (isComponentStack ? "passthrough" : "block");
   const pointerEvents = backdropBehavior === "passthrough" ? "box-none" : undefined;
   const isBackdropActive = backdropBehavior === "dismiss" || backdropBehavior === "collapse";
   return {