react-native-screen-transitions 3.12.0 → 3.13.0-beta.1

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

@@ -3,9 +3,8 @@
 import { useCallback } from "react";
 import { useWindowDimensions } from "react-native";
 import { applyMeasuredBoundsWrites } from "../../../providers/helpers/measured-bounds-writes";
-import { useScreenSlots } from "../../../providers/screen/styles";
+import { useScreenSlotStore } from "../../../providers/screen/styles";
 import { ScrollStore } from "../../../stores/scroll.store";
-import { SystemStore } from "../../../stores/system.store";
 import { getVisibilityBlockOffset } from "../../../utils/visibility-block-offset";
 import { attachScrollSnapshotToMeasuredBounds, correctMeasuredBoundsForVisibilityGate, isMeasurementInViewport, measureWithOverscrollAwareness } from "../utils/measured-bounds";
 export const useMeasurer = ({
@@ -24,16 +23,16 @@ export const useMeasurer = ({
   } = useWindowDimensions();
   const scrollState = ScrollStore.getValue(currentScreenKey, "coordination");
   const scrollMetadata = ScrollStore.getValue(currentScreenKey, "metadata");
-  const pendingLifecycleStartBlockCount = SystemStore.getValue(currentScreenKey, "pendingLifecycleStartBlockCount");
+  const screenSlotStore = useScreenSlotStore();
   const {
     visibilityBlocked
-  } = useScreenSlots();
+  } = screenSlotStore;
   return useCallback(target => {
     "worklet";
 
-    if (!enabled) return;
+    if (!enabled) return false;
     const measured = measureWithOverscrollAwareness(measuredAnimatedRef, scrollState.get());
-    if (!measured) return;
+    if (!measured) return false;
     const correctedMeasured = correctMeasuredBoundsForVisibilityGate({
       measured,
       visibilityBlocked: visibilityBlocked.get(),
@@ -47,17 +46,8 @@ export const useMeasurer = ({
         pairKey: target.pairKey
       });
     }
-
-    /**
-     * - Destination Pass -
-     * Be strict while lifecycle start is blocked for destination capture.
-     * This is the initial attach window: the transition has not started yet,
-     * and malformed off-screen destination measurements should keep the
-     * lifecycle blocked until a valid retry lands.
-     */
-    const shouldGuardDestinationViewport = pendingLifecycleStartBlockCount.get() > 0 || !!boundTag.group;
-    const viewportAllowsDestinationWrite = target.type !== "destination" || !shouldGuardDestinationViewport || isMeasurementInViewport(correctedMeasured, viewportWidth, viewportHeight);
-    if (!viewportAllowsDestinationWrite) return;
+    const viewportAllowsDestinationWrite = target.type !== "destination" || isMeasurementInViewport(correctedMeasured, viewportWidth, viewportHeight);
+    if (!viewportAllowsDestinationWrite) return false;
     const measuredWithScroll = attachScrollSnapshotToMeasuredBounds(correctedMeasured, scrollMetadata.get());
     applyMeasuredBoundsWrites({
       entryTag: boundTag.tag,
@@ -70,6 +60,7 @@ export const useMeasurer = ({
       handoff,
       escapeClipping
     });
-  }, [enabled, boundTag, currentScreenKey, preparedStyles, measuredAnimatedRef, handoff, escapeClipping, localMeasurement, viewportWidth, viewportHeight, scrollState, scrollMetadata, pendingLifecycleStartBlockCount, visibilityBlocked]);
+    return true;
+  }, [enabled, boundTag, currentScreenKey, preparedStyles, measuredAnimatedRef, handoff, escapeClipping, localMeasurement, viewportWidth, viewportHeight, scrollState, scrollMetadata, visibilityBlocked]);
 };
 //# sourceMappingURL=use-measurer.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useWindowDimensions","applyMeasuredBoundsWrites","useScreenSlots","ScrollStore","SystemStore","getVisibilityBlockOffset","attachScrollSnapshotToMeasuredBounds","correctMeasuredBoundsForVisibilityGate","isMeasurementInViewport","measureWithOverscrollAwareness","useMeasurer","enabled","boundTag","currentScreenKey","preparedStyles","measuredAnimatedRef","handoff","escapeClipping","localMeasurement","width","viewportWidth","height","viewportHeight","scrollState","getValue","scrollMetadata","pendingLifecycleStartBlockCount","visibilityBlocked","target","measured","get","correctedMeasured","visibilityBlockOffset","type","set","bounds","pairKey","shouldGuardDestinationViewport","group","viewportAllowsDestinationWrite","measuredWithScroll","entryTag","tag","linkId","linkKey","linkWrite"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/hooks/use-measurer.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useWindowDimensions","applyMeasuredBoundsWrites","useScreenSlotStore","ScrollStore","getVisibilityBlockOffset","attachScrollSnapshotToMeasuredBounds","correctMeasuredBoundsForVisibilityGate","isMeasurementInViewport","measureWithOverscrollAwareness","useMeasurer","enabled","boundTag","currentScreenKey","preparedStyles","measuredAnimatedRef","handoff","escapeClipping","localMeasurement","width","viewportWidth","height","viewportHeight","scrollState","getValue","scrollMetadata","screenSlotStore","visibilityBlocked","target","measured","get","correctedMeasured","visibilityBlockOffset","type","set","bounds","pairKey","viewportAllowsDestinationWrite","measuredWithScroll","entryTag","tag","linkId","linkKey","group","linkWrite"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/hooks/use-measurer.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,OAAO;AAEnC,SAASC,mBAAmB,QAAQ,cAAc;AAElD,SAASC,yBAAyB,QAAQ,mDAAmD;AAC7F,SAASC,kBAAkB,QAAQ,kCAAkC;AAErE,SAASC,WAAW,QAAQ,8BAA8B;AAC1D,SAASC,wBAAwB,QAAQ,wCAAwC;AAEjF,SACCC,oCAAoC,EACpCC,sCAAsC,EACtCC,uBAAuB,EACvBC,8BAA8B,QACxB,0BAA0B;AAajC,OAAO,MAAMC,WAAW,GAAGA,CAAC;EAC3BC,OAAO;EACPC,QAAQ;EACRC,gBAAgB;EAChBC,cAAc;EACdC,mBAAmB;EACnBC,OAAO;EACPC,cAAc;EACdC;AACkB,CAAC,KAAsB;EACzC,MAAM;IAAEC,KAAK,EAAEC,aAAa;IAAEC,MAAM,EAAEC;EAAe,CAAC,GACrDrB,mBAAmB,CAAC,CAAC;EAEtB,MAAMsB,WAAW,GAAGnB,WAAW,CAACoB,QAAQ,CAACX,gBAAgB,EAAE,cAAc,CAAC;EAC1E,MAAMY,cAAc,GAAGrB,WAAW,CAACoB,QAAQ,CAACX,gBAAgB,EAAE,UAAU,CAAC;EACzE,MAAMa,eAAe,GAAGvB,kBAAkB,CAAC,CAAC;EAC5C,MAAM;IAAEwB;EAAkB,CAAC,GAAGD,eAAe;EAE7C,OAAO1B,WAAW,CAChB4B,MAAM,IAAK;IACX,SAAS;;IACT,IAAI,CAACjB,OAAO,EAAE,OAAO,KAAK;IAE1B,MAAMkB,QAAQ,GAAGpB,8BAA8B,CAC9CM,mBAAmB,EACnBQ,WAAW,CAACO,GAAG,CAAC,CACjB,CAAC;IAED,IAAI,CAACD,QAAQ,EAAE,OAAO,KAAK;IAE3B,MAAME,iBAAiB,GAAGxB,sCAAsC,CAAC;MAChEsB,QAAQ;MACRF,iBAAiB,EAAEA,iBAAiB,CAACG,GAAG,CAAC,CAAC;MAC1CE,qBAAqB,EAAE3B,wBAAwB,CAACiB,cAAc,CAAC;MAC/DF,aAAa;MACbE;IACD,CAAC,CAAC;IAEF,IAAIL,cAAc,IAAIW,MAAM,CAACK,IAAI,KAAK,QAAQ,EAAE;MAC/Cf,gBAAgB,CAACgB,GAAG,CAAC;QACpBC,MAAM,EAAEN,QAAQ;QAChBO,OAAO,EAAER,MAAM,CAACQ;MACjB,CAAC,CAAC;IACH;IAEA,MAAMC,8BAA8B,GACnCT,MAAM,CAACK,IAAI,KAAK,aAAa,IAC7BzB,uBAAuB,CACtBuB,iBAAiB,EACjBX,aAAa,EACbE,cACD,CAAC;IAEF,IAAI,CAACe,8BAA8B,EAAE,OAAO,KAAK;IAEjD,MAAMC,kBAAkB,GAAGhC,oCAAoC,CAC9DyB,iBAAiB,EACjBN,cAAc,CAACK,GAAG,CAAC,CACpB,CAAC;IAED5B,yBAAyB,CAAC;MACzBqC,QAAQ,EAAE3B,QAAQ,CAAC4B,GAAG;MACtBC,MAAM,EAAE7B,QAAQ,CAAC8B,OAAO;MACxBC,KAAK,EAAE/B,QAAQ,CAAC+B,KAAK;MACrB9B,gBAAgB;MAChBgB,QAAQ,EAAES,kBAAkB;MAC5BxB,cAAc;MACd8B,SAAS,EAAEhB,MAAM;MACjBZ,OAAO;MACPC;IACD,CAAC,CAAC;IAEF,OAAO,IAAI;EACZ,CAAC,EACD,CACCN,OAAO,EACPC,QAAQ,EACRC,gBAAgB,EAChBC,cAAc,EACdC,mBAAmB,EACnBC,OAAO,EACPC,cAAc,EACdC,gBAAgB,EAChBE,aAAa,EACbE,cAAc,EACdC,WAAW,EACXE,cAAc,EACdE,iBAAiB,CAEnB,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/shared/components/boundary/portal/components/boundary-content-portal/helpers/active-handoff-receiver.js

@@ -1,5 +1,14 @@
 "use strict";
 
+export const hasNestedHandoffTopology = ({
+  inheritedSourcePair,
+  pairDestinationScreenKey,
+  transitionDestinationScreenKey
+}) => {
+  "worklet";
+
+  return inheritedSourcePair || !!pairDestinationScreenKey && pairDestinationScreenKey !== transitionDestinationScreenKey;
+};
 export const resolveActiveHandoffReceiver = ({
   focusedIndex,
   routes,
@@ -57,4 +66,19 @@ export const resolveHandoffAttachmentCandidate = ({
   }
   return activeReceiverScreenKey;
 };
+export const resolveNestedHandoffAttachmentCandidate = ({
+  attachedReceiverScreenKey,
+  currentScreenKey,
+  hasActiveCloseFinished,
+  interpolatorReady,
+  pairDestinationScreenKey
+}) => {
+  "worklet";
+
+  if (hasActiveCloseFinished) return currentScreenKey;
+  if (interpolatorReady && pairDestinationScreenKey) {
+    return pairDestinationScreenKey;
+  }
+  return attachedReceiverScreenKey;
+};
 //# sourceMappingURL=active-handoff-receiver.js.map

package/lib/module/shared/components/boundary/portal/components/boundary-content-portal/helpers/active-handoff-receiver.js.map

@@ -1 +1 @@
-{"version":3,"names":["resolveActiveHandoffReceiver","focusedIndex","routes","scenes","index","length","scene","activity","route","key","resolvePreviousHandoffReceiver","previousIndex","previousScene","resolveHandoffAttachmentCandidate","activeReceiverClosing","activeReceiverScreenKey","attachedReceiverScreenKey","hasActiveCloseFinished","interpolatorReady","pairChangedDuringClose","pairDestinationScreenKey","previousReceiverScreenKey"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-content-portal/helpers/active-handoff-receiver.ts"],"mappings":";;AAeA,OAAO,MAAMA,4BAA4B,GAAGA,CAAC;EAC5CC,YAAY;EACZC,MAAM;EACNC;AACmC,CAAC,KAAoB;EACxD,KAAK,IAAIC,KAAK,GAAGD,MAAM,CAACE,MAAM,GAAG,CAAC,EAAED,KAAK,IAAI,CAAC,EAAEA,KAAK,EAAE,EAAE;IACxD,MAAME,KAAK,GAAGH,MAAM,CAACC,KAAK,CAAC;IAC3B,IAAIE,KAAK,EAAEC,QAAQ,KAAK,SAAS,EAAE;MAClC,OAAOD,KAAK,CAACE,KAAK,CAACC,GAAG;IACvB;EACD;EAEA,OAAOP,MAAM,CAACD,YAAY,CAAC,EAAEQ,GAAG,IAAI,IAAI;AACzC,CAAC;AAED,OAAO,MAAMC,8BAA8B,GAAGA,CAAC;EAC9CT,YAAY;EACZC,MAAM;EACNC;AACmC,CAAC,KAAoB;EACxD,KAAK,IAAIC,KAAK,GAAGD,MAAM,CAACE,MAAM,GAAG,CAAC,EAAED,KAAK,IAAI,CAAC,EAAEA,KAAK,EAAE,EAAE;IACxD,IAAID,MAAM,CAACC,KAAK,CAAC,EAAEG,QAAQ,KAAK,SAAS,EAAE;MAC1C;IACD;IAEA,KAAK,IAAII,aAAa,GAAGP,KAAK,GAAG,CAAC,EAAEO,aAAa,IAAI,CAAC,EAAEA,aAAa,EAAE,EAAE;MACxE,MAAMC,aAAa,GAAGT,MAAM,CAACQ,aAAa,CAAC;MAC3C,IAAIC,aAAa,EAAEL,QAAQ,KAAK,SAAS,EAAE;QAC1C,OAAOK,aAAa,EAAEJ,KAAK,CAACC,GAAG,IAAI,IAAI;MACxC;IACD;EACD;EAEA,OAAOP,MAAM,CAACD,YAAY,CAAC,EAAEQ,GAAG,IAAI,IAAI;AACzC,CAAC;AAED,OAAO,MAAMI,iCAAiC,GAAGA,CAAC;EACjDC,qBAAqB;EACrBC,uBAAuB;EACvBC,yBAAyB;EACzBC,sBAAsB;EACtBC,iBAAiB;EACjBC,sBAAsB,GAAG,KAAK;EAC9BC,wBAAwB;EACxBC;AAUD,CAAC,KAAK;EACL,SAAS;;EAET,IACCP,qBAAqB,IACrBI,iBAAiB,IACjBE,wBAAwB,IACxBD,sBAAsB,EACrB;IACD,OAAOC,wBAAwB;EAChC;EAEA,IACCH,sBAAsB,IACtBD,yBAAyB,KAAKD,uBAAuB,EACpD;IACD,OAAOM,yBAAyB;EACjC;EAEA,IAAIJ,sBAAsB,EAAE;IAC3B,OAAOD,yBAAyB;EACjC;EAEA,IACCF,qBAAqB,IACrBE,yBAAyB,KAAKD,uBAAuB,IACrDG,iBAAiB,IACjBE,wBAAwB,EACvB;IACD,OAAOA,wBAAwB;EAChC;EAEA,OAAOL,uBAAuB;AAC/B,CAAC","ignoreList":[]}
+{"version":3,"names":["hasNestedHandoffTopology","inheritedSourcePair","pairDestinationScreenKey","transitionDestinationScreenKey","resolveActiveHandoffReceiver","focusedIndex","routes","scenes","index","length","scene","activity","route","key","resolvePreviousHandoffReceiver","previousIndex","previousScene","resolveHandoffAttachmentCandidate","activeReceiverClosing","activeReceiverScreenKey","attachedReceiverScreenKey","hasActiveCloseFinished","interpolatorReady","pairChangedDuringClose","previousReceiverScreenKey","resolveNestedHandoffAttachmentCandidate","currentScreenKey"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-content-portal/helpers/active-handoff-receiver.ts"],"mappings":";;AAeA,OAAO,MAAMA,wBAAwB,GAAGA,CAAC;EACxCC,mBAAmB;EACnBC,wBAAwB;EACxBC;AAKD,CAAC,KAAK;EACL,SAAS;;EACT,OACCF,mBAAmB,IAClB,CAAC,CAACC,wBAAwB,IAC1BA,wBAAwB,KAAKC,8BAA+B;AAE/D,CAAC;AAED,OAAO,MAAMC,4BAA4B,GAAGA,CAAC;EAC5CC,YAAY;EACZC,MAAM;EACNC;AACmC,CAAC,KAAoB;EACxD,KAAK,IAAIC,KAAK,GAAGD,MAAM,CAACE,MAAM,GAAG,CAAC,EAAED,KAAK,IAAI,CAAC,EAAEA,KAAK,EAAE,EAAE;IACxD,MAAME,KAAK,GAAGH,MAAM,CAACC,KAAK,CAAC;IAC3B,IAAIE,KAAK,EAAEC,QAAQ,KAAK,SAAS,EAAE;MAClC,OAAOD,KAAK,CAACE,KAAK,CAACC,GAAG;IACvB;EACD;EAEA,OAAOP,MAAM,CAACD,YAAY,CAAC,EAAEQ,GAAG,IAAI,IAAI;AACzC,CAAC;AAED,OAAO,MAAMC,8BAA8B,GAAGA,CAAC;EAC9CT,YAAY;EACZC,MAAM;EACNC;AACmC,CAAC,KAAoB;EACxD,KAAK,IAAIC,KAAK,GAAGD,MAAM,CAACE,MAAM,GAAG,CAAC,EAAED,KAAK,IAAI,CAAC,EAAEA,KAAK,EAAE,EAAE;IACxD,IAAID,MAAM,CAACC,KAAK,CAAC,EAAEG,QAAQ,KAAK,SAAS,EAAE;MAC1C;IACD;IAEA,KAAK,IAAII,aAAa,GAAGP,KAAK,GAAG,CAAC,EAAEO,aAAa,IAAI,CAAC,EAAEA,aAAa,EAAE,EAAE;MACxE,MAAMC,aAAa,GAAGT,MAAM,CAACQ,aAAa,CAAC;MAC3C,IAAIC,aAAa,EAAEL,QAAQ,KAAK,SAAS,EAAE;QAC1C,OAAOK,aAAa,EAAEJ,KAAK,CAACC,GAAG,IAAI,IAAI;MACxC;IACD;EACD;EAEA,OAAOP,MAAM,CAACD,YAAY,CAAC,EAAEQ,GAAG,IAAI,IAAI;AACzC,CAAC;AAED,OAAO,MAAMI,iCAAiC,GAAGA,CAAC;EACjDC,qBAAqB;EACrBC,uBAAuB;EACvBC,yBAAyB;EACzBC,sBAAsB;EACtBC,iBAAiB;EACjBC,sBAAsB,GAAG,KAAK;EAC9BrB,wBAAwB;EACxBsB;AAUD,CAAC,KAAK;EACL,SAAS;;EAET,IACCN,qBAAqB,IACrBI,iBAAiB,IACjBpB,wBAAwB,IACxBqB,sBAAsB,EACrB;IACD,OAAOrB,wBAAwB;EAChC;EAEA,IACCmB,sBAAsB,IACtBD,yBAAyB,KAAKD,uBAAuB,EACpD;IACD,OAAOK,yBAAyB;EACjC;EAEA,IAAIH,sBAAsB,EAAE;IAC3B,OAAOD,yBAAyB;EACjC;EAEA,IACCF,qBAAqB,IACrBE,yBAAyB,KAAKD,uBAAuB,IACrDG,iBAAiB,IACjBpB,wBAAwB,EACvB;IACD,OAAOA,wBAAwB;EAChC;EAEA,OAAOiB,uBAAuB;AAC/B,CAAC;AAED,OAAO,MAAMM,uCAAuC,GAAGA,CAAC;EACvDL,yBAAyB;EACzBM,gBAAgB;EAChBL,sBAAsB;EACtBC,iBAAiB;EACjBpB;AAOD,CAAC,KAAK;EACL,SAAS;;EAET,IAAImB,sBAAsB,EAAE,OAAOK,gBAAgB;EACnD,IAAIJ,iBAAiB,IAAIpB,wBAAwB,EAAE;IAClD,OAAOA,wBAAwB;EAChC;EAEA,OAAOkB,yBAAyB;AACjC,CAAC","ignoreList":[]}

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

@@ -3,7 +3,7 @@
 import { useAnimatedProps, useSharedValue } from "react-native-reanimated";
 import { useStack } from "../../../../../../hooks/navigation/use-stack";
 import { useDescriptorsStore } from "../../../../../../providers/screen/descriptors";
-import { useScreenSlots } from "../../../../../../providers/screen/styles";
+import { useOptionalScreenSlotStore, useScreenSlotStore } 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";
@@ -12,24 +12,29 @@ 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 { resolveActiveHandoffReceiver, resolveHandoffAttachmentCandidate, resolvePreviousHandoffReceiver } from "../helpers/active-handoff-receiver";
+import { hasNestedHandoffTopology, resolveActiveHandoffReceiver, resolveHandoffAttachmentCandidate, resolveNestedHandoffAttachmentCandidate, resolvePreviousHandoffReceiver } from "../helpers/active-handoff-receiver";
 import { createBoundaryContentPortalHostName } from "../helpers/host-name";
 export const useBoundaryContentPortalAttachment = ({
   boundaryId
 }) => {
-  const {
-    slotsMap
-  } = useScreenSlots();
+  const slotsMap = useScreenSlotStore(store => store.slotsMap);
   const currentScreenKey = useDescriptorsStore(s => s.derivations.currentScreenKey);
   const nextScreenKey = useDescriptorsStore(s => s.derivations.nextScreenKey);
   const sourcePairKey = useDescriptorsStore(s => s.derivations.sourcePairKey);
-  const destinationSlots = useScreenSlots(nextScreenKey ?? currentScreenKey);
+  const transitionSourcePairKey = useDescriptorsStore(s => s.derivations.transitionSourcePairKey);
+  const transitionDestinationScreenKey = useDescriptorsStore(s => s.derivations.transitionDestinationScreenKey);
+  const isNestedSource = !sourcePairKey && !!transitionSourcePairKey;
+  const resolvedSourcePairKey = sourcePairKey ?? transitionSourcePairKey;
+  const resolvedDestinationScreenKey = nextScreenKey ?? transitionDestinationScreenKey;
+  const destinationSlots = useOptionalScreenSlotStore(resolvedDestinationScreenKey ?? currentScreenKey);
   const unavailableInterpolatorReady = useSharedValue(0);
   const interpolatorReady = destinationSlots?.interpolatorReady ?? unavailableInterpolatorReady;
   const activeReceiverScreenKey = useStack(resolveActiveHandoffReceiver);
   const previousReceiverScreenKey = useStack(resolvePreviousHandoffReceiver);
   const activeReceiverAnimationProgress = SystemStore.getValue(activeReceiverScreenKey ?? currentScreenKey, "animationProgress");
   const activeReceiverClosing = AnimationStore.getValue(activeReceiverScreenKey ?? currentScreenKey, "closing");
+  const nestedDestinationAnimationProgress = SystemStore.getValue(isNestedSource && resolvedDestinationScreenKey ? resolvedDestinationScreenKey : currentScreenKey, "animationProgress");
+  const nestedDestinationClosing = AnimationStore.getValue(isNestedSource && resolvedDestinationScreenKey ? resolvedDestinationScreenKey : currentScreenKey, "closing");
   const attachedReceiverScreenKey = useSharedValue(currentScreenKey);
   const sourcePairBeforeClose = useSharedValue(null);
   const teleportProps = useAnimatedProps(() => {
@@ -42,22 +47,33 @@ export const useBoundaryContentPortalAttachment = ({
       ...slotProps
     } = slot?.props ?? {};
     const shouldTeleport = isTeleportEnabled(teleport);
-    const closing = activeReceiverClosing.get();
-    const animationProgress = activeReceiverAnimationProgress.get();
+    const closing = isNestedSource ? nestedDestinationClosing.get() : activeReceiverClosing.get();
+    const animationProgress = isNestedSource ? nestedDestinationAnimationProgress.get() : activeReceiverAnimationProgress.get();
     if (!closing) {
-      sourcePairBeforeClose.set(sourcePairKey ?? null);
+      sourcePairBeforeClose.set(resolvedSourcePairKey ?? null);
     }
-    const pairChangedDuringClose = !!closing && !!sourcePairKey && sourcePairKey !== sourcePairBeforeClose.get();
+    const pairChangedDuringClose = !!closing && !!resolvedSourcePairKey && resolvedSourcePairKey !== sourcePairBeforeClose.get();
     const hasActiveCloseFinished = hasCloseTransitionFinished({
       closing,
       animationProgress
     });
-    const pair = sourcePairKey ? pairs.get()[sourcePairKey] : null;
+    const pair = resolvedSourcePairKey ? pairs.get()[resolvedSourcePairKey] : null;
     const link = pair?.links[getLinkKeyFromTag(boundaryId)];
     const pairDestination = link?.status === "complete" && (!link.group || pair?.groups[link.group]?.activeId === getLinkKeyFromTag(boundaryId)) ? link.destination.screenKey : null;
     const isInterpolatorReady = interpolatorReady.get();
     const attachedScreenKey = attachedReceiverScreenKey.get();
-    const nextReceiverScreenKey = resolveHandoffAttachmentCandidate({
+    const usesNestedReceiver = hasNestedHandoffTopology({
+      inheritedSourcePair: isNestedSource,
+      pairDestinationScreenKey: pairDestination,
+      transitionDestinationScreenKey: resolvedDestinationScreenKey
+    });
+    const nextReceiverScreenKey = usesNestedReceiver ? resolveNestedHandoffAttachmentCandidate({
+      attachedReceiverScreenKey: attachedScreenKey,
+      currentScreenKey,
+      hasActiveCloseFinished,
+      interpolatorReady: !!isInterpolatorReady,
+      pairDestinationScreenKey: pairDestination
+    }) : resolveHandoffAttachmentCandidate({
       activeReceiverClosing: !!closing,
       activeReceiverScreenKey,
       attachedReceiverScreenKey: attachedScreenKey,
@@ -71,7 +87,7 @@ export const useBoundaryContentPortalAttachment = ({
     const receiverReady = receiverEntry?.handoff === true;
     const returningFromActiveClose = hasActiveCloseFinished && attachedScreenKey === activeReceiverScreenKey;
     const activatingPairDestination = !!pairDestination && !!isInterpolatorReady && nextReceiverScreenKey === pairDestination;
-    const canActivateReceiver = returningFromActiveClose || activatingPairDestination || animationProgress > 0;
+    const canActivateReceiver = usesNestedReceiver ? nextReceiverScreenKey === attachedScreenKey || hasActiveCloseFinished || activatingPairDestination : returningFromActiveClose || activatingPairDestination || animationProgress > 0;
     if (nextReceiverScreenKey && receiverReady && canActivateReceiver) {
       attachedReceiverScreenKey.set(nextReceiverScreenKey);
     }

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

@@ -1 +1 @@
-{"version":3,"names":["useAnimatedProps","useSharedValue","useStack","useDescriptorsStore","useScreenSlots","hasCloseTransitionFinished","AnimationStore","getLinkKeyFromTag","getEntry","pairs","SystemStore","PORTAL_HOST_NAME_RESET_VALUE","isTeleportEnabled","resolveActiveHandoffReceiver","resolveHandoffAttachmentCandidate","resolvePreviousHandoffReceiver","createBoundaryContentPortalHostName","useBoundaryContentPortalAttachment","boundaryId","slotsMap","currentScreenKey","s","derivations","nextScreenKey","sourcePairKey","destinationSlots","unavailableInterpolatorReady","interpolatorReady","activeReceiverScreenKey","previousReceiverScreenKey","activeReceiverAnimationProgress","getValue","activeReceiverClosing","attachedReceiverScreenKey","sourcePairBeforeClose","teleportProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldTeleport","closing","animationProgress","set","pairChangedDuringClose","hasActiveCloseFinished","pair","link","links","pairDestination","status","group","groups","activeId","destination","screenKey","isInterpolatorReady","attachedScreenKey","nextReceiverScreenKey","pairDestinationScreenKey","receiverEntry","receiverReady","handoff","returningFromActiveClose","activatingPairDestination","canActivateReceiver","targetScreenKey","targetHostName","hostName"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-content-portal/hooks/use-boundary-content-portal-attachment.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useAnimatedProps","useSharedValue","useStack","useDescriptorsStore","useOptionalScreenSlotStore","useScreenSlotStore","hasCloseTransitionFinished","AnimationStore","getLinkKeyFromTag","getEntry","pairs","SystemStore","PORTAL_HOST_NAME_RESET_VALUE","isTeleportEnabled","hasNestedHandoffTopology","resolveActiveHandoffReceiver","resolveHandoffAttachmentCandidate","resolveNestedHandoffAttachmentCandidate","resolvePreviousHandoffReceiver","createBoundaryContentPortalHostName","useBoundaryContentPortalAttachment","boundaryId","slotsMap","store","currentScreenKey","s","derivations","nextScreenKey","sourcePairKey","transitionSourcePairKey","transitionDestinationScreenKey","isNestedSource","resolvedSourcePairKey","resolvedDestinationScreenKey","destinationSlots","unavailableInterpolatorReady","interpolatorReady","activeReceiverScreenKey","previousReceiverScreenKey","activeReceiverAnimationProgress","getValue","activeReceiverClosing","nestedDestinationAnimationProgress","nestedDestinationClosing","attachedReceiverScreenKey","sourcePairBeforeClose","teleportProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldTeleport","closing","animationProgress","set","pairChangedDuringClose","hasActiveCloseFinished","pair","link","links","pairDestination","status","group","groups","activeId","destination","screenKey","isInterpolatorReady","attachedScreenKey","usesNestedReceiver","inheritedSourcePair","pairDestinationScreenKey","nextReceiverScreenKey","receiverEntry","receiverReady","handoff","returningFromActiveClose","activatingPairDestination","canActivateReceiver","targetScreenKey","targetHostName","hostName"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-content-portal/hooks/use-boundary-content-portal-attachment.ts"],"mappings":";;AAAA,SAASA,gBAAgB,EAAEC,cAAc,QAAQ,yBAAyB;AAC1E,SAASC,QAAQ,QAAQ,8CAA8C;AACvE,SAASC,mBAAmB,QAAQ,gDAAgD;AACpF,SACCC,0BAA0B,EAC1BC,kBAAkB,QACZ,2CAA2C;AAClD,SAASC,0BAA0B,QAAQ,2EAA2E;AACtH,SAASC,cAAc,QAAQ,0CAA0C;AACzE,SAASC,iBAAiB,QAAQ,4DAA4D;AAC9F,SAASC,QAAQ,QAAQ,mDAAmD;AAC5E,SAASC,KAAK,QAAQ,iDAAiD;AACvE,SAASC,WAAW,QAAQ,uCAAuC;AACnE,SAASC,4BAA4B,QAAQ,uBAAuB;AACpE,SAASC,iBAAiB,QAAQ,iCAAiC;AACnE,SACCC,wBAAwB,EACxBC,4BAA4B,EAC5BC,iCAAiC,EACjCC,uCAAuC,EACvCC,8BAA8B,QACxB,oCAAoC;AAC3C,SAASC,mCAAmC,QAAQ,sBAAsB;AAM1E,OAAO,MAAMC,kCAAkC,GAAGA,CAAC;EAClDC;AACyC,CAAC,KAAK;EAC/C,MAAMC,QAAQ,GAAGjB,kBAAkB,CAAEkB,KAAK,IAAKA,KAAK,CAACD,QAAQ,CAAC;EAE9D,MAAME,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,aAAa,GAAGzB,mBAAmB,CAAEsB,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACE,aAAa,CAAC;EAC7E,MAAMC,uBAAuB,GAAG1B,mBAAmB,CACjDsB,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACG,uBACtB,CAAC;EACD,MAAMC,8BAA8B,GAAG3B,mBAAmB,CACxDsB,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACI,8BACtB,CAAC;EACD,MAAMC,cAAc,GAAG,CAACH,aAAa,IAAI,CAAC,CAACC,uBAAuB;EAClE,MAAMG,qBAAqB,GAAGJ,aAAa,IAAIC,uBAAuB;EACtE,MAAMI,4BAA4B,GACjCN,aAAa,IAAIG,8BAA8B;EAChD,MAAMI,gBAAgB,GAAG9B,0BAA0B,CAClD6B,4BAA4B,IAAIT,gBACjC,CAAC;EACD,MAAMW,4BAA4B,GAAGlC,cAAc,CAAC,CAAC,CAAC;EACtD,MAAMmC,iBAAiB,GACtBF,gBAAgB,EAAEE,iBAAiB,IAAID,4BAA4B;EAEpE,MAAME,uBAAuB,GAAGnC,QAAQ,CAACa,4BAA4B,CAAC;EACtE,MAAMuB,yBAAyB,GAAGpC,QAAQ,CAACgB,8BAA8B,CAAC;EAE1E,MAAMqB,+BAA+B,GAAG5B,WAAW,CAAC6B,QAAQ,CAC3DH,uBAAuB,IAAIb,gBAAgB,EAC3C,mBACD,CAAC;EAED,MAAMiB,qBAAqB,GAAGlC,cAAc,CAACiC,QAAQ,CACpDH,uBAAuB,IAAIb,gBAAgB,EAC3C,SACD,CAAC;EACD,MAAMkB,kCAAkC,GAAG/B,WAAW,CAAC6B,QAAQ,CAC9DT,cAAc,IAAIE,4BAA4B,GAC3CA,4BAA4B,GAC5BT,gBAAgB,EACnB,mBACD,CAAC;EACD,MAAMmB,wBAAwB,GAAGpC,cAAc,CAACiC,QAAQ,CACvDT,cAAc,IAAIE,4BAA4B,GAC3CA,4BAA4B,GAC5BT,gBAAgB,EACnB,SACD,CAAC;EAED,MAAMoB,yBAAyB,GAAG3C,cAAc,CAACuB,gBAAgB,CAAC;EAClE,MAAMqB,qBAAqB,GAAG5C,cAAc,CAAgB,IAAI,CAAC;EAEjE,MAAM6C,aAAa,GAAG9C,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IAET,MAAM+C,IAAI,GAAGzB,QAAQ,CAAC0B,GAAG,CAAC,CAAC,CAAC3B,UAAU,CAAC;IACvC,MAAM;MACL4B,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IAErB,MAAMC,cAAc,GAAGzC,iBAAiB,CAACsC,QAAQ,CAAC;IAClD,MAAMI,OAAO,GAAGxB,cAAc,GAC3BY,wBAAwB,CAACK,GAAG,CAAC,CAAC,GAC9BP,qBAAqB,CAACO,GAAG,CAAC,CAAC;IAC9B,MAAMQ,iBAAiB,GAAGzB,cAAc,GACrCW,kCAAkC,CAACM,GAAG,CAAC,CAAC,GACxCT,+BAA+B,CAACS,GAAG,CAAC,CAAC;IAExC,IAAI,CAACO,OAAO,EAAE;MACbV,qBAAqB,CAACY,GAAG,CAACzB,qBAAqB,IAAI,IAAI,CAAC;IACzD;IAEA,MAAM0B,sBAAsB,GAC3B,CAAC,CAACH,OAAO,IACT,CAAC,CAACvB,qBAAqB,IACvBA,qBAAqB,KAAKa,qBAAqB,CAACG,GAAG,CAAC,CAAC;IAEtD,MAAMW,sBAAsB,GAAGrD,0BAA0B,CAAC;MACzDiD,OAAO;MACPC;IACD,CAAC,CAAC;IAEF,MAAMI,IAAI,GAAG5B,qBAAqB,GAC/BtB,KAAK,CAACsC,GAAG,CAAC,CAAC,CAAChB,qBAAqB,CAAC,GAClC,IAAI;IACP,MAAM6B,IAAI,GAAGD,IAAI,EAAEE,KAAK,CAACtD,iBAAiB,CAACa,UAAU,CAAC,CAAC;IAEvD,MAAM0C,eAAe,GACpBF,IAAI,EAAEG,MAAM,KAAK,UAAU,KAC1B,CAACH,IAAI,CAACI,KAAK,IACXL,IAAI,EAAEM,MAAM,CAACL,IAAI,CAACI,KAAK,CAAC,EAAEE,QAAQ,KAAK3D,iBAAiB,CAACa,UAAU,CAAC,CAAC,GACnEwC,IAAI,CAACO,WAAW,CAACC,SAAS,GAC1B,IAAI;IAER,MAAMC,mBAAmB,GAAGlC,iBAAiB,CAACY,GAAG,CAAC,CAAC;IACnD,MAAMuB,iBAAiB,GAAG3B,yBAAyB,CAACI,GAAG,CAAC,CAAC;IACzD,MAAMwB,kBAAkB,GAAG1D,wBAAwB,CAAC;MACnD2D,mBAAmB,EAAE1C,cAAc;MACnC2C,wBAAwB,EAAEX,eAAe;MACzCjC,8BAA8B,EAAEG;IACjC,CAAC,CAAC;IAEF,MAAM0C,qBAAqB,GAAGH,kBAAkB,GAC7CvD,uCAAuC,CAAC;MACxC2B,yBAAyB,EAAE2B,iBAAiB;MAC5C/C,gBAAgB;MAChBmC,sBAAsB;MACtBvB,iBAAiB,EAAE,CAAC,CAACkC,mBAAmB;MACxCI,wBAAwB,EAAEX;IAC3B,CAAC,CAAC,GACD/C,iCAAiC,CAAC;MAClCyB,qBAAqB,EAAE,CAAC,CAACc,OAAO;MAChClB,uBAAuB;MACvBO,yBAAyB,EAAE2B,iBAAiB;MAC5CZ,sBAAsB;MACtBvB,iBAAiB,EAAE,CAAC,CAACkC,mBAAmB;MACxCZ,sBAAsB;MACtBgB,wBAAwB,EAAEX,eAAe;MACzCzB;IACD,CAAC,CAAC;IAEJ,MAAMsC,aAAa,GAAGD,qBAAqB,GACxClE,QAAQ,CAACY,UAAU,EAAEsD,qBAAqB,CAAC,GAC3C,IAAI;IAEP,MAAME,aAAa,GAAGD,aAAa,EAAEE,OAAO,KAAK,IAAI;IAErD,MAAMC,wBAAwB,GAC7BpB,sBAAsB,IAAIY,iBAAiB,KAAKlC,uBAAuB;IAExE,MAAM2C,yBAAyB,GAC9B,CAAC,CAACjB,eAAe,IACjB,CAAC,CAACO,mBAAmB,IACrBK,qBAAqB,KAAKZ,eAAe;IAE1C,MAAMkB,mBAAmB,GAAGT,kBAAkB,GAC3CG,qBAAqB,KAAKJ,iBAAiB,IAC5CZ,sBAAsB,IACtBqB,yBAAyB,GACxBD,wBAAwB,IACzBC,yBAAyB,IACzBxB,iBAAiB,GAAG,CAAC;IAEvB,IAAImB,qBAAqB,IAAIE,aAAa,IAAII,mBAAmB,EAAE;MAClErC,yBAAyB,CAACa,GAAG,CAACkB,qBAAqB,CAAC;IACrD;IAEA,MAAMO,eAAe,GAAG5B,cAAc,GACnCV,yBAAyB,CAACI,GAAG,CAAC,CAAC,GAC/B,IAAI;IAEP,MAAMmC,cAAc,GAAGD,eAAe,GACnC/D,mCAAmC,CAAC+D,eAAe,EAAE7D,UAAU,CAAC,GAChET,4BAA4B;IAE/B,OAAO;MACN,GAAGwC,SAAS;MACZgC,QAAQ,EAAED;IACX,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IAAErC;EAAc,CAAC;AACzB,CAAC","ignoreList":[]}

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

@@ -5,7 +5,9 @@ import { I18nManager, StyleSheet } from "react-native";
 import Animated, { useAnimatedReaction, useAnimatedStyle } from "react-native-reanimated";
 import { NO_STYLES } from "../../../../../../constants";
 import { composeSlotStyleWithLocalTransform } from "../../../../../../providers/screen/styles/helpers/compose-slot-style";
+import { markBoundaryPortalReady } from "../../../../../../stores/bounds/internals/coordinator";
 import { NativePortalHost, PORTAL_POINTER_EVENTS } from "../../../teleport";
+import { resolveReadyPortalHostName } from "../helpers/host-readiness";
 import { resolveBoundaryLocalMeasurement } from "../helpers/local-measurement";
 import { resolvePortalOffsetStyle } from "../helpers/offset-style";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -29,8 +31,13 @@ export const PortalBoundaryHost = /*#__PURE__*/memo(function PortalBoundaryHost(
   }, ready => {
     "worklet";
 
+    host.portalHostReady.set(resolveReadyPortalHostName({
+      currentReadyHostName: host.portalHostReady.get(),
+      hostName: host.portalHostName,
+      ready
+    }));
     if (ready) {
-      host.portalHostReady.set(true);
+      markBoundaryPortalReady(host.pairKey, host.boundaryId);
     }
   });
   const hostStyle = useAnimatedStyle(() => {

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

@@ -1 +1 @@
-{"version":3,"names":["memo","I18nManager","StyleSheet","Animated","useAnimatedReaction","useAnimatedStyle","NO_STYLES","composeSlotStyleWithLocalTransform","NativePortalHost","PORTAL_POINTER_EVENTS","resolveBoundaryLocalMeasurement","resolvePortalOffsetStyle","jsx","_jsx","AnimatedPortalBoundaryHost","createAnimatedComponent","getCurrentBoundaryBounds","host","localMeasurement","get","pairKey","PortalBoundaryHost","hostBounds","hostMeasurementKey","measuredHostKey","style","ready","portalHostReady","set","hostStyle","boundaryBounds","bounds","contentFrameStyle","height","width","slotStyle","slot","slotsMap","boundaryId","undefined","boundsLocalTransform","View","pointerEvents","collapsable","children","name","portalHostName","styles","content","create","isRTL","end","position","top","left"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["memo","I18nManager","StyleSheet","Animated","useAnimatedReaction","useAnimatedStyle","NO_STYLES","composeSlotStyleWithLocalTransform","markBoundaryPortalReady","NativePortalHost","PORTAL_POINTER_EVENTS","resolveReadyPortalHostName","resolveBoundaryLocalMeasurement","resolvePortalOffsetStyle","jsx","_jsx","AnimatedPortalBoundaryHost","createAnimatedComponent","getCurrentBoundaryBounds","host","localMeasurement","get","pairKey","PortalBoundaryHost","hostBounds","hostMeasurementKey","measuredHostKey","style","ready","portalHostReady","set","currentReadyHostName","hostName","portalHostName","boundaryId","hostStyle","boundaryBounds","bounds","contentFrameStyle","height","width","slotStyle","slot","slotsMap","undefined","boundsLocalTransform","View","pointerEvents","collapsable","children","name","styles","content","create","isRTL","end","position","top","left"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,14 @@
+"use strict";
+
+import { isTeleportEnabled } from "../../../utils/teleport-control";
+export const shouldAttachBoundaryPortal = ({
+  focused,
+  portalHostReady,
+  slotActive,
+  teleport
+}) => {
+  "worklet";
+
+  return slotActive && !focused && portalHostReady && isTeleportEnabled(teleport);
+};
+//# sourceMappingURL=attachment.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["isTeleportEnabled","shouldAttachBoundaryPortal","focused","portalHostReady","slotActive","teleport"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/helpers/attachment.ts"],"mappings":";;AACA,SAASA,iBAAiB,QAAQ,iCAAiC;AAEnE,OAAO,MAAMC,0BAA0B,GAAGA,CAAC;EAC1CC,OAAO;EACPC,eAAe;EACfC,UAAU;EACVC;AAMD,CAAC,KAAK;EACL,SAAS;;EACT,OACCD,UAAU,IAAI,CAACF,OAAO,IAAIC,eAAe,IAAIH,iBAAiB,CAACK,QAAQ,CAAC;AAE1E,CAAC","ignoreList":[]}

package/lib/module/shared/components/boundary/portal/components/boundary-portal/helpers/host-readiness.js

@@ -0,0 +1,13 @@
+"use strict";
+
+export const resolveReadyPortalHostName = ({
+  currentReadyHostName,
+  hostName,
+  ready
+}) => {
+  "worklet";
+
+  if (ready) return hostName;
+  return currentReadyHostName === hostName ? null : currentReadyHostName;
+};
+//# sourceMappingURL=host-readiness.js.map

package/lib/module/shared/components/boundary/portal/components/boundary-portal/helpers/host-readiness.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["resolveReadyPortalHostName","currentReadyHostName","hostName","ready"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/helpers/host-readiness.ts"],"mappings":";;AAAA,OAAO,MAAMA,0BAA0B,GAAGA,CAAC;EAC1CC,oBAAoB;EACpBC,QAAQ;EACRC;AAKD,CAAC,KAAK;EACL,SAAS;;EAET,IAAIA,KAAK,EAAE,OAAOD,QAAQ;EAC1B,OAAOD,oBAAoB,KAAKC,QAAQ,GAAG,IAAI,GAAGD,oBAAoB;AACvE,CAAC","ignoreList":[]}

package/lib/module/shared/components/boundary/portal/components/boundary-portal/helpers/local-measurement.js

@@ -1,5 +1,24 @@
 "use strict";
 
+import { getGroupKeyFromTag, getLinkKeyFromTag } from "../../../../../../stores/bounds/helpers/link-pairs.helpers";
+import { isTeleportEnabled } from "../../../utils/teleport-control";
+export const resolveBoundaryPortalPairKey = measurement => {
+  "worklet";
+
+  return measurement?.pairKey ?? null;
+};
+export const resolveActiveBoundaryPortalPairKey = (measurement, slot, boundaryId, pairsState) => {
+  "worklet";
+
+  if (!measurement) return null;
+  const group = getGroupKeyFromTag(boundaryId);
+  if (group) {
+    const activeId = pairsState[measurement.pairKey]?.groups[group]?.activeId;
+    if (activeId !== getLinkKeyFromTag(boundaryId)) return null;
+  }
+  if (slot && !isTeleportEnabled(slot.props?.teleport)) return null;
+  return measurement.pairKey;
+};
 export const resolveBoundaryLocalMeasurement = (measurement, pairKey) => {
   "worklet";
 

package/lib/module/shared/components/boundary/portal/components/boundary-portal/helpers/local-measurement.js.map

@@ -1 +1 @@
-{"version":3,"names":["resolveBoundaryLocalMeasurement","measurement","pairKey","bounds"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/helpers/local-measurement.ts"],"mappings":";;AAGA,OAAO,MAAMA,+BAA+B,GAAGA,CAC9CC,WAA4C,EAC5CC,OAAsB,KAClB;EACJ,SAAS;;EACT,OAAOD,WAAW,EAAEC,OAAO,KAAKA,OAAO,GAAGD,WAAW,CAACE,MAAM,GAAG,IAAI;AACpE,CAAC","ignoreList":[]}
+{"version":3,"names":["getGroupKeyFromTag","getLinkKeyFromTag","isTeleportEnabled","resolveBoundaryPortalPairKey","measurement","pairKey","resolveActiveBoundaryPortalPairKey","slot","boundaryId","pairsState","group","activeId","groups","props","teleport","resolveBoundaryLocalMeasurement","bounds"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/helpers/local-measurement.ts"],"mappings":";;AAAA,SACCA,kBAAkB,EAClBC,iBAAiB,QACX,4DAA4D;AAOnE,SAASC,iBAAiB,QAAQ,iCAAiC;AAEnE,OAAO,MAAMC,4BAA4B,GACxCC,WAA4C,IAClB;EAC1B,SAAS;;EACT,OAAOA,WAAW,EAAEC,OAAO,IAAI,IAAI;AACpC,CAAC;AAED,OAAO,MAAMC,kCAAkC,GAAGA,CACjDF,WAA4C,EAC5CG,IAA+C,EAC/CC,UAAkB,EAClBC,UAA0B,KACA;EAC1B,SAAS;;EACT,IAAI,CAACL,WAAW,EAAE,OAAO,IAAI;EAE7B,MAAMM,KAAK,GAAGV,kBAAkB,CAACQ,UAAU,CAAC;EAC5C,IAAIE,KAAK,EAAE;IACV,MAAMC,QAAQ,GAAGF,UAAU,CAACL,WAAW,CAACC,OAAO,CAAC,EAAEO,MAAM,CAACF,KAAK,CAAC,EAAEC,QAAQ;IACzE,IAAIA,QAAQ,KAAKV,iBAAiB,CAACO,UAAU,CAAC,EAAE,OAAO,IAAI;EAC5D;EAEA,IAAID,IAAI,IAAI,CAACL,iBAAiB,CAACK,IAAI,CAACM,KAAK,EAAEC,QAAQ,CAAC,EAAE,OAAO,IAAI;EACjE,OAAOV,WAAW,CAACC,OAAO;AAC3B,CAAC;AAED,OAAO,MAAMU,+BAA+B,GAAGA,CAC9CX,WAA4C,EAC5CC,OAAsB,KAClB;EACJ,SAAS;;EACT,OAAOD,WAAW,EAAEC,OAAO,KAAKA,OAAO,GAAGD,WAAW,CAACY,MAAM,GAAG,IAAI;AACpE,CAAC","ignoreList":[]}

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

@@ -2,12 +2,13 @@
 
 import { useCallback, useLayoutEffect, useState } from "react";
 import { runOnJS, useAnimatedReaction } from "react-native-reanimated";
-import { getPairKeyForSource } from "../../../../../../stores/bounds/internals/links";
+import { pairs } from "../../../../../../stores/bounds/internals/state";
 import { createBoundaryPortalHostName } from "../../../utils/naming";
+import { isTeleportEnabled } from "../../../utils/teleport-control";
+import { resolveActiveBoundaryPortalPairKey } from "../helpers/local-measurement";
 import { mountPortalBoundaryHost, unmountPortalBoundaryHostByName } from "../stores/portal-boundary-host.store";
 export const useActivePortalBoundaryHost = ({
   boundaryId,
-  currentScreenKey,
   escapeHostKey,
   localMeasurement,
   portalHostName,
@@ -21,24 +22,23 @@ export const useActivePortalBoundaryHost = ({
   useAnimatedReaction(() => {
     "worklet";
 
-    const pairKey = getPairKeyForSource(boundaryId, currentScreenKey);
-    const measurement = localMeasurement.get();
-    if (!pairKey || measurement?.pairKey !== pairKey) {
-      return null;
-    }
-    return pairKey;
+    return resolveActiveBoundaryPortalPairKey(localMeasurement.get(), slotsMap.get()[boundaryId], boundaryId, pairs.get());
   }, (pairKey, previousPairKey) => {
     "worklet";
 
     if (pairKey === previousPairKey) {
       return;
     }
+    const slot = slotsMap.get()[boundaryId];
+    if (pairKey === null && localMeasurement.get() !== null && slot && !isTeleportEnabled(slot.props?.teleport)) {
+      localMeasurement.set(null);
+    }
     runOnJS(updateActivePairKey)(pairKey);
   });
   useLayoutEffect(() => {
     if (!activePairKey || !escapeHostKey) {
       portalHostName.set(null);
-      portalHostReady.set(false);
+      portalHostReady.set(null);
       return;
     }
     const nextPortalHostName = createBoundaryPortalHostName(escapeHostKey, boundaryId, activePairKey);
@@ -54,7 +54,7 @@ export const useActivePortalBoundaryHost = ({
     portalHostName.set(nextPortalHostName);
     return () => {
       portalHostName.set(null);
-      portalHostReady.set(false);
+      portalHostReady.set(null);
       unmountPortalBoundaryHostByName(nextPortalHostName);
     };
   }, [activePairKey, boundaryId, escapeHostKey, localMeasurement, portalHostName, portalHostReady, slotsMap]);

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

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useLayoutEffect","useState","runOnJS","useAnimatedReaction","getPairKeyForSource","createBoundaryPortalHostName","mountPortalBoundaryHost","unmountPortalBoundaryHostByName","useActivePortalBoundaryHost","boundaryId","currentScreenKey","escapeHostKey","localMeasurement","portalHostName","portalHostReady","slotsMap","activePairKey","setActivePairKey","updateActivePairKey","pairKey","measurement","get","previousPairKey","set","nextPortalHostName","hostKey"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,eAAe,EAAEC,QAAQ,QAAQ,OAAO;AAC9D,SACCC,OAAO,EAEPC,mBAAmB,QACb,yBAAyB;AAChC,SAASC,mBAAmB,QAAQ,iDAAiD;AAIrF,SAASC,4BAA4B,QAAQ,uBAAuB;AACpE,SACCC,uBAAuB,EACvBC,+BAA+B,QACzB,sCAAsC;AAY7C,OAAO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC,UAAU;EACVC,gBAAgB;EAChBC,aAAa;EACbC,gBAAgB;EAChBC,cAAc;EACdC,eAAe;EACfC;AACkC,CAAC,KAAK;EACxC,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAGhB,QAAQ,CACjD,IACD,CAAC;EAED,MAAMiB,mBAAmB,GAAGnB,WAAW,CAAEoB,OAA6B,IAAK;IAC1EF,gBAAgB,CAACE,OAAO,CAAC;EAC1B,CAAC,EAAE,EAAE,CAAC;EAENhB,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,MAAMgB,OAAO,GAAGf,mBAAmB,CAACK,UAAU,EAAEC,gBAAgB,CAAC;IACjE,MAAMU,WAAW,GAAGR,gBAAgB,CAACS,GAAG,CAAC,CAAC;IAC1C,IAAI,CAACF,OAAO,IAAIC,WAAW,EAAED,OAAO,KAAKA,OAAO,EAAE;MACjD,OAAO,IAAI;IACZ;IAEA,OAAOA,OAAO;EACf,CAAC,EACD,CAACA,OAAO,EAAEG,eAAe,KAAK;IAC7B,SAAS;;IACT,IAAIH,OAAO,KAAKG,eAAe,EAAE;MAChC;IACD;IAEApB,OAAO,CAACgB,mBAAmB,CAAC,CAACC,OAAO,CAAC;EACtC,CACD,CAAC;EAEDnB,eAAe,CAAC,MAAM;IACrB,IAAI,CAACgB,aAAa,IAAI,CAACL,aAAa,EAAE;MACrCE,cAAc,CAACU,GAAG,CAAC,IAAI,CAAC;MACxBT,eAAe,CAACS,GAAG,CAAC,KAAK,CAAC;MAC1B;IACD;IAEA,MAAMC,kBAAkB,GAAGnB,4BAA4B,CACtDM,aAAa,EACbF,UAAU,EACVO,aACD,CAAC;IAEDV,uBAAuB,CAAC;MACvBG,UAAU;MACVgB,OAAO,EAAEd,aAAa;MACtBC,gBAAgB;MAChBO,OAAO,EAAEH,aAAa;MACtBH,cAAc,EAAEW,kBAAkB;MAClCV,eAAe;MACfC;IACD,CAAC,CAAC;IACFF,cAAc,CAACU,GAAG,CAACC,kBAAkB,CAAC;IAEtC,OAAO,MAAM;MACZX,cAAc,CAACU,GAAG,CAAC,IAAI,CAAC;MACxBT,eAAe,CAACS,GAAG,CAAC,KAAK,CAAC;MAC1BhB,+BAA+B,CAACiB,kBAAkB,CAAC;IACpD,CAAC;EACF,CAAC,EAAE,CACFR,aAAa,EACbP,UAAU,EACVE,aAAa,EACbC,gBAAgB,EAChBC,cAAc,EACdC,eAAe,EACfC,QAAQ,CACR,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["useCallback","useLayoutEffect","useState","runOnJS","useAnimatedReaction","pairs","createBoundaryPortalHostName","isTeleportEnabled","resolveActiveBoundaryPortalPairKey","mountPortalBoundaryHost","unmountPortalBoundaryHostByName","useActivePortalBoundaryHost","boundaryId","escapeHostKey","localMeasurement","portalHostName","portalHostReady","slotsMap","activePairKey","setActivePairKey","updateActivePairKey","pairKey","get","previousPairKey","slot","props","teleport","set","nextPortalHostName","hostKey"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,eAAe,EAAEC,QAAQ,QAAQ,OAAO;AAC9D,SACCC,OAAO,EAEPC,mBAAmB,QACb,yBAAyB;AAChC,SAASC,KAAK,QAAQ,iDAAiD;AAIvE,SAASC,4BAA4B,QAAQ,uBAAuB;AACpE,SAASC,iBAAiB,QAAQ,iCAAiC;AACnE,SAASC,kCAAkC,QAAQ,8BAA8B;AACjF,SACCC,uBAAuB,EACvBC,+BAA+B,QACzB,sCAAsC;AAW7C,OAAO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC,UAAU;EACVC,aAAa;EACbC,gBAAgB;EAChBC,cAAc;EACdC,eAAe;EACfC;AACkC,CAAC,KAAK;EACxC,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAGjB,QAAQ,CACjD,IACD,CAAC;EAED,MAAMkB,mBAAmB,GAAGpB,WAAW,CAAEqB,OAA6B,IAAK;IAC1EF,gBAAgB,CAACE,OAAO,CAAC;EAC1B,CAAC,EAAE,EAAE,CAAC;EAENjB,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,OAAOI,kCAAkC,CACxCM,gBAAgB,CAACQ,GAAG,CAAC,CAAC,EACtBL,QAAQ,CAACK,GAAG,CAAC,CAAC,CAACV,UAAU,CAAC,EAC1BA,UAAU,EACVP,KAAK,CAACiB,GAAG,CAAC,CACX,CAAC;EACF,CAAC,EACD,CAACD,OAAO,EAAEE,eAAe,KAAK;IAC7B,SAAS;;IACT,IAAIF,OAAO,KAAKE,eAAe,EAAE;MAChC;IACD;IAEA,MAAMC,IAAI,GAAGP,QAAQ,CAACK,GAAG,CAAC,CAAC,CAACV,UAAU,CAAC;IACvC,IACCS,OAAO,KAAK,IAAI,IAChBP,gBAAgB,CAACQ,GAAG,CAAC,CAAC,KAAK,IAAI,IAC/BE,IAAI,IACJ,CAACjB,iBAAiB,CAACiB,IAAI,CAACC,KAAK,EAAEC,QAAQ,CAAC,EACvC;MACDZ,gBAAgB,CAACa,GAAG,CAAC,IAAI,CAAC;IAC3B;IAEAxB,OAAO,CAACiB,mBAAmB,CAAC,CAACC,OAAO,CAAC;EACtC,CACD,CAAC;EAEDpB,eAAe,CAAC,MAAM;IACrB,IAAI,CAACiB,aAAa,IAAI,CAACL,aAAa,EAAE;MACrCE,cAAc,CAACY,GAAG,CAAC,IAAI,CAAC;MACxBX,eAAe,CAACW,GAAG,CAAC,IAAI,CAAC;MACzB;IACD;IAEA,MAAMC,kBAAkB,GAAGtB,4BAA4B,CACtDO,aAAa,EACbD,UAAU,EACVM,aACD,CAAC;IAEDT,uBAAuB,CAAC;MACvBG,UAAU;MACViB,OAAO,EAAEhB,aAAa;MACtBC,gBAAgB;MAChBO,OAAO,EAAEH,aAAa;MACtBH,cAAc,EAAEa,kBAAkB;MAClCZ,eAAe;MACfC;IACD,CAAC,CAAC;IACFF,cAAc,CAACY,GAAG,CAACC,kBAAkB,CAAC;IAEtC,OAAO,MAAM;MACZb,cAAc,CAACY,GAAG,CAAC,IAAI,CAAC;MACxBX,eAAe,CAACW,GAAG,CAAC,IAAI,CAAC;MACzBjB,+BAA+B,CAACkB,kBAAkB,CAAC;IACpD,CAAC;EACF,CAAC,EAAE,CACFV,aAAa,EACbN,UAAU,EACVC,aAAa,EACbC,gBAAgB,EAChBC,cAAc,EACdC,eAAe,EACfC,QAAQ,CACR,CAAC;AACH,CAAC","ignoreList":[]}

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

@@ -1,32 +1,33 @@
 "use strict";
 
+import { useIsFocused } from "@react-navigation/native";
 import { useAnimatedProps, useSharedValue } from "react-native-reanimated";
 import { useDescriptorsStore } from "../../../../../../providers/screen/descriptors";
-import { useScreenSlots } from "../../../../../../providers/screen/styles";
+import { useScreenSlotStore } from "../../../../../../providers/screen/styles";
+import { pairs } from "../../../../../../stores/bounds/internals/state";
 import { useBoundaryRootStore } from "../../../../providers/boundary-root.provider";
 import { PORTAL_HOST_NAME_RESET_VALUE } from "../../../utils/naming";
-import { isTeleportEnabled } from "../../../utils/teleport-control";
+import { shouldAttachBoundaryPortal } from "../helpers/attachment";
+import { resolveActiveBoundaryPortalPairKey } from "../helpers/local-measurement";
 import { useActiveHostKey } from "../stores/host-registry.store";
 import { useActivePortalBoundaryHost } from "./use-active-portal-boundary-host";
 export const useBoundaryPortalAttachment = ({
   boundaryId
 }) => {
   const localMeasurement = useBoundaryRootStore(root => {
-    if (!root) {
-      throw new Error("Boundary portal attachment requires a boundary root.");
-    }
     return root.localMeasurement;
   });
   const currentScreenKey = useDescriptorsStore(s => s.derivations.currentScreenKey);
-  const {
-    slotsMap
-  } = useScreenSlots();
+  // React Navigation resolves focus through the entire parent navigator chain.
+  // A leaf that is still selected in its own one-screen stack becomes unfocused
+  // when any ancestor route is covered.
+  const focused = useIsFocused();
+  const slotsMap = useScreenSlotStore(store => store.slotsMap);
   const portalHostName = useSharedValue(null);
-  const portalHostReady = useSharedValue(false);
+  const portalHostReady = useSharedValue(null);
   const escapeHostKey = useActiveHostKey(currentScreenKey);
   useActivePortalBoundaryHost({
     boundaryId,
-    currentScreenKey,
     escapeHostKey,
     localMeasurement,
     portalHostName,
@@ -42,13 +43,19 @@ export const useBoundaryPortalAttachment = ({
       teleport,
       ...slotProps
     } = slot?.props ?? {};
-    const shouldAttach = slot !== undefined && isTeleportEnabled(teleport) && portalHostReady.get();
-    const hostName = shouldAttach ? portalHostName.get() : PORTAL_HOST_NAME_RESET_VALUE;
+    const activePortalHostName = portalHostName.get();
+    const shouldAttach = shouldAttachBoundaryPortal({
+      focused,
+      portalHostReady: activePortalHostName !== null && portalHostReady.get() === activePortalHostName,
+      slotActive: resolveActiveBoundaryPortalPairKey(localMeasurement.get(), slot, boundaryId, pairs.get()) !== null && slot !== undefined,
+      teleport
+    });
+    const hostName = shouldAttach ? activePortalHostName : PORTAL_HOST_NAME_RESET_VALUE;
     return {
       ...slotProps,
       hostName
     };
-  });
+  }, [focused]);
   return {
     teleportProps
   };

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

@@ -1 +1 @@
-{"version":3,"names":["useAnimatedProps","useSharedValue","useDescriptorsStore","useScreenSlots","useBoundaryRootStore","PORTAL_HOST_NAME_RESET_VALUE","isTeleportEnabled","useActiveHostKey","useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","localMeasurement","root","Error","currentScreenKey","s","derivations","slotsMap","portalHostName","portalHostReady","escapeHostKey","teleportProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldAttach","undefined","hostName"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts"],"mappings":";;AAAA,SAASA,gBAAgB,EAAEC,cAAc,QAAQ,yBAAyB;AAC1E,SAASC,mBAAmB,QAAQ,gDAAgD;AACpF,SAASC,cAAc,QAAQ,2CAA2C;AAC1E,SAASC,oBAAoB,QAAQ,8CAA8C;AACnF,SAASC,4BAA4B,QAAQ,uBAAuB;AACpE,SAASC,iBAAiB,QAAQ,iCAAiC;AACnE,SAASC,gBAAgB,QAAQ,+BAA+B;AAChE,SAASC,2BAA2B,QAAQ,mCAAmC;AAM/E,OAAO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC;AACkC,CAAC,KAAK;EACxC,MAAMC,gBAAgB,GAAGP,oBAAoB,CAAEQ,IAAI,IAAK;IACvD,IAAI,CAACA,IAAI,EAAE;MACV,MAAM,IAAIC,KAAK,CAAC,sDAAsD,CAAC;IACxE;IAEA,OAAOD,IAAI,CAACD,gBAAgB;EAC7B,CAAC,CAAC;EACF,MAAMG,gBAAgB,GAAGZ,mBAAmB,CAC1Ca,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,gBACtB,CAAC;EACD,MAAM;IAAEG;EAAS,CAAC,GAAGd,cAAc,CAAC,CAAC;EACrC,MAAMe,cAAc,GAAGjB,cAAc,CAAgB,IAAI,CAAC;EAC1D,MAAMkB,eAAe,GAAGlB,cAAc,CAAC,KAAK,CAAC;EAC7C,MAAMmB,aAAa,GAAGb,gBAAgB,CAACO,gBAAgB,CAAC;EAExDN,2BAA2B,CAAC;IAC3BE,UAAU;IACVI,gBAAgB;IAChBM,aAAa;IACbT,gBAAgB;IAChBO,cAAc;IACdC,eAAe;IACfF;EACD,CAAC,CAAC;EAEF,MAAMI,aAAa,GAAGrB,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IAET,MAAMsB,IAAI,GAAGL,QAAQ,CAACM,GAAG,CAAC,CAAC,CAACb,UAAU,CAAC;IACvC,MAAM;MACLc,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IAErB,MAAMC,YAAY,GACjBP,IAAI,KAAKQ,SAAS,IAClBxB,iBAAiB,CAACoB,QAAQ,CAAC,IAC3BP,eAAe,CAACI,GAAG,CAAC,CAAC;IAEtB,MAAMQ,QAAQ,GAAGF,YAAY,GAC1BX,cAAc,CAACK,GAAG,CAAC,CAAC,GACpBlB,4BAA4B;IAE/B,OAAO;MACN,GAAGsB,SAAS;MACZI;IACD,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IAAEV;EAAc,CAAC;AACzB,CAAC","ignoreList":[]}
+{"version":3,"names":["useIsFocused","useAnimatedProps","useSharedValue","useDescriptorsStore","useScreenSlotStore","pairs","useBoundaryRootStore","PORTAL_HOST_NAME_RESET_VALUE","shouldAttachBoundaryPortal","resolveActiveBoundaryPortalPairKey","useActiveHostKey","useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","localMeasurement","root","currentScreenKey","s","derivations","focused","slotsMap","store","portalHostName","portalHostReady","escapeHostKey","teleportProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","activePortalHostName","shouldAttach","slotActive","undefined","hostName"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,0BAA0B;AACvD,SAASC,gBAAgB,EAAEC,cAAc,QAAQ,yBAAyB;AAC1E,SAASC,mBAAmB,QAAQ,gDAAgD;AACpF,SAASC,kBAAkB,QAAQ,2CAA2C;AAC9E,SAASC,KAAK,QAAQ,iDAAiD;AACvE,SAASC,oBAAoB,QAAQ,8CAA8C;AACnF,SAASC,4BAA4B,QAAQ,uBAAuB;AACpE,SAASC,0BAA0B,QAAQ,uBAAuB;AAClE,SAASC,kCAAkC,QAAQ,8BAA8B;AACjF,SAASC,gBAAgB,QAAQ,+BAA+B;AAChE,SAASC,2BAA2B,QAAQ,mCAAmC;AAM/E,OAAO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC;AACkC,CAAC,KAAK;EACxC,MAAMC,gBAAgB,GAAGR,oBAAoB,CAAES,IAAI,IAAK;IACvD,OAAOA,IAAI,CAACD,gBAAgB;EAC7B,CAAC,CAAC;EACF,MAAME,gBAAgB,GAAGb,mBAAmB,CAC1Cc,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,gBACtB,CAAC;EACD;EACA;EACA;EACA,MAAMG,OAAO,GAAGnB,YAAY,CAAC,CAAC;EAC9B,MAAMoB,QAAQ,GAAGhB,kBAAkB,CAAEiB,KAAK,IAAKA,KAAK,CAACD,QAAQ,CAAC;EAC9D,MAAME,cAAc,GAAGpB,cAAc,CAAgB,IAAI,CAAC;EAC1D,MAAMqB,eAAe,GAAGrB,cAAc,CAAgB,IAAI,CAAC;EAC3D,MAAMsB,aAAa,GAAGd,gBAAgB,CAACM,gBAAgB,CAAC;EAExDL,2BAA2B,CAAC;IAC3BE,UAAU;IACVW,aAAa;IACbV,gBAAgB;IAChBQ,cAAc;IACdC,eAAe;IACfH;EACD,CAAC,CAAC;EAEF,MAAMK,aAAa,GAAGxB,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IAET,MAAMyB,IAAI,GAAGN,QAAQ,CAACO,GAAG,CAAC,CAAC,CAACd,UAAU,CAAC;IACvC,MAAM;MACLe,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IAErB,MAAMC,oBAAoB,GAAGX,cAAc,CAACK,GAAG,CAAC,CAAC;IACjD,MAAMO,YAAY,GAAG1B,0BAA0B,CAAC;MAC/CW,OAAO;MACPI,eAAe,EACdU,oBAAoB,KAAK,IAAI,IAC7BV,eAAe,CAACI,GAAG,CAAC,CAAC,KAAKM,oBAAoB;MAC/CE,UAAU,EACT1B,kCAAkC,CACjCK,gBAAgB,CAACa,GAAG,CAAC,CAAC,EACtBD,IAAI,EACJb,UAAU,EACVR,KAAK,CAACsB,GAAG,CAAC,CACX,CAAC,KAAK,IAAI,IAAID,IAAI,KAAKU,SAAS;MACjCN;IACD,CAAC,CAAC;IAEF,MAAMO,QAAQ,GAAGH,YAAY,GAC1BD,oBAAoB,GACpB1B,4BAA4B;IAE/B,OAAO;MACN,GAAGwB,SAAS;MACZM;IACD,CAAC;EACF,CAAC,EAAE,CAAClB,OAAO,CAAC,CAAC;EAEb,OAAO;IAAEM;EAAc,CAAC;AACzB,CAAC","ignoreList":[]}

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

@@ -4,7 +4,7 @@ import { useImperativeHandle, useLayoutEffect, useMemo, useRef } from "react";
 import { useAnimatedRef, useSharedValue } 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 { useOptionalBlankStackStore } 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";
@@ -16,10 +16,9 @@ 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,
-  useBoundaryRootStore
-} = createProvider("BoundaryRoot", {
-  guarded: false
-})(({
+  useBoundaryRootStore,
+  useOptionalBoundaryRootStore
+} = createProvider("BoundaryRoot")(({
   children,
   config,
   enabled = true,
@@ -39,7 +38,7 @@ export const {
     escapeClipping
   });
   const currentScreenKey = useDescriptorsStore(s => s.derivations.currentScreenKey);
-  const isCurrentScreenClosing = useBlankStackStore(store => portalRuntime.handoff && store?.scenesByKey[currentScreenKey]?.activity === "closing");
+  const isCurrentScreenClosing = useOptionalBlankStackStore(store => portalRuntime.handoff && store?.scenesByKey[currentScreenKey]?.activity === "closing");
   const retainedBoundTagRef = useRef(requestedBoundTag);
   const shouldRetainClosingBoundTag = portalRuntime.handoff && isCurrentScreenClosing;
 

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

@@ -1 +1 @@
-{"version":3,"names":["useImperativeHandle","useLayoutEffect","useMemo","useRef","useAnimatedRef","useSharedValue","useDescriptorsStore","useComposedSlotStyles","useSlotStackingStyles","useBlankStackStore","createBoundTag","createProvider","logger","BoundaryLifecycle","resolveBoundaryPortal","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","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","shouldAttachAssociatedStyles","shouldEscapeBoundaryRootToScreenHost","associatedStyles","tag","associatedStackingStyles","rootRef","measurementRef","localMeasurement","__DEV__","warnOnce","measuredRef","shouldRenderBoundaryRootThroughPortal","handoffEnabled","attachedStyle","undefined","value","ref","shouldRenderHandoffHost"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/providers/boundary-root.provider.tsx"],"mappings":";;AAAA,SAGCA,mBAAmB,EACnBC,eAAe,EACfC,OAAO,EACPC,MAAM,QACA,OAAO;AAGd,SAASC,cAAc,EAAEC,cAAc,QAAQ,yBAAyB;AACxE,SAASC,mBAAmB,QAAQ,uCAAuC;AAC3E,SACCC,qBAAqB,EACrBC,qBAAqB,QACf,kCAAkC;AACzC,SAASC,kBAAkB,QAAQ,+CAA+C;AAClF,SAASC,cAAc,QAAQ,mDAAmD;AAElF,OAAOC,cAAc,MAAM,gCAAgC;AAC3D,SAASC,MAAM,QAAQ,uBAAuB;AAC9C,SAASC,iBAAiB,QAAQ,kCAAkC;AACpE,SAECC,qBAAqB,QACf,gCAAgC;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA,EAAAC,IAAA,IAAAC,KAAA;AAWxC;AACA,MAAMC,wBAAwB,GAC7B,kIAAkI;AAEnI,OAAO,MAAMC,2BAA2B,GACvC,gHAAgH;AA6BjH,OAAO,MAAM;EAAEC,oBAAoB;EAAEC;AAAqB,CAAC,GAAGb,cAAc,CAC3E,cAAc,EACd;EAAEc,OAAO,EAAE;AAAM,CAClB,CAAC,CACA,CAAC;EACAC,QAAQ;EACRC,MAAM;EACNC,OAAO,GAAG,IAAI;EACdC,cAAc;EACdC,YAAY;EACZC,KAAK;EACLC,OAAO;EACPC,SAAS;EACTC,EAAE;EACFC,KAAK;EACLC,WAAW;EACXC;AACD,CAAC,KAAK;EACL,MAAMC,iBAAiB,GAAGpC,OAAO,CAChC,MAAMQ,cAAc,CAAC6B,MAAM,CAACL,EAAE,CAAC,EAAEH,KAAK,CAAC,EACvC,CAACG,EAAE,EAAEH,KAAK,CACX,CAAC;EACD,MAAMS,aAAa,GAAG1B,qBAAqB,CAAC;IAC3CkB,OAAO;IACPH;EACD,CAAC,CAAC;EAEF,MAAMY,gBAAgB,GAAGnC,mBAAmB,CAC1CoC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,gBACtB,CAAC;EACD,MAAMG,sBAAsB,GAAGnC,kBAAkB,CAC/CoC,KAAK,IACLL,aAAa,CAACR,OAAO,IACrBa,KAAK,EAAEC,WAAW,CAACL,gBAAgB,CAAC,EAAEM,QAAQ,KAAK,SACrD,CAAC;EACD,MAAMC,mBAAmB,GAAG7C,MAAM,CAACmC,iBAAiB,CAAC;EACrD,MAAMW,2BAA2B,GAChCT,aAAa,CAACR,OAAO,IAAIY,sBAAsB;;EAEhD;EACA;EACA;EACA,IAAI,CAACK,2BAA2B,EAAE;IACjCD,mBAAmB,CAACE,OAAO,GAAGZ,iBAAiB;EAChD;EAEA,MAAMa,QAAQ,GAAGH,mBAAmB,CAACE,OAAO;EAC5C;EACA;EACA,MAAME,4BAA4B,GAAGxB,OAAO;EAC5C,MAAMyB,oCAAoC,GAAGb,aAAa,CAACX,cAAc;EAEzE,MAAMyB,gBAAgB,GAAG/C,qBAAqB,CAAC4C,QAAQ,CAACI,GAAG,EAAEpB,KAAK,CAAC;EACnE,MAAMqB,wBAAwB,GAAGhD,qBAAqB,CAAC2C,QAAQ,CAACI,GAAG,CAAC;EACpE,MAAME,OAAO,GAAGrD,cAAc,CAAO,CAAC;EACtC,MAAMsD,cAAc,GAAGtD,cAAc,CAAO,CAAC;EAC7C,MAAMuD,gBAAgB,GAAGtD,cAAc,CACtC,IACD,CAAC;EAEDJ,eAAe,CAAC,MAAM;IACrB,IAAI2D,OAAO,IAAIxB,WAAW,GAAG,CAAC,EAAE;MAC/BxB,MAAM,CAACiD,QAAQ,CAAC,2BAA2B,EAAExC,wBAAwB,CAAC;IACvE;EACD,CAAC,EAAE,CAACe,WAAW,CAAC,CAAC;EAEjB,MAAM0B,WAAW,GAChB7B,SAAS,IAAIoB,oCAAoC,GAC9CK,cAAc,GACdD,OAAO;EAEXzD,mBAAmB,CAAC8B,YAAY,EAAE,MAAM2B,OAAO,CAACP,OAAc,EAAE,CAACO,OAAO,CAAC,CAAC;EAE1E,MAAMM,qCAAqC,GAC1CV,oCAAoC,IAAI,CAACpB,SAAS;EACnD,MAAM+B,cAAc,GAAGpC,OAAO,IAAIY,aAAa,CAACR,OAAO;EACvD;EACA;EACA;EACA;EACA;EACA;EACA;EACA,MAAMiC,aAAa,GAAGb,4BAA4B,GAC/CnB,SAAS,GACRuB,wBAAwB,GACxBO,qCAAqC,GACpCG,SAAS,GACTZ,gBAAgB,GAClBY,SAAS;EAEZ,MAAMC,KAAK,GAAGjE,OAAO,CACpB,OAAO;IACN+D,aAAa;IACbd,QAAQ;IACRV,gBAAgB;IAChBuB,cAAc;IACdL,gBAAgB;IAChBD,cAAc;IACdlB,aAAa;IACb4B,GAAG,EAAEX,OAAO;IACZM,qCAAqC;IACrCM,uBAAuB,EAAEL,cAAc,IAAI,CAAC/B;EAC7C,CAAC,CAAC,EACF,CACCgC,aAAa,EACbd,QAAQ,EACRV,gBAAgB,EAChBuB,cAAc,EACd/B,SAAS,EACT0B,gBAAgB,EAChBD,cAAc,EACdlB,aAAa,EACbiB,OAAO,EACPM,qCAAqC,CAEvC,CAAC;EAED,OAAO;IACNI,KAAK;IACLzC,QAAQ,eACPN,KAAA,CAAAF,SAAA;MAAAQ,QAAA,GACEA,QAAQ,CAACyC,KAAK,CAAC,eAChBnD,IAAA,CAACH,iBAAiB;QACjBsC,QAAQ,EAAEA,QAAS;QACnBxB,MAAM,EAAEA,MAAO;QACfc,gBAAgB,EAAEA,gBAAiB;QACnCb,OAAO,EAAEA,OAAQ;QACjBC,cAAc,EAAEW,aAAa,CAACX,cAAe;QAC7CG,OAAO,EAAEQ,aAAa,CAACR,OAAQ;QAC/B2B,gBAAgB,EAAEA,gBAAiB;QACnCG,WAAW,EAAEA,WAAY;QACzB3B,KAAK,EAAEF,SAAS,GAAGI,WAAW,GAAGF;MAAM,CACvC,CAAC;IAAA,CACD;EAEJ,CAAC;AACF,CACD,CAAC","ignoreList":[]}
+{"version":3,"names":["useImperativeHandle","useLayoutEffect","useMemo","useRef","useAnimatedRef","useSharedValue","useDescriptorsStore","useComposedSlotStyles","useSlotStackingStyles","useOptionalBlankStackStore","createBoundTag","createProvider","logger","BoundaryLifecycle","resolveBoundaryPortal","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","MULTIPLE_TARGETS_WARNING","TARGET_OUTSIDE_ROOT_WARNING","BoundaryRootProvider","useBoundaryRootStore","useOptionalBoundaryRootStore","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","shouldAttachAssociatedStyles","shouldEscapeBoundaryRootToScreenHost","associatedStyles","tag","associatedStackingStyles","rootRef","measurementRef","localMeasurement","__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":[]}