react-native-screen-transitions 3.13.0-beta.0 → 3.13.0

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

@@ -1 +1 @@
-{"version":3,"names":["cloneElement","forwardRef","memo","useMemo","Animated","BOUNDARY_TARGET_ACTIVE_PROP","BoundaryTarget","BoundaryContentPortalHost","BoundaryPortal","BoundaryRootProvider","resolveBoundaryTarget","jsx","_jsx","createBoundaryComponent","Wrapped","options","alreadyAnimated","AnimatedComponent","createAnimatedComponent","Inner","props","forwardedRef","enabled","group","id","anchor","scaleMode","target","method","style","handoff","escapeClipping","children","rest","targetResolution","isTarget","element","type","mapTarget","selected","targetStyle","config","hasTarget","targetCount","root","boundaryId","boundTag","tag","shouldRenderBoundaryRootThroughPortal","placeholderRef","measurementRef","ref","attachedStyle","collapsable","shouldRenderHandoffHost","screenKey","currentScreenKey"],"sourceRoot":"../../../../../src","sources":["shared/components/boundary/create-boundary-component.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["cloneElement","forwardRef","memo","useMemo","Animated","BOUNDARY_TARGET_ACTIVE_PROP","BoundaryTarget","BoundaryContentPortal","BoundaryContentPortalHost","BoundaryPortal","BoundaryRootProvider","resolveBoundaryTarget","jsx","_jsx","createBoundaryComponent","Wrapped","options","alreadyAnimated","AnimatedComponent","createAnimatedComponent","Inner","props","forwardedRef","enabled","group","id","anchor","scaleMode","target","method","style","handoff","escapeClipping","children","rest","targetResolution","isTarget","element","type","mapTarget","selected","targetStyle","config","hasTarget","targetCount","root","boundaryId","boundTag","tag","shouldRenderBoundaryRootThroughPortal","placeholderRef","measurementRef","ref","attachedStyle","collapsable","shouldRenderHandoffHost","screenKey","currentScreenKey"],"sourceRoot":"../../../../../src","sources":["shared/components/boundary/create-boundary-component.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -3,7 +3,7 @@
 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 { getVisibilityBlockOffset } from "../../../utils/visibility-block-offset";
 import { attachScrollSnapshotToMeasuredBounds, correctMeasuredBoundsForVisibilityGate, isMeasurementInViewport, measureWithOverscrollAwareness } from "../utils/measured-bounds";
@@ -23,9 +23,10 @@ export const useMeasurer = ({
   } = useWindowDimensions();
   const scrollState = ScrollStore.getValue(currentScreenKey, "coordination");
   const scrollMetadata = ScrollStore.getValue(currentScreenKey, "metadata");
+  const screenSlotStore = useScreenSlotStore();
   const {
     visibilityBlocked
-  } = useScreenSlots();
+  } = screenSlotStore;
   return useCallback(target => {
     "worklet";
 

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

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useWindowDimensions","applyMeasuredBoundsWrites","useScreenSlots","ScrollStore","getVisibilityBlockOffset","attachScrollSnapshotToMeasuredBounds","correctMeasuredBoundsForVisibilityGate","isMeasurementInViewport","measureWithOverscrollAwareness","useMeasurer","enabled","boundTag","currentScreenKey","preparedStyles","measuredAnimatedRef","handoff","escapeClipping","localMeasurement","width","viewportWidth","height","viewportHeight","scrollState","getValue","scrollMetadata","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,cAAc,QAAQ,kCAAkC;AAEjE,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,MAAM;IAAEa;EAAkB,CAAC,GAAGvB,cAAc,CAAC,CAAC;EAE9C,OAAOH,WAAW,CAChB2B,MAAM,IAAK;IACX,SAAS;;IACT,IAAI,CAAChB,OAAO,EAAE,OAAO,KAAK;IAE1B,MAAMiB,QAAQ,GAAGnB,8BAA8B,CAC9CM,mBAAmB,EACnBQ,WAAW,CAACM,GAAG,CAAC,CACjB,CAAC;IAED,IAAI,CAACD,QAAQ,EAAE,OAAO,KAAK;IAE3B,MAAME,iBAAiB,GAAGvB,sCAAsC,CAAC;MAChEqB,QAAQ;MACRF,iBAAiB,EAAEA,iBAAiB,CAACG,GAAG,CAAC,CAAC;MAC1CE,qBAAqB,EAAE1B,wBAAwB,CAACiB,cAAc,CAAC;MAC/DF,aAAa;MACbE;IACD,CAAC,CAAC;IAEF,IAAIL,cAAc,IAAIU,MAAM,CAACK,IAAI,KAAK,QAAQ,EAAE;MAC/Cd,gBAAgB,CAACe,GAAG,CAAC;QACpBC,MAAM,EAAEN,QAAQ;QAChBO,OAAO,EAAER,MAAM,CAACQ;MACjB,CAAC,CAAC;IACH;IAEA,MAAMC,8BAA8B,GACnCT,MAAM,CAACK,IAAI,KAAK,aAAa,IAC7BxB,uBAAuB,CACtBsB,iBAAiB,EACjBV,aAAa,EACbE,cACD,CAAC;IAEF,IAAI,CAACc,8BAA8B,EAAE,OAAO,KAAK;IAEjD,MAAMC,kBAAkB,GAAG/B,oCAAoC,CAC9DwB,iBAAiB,EACjBL,cAAc,CAACI,GAAG,CAAC,CACpB,CAAC;IAED3B,yBAAyB,CAAC;MACzBoC,QAAQ,EAAE1B,QAAQ,CAAC2B,GAAG;MACtBC,MAAM,EAAE5B,QAAQ,CAAC6B,OAAO;MACxBC,KAAK,EAAE9B,QAAQ,CAAC8B,KAAK;MACrB7B,gBAAgB;MAChBe,QAAQ,EAAES,kBAAkB;MAC5BvB,cAAc;MACd6B,SAAS,EAAEhB,MAAM;MACjBX,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,EACdC,iBAAiB,CAEnB,CAAC;AACF,CAAC","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

@@ -48,13 +48,21 @@ export const resolveHandoffAttachmentCandidate = ({
   interpolatorReady,
   pairChangedDuringClose = false,
   pairDestinationScreenKey,
+  pairHasBoundaryLink,
   previousReceiverScreenKey
 }) => {
   "worklet";
 
+  const currentPairHasBoundaryLink = pairHasBoundaryLink ?? pairDestinationScreenKey !== null;
+  if (activeReceiverClosing && attachedReceiverScreenKey !== activeReceiverScreenKey && !currentPairHasBoundaryLink) {
+    return attachedReceiverScreenKey;
+  }
   if (activeReceiverClosing && interpolatorReady && pairDestinationScreenKey && pairChangedDuringClose) {
     return pairDestinationScreenKey;
   }
+  if (activeReceiverClosing && pairChangedDuringClose && !currentPairHasBoundaryLink) {
+    return hasActiveCloseFinished ? previousReceiverScreenKey : attachedReceiverScreenKey;
+  }
   if (hasActiveCloseFinished && attachedReceiverScreenKey === activeReceiverScreenKey) {
     return previousReceiverScreenKey;
   }

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

@@ -1 +1 @@
-{"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":[]}
+{"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","pairHasBoundaryLink","previousReceiverScreenKey","currentPairHasBoundaryLink","resolveNestedHandoffAttachmentCandidate","currentScreenKey"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-content-portal/helpers/active-handoff-receiver.ts"],"mappings":"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","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";
@@ -17,9 +17,7 @@ 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);
@@ -28,7 +26,7 @@ export const useBoundaryContentPortalAttachment = ({
   const isNestedSource = !sourcePairKey && !!transitionSourcePairKey;
   const resolvedSourcePairKey = sourcePairKey ?? transitionSourcePairKey;
   const resolvedDestinationScreenKey = nextScreenKey ?? transitionDestinationScreenKey;
-  const destinationSlots = useScreenSlots(resolvedDestinationScreenKey ?? currentScreenKey);
+  const destinationSlots = useOptionalScreenSlotStore(resolvedDestinationScreenKey ?? currentScreenKey);
   const unavailableInterpolatorReady = useSharedValue(0);
   const interpolatorReady = destinationSlots?.interpolatorReady ?? unavailableInterpolatorReady;
   const activeReceiverScreenKey = useStack(resolveActiveHandoffReceiver);
@@ -83,6 +81,7 @@ export const useBoundaryContentPortalAttachment = ({
       interpolatorReady: !!isInterpolatorReady,
       pairChangedDuringClose,
       pairDestinationScreenKey: pairDestination,
+      pairHasBoundaryLink: link !== undefined,
       previousReceiverScreenKey
     });
     const receiverEntry = nextReceiverScreenKey ? getEntry(boundaryId, nextReceiverScreenKey) : null;

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","hasNestedHandoffTopology","resolveActiveHandoffReceiver","resolveHandoffAttachmentCandidate","resolveNestedHandoffAttachmentCandidate","resolvePreviousHandoffReceiver","createBoundaryContentPortalHostName","useBoundaryContentPortalAttachment","boundaryId","slotsMap","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":"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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","pairHasBoundaryLink","undefined","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":[]}

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

@@ -3,7 +3,7 @@
 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";
@@ -15,9 +15,6 @@ 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);
@@ -25,9 +22,7 @@ export const useBoundaryPortalAttachment = ({
   // 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
-  } = useScreenSlots();
+  const slotsMap = useScreenSlotStore(store => store.slotsMap);
   const portalHostName = useSharedValue(null);
   const portalHostReady = useSharedValue(null);
   const escapeHostKey = useActiveHostKey(currentScreenKey);

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

@@ -1 +1 @@
-{"version":3,"names":["useIsFocused","useAnimatedProps","useSharedValue","useDescriptorsStore","useScreenSlots","pairs","useBoundaryRootStore","PORTAL_HOST_NAME_RESET_VALUE","shouldAttachBoundaryPortal","resolveActiveBoundaryPortalPairKey","useActiveHostKey","useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","localMeasurement","root","Error","currentScreenKey","s","derivations","focused","slotsMap","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,cAAc,QAAQ,2CAA2C;AAC1E,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,IAAI,CAACA,IAAI,EAAE;MACV,MAAM,IAAIC,KAAK,CAAC,sDAAsD,CAAC;IACxE;IAEA,OAAOD,IAAI,CAACD,gBAAgB;EAC7B,CAAC,CAAC;EACF,MAAMG,gBAAgB,GAAGd,mBAAmB,CAC1Ce,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,gBACtB,CAAC;EACD;EACA;EACA;EACA,MAAMG,OAAO,GAAGpB,YAAY,CAAC,CAAC;EAC9B,MAAM;IAAEqB;EAAS,CAAC,GAAGjB,cAAc,CAAC,CAAC;EACrC,MAAMkB,cAAc,GAAGpB,cAAc,CAAgB,IAAI,CAAC;EAC1D,MAAMqB,eAAe,GAAGrB,cAAc,CAAgB,IAAI,CAAC;EAC3D,MAAMsB,aAAa,GAAGd,gBAAgB,CAACO,gBAAgB,CAAC;EAExDN,2BAA2B,CAAC;IAC3BE,UAAU;IACVW,aAAa;IACbV,gBAAgB;IAChBQ,cAAc;IACdC,eAAe;IACfF;EACD,CAAC,CAAC;EAEF,MAAMI,aAAa,GAAGxB,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IAET,MAAMyB,IAAI,GAAGL,QAAQ,CAACM,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/CY,OAAO;MACPG,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,CAACjB,OAAO,CAAC,CAAC;EAEb,OAAO;IAAEK;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/portal/teleport.js

@@ -1,7 +1,5 @@
 "use strict";
 
-import { createElement } from "react";
-
 /**
  * `react-native-teleport` is an optional peer dependency. The require sits in a
  * try/catch so Metro treats it as an optional dependency — an absent module no
@@ -11,21 +9,10 @@ import { createElement } from "react";
  * inline rendering; everything else keeps working.
  */
 let mod = null;
-let managerMod = null;
-let providerViewMod = null;
 try {
   mod = require("react-native-teleport");
-  managerMod = require("react-native-teleport/lib/module/contexts/PortalManager");
-  providerViewMod = require("react-native-teleport/lib/module/views/PortalProvider");
 } catch {}
-const NativePortalProviderView = providerViewMod?.default ?? null;
-const PortalManagerProvider = managerMod?.PortalManagerProvider ?? null;
-const SafeNativePortalProvider = PortalManagerProvider ? ({
-  children
-}) => {
-  const managedChildren = /*#__PURE__*/createElement(PortalManagerProvider, null, children);
-  return NativePortalProviderView ? /*#__PURE__*/createElement(NativePortalProviderView, null, managedChildren) : managedChildren;
-} : null;
+const SafeNativePortalProvider = mod?.PortalProvider ?? null;
 export const isTeleportAvailable = mod !== null && SafeNativePortalProvider !== null;
 export const PORTAL_POINTER_EVENTS = "box-none";
 export const NativePortal = mod?.Portal ?? null;

package/lib/module/shared/components/boundary/portal/teleport.js.map

@@ -1 +1 @@
-{"version":3,"names":["createElement","mod","managerMod","providerViewMod","require","NativePortalProviderView","default","PortalManagerProvider","SafeNativePortalProvider","children","managedChildren","isTeleportAvailable","PORTAL_POINTER_EVENTS","NativePortal","Portal","NativePortalProvider","NativePortalHost","PortalHost"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/portal/teleport.ts"],"mappings":";;AAAA,SAA6BA,aAAa,QAAwB,OAAO;;AAEzE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,IAAIC,GAAQ,GAAG,IAAI;AACnB,IAAIC,UAAe,GAAG,IAAI;AAC1B,IAAIC,eAAoB,GAAG,IAAI;AAC/B,IAAI;EACHF,GAAG,GAAGG,OAAO,CAAC,uBAAuB,CAAC;EACtCF,UAAU,GAAGE,OAAO,CAAC,yDAAyD,CAAC;EAC/ED,eAAe,GAAGC,OAAO,CAAC,uDAAuD,CAAC;AACnF,CAAC,CAAC,MAAM,CAAC;AAET,MAAMC,wBAAuE,GAC5EF,eAAe,EAAEG,OAAO,IAAI,IAAI;AACjC,MAAMC,qBAAoE,GACzEL,UAAU,EAAEK,qBAAqB,IAAI,IAAI;AAE1C,MAAMC,wBAAuE,GAC5ED,qBAAqB,GAClB,CAAC;EAAEE;AAAkC,CAAC,KAAK;EAC3C,MAAMC,eAAe,gBAAGV,aAAa,CACpCO,qBAAqB,EACrB,IAAI,EACJE,QACD,CAAC;EAED,OAAOJ,wBAAwB,gBAC5BL,aAAa,CAACK,wBAAwB,EAAE,IAAI,EAAEK,eAAe,CAAC,GAC9DA,eAAe;AACnB,CAAC,GACA,IAAI;AAER,OAAO,MAAMC,mBAAmB,GAC/BV,GAAG,KAAK,IAAI,IAAIO,wBAAwB,KAAK,IAAI;AAClD,OAAO,MAAMI,qBAAqB,GAAG,UAAmB;AACxD,OAAO,MAAMC,YAAuC,GAAGZ,GAAG,EAAEa,MAAM,IAAI,IAAI;AAC1E,OAAO,MAAMC,oBAA+C,GAC3DP,wBAAwB;AACzB,OAAO,MAAMQ,gBAA2C,GACvDf,GAAG,EAAEgB,UAAU,IAAI,IAAI","ignoreList":[]}
+{"version":3,"names":["mod","require","SafeNativePortalProvider","PortalProvider","isTeleportAvailable","PORTAL_POINTER_EVENTS","NativePortal","Portal","NativePortalProvider","NativePortalHost","PortalHost"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/portal/teleport.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,IAAIA,GAAQ,GAAG,IAAI;AACnB,IAAI;EACHA,GAAG,GAAGC,OAAO,CAAC,uBAAuB,CAAC;AACvC,CAAC,CAAC,MAAM,CAAC;AAET,MAAMC,wBAAuE,GAC5EF,GAAG,EAAEG,cAAc,IAAI,IAAI;AAE5B,OAAO,MAAMC,mBAAmB,GAC/BJ,GAAG,KAAK,IAAI,IAAIE,wBAAwB,KAAK,IAAI;AAClD,OAAO,MAAMG,qBAAqB,GAAG,UAAmB;AACxD,OAAO,MAAMC,YAAuC,GAAGN,GAAG,EAAEO,MAAM,IAAI,IAAI;AAC1E,OAAO,MAAMC,oBAA+C,GAC3DN,wBAAwB;AACzB,OAAO,MAAMO,gBAA2C,GACvDT,GAAG,EAAEU,UAAU,IAAI,IAAI","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":"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","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":[]}

package/lib/module/shared/components/overlay/helpers/create-overlay-interpolator-frame.js

@@ -1,6 +1,12 @@
 "use strict";
 
 import { updateDerivations } from "../../../providers/screen/animation/helpers/derivations";
+export const shouldUseOverlayGestureDriver = (overlayFrame, driverFrame) => {
+  "worklet";
+
+  const gesture = overlayFrame.current.gesture;
+  return driverFrame.current.route.key !== overlayFrame.current.route.key && !!(gesture.dragging || gesture.dismissing || gesture.settling);
+};
 export const createOverlayInterpolatorFrame = ({
   overlayFrame,
   driverFrame,
@@ -18,7 +24,7 @@ export const createOverlayInterpolatorFrame = ({
     layouts: current.layouts
   };
   updateDerivations(frame);
-  frame.stackProgress = frame.progress;
+  frame.stackProgress = overlayFrame.stackProgress;
   frame.logicallySettled = frame.active.settled;
   return frame;
 };

package/lib/module/shared/components/overlay/helpers/create-overlay-interpolator-frame.js.map

@@ -1 +1 @@
-{"version":3,"names":["updateDerivations","createOverlayInterpolatorFrame","overlayFrame","driverFrame","previousOverlayFrame","current","driverIsCurrent","route","key","frame","previous","next","undefined","layouts","stackProgress","progress","logicallySettled","active","settled"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/helpers/create-overlay-interpolator-frame.ts"],"mappings":";;AAAA,SAASA,iBAAiB,QAAQ,yDAAyD;AAG3F,OAAO,MAAMC,8BAA8B,GAAGA,CAAC;EAC9CC,YAAY;EACZC,WAAW;EACXC;AAKD,CAAC,KAA8B;EAC9B,SAAS;;EACT,MAAMC,OAAO,GAAGH,YAAY,CAACG,OAAO;EACpC,MAAMC,eAAe,GAAGH,WAAW,CAACE,OAAO,CAACE,KAAK,CAACC,GAAG,KAAKH,OAAO,CAACE,KAAK,CAACC,GAAG;EAC3E,MAAMC,KAA8B,GAAG;IACtC,GAAGP,YAAY;IACfQ,QAAQ,EAAEN,oBAAoB,EAAEC,OAAO;IACvCA,OAAO;IACPM,IAAI,EAAEL,eAAe,GAAGM,SAAS,GAAGT,WAAW,CAACE,OAAO;IACvDQ,OAAO,EAAER,OAAO,CAACQ;EAClB,CAAC;EAEDb,iBAAiB,CAACS,KAAK,CAAC;EACxBA,KAAK,CAACK,aAAa,GAAGL,KAAK,CAACM,QAAQ;EACpCN,KAAK,CAACO,gBAAgB,GAAGP,KAAK,CAACQ,MAAM,CAACC,OAAO;EAE7C,OAAOT,KAAK;AACb,CAAC","ignoreList":[]}
+{"version":3,"names":["updateDerivations","shouldUseOverlayGestureDriver","overlayFrame","driverFrame","gesture","current","route","key","dragging","dismissing","settling","createOverlayInterpolatorFrame","previousOverlayFrame","driverIsCurrent","frame","previous","next","undefined","layouts","stackProgress","logicallySettled","active","settled"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/helpers/create-overlay-interpolator-frame.ts"],"mappings":";;AAAA,SAASA,iBAAiB,QAAQ,yDAAyD;AAG3F,OAAO,MAAMC,6BAA6B,GAAGA,CAC5CC,YAAqC,EACrCC,WAAoC,KACvB;EACb,SAAS;;EACT,MAAMC,OAAO,GAAGF,YAAY,CAACG,OAAO,CAACD,OAAO;EAE5C,OACCD,WAAW,CAACE,OAAO,CAACC,KAAK,CAACC,GAAG,KAAKL,YAAY,CAACG,OAAO,CAACC,KAAK,CAACC,GAAG,IAChE,CAAC,EAAEH,OAAO,CAACI,QAAQ,IAAIJ,OAAO,CAACK,UAAU,IAAIL,OAAO,CAACM,QAAQ,CAAC;AAEhE,CAAC;AAED,OAAO,MAAMC,8BAA8B,GAAGA,CAAC;EAC9CT,YAAY;EACZC,WAAW;EACXS;AAKD,CAAC,KAA8B;EAC9B,SAAS;;EACT,MAAMP,OAAO,GAAGH,YAAY,CAACG,OAAO;EACpC,MAAMQ,eAAe,GAAGV,WAAW,CAACE,OAAO,CAACC,KAAK,CAACC,GAAG,KAAKF,OAAO,CAACC,KAAK,CAACC,GAAG;EAC3E,MAAMO,KAA8B,GAAG;IACtC,GAAGZ,YAAY;IACfa,QAAQ,EAAEH,oBAAoB,EAAEP,OAAO;IACvCA,OAAO;IACPW,IAAI,EAAEH,eAAe,GAAGI,SAAS,GAAGd,WAAW,CAACE,OAAO;IACvDa,OAAO,EAAEb,OAAO,CAACa;EAClB,CAAC;EAEDlB,iBAAiB,CAACc,KAAK,CAAC;EACxBA,KAAK,CAACK,aAAa,GAAGjB,YAAY,CAACiB,aAAa;EAChDL,KAAK,CAACM,gBAAgB,GAAGN,KAAK,CAACO,MAAM,CAACC,OAAO;EAE7C,OAAOR,KAAK;AACb,CAAC","ignoreList":[]}

package/lib/module/shared/components/overlay/helpers/get-active-overlay.js

@@ -45,9 +45,21 @@ export function getFloatOverlayStack(scenes, transitionsAlwaysOn) {
 }
 export function getFloatOverlayTransitions(overlayStack, scenes) {
   const topScene = scenes[scenes.length - 1];
-  return overlayStack.map((entry, index) => ({
-    ...entry,
-    driverScene: overlayStack[index + 1]?.scene ?? topScene ?? entry.scene
-  }));
+  return overlayStack.map((entry, index) => {
+    const nextEntry = overlayStack[index + 1];
+    let nextPresentedEntry;
+    for (let nextIndex = index + 1; nextIndex < overlayStack.length; nextIndex++) {
+      const candidate = overlayStack[nextIndex];
+      if (candidate?.scene.activity !== "closing") {
+        nextPresentedEntry = candidate;
+        break;
+      }
+    }
+    const driverScene = entry.scene.activity === "closing" && nextEntry ? entry.scene : nextPresentedEntry?.scene ?? nextEntry?.scene ?? topScene ?? entry.scene;
+    return {
+      ...entry,
+      driverScene
+    };
+  });
 }
 //# sourceMappingURL=get-active-overlay.js.map

package/lib/module/shared/components/overlay/helpers/get-active-overlay.js.map

@@ -1 +1 @@
-{"version":3,"names":["isOverlayVisible","resolveOverlayActivity","scene","distanceFromTop","activity","getFloatOverlayStack","scenes","transitionsAlwaysOn","candidates","index","length","options","descriptor","enableTransitions","push","overlayIndex","topIndex","map","candidate","getFloatOverlayTransitions","overlayStack","topScene","entry","driverScene"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/helpers/get-active-overlay.ts"],"mappings":";;AACA,SAASA,gBAAgB,QAAQ,mCAAmC;AAgBpE,MAAMC,sBAAsB,GAAGA,CAC9BC,KAAiB,EACjBC,eAAuB,KACG;EAC1B,IAAIA,eAAe,KAAK,CAAC,IAAID,KAAK,CAACE,QAAQ,KAAK,SAAS,EAAE;IAC1D,OAAO,SAAS;EACjB;EAEA,IAAID,eAAe,KAAK,CAAC,EAAE;IAC1B,OAAO,QAAQ;EAChB;EAEA,IAAIA,eAAe,KAAK,CAAC,EAAE;IAC1B,OAAO,OAAO;EACf;EAEA,OAAO,UAAU;AAClB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,oBAAoBA,CACnCC,MAAoB,EACpBC,mBAA4B,EACN;EACtB,MAAMC,UAA8B,GAAG,EAAE;EAEzC,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGH,MAAM,CAACI,MAAM,EAAED,KAAK,IAAI,CAAC,EAAE;IACtD,MAAMP,KAAK,GAAGI,MAAM,CAACG,KAAK,CAAC;IAC3B,MAAME,OAAO,GAAGT,KAAK,EAAEU,UAAU,EAAED,OAAO;IAE1C,IAAI,CAACJ,mBAAmB,IAAI,CAACI,OAAO,EAAEE,iBAAiB,EAAE;MACxD;IACD;IAEA,IAAIb,gBAAgB,CAACW,OAAO,CAAC,EAAE;MAC9BH,UAAU,CAACM,IAAI,CAAC;QAAEZ,KAAK;QAAEa,YAAY,EAAEN;MAAM,CAAC,CAAC;IAChD;EACD;EAEA,MAAMO,QAAQ,GAAGR,UAAU,CAACE,MAAM,GAAG,CAAC;EACtC,OAAOF,UAAU,CAACS,GAAG,CAAC,CAACC,SAAS,EAAET,KAAK,MAAM;IAC5C,GAAGS,SAAS;IACZd,QAAQ,EAAEH,sBAAsB,CAACiB,SAAS,CAAChB,KAAK,EAAEc,QAAQ,GAAGP,KAAK;EACnE,CAAC,CAAC,CAAC;AACJ;AAEA,OAAO,SAASU,0BAA0BA,CACzCC,YAAiC,EACjCd,MAAoB,EACY;EAChC,MAAMe,QAAQ,GAAGf,MAAM,CAACA,MAAM,CAACI,MAAM,GAAG,CAAC,CAAC;EAE1C,OAAOU,YAAY,CAACH,GAAG,CAAC,CAACK,KAAK,EAAEb,KAAK,MAAM;IAC1C,GAAGa,KAAK;IACRC,WAAW,EAAEH,YAAY,CAACX,KAAK,GAAG,CAAC,CAAC,EAAEP,KAAK,IAAImB,QAAQ,IAAIC,KAAK,CAACpB;EAClE,CAAC,CAAC,CAAC;AACJ","ignoreList":[]}
+{"version":3,"names":["isOverlayVisible","resolveOverlayActivity","scene","distanceFromTop","activity","getFloatOverlayStack","scenes","transitionsAlwaysOn","candidates","index","length","options","descriptor","enableTransitions","push","overlayIndex","topIndex","map","candidate","getFloatOverlayTransitions","overlayStack","topScene","entry","nextEntry","nextPresentedEntry","nextIndex","driverScene"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/helpers/get-active-overlay.ts"],"mappings":";;AACA,SAASA,gBAAgB,QAAQ,mCAAmC;AAgBpE,MAAMC,sBAAsB,GAAGA,CAC9BC,KAAiB,EACjBC,eAAuB,KACG;EAC1B,IAAIA,eAAe,KAAK,CAAC,IAAID,KAAK,CAACE,QAAQ,KAAK,SAAS,EAAE;IAC1D,OAAO,SAAS;EACjB;EAEA,IAAID,eAAe,KAAK,CAAC,EAAE;IAC1B,OAAO,QAAQ;EAChB;EAEA,IAAIA,eAAe,KAAK,CAAC,EAAE;IAC1B,OAAO,OAAO;EACf;EAEA,OAAO,UAAU;AAClB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,oBAAoBA,CACnCC,MAAoB,EACpBC,mBAA4B,EACN;EACtB,MAAMC,UAA8B,GAAG,EAAE;EAEzC,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGH,MAAM,CAACI,MAAM,EAAED,KAAK,IAAI,CAAC,EAAE;IACtD,MAAMP,KAAK,GAAGI,MAAM,CAACG,KAAK,CAAC;IAC3B,MAAME,OAAO,GAAGT,KAAK,EAAEU,UAAU,EAAED,OAAO;IAE1C,IAAI,CAACJ,mBAAmB,IAAI,CAACI,OAAO,EAAEE,iBAAiB,EAAE;MACxD;IACD;IAEA,IAAIb,gBAAgB,CAACW,OAAO,CAAC,EAAE;MAC9BH,UAAU,CAACM,IAAI,CAAC;QAAEZ,KAAK;QAAEa,YAAY,EAAEN;MAAM,CAAC,CAAC;IAChD;EACD;EAEA,MAAMO,QAAQ,GAAGR,UAAU,CAACE,MAAM,GAAG,CAAC;EACtC,OAAOF,UAAU,CAACS,GAAG,CAAC,CAACC,SAAS,EAAET,KAAK,MAAM;IAC5C,GAAGS,SAAS;IACZd,QAAQ,EAAEH,sBAAsB,CAACiB,SAAS,CAAChB,KAAK,EAAEc,QAAQ,GAAGP,KAAK;EACnE,CAAC,CAAC,CAAC;AACJ;AAEA,OAAO,SAASU,0BAA0BA,CACzCC,YAAiC,EACjCd,MAAoB,EACY;EAChC,MAAMe,QAAQ,GAAGf,MAAM,CAACA,MAAM,CAACI,MAAM,GAAG,CAAC,CAAC;EAE1C,OAAOU,YAAY,CAACH,GAAG,CAAC,CAACK,KAAK,EAAEb,KAAK,KAAK;IACzC,MAAMc,SAAS,GAAGH,YAAY,CAACX,KAAK,GAAG,CAAC,CAAC;IACzC,IAAIe,kBAAiD;IAErD,KACC,IAAIC,SAAS,GAAGhB,KAAK,GAAG,CAAC,EACzBgB,SAAS,GAAGL,YAAY,CAACV,MAAM,EAC/Be,SAAS,EAAE,EACV;MACD,MAAMP,SAAS,GAAGE,YAAY,CAACK,SAAS,CAAC;MACzC,IAAIP,SAAS,EAAEhB,KAAK,CAACE,QAAQ,KAAK,SAAS,EAAE;QAC5CoB,kBAAkB,GAAGN,SAAS;QAC9B;MACD;IACD;IAEA,MAAMQ,WAAW,GAChBJ,KAAK,CAACpB,KAAK,CAACE,QAAQ,KAAK,SAAS,IAAImB,SAAS,GAC5CD,KAAK,CAACpB,KAAK,GACVsB,kBAAkB,EAAEtB,KAAK,IAC3BqB,SAAS,EAAErB,KAAK,IAChBmB,QAAQ,IACRC,KAAK,CAACpB,KAAM;IAEf,OAAO;MACN,GAAGoB,KAAK;MACRI;IACD,CAAC;EACF,CAAC,CAAC;AACH","ignoreList":[]}

package/lib/module/shared/components/overlay/hooks/use-overlay-slot.js

@@ -7,10 +7,11 @@ import { NO_PROPS, NO_STYLES } from "../../../constants";
 import { useBuildTransitionAccessor } from "../../../providers/screen/animation/helpers/accessors/use-build-transition-accessor";
 import { collectInterpolatorSharedValues } from "../../../providers/screen/styles/helpers/collect-interpolator-shared-values";
 import { getVisibilityBlockOffset } from "../../../utils/visibility-block-offset";
-import { createOverlayInterpolatorFrame } from "../helpers/create-overlay-interpolator-frame";
+import { createOverlayInterpolatorFrame, shouldUseOverlayGestureDriver } from "../helpers/create-overlay-interpolator-frame";
 import { runOverlaySlotInterpolator } from "../helpers/run-overlay-slot-interpolator";
 export const useOverlaySlot = ({
   overlayAnimationStore,
+  overlayInterpolator,
   driverAnimationStore,
   previousOverlayAnimationStore,
   driverInterpolator,
@@ -20,8 +21,9 @@ export const useOverlaySlot = ({
   const {
     height
   } = useWindowDimensions();
-  const transition = useBuildTransitionAccessor(driverAnimationStore);
-  const interpolatorSharedValues = useMemo(() => collectInterpolatorSharedValues([driverInterpolator]), [driverInterpolator]);
+  const overlayTransition = useBuildTransitionAccessor(overlayAnimationStore);
+  const driverTransition = useBuildTransitionAccessor(driverAnimationStore);
+  const interpolatorSharedValues = useMemo(() => collectInterpolatorSharedValues([overlayInterpolator, driverInterpolator]), [overlayInterpolator, driverInterpolator]);
   const overlaySlot = useDerivedValue(() => {
     "worklet";
 
@@ -31,15 +33,18 @@ export const useOverlaySlot = ({
     for (let index = 0; index < interpolatorSharedValues.length; index++) {
       interpolatorSharedValues[index]?.get();
     }
+    const overlayFrame = overlayAnimationStore.screenInterpolatorProps.get();
+    const driverFrame = driverAnimationStore.screenInterpolatorProps.get();
+    const overlayOwnsGesture = shouldUseOverlayGestureDriver(overlayFrame, driverFrame);
     const frame = createOverlayInterpolatorFrame({
-      overlayFrame: overlayAnimationStore.screenInterpolatorProps.get(),
-      driverFrame: driverAnimationStore.screenInterpolatorProps.get(),
+      overlayFrame,
+      driverFrame: overlayOwnsGesture ? overlayFrame : driverFrame,
       previousOverlayFrame: previousOverlayAnimationStore?.screenInterpolatorProps.get()
     });
     return runOverlaySlotInterpolator({
       frame,
-      interpolator: driverInterpolator,
-      transition
+      interpolator: overlayOwnsGesture ? overlayInterpolator : driverInterpolator,
+      transition: overlayOwnsGesture ? overlayTransition : driverTransition
     });
   });
   const animatedStyle = useAnimatedStyle(() => {

package/lib/module/shared/components/overlay/hooks/use-overlay-slot.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","useWindowDimensions","useAnimatedProps","useAnimatedStyle","useDerivedValue","NO_PROPS","NO_STYLES","useBuildTransitionAccessor","collectInterpolatorSharedValues","getVisibilityBlockOffset","createOverlayInterpolatorFrame","runOverlaySlotInterpolator","useOverlaySlot","overlayAnimationStore","driverAnimationStore","previousOverlayAnimationStore","driverInterpolator","interpolatorReady","isIncoming","height","transition","interpolatorSharedValues","overlaySlot","screenInterpolatorPropsRevision","get","index","length","frame","overlayFrame","screenInterpolatorProps","driverFrame","previousOverlayFrame","interpolator","animatedStyle","slot","transform","translateY","style","animatedProps","slotProps","props","pointerEvents","_pointerEvents","teleport","_teleport"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/hooks/use-overlay-slot.ts"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,mBAAmB,QAAQ,cAAc;AAClD,SAECC,gBAAgB,EAChBC,gBAAgB,EAChBC,eAAe,QACT,yBAAyB;AAChC,SAASC,QAAQ,EAAEC,SAAS,QAAQ,oBAAoB;AAExD,SAASC,0BAA0B,QAAQ,qFAAqF;AAChI,SAASC,+BAA+B,QAAQ,6EAA6E;AAK7H,SAASC,wBAAwB,QAAQ,wCAAwC;AACjF,SAASC,8BAA8B,QAAQ,8CAA8C;AAC7F,SAASC,0BAA0B,QAAQ,0CAA0C;AAErF,OAAO,MAAMC,cAAc,GAAGA,CAAC;EAC9BC,qBAAqB;EACrBC,oBAAoB;EACpBC,6BAA6B;EAC7BC,kBAAkB;EAClBC,iBAAiB;EACjBC;AAQD,CAAC,KAAK;EACL,MAAM;IAAEC;EAAO,CAAC,GAAGlB,mBAAmB,CAAC,CAAC;EACxC,MAAMmB,UAAU,GAAGb,0BAA0B,CAACO,oBAAoB,CAAC;EAEnE,MAAMO,wBAAwB,GAAGrB,OAAO,CACvC,MAAMQ,+BAA+B,CAAC,CAACQ,kBAAkB,CAAC,CAAC,EAC3D,CAACA,kBAAkB,CACpB,CAAC;EAED,MAAMM,WAAW,GAAGlB,eAAe,CAEjC,MAAM;IACP,SAAS;;IACTS,qBAAqB,CAACU,+BAA+B,CAACC,GAAG,CAAC,CAAC;IAC3DV,oBAAoB,CAACS,+BAA+B,CAACC,GAAG,CAAC,CAAC;IAC1DT,6BAA6B,EAAEQ,+BAA+B,CAACC,GAAG,CAAC,CAAC;IAEpE,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGJ,wBAAwB,CAACK,MAAM,EAAED,KAAK,EAAE,EAAE;MACrEJ,wBAAwB,CAACI,KAAK,CAAC,EAAED,GAAG,CAAC,CAAC;IACvC;IAEA,MAAMG,KAAK,GAAGjB,8BAA8B,CAAC;MAC5CkB,YAAY,EAAEf,qBAAqB,CAACgB,uBAAuB,CAACL,GAAG,CAAC,CAAC;MACjEM,WAAW,EAAEhB,oBAAoB,CAACe,uBAAuB,CAACL,GAAG,CAAC,CAAC;MAC/DO,oBAAoB,EACnBhB,6BAA6B,EAAEc,uBAAuB,CAACL,GAAG,CAAC;IAC7D,CAAC,CAAC;IAEF,OAAOb,0BAA0B,CAAC;MACjCgB,KAAK;MACLK,YAAY,EAAEhB,kBAAkB;MAChCI;IACD,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,MAAMa,aAAa,GAAG9B,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IACT,MAAM+B,IAAI,GAAGZ,WAAW,CAACE,GAAG,CAAC,CAAC;IAC9B,IAAI,CAACU,IAAI,EAAE;MACV,OAAO5B,SAAS;IACjB;IAEA,IAAIY,UAAU,IAAI,CAACD,iBAAiB,CAACO,GAAG,CAAC,CAAC,EAAE;MAC3C,OAAO;QACNW,SAAS,EAAE,CAAC;UAAEC,UAAU,EAAE3B,wBAAwB,CAACU,MAAM;QAAE,CAAC;MAC7D,CAAC;IACF;IAEA,OAAOe,IAAI,CAACG,KAAK,IAAI/B,SAAS;EAC/B,CAAC,CAAC;EAEF,MAAMgC,aAAa,GAAGpC,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IACT,MAAMqC,SAAS,GAAGjB,WAAW,CAACE,GAAG,CAAC,CAAC,EAAEgB,KAAK;IAC1C,IAAI,CAACD,SAAS,EAAE;MACf,OAAOlC,QAAQ;IAChB;IAEA,MAAM;MACLoC,aAAa,EAAEC,cAAc;MAC7BC,QAAQ,EAAEC,SAAS;MACnB,GAAGJ;IACJ,CAAC,GAAGD,SAAS;IAEb,OAAOC,KAAK;EACb,CAAC,CAAC;EAEF,OAAO;IAAEF,aAAa;IAAEL;EAAc,CAAC;AACxC,CAAC","ignoreList":[]}
+{"version":3,"names":["useMemo","useWindowDimensions","useAnimatedProps","useAnimatedStyle","useDerivedValue","NO_PROPS","NO_STYLES","useBuildTransitionAccessor","collectInterpolatorSharedValues","getVisibilityBlockOffset","createOverlayInterpolatorFrame","shouldUseOverlayGestureDriver","runOverlaySlotInterpolator","useOverlaySlot","overlayAnimationStore","overlayInterpolator","driverAnimationStore","previousOverlayAnimationStore","driverInterpolator","interpolatorReady","isIncoming","height","overlayTransition","driverTransition","interpolatorSharedValues","overlaySlot","screenInterpolatorPropsRevision","get","index","length","overlayFrame","screenInterpolatorProps","driverFrame","overlayOwnsGesture","frame","previousOverlayFrame","interpolator","transition","animatedStyle","slot","transform","translateY","style","animatedProps","slotProps","props","pointerEvents","_pointerEvents","teleport","_teleport"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/hooks/use-overlay-slot.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/overlay/variations/overlay-host.js

@@ -6,8 +6,8 @@ import { StyleSheet, View } from "react-native";
 import Animated, { useDerivedValue } from "react-native-reanimated";
 import { snapDescriptorToIndex } from "../../../animation/snap-to";
 import { useStack } from "../../../hooks/navigation/use-stack";
-import { useScreenAnimationStore } from "../../../providers/screen/animation";
-import { useScreenSlots } from "../../../providers/screen/styles/slot.provider";
+import { useOptionalScreenAnimationStore } from "../../../providers/screen/animation";
+import { useOptionalScreenSlotStore } from "../../../providers/screen/styles/slot.provider";
 import { retainReadyOverlayResources } from "../helpers/retain-ready-overlay-resources";
 import { useOverlaySlot } from "../hooks/use-overlay-slot";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -18,10 +18,10 @@ export const OverlayHost = /*#__PURE__*/memo(function OverlayHost({
   activity,
   layerIndex
 }) {
-  const overlayAnimationStore = useScreenAnimationStore(scene.route.key);
-  const driverAnimationStore = useScreenAnimationStore(driverScene.route.key);
-  const previousOverlayAnimationStore = useScreenAnimationStore(previousOverlayScene?.route.key ?? scene.route.key);
-  const driverSlots = useScreenSlots(driverScene.route.key);
+  const overlayAnimationStore = useOptionalScreenAnimationStore(scene.route.key);
+  const driverAnimationStore = useOptionalScreenAnimationStore(driverScene.route.key);
+  const previousOverlayAnimationStore = useOptionalScreenAnimationStore(previousOverlayScene?.route.key ?? scene.route.key);
+  const driverSlots = useOptionalScreenSlotStore(driverScene.route.key);
   const overlayComponentRef = useRef(scene.descriptor.options.overlay);
   const OverlayComponent = overlayComponentRef.current;
   const readyResourcesRef = useRef(null);
@@ -67,6 +67,7 @@ function ReadyOverlayHost({
     animatedStyle
   } = useOverlaySlot({
     overlayAnimationStore,
+    overlayInterpolator: scene.descriptor.options.screenStyleInterpolator,
     driverAnimationStore,
     previousOverlayAnimationStore: previousOverlayAnimationStore ?? undefined,
     driverInterpolator: driverScene.descriptor.options.screenStyleInterpolator,

package/lib/module/shared/components/overlay/variations/overlay-host.js.map

@@ -1 +1 @@
-{"version":3,"names":["NavigationContext","NavigationRouteContext","memo","useMemo","useRef","StyleSheet","View","Animated","useDerivedValue","snapDescriptorToIndex","useStack","useScreenAnimationStore","useScreenSlots","retainReadyOverlayResources","useOverlaySlot","jsx","_jsx","OverlayHost","scene","driverScene","previousOverlayScene","activity","layerIndex","overlayAnimationStore","route","key","driverAnimationStore","previousOverlayAnimationStore","driverSlots","overlayComponentRef","descriptor","options","overlay","OverlayComponent","current","readyResourcesRef","readyResources","ReadyOverlayHost","undefined","scenes","focusedIndex","routeKeys","routes","focusedScene","length","focusedDescriptor","animatedProps","animatedStyle","driverInterpolator","screenStyleInterpolator","interpolatorReady","isIncoming","relativeProgress","screenInterpolatorPropsRevision","get","screenInterpolatorProps","stackProgress","overlayProps","index","indexOf","focusedRoute","meta","navigation","snapTo","progress","pointerEvents","style","styles","container","floating","absoluteFill","zIndex","children","Provider","value","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/variations/overlay-host.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["NavigationContext","NavigationRouteContext","memo","useMemo","useRef","StyleSheet","View","Animated","useDerivedValue","snapDescriptorToIndex","useStack","useOptionalScreenAnimationStore","useOptionalScreenSlotStore","retainReadyOverlayResources","useOverlaySlot","jsx","_jsx","OverlayHost","scene","driverScene","previousOverlayScene","activity","layerIndex","overlayAnimationStore","route","key","driverAnimationStore","previousOverlayAnimationStore","driverSlots","overlayComponentRef","descriptor","options","overlay","OverlayComponent","current","readyResourcesRef","readyResources","ReadyOverlayHost","undefined","scenes","focusedIndex","routeKeys","routes","focusedScene","length","focusedDescriptor","animatedProps","animatedStyle","overlayInterpolator","screenStyleInterpolator","driverInterpolator","interpolatorReady","isIncoming","relativeProgress","screenInterpolatorPropsRevision","get","screenInterpolatorProps","stackProgress","overlayProps","index","indexOf","focusedRoute","meta","navigation","snapTo","progress","pointerEvents","style","styles","container","floating","absoluteFill","zIndex","children","Provider","value","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/variations/overlay-host.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/screen-container/layers/content.js

@@ -1,12 +1,11 @@
 "use strict";
 
-/** biome-ignore-all lint/style/noNonNullAssertion: <Screen gesture is under the gesture context, so this will always exist.> */
 import { memo, useMemo } from "react";
 import { StyleSheet, View } from "react-native";
 import { GestureDetector } from "react-native-gesture-handler";
 import Animated from "react-native-reanimated";
 import { useDescriptorsStore } from "../../../providers/screen/descriptors";
-import { useGestureStore } from "../../../providers/screen/gestures";
+import { useScreenGestureStore } from "../../../providers/screen/gestures";
 import { useSlotProps, useSlotStyles } from "../../../providers/screen/styles";
 import { ScreenFallbackHost } from "../../boundary/portal/components/boundary-portal/components/host";
 import { useContentLayout } from "../hooks/use-content-layout";
@@ -19,7 +18,7 @@ export const ContentLayer = /*#__PURE__*/memo(({
   pointerEvents,
   isBackdropActive
 }) => {
-  const gestureContext = useGestureStore();
+  const gestureContext = useScreenGestureStore();
   const ContentComponent = useDescriptorsStore(store => store.options.contentComponent);
   const isNavigationMaskEnabled = useDescriptorsStore(store => !!store.options.navigationMaskEnabled);
   const hasAutoSnapPoint = useDescriptorsStore(store => store.options.snapPoints?.includes("auto") ?? false);

package/lib/module/shared/components/screen-container/layers/content.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","useMemo","StyleSheet","View","GestureDetector","Animated","useDescriptorsStore","useGestureStore","useSlotProps","useSlotStyles","ScreenFallbackHost","useContentLayout","MaybeMaskedNavigationContainer","usesLayerRenderProps","SurfaceContainer","jsx","_jsx","jsxs","_jsxs","ContentLayer","children","pointerEvents","isBackdropActive","gestureContext","ContentComponent","store","options","contentComponent","isNavigationMaskEnabled","navigationMaskEnabled","hasAutoSnapPoint","snapPoints","includes","contentPointerEvents","AnimatedContentComponent","createAnimatedComponent","handleContentLayout","animatedContentStyle","animatedContentProps","contentStyles","styles","content","contentProps","contentChildren","enabled","collapsable","onLayout","gesture","detectorGesture","style","animatedProps","props","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/content.tsx"],"mappings":";;AAAA;AACA,SAA6BA,IAAI,EAAEC,OAAO,QAAQ,OAAO;AACzD,SAASC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,eAAe,QAAQ,8BAA8B;AAC9D,OAAOC,QAAQ,MAAM,yBAAyB;AAC9C,SAASC,mBAAmB,QAAQ,uCAAuC;AAC3E,SAASC,eAAe,QAAQ,oCAAoC;AACpE,SAASC,YAAY,EAAEC,aAAa,QAAQ,kCAAkC;AAE9E,SAASC,kBAAkB,QAAQ,kEAAkE;AACrG,SAASC,gBAAgB,QAAQ,6BAA6B;AAC9D,SAASC,8BAA8B,QAAQ,qCAAqC;AACpF,SAASC,oBAAoB,QAAQ,oBAAoB;AACzD,SAASC,gBAAgB,QAAQ,qBAAqB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAQvD,OAAO,MAAMC,YAAY,gBAAGnB,IAAI,CAC/B,CAAC;EAAEoB,QAAQ;EAAEC,aAAa;EAAEC;AAAwB,CAAC,KAAK;EACzD,MAAMC,cAAc,GAAGhB,eAAe,CAAC,CAAC;EACxC,MAAMiB,gBAAgB,GAAGlB,mBAAmB,CAC1CmB,KAAK,IAAKA,KAAK,CAACC,OAAO,CAACC,gBAC1B,CAAC;EACD,MAAMC,uBAAuB,GAAGtB,mBAAmB,CACjDmB,KAAK,IAAK,CAAC,CAACA,KAAK,CAACC,OAAO,CAACG,qBAC5B,CAAC;EACD,MAAMC,gBAAgB,GAAGxB,mBAAmB,CAC1CmB,KAAK,IAAKA,KAAK,CAACC,OAAO,CAACK,UAAU,EAAEC,QAAQ,CAAC,MAAM,CAAC,IAAI,KAC1D,CAAC;EACD,MAAMC,oBAAoB,GAAGX,gBAAgB,GAAG,UAAU,GAAGD,aAAa;EAE1E,MAAMa,wBAAwB,GAAGjC,OAAO,CAAC,MAAM;IAC9C,OAAOuB,gBAAgB,IAAI,CAACX,oBAAoB,CAACW,gBAAgB,CAAC,GAC/DnB,QAAQ,CAAC8B,uBAAuB,CAChCX,gBACD,CAAC,GACA,IAAI;EACR,CAAC,EAAE,CAACA,gBAAgB,CAAC,CAAC;EAEtB,MAAMY,mBAAmB,GAAGzB,gBAAgB,CAAC,CAAC;EAE9C,MAAM0B,oBAAoB,GAAG5B,aAAa,CAAC,SAAS,CAAC;EACrD,MAAM6B,oBAAoB,GAAG9B,YAAY,CAAC,SAAS,CAAC;EACpD,MAAM+B,aAAa,GAAG,CACrBC,MAAM,CAACC,OAAO,EACdJ,oBAAoB,CACqB;EAC1C,MAAMK,YAAY,GACjBJ,oBAA4D;EAE7D,MAAMK,eAAe,gBACpB3B,IAAA,CAACJ,8BAA8B;IAC9BS,aAAa,EAAEY,oBAAqB;IACpCW,OAAO,EAAEhB,uBAAwB;IAAAR,QAAA,eAEjCF,KAAA,CAACJ,gBAAgB;MAACO,aAAa,EAAEY,oBAAqB;MAAAb,QAAA,GACpDU,gBAAgB,gBAChBd,IAAA,CAACb,IAAI;QAAC0C,WAAW,EAAE,KAAM;QAACC,QAAQ,EAAEV,mBAAoB;QAAAhB,QAAA,EACtDA;MAAQ,CACJ,CAAC,GAEPA,QACA,eACDJ,IAAA,CAACN,kBAAkB,IAAE,CAAC;IAAA,CACL;EAAC,CACY,CAChC;EAED,oBACCM,IAAA,CAACZ,eAAe;IAAC2C,OAAO,EAAExB,cAAc,CAAEyB,eAAgB;IAAA5B,QAAA,EACxDc,wBAAwB,gBACxBlB,IAAA,CAACkB,wBAAwB;MACxBe,KAAK,EAAEV,aAAc;MACrBW,aAAa,EAAEZ,oBAAqB;MACpCjB,aAAa,EAAEY,oBAAqB;MAAAb,QAAA,EAEnCuB;IAAe,CACS,CAAC,GACxBnB,gBAAgB,gBACnBR,IAAA,CAACQ,gBAAgB;MAChBgB,MAAM,EAAED,aAAc;MACtBY,KAAK,EAAET,YAAa;MACpBrB,aAAa,EAAEY,oBAAqB;MAAAb,QAAA,EAEnCuB;IAAe,CACC,CAAC,gBAEnB3B,IAAA,CAACX,QAAQ,CAACF,IAAI;MACb8C,KAAK,EAAEV,aAAc;MACrBW,aAAa,EAAEZ,oBAAqB;MACpCjB,aAAa,EAAEY,oBAAqB;MAAAb,QAAA,EAEnCuB;IAAe,CACF;EACf,CACe,CAAC;AAEpB,CACD,CAAC;AAED,MAAMH,MAAM,GAAGtC,UAAU,CAACkD,MAAM,CAAC;EAChCX,OAAO,EAAE;IACRY,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["memo","useMemo","StyleSheet","View","GestureDetector","Animated","useDescriptorsStore","useScreenGestureStore","useSlotProps","useSlotStyles","ScreenFallbackHost","useContentLayout","MaybeMaskedNavigationContainer","usesLayerRenderProps","SurfaceContainer","jsx","_jsx","jsxs","_jsxs","ContentLayer","children","pointerEvents","isBackdropActive","gestureContext","ContentComponent","store","options","contentComponent","isNavigationMaskEnabled","navigationMaskEnabled","hasAutoSnapPoint","snapPoints","includes","contentPointerEvents","AnimatedContentComponent","createAnimatedComponent","handleContentLayout","animatedContentStyle","animatedContentProps","contentStyles","styles","content","contentProps","contentChildren","enabled","collapsable","onLayout","gesture","detectorGesture","style","animatedProps","props","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/content.tsx"],"mappings":";;AAAA,SAA6BA,IAAI,EAAEC,OAAO,QAAQ,OAAO;AACzD,SAASC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,eAAe,QAAQ,8BAA8B;AAC9D,OAAOC,QAAQ,MAAM,yBAAyB;AAC9C,SAASC,mBAAmB,QAAQ,uCAAuC;AAC3E,SAASC,qBAAqB,QAAQ,oCAAoC;AAC1E,SAASC,YAAY,EAAEC,aAAa,QAAQ,kCAAkC;AAE9E,SAASC,kBAAkB,QAAQ,kEAAkE;AACrG,SAASC,gBAAgB,QAAQ,6BAA6B;AAC9D,SAASC,8BAA8B,QAAQ,qCAAqC;AACpF,SAASC,oBAAoB,QAAQ,oBAAoB;AACzD,SAASC,gBAAgB,QAAQ,qBAAqB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAQvD,OAAO,MAAMC,YAAY,gBAAGnB,IAAI,CAC/B,CAAC;EAAEoB,QAAQ;EAAEC,aAAa;EAAEC;AAAwB,CAAC,KAAK;EACzD,MAAMC,cAAc,GAAGhB,qBAAqB,CAAC,CAAC;EAC9C,MAAMiB,gBAAgB,GAAGlB,mBAAmB,CAC1CmB,KAAK,IAAKA,KAAK,CAACC,OAAO,CAACC,gBAC1B,CAAC;EACD,MAAMC,uBAAuB,GAAGtB,mBAAmB,CACjDmB,KAAK,IAAK,CAAC,CAACA,KAAK,CAACC,OAAO,CAACG,qBAC5B,CAAC;EACD,MAAMC,gBAAgB,GAAGxB,mBAAmB,CAC1CmB,KAAK,IAAKA,KAAK,CAACC,OAAO,CAACK,UAAU,EAAEC,QAAQ,CAAC,MAAM,CAAC,IAAI,KAC1D,CAAC;EACD,MAAMC,oBAAoB,GAAGX,gBAAgB,GAAG,UAAU,GAAGD,aAAa;EAE1E,MAAMa,wBAAwB,GAAGjC,OAAO,CAAC,MAAM;IAC9C,OAAOuB,gBAAgB,IAAI,CAACX,oBAAoB,CAACW,gBAAgB,CAAC,GAC/DnB,QAAQ,CAAC8B,uBAAuB,CAChCX,gBACD,CAAC,GACA,IAAI;EACR,CAAC,EAAE,CAACA,gBAAgB,CAAC,CAAC;EAEtB,MAAMY,mBAAmB,GAAGzB,gBAAgB,CAAC,CAAC;EAE9C,MAAM0B,oBAAoB,GAAG5B,aAAa,CAAC,SAAS,CAAC;EACrD,MAAM6B,oBAAoB,GAAG9B,YAAY,CAAC,SAAS,CAAC;EACpD,MAAM+B,aAAa,GAAG,CACrBC,MAAM,CAACC,OAAO,EACdJ,oBAAoB,CACqB;EAC1C,MAAMK,YAAY,GACjBJ,oBAA4D;EAE7D,MAAMK,eAAe,gBACpB3B,IAAA,CAACJ,8BAA8B;IAC9BS,aAAa,EAAEY,oBAAqB;IACpCW,OAAO,EAAEhB,uBAAwB;IAAAR,QAAA,eAEjCF,KAAA,CAACJ,gBAAgB;MAACO,aAAa,EAAEY,oBAAqB;MAAAb,QAAA,GACpDU,gBAAgB,gBAChBd,IAAA,CAACb,IAAI;QAAC0C,WAAW,EAAE,KAAM;QAACC,QAAQ,EAAEV,mBAAoB;QAAAhB,QAAA,EACtDA;MAAQ,CACJ,CAAC,GAEPA,QACA,eACDJ,IAAA,CAACN,kBAAkB,IAAE,CAAC;IAAA,CACL;EAAC,CACY,CAChC;EAED,oBACCM,IAAA,CAACZ,eAAe;IAAC2C,OAAO,EAAExB,cAAc,CAACyB,eAAgB;IAAA5B,QAAA,EACvDc,wBAAwB,gBACxBlB,IAAA,CAACkB,wBAAwB;MACxBe,KAAK,EAAEV,aAAc;MACrBW,aAAa,EAAEZ,oBAAqB;MACpCjB,aAAa,EAAEY,oBAAqB;MAAAb,QAAA,EAEnCuB;IAAe,CACS,CAAC,GACxBnB,gBAAgB,gBACnBR,IAAA,CAACQ,gBAAgB;MAChBgB,MAAM,EAAED,aAAc;MACtBY,KAAK,EAAET,YAAa;MACpBrB,aAAa,EAAEY,oBAAqB;MAAAb,QAAA,EAEnCuB;IAAe,CACC,CAAC,gBAEnB3B,IAAA,CAACX,QAAQ,CAACF,IAAI;MACb8C,KAAK,EAAEV,aAAc;MACrBW,aAAa,EAAEZ,oBAAqB;MACpCjB,aAAa,EAAEY,oBAAqB;MAAAb,QAAA,EAEnCuB;IAAe,CACF;EACf,CACe,CAAC;AAEpB,CACD,CAAC;AAED,MAAMH,MAAM,GAAGtC,UAAU,CAACkD,MAAM,CAAC;EAChCX,OAAO,EAAE;IACRY,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}