react-native-screen-transitions 4.0.0-alpha.3 → 4.0.0-alpha.5

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

@@ -3,40 +3,26 @@
 import { useAnimatedProps, useSharedValue } from "react-native-reanimated";
 import { useDescriptorsStore } from "../../../../../../providers/screen/descriptors";
 import { useScreenSlots } from "../../../../../../providers/screen/styles";
-import { hasCloseTransitionFinished } from "../../../../../../providers/screen/styles/helpers/transition-visual-state";
-import { AnimationStore } from "../../../../../../stores/animation.store";
-import { 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 { hasActiveBoundaryPortalLink } from "../helpers/active-pair";
 import { useActiveHostKey } from "../stores/host-registry.store";
 import { useActivePortalBoundaryHost } from "./use-active-portal-boundary-host";
 export const useBoundaryPortalAttachment = ({
   boundaryId
 }) => {
-  const sourcePairKey = useDescriptorsStore(s => s.derivations.sourcePairKey);
   const currentScreenKey = useDescriptorsStore(s => s.derivations.currentScreenKey);
-  const nextScreenKey = useDescriptorsStore(s => s.derivations.nextScreenKey);
-  const destinationScreenKey = nextScreenKey ?? currentScreenKey;
-  const destinationAnimationProgress = SystemStore.getValue(destinationScreenKey, "animationProgress");
-  const destinationClosing = AnimationStore.getValue(destinationScreenKey, "closing");
   const {
-    localStylesMaps,
     slotsMap
   } = useScreenSlots();
   const portalHostName = useSharedValue(null);
   const portalHostReady = useSharedValue(false);
-  const attachedDestination = useSharedValue(null);
   const escapeHostKey = useActiveHostKey(currentScreenKey);
   useActivePortalBoundaryHost({
     boundaryId,
     currentScreenKey,
     escapeHostKey,
-    localStylesMaps,
     portalHostName,
     portalHostReady,
-    sourcePairKey,
     slotsMap
   });
   const teleportProps = useAnimatedProps(() => {
@@ -48,30 +34,11 @@ export const useBoundaryPortalAttachment = ({
       teleport,
       ...slotProps
     } = slot?.props ?? {};
-    const shouldTeleport = isTeleportEnabled(teleport);
-    const hostName = portalHostName.get();
-    const hasActiveLink = hasActiveBoundaryPortalLink({
-      boundaryId,
-      pairsState: pairs.get(),
-      sourcePairKey
-    });
-    const hasAttachableHost = shouldTeleport && hasActiveLink && portalHostReady.get() && hostName;
-    if (hasAttachableHost) {
-      attachedDestination.set({
-        animationProgress: destinationAnimationProgress,
-        closing: destinationClosing
-      });
-    }
-    const attached = attachedDestination.get();
-    const hasAttachedCloseFinished = attached !== null && hasCloseTransitionFinished({
-      animationProgress: attached.animationProgress.get(),
-      closing: attached.closing.get()
-    });
-    const canAttach = hasAttachableHost && !hasAttachedCloseFinished;
-    const targetHostName = canAttach ? hostName : PORTAL_HOST_NAME_RESET_VALUE;
+    const shouldAttach = slot !== undefined && isTeleportEnabled(teleport) && portalHostReady.get();
+    const hostName = shouldAttach ? portalHostName.get() : PORTAL_HOST_NAME_RESET_VALUE;
     return {
       ...slotProps,
-      hostName: targetHostName
+      hostName
     };
   });
   return {

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

@@ -1 +1 @@
-{"version":3,"names":["useAnimatedProps","useSharedValue","useDescriptorsStore","useScreenSlots","hasCloseTransitionFinished","AnimationStore","pairs","SystemStore","PORTAL_HOST_NAME_RESET_VALUE","isTeleportEnabled","hasActiveBoundaryPortalLink","useActiveHostKey","useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","sourcePairKey","s","derivations","currentScreenKey","nextScreenKey","destinationScreenKey","destinationAnimationProgress","getValue","destinationClosing","localStylesMaps","slotsMap","portalHostName","portalHostReady","attachedDestination","escapeHostKey","teleportProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldTeleport","hostName","hasActiveLink","pairsState","hasAttachableHost","set","animationProgress","closing","attached","hasAttachedCloseFinished","canAttach","targetHostName"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useAnimatedProps","useSharedValue","useDescriptorsStore","useScreenSlots","PORTAL_HOST_NAME_RESET_VALUE","isTeleportEnabled","useActiveHostKey","useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","currentScreenKey","s","derivations","slotsMap","portalHostName","portalHostReady","escapeHostKey","teleportProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldAttach","undefined","hostName"],"sourceRoot":"../../../../../../../../src","sources":["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,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,GAAGR,mBAAmB,CAC1CS,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,gBACtB,CAAC;EACD,MAAM;IAAEG;EAAS,CAAC,GAAGV,cAAc,CAAC,CAAC;EACrC,MAAMW,cAAc,GAAGb,cAAc,CAAgB,IAAI,CAAC;EAC1D,MAAMc,eAAe,GAAGd,cAAc,CAAC,KAAK,CAAC;EAC7C,MAAMe,aAAa,GAAGV,gBAAgB,CAACI,gBAAgB,CAAC;EAExDH,2BAA2B,CAAC;IAC3BE,UAAU;IACVC,gBAAgB;IAChBM,aAAa;IACbF,cAAc;IACdC,eAAe;IACfF;EACD,CAAC,CAAC;EAEF,MAAMI,aAAa,GAAGjB,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IAET,MAAMkB,IAAI,GAAGL,QAAQ,CAACM,GAAG,CAAC,CAAC,CAACV,UAAU,CAAC;IACvC,MAAM;MACLW,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IACrB,MAAMC,YAAY,GACjBP,IAAI,KAAKQ,SAAS,IAClBrB,iBAAiB,CAACiB,QAAQ,CAAC,IAC3BP,eAAe,CAACI,GAAG,CAAC,CAAC;IACtB,MAAMQ,QAAQ,GAAGF,YAAY,GAC1BX,cAAc,CAACK,GAAG,CAAC,CAAC,GACpBf,4BAA4B;IAE/B,OAAO;MACN,GAAGmB,SAAS;MACZI;IACD,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IAAEV;EAAc,CAAC;AACzB,CAAC","ignoreList":[]}

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

@@ -5,7 +5,7 @@ import { cancelAnimation, measure, useAnimatedReaction, useAnimatedRef, useShare
 import { scheduleOnUI } from "react-native-worklets";
 import { ScrollStore } from "../../../../../../stores/scroll.store";
 import { getVisibilityBlockOffset } from "../../../../../../utils/visibility-block-offset";
-import { adjustedMeasuredBoundsForOverscrollDeltas, correctMeasuredBoundsForVisibilityGate, isMeasurementInViewport } from "../../../../utils/measured-bounds";
+import { adjustedMeasuredBoundsForOverscrollDeltas, correctMeasuredBoundsForVisibilityGate } from "../../../../utils/measured-bounds";
 import { clearPortalHostBounds, setPortalHostBounds } from "../stores/host-bounds.store";
 const HOST_MEASUREMENT_RETRY_DELAY_MS = 16;
 export const useHostMeasurement = ({
@@ -61,7 +61,7 @@ export const useHostMeasurement = ({
       viewportWidth,
       viewportHeight
     });
-    if (!isMeasurementInViewport(correctedMeasured, viewportWidth, viewportHeight)) {
+    if (correctedMeasured.width <= 0 || correctedMeasured.height <= 0) {
       cancelAnimation(retryToken);
       retryToken.set(withDelay(HOST_MEASUREMENT_RETRY_DELAY_MS, withTiming(retryToken.get() + 1, {
         duration: 0

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

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

package/lib/module/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.js

@@ -25,7 +25,7 @@ const emit = () => {
   }
 };
 const isSameHost = (a, b) => {
-  return a.boundaryId === b.boundaryId && a.hostKey === b.hostKey && a.localStylesMaps === b.localStylesMaps && a.pairKey === b.pairKey && a.portalHostName === b.portalHostName && a.portalHostReady === b.portalHostReady && a.screenKey === b.screenKey && a.slotsMap === b.slotsMap;
+  return a.boundaryId === b.boundaryId && a.hostKey === b.hostKey && a.pairKey === b.pairKey && a.portalHostName === b.portalHostName && a.portalHostReady === b.portalHostReady && a.screenKey === b.screenKey && a.slotsMap === b.slotsMap;
 };
 export const mountPortalBoundaryHost = host => {
   const previous = activeBoundaryHosts.get(host.portalHostName);

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

@@ -1 +1 @@
-{"version":3,"names":["useSyncExternalStore","EMPTY_HOSTS","listeners","Set","activeBoundaryHosts","Map","snapshot","hostsByScope","buildSnapshot","host","values","hosts","hostKey","push","emit","listener","isSameHost","a","b","boundaryId","localStylesMaps","pairKey","portalHostName","portalHostReady","screenKey","slotsMap","mountPortalBoundaryHost","previous","get","set","unmountPortalBoundaryHostByName","delete","subscribe","add","useActivePortalBoundaryHosts"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.ts"],"mappings":";;AAAA,SAASA,oBAAoB,QAAQ,OAAO;AAoB5C,MAAMC,WAAuC,GAAG,EAAE;AAElD,MAAMC,SAAS,GAAG,IAAIC,GAAG,CAAa,CAAC;AACvC,MAAMC,mBAAmB,GAAG,IAAIC,GAAG,CAAmC,CAAC;AAEvE,IAAIC,QAAwB,GAAG;EAC9BC,YAAY,EAAE,CAAC;AAChB,CAAC;AAED,MAAMC,aAAa,GAAGA,CAAA,KAAsB;EAC3C,MAAMD,YAAwD,GAAG,CAAC,CAAC;EAEnE,KAAK,MAAME,IAAI,IAAIL,mBAAmB,CAACM,MAAM,CAAC,CAAC,EAAE;IAChD,MAAMC,KAAK,GAAGJ,YAAY,CAACE,IAAI,CAACG,OAAO,CAAC,IAAI,EAAE;IAC9CD,KAAK,CAACE,IAAI,CAACJ,IAAI,CAAC;IAChBF,YAAY,CAACE,IAAI,CAACG,OAAO,CAAC,GAAGD,KAAK;EACnC;EAEA,OAAO;IACNJ;EACD,CAAC;AACF,CAAC;AAED,MAAMO,IAAI,GAAGA,CAAA,KAAM;EAClBR,QAAQ,GAAGE,aAAa,CAAC,CAAC;EAE1B,KAAK,MAAMO,QAAQ,IAAIb,SAAS,EAAE;IACjCa,QAAQ,CAAC,CAAC;EACX;AACD,CAAC;AAED,MAAMC,UAAU,GAAGA,CAClBC,CAA2B,EAC3BC,CAA2B,KACvB;EACJ,OACCD,CAAC,CAACE,UAAU,KAAKD,CAAC,CAACC,UAAU,IAC7BF,CAAC,CAACL,OAAO,KAAKM,CAAC,CAACN,OAAO,IACvBK,CAAC,CAACG,eAAe,KAAKF,CAAC,CAACE,eAAe,IACvCH,CAAC,CAACI,OAAO,KAAKH,CAAC,CAACG,OAAO,IACvBJ,CAAC,CAACK,cAAc,KAAKJ,CAAC,CAACI,cAAc,IACrCL,CAAC,CAACM,eAAe,KAAKL,CAAC,CAACK,eAAe,IACvCN,CAAC,CAACO,SAAS,KAAKN,CAAC,CAACM,SAAS,IAC3BP,CAAC,CAACQ,QAAQ,KAAKP,CAAC,CAACO,QAAQ;AAE3B,CAAC;AAED,OAAO,MAAMC,uBAAuB,GAAIjB,IAA8B,IAAK;EAC1E,MAAMkB,QAAQ,GAAGvB,mBAAmB,CAACwB,GAAG,CAACnB,IAAI,CAACa,cAAc,CAAC;EAC7D,IAAIK,QAAQ,IAAIX,UAAU,CAACW,QAAQ,EAAElB,IAAI,CAAC,EAAE;IAC3C;EACD;EAEAL,mBAAmB,CAACyB,GAAG,CAACpB,IAAI,CAACa,cAAc,EAAEb,IAAI,CAAC;EAClDK,IAAI,CAAC,CAAC;AACP,CAAC;AAED,OAAO,MAAMgB,+BAA+B,GAC3CR,cAAyC,IACrC;EACJ,IAAI,CAACA,cAAc,IAAI,CAAClB,mBAAmB,CAAC2B,MAAM,CAACT,cAAc,CAAC,EAAE;IACnE;EACD;EAEAR,IAAI,CAAC,CAAC;AACP,CAAC;AAED,MAAMkB,SAAS,GAAIjB,QAAoB,IAAK;EAC3Cb,SAAS,CAAC+B,GAAG,CAAClB,QAAQ,CAAC;EAEvB,OAAO,MAAM;IACZb,SAAS,CAAC6B,MAAM,CAAChB,QAAQ,CAAC;EAC3B,CAAC;AACF,CAAC;AAED,OAAO,MAAMmB,4BAA4B,GAAItB,OAAe,IAAK;EAChE,OAAOZ,oBAAoB,CAC1BgC,SAAS,EACT,MAAM1B,QAAQ,CAACC,YAAY,CAACK,OAAO,CAAC,IAAIX,WAAW,EACnD,MAAMA,WACP,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useSyncExternalStore","EMPTY_HOSTS","listeners","Set","activeBoundaryHosts","Map","snapshot","hostsByScope","buildSnapshot","host","values","hosts","hostKey","push","emit","listener","isSameHost","a","b","boundaryId","pairKey","portalHostName","portalHostReady","screenKey","slotsMap","mountPortalBoundaryHost","previous","get","set","unmountPortalBoundaryHostByName","delete","subscribe","add","useActivePortalBoundaryHosts"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.ts"],"mappings":";;AAAA,SAASA,oBAAoB,QAAQ,OAAO;AAkB5C,MAAMC,WAAuC,GAAG,EAAE;AAElD,MAAMC,SAAS,GAAG,IAAIC,GAAG,CAAa,CAAC;AACvC,MAAMC,mBAAmB,GAAG,IAAIC,GAAG,CAAmC,CAAC;AAEvE,IAAIC,QAAwB,GAAG;EAC9BC,YAAY,EAAE,CAAC;AAChB,CAAC;AAED,MAAMC,aAAa,GAAGA,CAAA,KAAsB;EAC3C,MAAMD,YAAwD,GAAG,CAAC,CAAC;EAEnE,KAAK,MAAME,IAAI,IAAIL,mBAAmB,CAACM,MAAM,CAAC,CAAC,EAAE;IAChD,MAAMC,KAAK,GAAGJ,YAAY,CAACE,IAAI,CAACG,OAAO,CAAC,IAAI,EAAE;IAC9CD,KAAK,CAACE,IAAI,CAACJ,IAAI,CAAC;IAChBF,YAAY,CAACE,IAAI,CAACG,OAAO,CAAC,GAAGD,KAAK;EACnC;EAEA,OAAO;IACNJ;EACD,CAAC;AACF,CAAC;AAED,MAAMO,IAAI,GAAGA,CAAA,KAAM;EAClBR,QAAQ,GAAGE,aAAa,CAAC,CAAC;EAE1B,KAAK,MAAMO,QAAQ,IAAIb,SAAS,EAAE;IACjCa,QAAQ,CAAC,CAAC;EACX;AACD,CAAC;AAED,MAAMC,UAAU,GAAGA,CAClBC,CAA2B,EAC3BC,CAA2B,KACvB;EACJ,OACCD,CAAC,CAACE,UAAU,KAAKD,CAAC,CAACC,UAAU,IAC7BF,CAAC,CAACL,OAAO,KAAKM,CAAC,CAACN,OAAO,IACvBK,CAAC,CAACG,OAAO,KAAKF,CAAC,CAACE,OAAO,IACvBH,CAAC,CAACI,cAAc,KAAKH,CAAC,CAACG,cAAc,IACrCJ,CAAC,CAACK,eAAe,KAAKJ,CAAC,CAACI,eAAe,IACvCL,CAAC,CAACM,SAAS,KAAKL,CAAC,CAACK,SAAS,IAC3BN,CAAC,CAACO,QAAQ,KAAKN,CAAC,CAACM,QAAQ;AAE3B,CAAC;AAED,OAAO,MAAMC,uBAAuB,GAAIhB,IAA8B,IAAK;EAC1E,MAAMiB,QAAQ,GAAGtB,mBAAmB,CAACuB,GAAG,CAAClB,IAAI,CAACY,cAAc,CAAC;EAC7D,IAAIK,QAAQ,IAAIV,UAAU,CAACU,QAAQ,EAAEjB,IAAI,CAAC,EAAE;IAC3C;EACD;EAEAL,mBAAmB,CAACwB,GAAG,CAACnB,IAAI,CAACY,cAAc,EAAEZ,IAAI,CAAC;EAClDK,IAAI,CAAC,CAAC;AACP,CAAC;AAED,OAAO,MAAMe,+BAA+B,GAC3CR,cAAyC,IACrC;EACJ,IAAI,CAACA,cAAc,IAAI,CAACjB,mBAAmB,CAAC0B,MAAM,CAACT,cAAc,CAAC,EAAE;IACnE;EACD;EAEAP,IAAI,CAAC,CAAC;AACP,CAAC;AAED,MAAMiB,SAAS,GAAIhB,QAAoB,IAAK;EAC3Cb,SAAS,CAAC8B,GAAG,CAACjB,QAAQ,CAAC;EAEvB,OAAO,MAAM;IACZb,SAAS,CAAC4B,MAAM,CAACf,QAAQ,CAAC;EAC3B,CAAC;AACF,CAAC;AAED,OAAO,MAAMkB,4BAA4B,GAAIrB,OAAe,IAAK;EAChE,OAAOZ,oBAAoB,CAC1B+B,SAAS,EACT,MAAMzB,QAAQ,CAACC,YAAY,CAACK,OAAO,CAAC,IAAIX,WAAW,EACnD,MAAMA,WACP,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/components/boundary/utils/destination-signals.js

@@ -6,18 +6,22 @@ export const getInitialDestinationMeasurementSignal = params => {
 
   const {
     enabled,
-    destinationPairKey,
-    ancestorDestinationPairKey,
+    pairKey,
     linkId,
     group,
     destinationPresent,
     sourcePresent,
     linkState
   } = params;
-  const pairKey = destinationPairKey ?? ancestorDestinationPairKey;
-  if (!enabled || !pairKey) {
+  if (!enabled) {
     return null;
   }
+  if (!pairKey) {
+    return {
+      pairKey: null,
+      action: "wait"
+    };
+  }
   if (!destinationPresent) {
     return {
       pairKey,

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

@@ -1 +1 @@
-{"version":3,"names":["getActiveGroupId","getLinkKeyFromTag","getInitialDestinationMeasurementSignal","params","enabled","destinationPairKey","ancestorDestinationPairKey","linkId","group","destinationPresent","sourcePresent","linkState","pairKey","action","linkKey","activeGroupId","link","links","destination","source"],"sourceRoot":"../../../../../src","sources":["components/boundary/utils/destination-signals.ts"],"mappings":";;AAAA,SACCA,gBAAgB,EAChBC,iBAAiB,QACX,mDAAmD;AAiB1D,OAAO,MAAMC,sCAAsC,GAAIC,MAStD,IAAiD;EACjD,SAAS;;EACT,MAAM;IACLC,OAAO;IACPC,kBAAkB;IAClBC,0BAA0B;IAC1BC,MAAM;IACNC,KAAK;IACLC,kBAAkB;IAClBC,aAAa;IACbC;EACD,CAAC,GAAGR,MAAM;EACV,MAAMS,OAAO,GAAGP,kBAAkB,IAAIC,0BAA0B;EAEhE,IAAI,CAACF,OAAO,IAAI,CAACQ,OAAO,EAAE;IACzB,OAAO,IAAI;EACZ;EAEA,IAAI,CAACH,kBAAkB,EAAE;IACxB,OAAO;MAAEG,OAAO;MAAEC,MAAM,EAAE;IAAO,CAAC;EACnC;EAEA,IAAI,CAACH,aAAa,EAAE;IACnB,OAAO;MAAEE,OAAO;MAAEC,MAAM,EAAE;IAAU,CAAC;EACtC;EAEA,MAAMC,OAAO,GAAGb,iBAAiB,CAACM,MAAM,CAAC;EACzC,MAAMQ,aAAa,GAClBP,KAAK,IAAIG,SAAS,GAAGX,gBAAgB,CAACW,SAAS,EAAEC,OAAO,EAAEJ,KAAK,CAAC,GAAG,IAAI;EAExE,IAAIO,aAAa,IAAIA,aAAa,KAAKD,OAAO,EAAE;IAC/C,OAAO;MAAEF,OAAO;MAAEC,MAAM,EAAE;IAAU,CAAC;EACtC;EAEA,MAAMG,IAAI,GAAGL,SAAS,GAAGC,OAAO,CAAC,EAAEK,KAAK,GAAGH,OAAO,CAAC;EAEnD,IAAI,CAACE,IAAI,EAAEE,WAAW,EAAE;IACvB,OAAO;MAAEN,OAAO;MAAEC,MAAM,EAAE;IAAU,CAAC;EACtC;EAEA,IAAI,CAACG,IAAI,CAACG,MAAM,EAAE;IACjB,OAAO;MAAEP,OAAO;MAAEC,MAAM,EAAE;IAAO,CAAC;EACnC;EAEA,OAAO;IAAED,OAAO;IAAEC,MAAM,EAAE;EAAW,CAAC;AACvC,CAAC","ignoreList":[]}
+{"version":3,"names":["getActiveGroupId","getLinkKeyFromTag","getInitialDestinationMeasurementSignal","params","enabled","pairKey","linkId","group","destinationPresent","sourcePresent","linkState","action","linkKey","activeGroupId","link","links","destination","source"],"sourceRoot":"../../../../../src","sources":["components/boundary/utils/destination-signals.ts"],"mappings":";;AAAA,SACCA,gBAAgB,EAChBC,iBAAiB,QACX,mDAAmD;AAiB1D,OAAO,MAAMC,sCAAsC,GAAIC,MAQtD,IAAiD;EACjD,SAAS;;EACT,MAAM;IACLC,OAAO;IACPC,OAAO;IACPC,MAAM;IACNC,KAAK;IACLC,kBAAkB;IAClBC,aAAa;IACbC;EACD,CAAC,GAAGP,MAAM;EACV,IAAI,CAACC,OAAO,EAAE;IACb,OAAO,IAAI;EACZ;EAEA,IAAI,CAACC,OAAO,EAAE;IACb,OAAO;MAAEA,OAAO,EAAE,IAAI;MAAEM,MAAM,EAAE;IAAO,CAAC;EACzC;EAEA,IAAI,CAACH,kBAAkB,EAAE;IACxB,OAAO;MAAEH,OAAO;MAAEM,MAAM,EAAE;IAAO,CAAC;EACnC;EAEA,IAAI,CAACF,aAAa,EAAE;IACnB,OAAO;MAAEJ,OAAO;MAAEM,MAAM,EAAE;IAAU,CAAC;EACtC;EAEA,MAAMC,OAAO,GAAGX,iBAAiB,CAACK,MAAM,CAAC;EACzC,MAAMO,aAAa,GAClBN,KAAK,IAAIG,SAAS,GAAGV,gBAAgB,CAACU,SAAS,EAAEL,OAAO,EAAEE,KAAK,CAAC,GAAG,IAAI;EAExE,IAAIM,aAAa,IAAIA,aAAa,KAAKD,OAAO,EAAE;IAC/C,OAAO;MAAEP,OAAO;MAAEM,MAAM,EAAE;IAAU,CAAC;EACtC;EAEA,MAAMG,IAAI,GAAGJ,SAAS,GAAGL,OAAO,CAAC,EAAEU,KAAK,GAAGH,OAAO,CAAC;EAEnD,IAAI,CAACE,IAAI,EAAEE,WAAW,EAAE;IACvB,OAAO;MAAEX,OAAO;MAAEM,MAAM,EAAE;IAAU,CAAC;EACtC;EAEA,IAAI,CAACG,IAAI,CAACG,MAAM,EAAE;IACjB,OAAO;MAAEZ,OAAO;MAAEM,MAAM,EAAE;IAAO,CAAC;EACnC;EAEA,OAAO;IAAEN,OAAO;IAAEM,MAAM,EAAE;EAAW,CAAC;AACvC,CAAC","ignoreList":[]}

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

@@ -20,8 +20,6 @@ export const getRefreshBoundarySignal = params => {
     currentScreenKey,
     sourcePairKey,
     destinationPairKey,
-    ancestorDestinationPairKey,
-    nextScreenKey,
     linkId,
     group,
     shouldRefresh,
@@ -44,7 +42,7 @@ export const getRefreshBoundarySignal = params => {
       }
       return buildRefreshSignal("source", sourcePairKey, [currentScreenKey, closing ? "closing" : "settled"].join("|"));
     }
-    const refreshDestinationPairKey = destinationPairKey ?? (nextScreenKey ? undefined : ancestorDestinationPairKey);
+    const refreshDestinationPairKey = destinationPairKey;
     if (!refreshDestinationPairKey) {
       return null;
     }
@@ -63,7 +61,7 @@ export const getRefreshBoundarySignal = params => {
     }
     return buildRefreshSignal("source", sourcePairKey, [group, linkId, closing ? "closing" : "settled"].join("|"));
   }
-  const refreshDestinationPairKey = destinationPairKey ?? (nextScreenKey ? undefined : ancestorDestinationPairKey);
+  const refreshDestinationPairKey = destinationPairKey;
   if (!refreshDestinationPairKey) return null;
 
   // Destination side:

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

@@ -1 +1 @@
-{"version":3,"names":["SOURCE_SIGNAL_PREFIX","DESTINATION_SIGNAL_PREFIX","buildRefreshSignal","type","pairKey","key","prefix","signal","getRefreshBoundarySignal","params","enabled","currentScreenKey","sourcePairKey","destinationPairKey","ancestorDestinationPairKey","nextScreenKey","linkId","group","shouldRefresh","closing","linkState","sourcePair","participates","links","sourceRequests","join","refreshDestinationPairKey","undefined","activeId","groups"],"sourceRoot":"../../../../../src","sources":["components/boundary/utils/refresh-signals.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["SOURCE_SIGNAL_PREFIX","DESTINATION_SIGNAL_PREFIX","buildRefreshSignal","type","pairKey","key","prefix","signal","getRefreshBoundarySignal","params","enabled","currentScreenKey","sourcePairKey","destinationPairKey","linkId","group","shouldRefresh","closing","linkState","sourcePair","participates","links","sourceRequests","join","refreshDestinationPairKey","activeId","groups"],"sourceRoot":"../../../../../src","sources":["components/boundary/utils/refresh-signals.ts"],"mappings":";;AAMA,MAAMA,oBAAoB,GAAG,SAAS;AACtC,MAAMC,yBAAyB,GAAG,cAAc;AAMhD,MAAMC,kBAAkB,GAAGA,CAC1BC,IAA2B,EAC3BC,OAAsB,EACtBC,GAAW,KACgB;EAC3B,SAAS;;EACT,MAAMC,MAAM,GACXH,IAAI,KAAK,QAAQ,GAAGH,oBAAoB,GAAGC,yBAAyB;EACrE,OAAO;IACNE,IAAI;IACJC,OAAO;IACPG,MAAM,EAAE,GAAGD,MAAM,GAAGF,OAAO,IAAIC,GAAG;EACnC,CAAC;AACF,CAAC;AAED,OAAO,MAAMG,wBAAwB,GAAIC,MAUxC,IAAmC;EACnC,SAAS;;EACT,MAAM;IACLC,OAAO;IACPC,gBAAgB;IAChBC,aAAa;IACbC,kBAAkB;IAClBC,MAAM;IACNC,KAAK;IACLC,aAAa;IACbC,OAAO;IACPC;EACD,CAAC,GAAGT,MAAM;EAEV,IAAI,CAACC,OAAO,EAAE,OAAO,IAAI;EAEzB,IAAI,CAACM,aAAa,EAAE;IACnB,OAAO,IAAI;EACZ;;EAEA;EACA;EACA,IAAI,CAACD,KAAK,EAAE;IACX,IAAIH,aAAa,EAAE;MAClB,MAAMO,UAAU,GAAGD,SAAS,GAAGN,aAAa,CAAC;MAC7C,MAAMQ,YAAY,GACjB,CAAC,CAACD,UAAU,EAAEE,KAAK,GAAGP,MAAM,CAAC,IAAI,CAAC,CAACK,UAAU,EAAEG,cAAc,GAAGR,MAAM,CAAC;MAExE,IAAI,CAACM,YAAY,EAAE;QAClB,OAAO,IAAI;MACZ;MAEA,OAAOlB,kBAAkB,CACxB,QAAQ,EACRU,aAAa,EACb,CAACD,gBAAgB,EAAEM,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACM,IAAI,CAAC,GAAG,CAC7D,CAAC;IACF;IAEA,MAAMC,yBAAyB,GAAGX,kBAAkB;IAEpD,IAAI,CAACW,yBAAyB,EAAE;MAC/B,OAAO,IAAI;IACZ;IAEA,IAAI,CAACN,SAAS,GAAGM,yBAAyB,CAAC,EAAEH,KAAK,GAAGP,MAAM,CAAC,EAAE;MAC7D,OAAO,IAAI;IACZ;IAEA,OAAOZ,kBAAkB,CACxB,aAAa,EACbsB,yBAAyB,EACzB,CAACb,gBAAgB,EAAEM,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACM,IAAI,CAAC,GAAG,CAC7D,CAAC;EACF;;EAEA;EACA;EACA,IAAIX,aAAa,EAAE;IAClB,MAAMa,QAAQ,GAAGP,SAAS,GAAGN,aAAa,CAAC,EAAEc,MAAM,GAAGX,KAAK,CAAC,EAAEU,QAAQ;IAEtE,IAAIA,QAAQ,KAAKX,MAAM,EAAE;MACxB,OAAO,IAAI;IACZ;IAEA,OAAOZ,kBAAkB,CACxB,QAAQ,EACRU,aAAa,EACb,CAACG,KAAK,EAAED,MAAM,EAAEG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACM,IAAI,CAAC,GAAG,CAC1D,CAAC;EACF;EAEA,MAAMC,yBAAyB,GAAGX,kBAAkB;EAEpD,IAAI,CAACW,yBAAyB,EAAE,OAAO,IAAI;;EAE3C;EACA;EACA,MAAMC,QAAQ,GACbP,SAAS,GAAGM,yBAAyB,CAAC,EAAEE,MAAM,GAAGX,KAAK,CAAC,EAAEU,QAAQ;;EAElE;EACA;EACA,IAAIA,QAAQ,KAAKX,MAAM,EAAE;IACxB,OAAO,IAAI;EACZ;EAEA,OAAOZ,kBAAkB,CACxB,aAAa,EACbsB,yBAAyB,EACzB,CAACT,KAAK,EAAED,MAAM,EAAEG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACM,IAAI,CAAC,GAAG,CAC1D,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/providers/screen/descriptors/descriptors.provider.js

@@ -5,7 +5,7 @@ import { useScreenTransitionsAdapterOptionalContext } from "../../../adapters/wi
 import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
 import createProvider from "../../../utils/create-provider";
 import { deriveDescriptorDerivations } from "./helpers/derive-descriptor-derivations";
-import { getAncestorKeyState } from "./helpers/get-ancestor-keys";
+import { getAncestorKeys } from "./helpers/get-ancestor-keys";
 
 /**
  * Base descriptor interface - minimal contract for all stack types.
@@ -41,17 +41,13 @@ export const {
     current: resolvedCurrent,
     next: resolvedNext
   }), [resolvedPrevious, resolvedCurrent, resolvedNext]);
-  const {
-    ancestorKeys,
-    ancestorDestinationPairKey
-  } = useMemo(() => getAncestorKeyState(resolvedCurrent), [resolvedCurrent]);
+  const ancestorKeys = useMemo(() => getAncestorKeys(resolvedCurrent), [resolvedCurrent]);
   const derivations = useMemo(() => deriveDescriptorDerivations({
     previous: resolvedPrevious,
     current: resolvedCurrent,
     next: resolvedNext,
-    ancestorKeys,
-    ancestorDestinationPairKey
-  }), [resolvedPrevious, resolvedCurrent, resolvedNext, ancestorKeys, ancestorDestinationPairKey]);
+    ancestorKeys
+  }), [resolvedPrevious, resolvedCurrent, resolvedNext, ancestorKeys]);
   return {
     value: {
       previous: resolvedPrevious,

package/lib/module/providers/screen/descriptors/descriptors.provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","useScreenTransitionsAdapterOptionalContext","useBlankStackStore","createProvider","deriveDescriptorDerivations","getAncestorKeyState","DescriptorsProvider","useDescriptorsStore","guarded","previous","current","next","routeKey","children","blankStackCurrent","store","scenesByKey","descriptor","undefined","blankStackPrevious","previousDescriptor","blankStackNext","nextDescriptor","adapterContext","adapterScene","scenes","routeIndexByKey","get","resolvedCurrent","resolvedPrevious","resolvedNext","Error","descriptors","ancestorKeys","ancestorDestinationPairKey","derivations","value","options"],"sourceRoot":"../../../../../src","sources":["providers/screen/descriptors/descriptors.provider.tsx"],"mappings":";;AACA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,0CAA0C,QAAQ,mDAAmD;AAC9G,SAASC,kBAAkB,QAAQ,+CAA+C;AAElF,OAAOC,cAAc,MAAM,gCAAgC;AAE3D,SAASC,2BAA2B,QAAQ,yCAAyC;AACrF,SAASC,mBAAmB,QAAQ,6BAA6B;;AAEjE;AACA;AACA;AACA;AACA;;AA6BA,OAAO,MAAM;EAAEC,mBAAmB;EAAEC;AAAoB,CAAC,GAAGJ,cAAc,CACzE,aAAa,EACb;EAAEK,OAAO,EAAE;AAAK,CACjB,CAAC,CACA,CAAC;EAAEC,QAAQ;EAAEC,OAAO;EAAEC,IAAI;EAAEC,QAAQ;EAAEC;AAAS,CAAC,KAAK;EACpD,MAAMC,iBAAiB,GAAGZ,kBAAkB,CAAEa,KAAK,IAClDH,QAAQ,GAAGG,KAAK,EAAEC,WAAW,CAACJ,QAAQ,CAAC,EAAEK,UAAU,GAAGC,SACvD,CAAC;EACD,MAAMC,kBAAkB,GAAGjB,kBAAkB,CAAEa,KAAK,IACnDH,QAAQ,GAAGG,KAAK,EAAEC,WAAW,CAACJ,QAAQ,CAAC,EAAEQ,kBAAkB,GAAGF,SAC/D,CAAC;EACD,MAAMG,cAAc,GAAGnB,kBAAkB,CAAEa,KAAK,IAC/CH,QAAQ,GAAGG,KAAK,EAAEC,WAAW,CAACJ,QAAQ,CAAC,EAAEU,cAAc,GAAGJ,SAC3D,CAAC;EACD,MAAMK,cAAc,GAAGtB,0CAA0C,CAAC,CAAC;EACnE,MAAMuB,YAAY,GAAGZ,QAAQ,GACzBW,cAAc,EAAEP,WAAW,GAAGJ,QAAQ,CAAC,IACzCW,cAAc,EAAEE,MAAM,CACrBF,cAAc,CAACG,eAAe,CAACC,GAAG,CAACf,QAAQ,CAAC,IAAI,CAAC,CAAC,CAClD,GACAM,SAAS;EAEZ,MAAMU,eAAe,GACpBlB,OAAO,IAAII,iBAAiB,IAAIU,YAAY,EAAEP,UAAU;EACzD,MAAMY,gBAAgB,GACrBpB,QAAQ,IAAIU,kBAAkB,IAAIK,YAAY,EAAEJ,kBAAkB;EACnE,MAAMU,YAAY,GAAGnB,IAAI,IAAIU,cAAc,IAAIG,YAAY,EAAEF,cAAc;EAE3E,IAAI,CAACM,eAAe,EAAE;IACrB,MAAM,IAAIG,KAAK,CACd,sBAAsBnB,QAAQ,IAAI,SAAS,kBAC5C,CAAC;EACF;EAEA,MAAMoB,WAAW,GAAGhC,OAAO,CAC1B,OAAO;IACNS,QAAQ,EAAEoB,gBAAgB;IAC1BnB,OAAO,EAAEkB,eAAe;IACxBjB,IAAI,EAAEmB;EACP,CAAC,CAAC,EACF,CAACD,gBAAgB,EAAED,eAAe,EAAEE,YAAY,CACjD,CAAC;EAED,MAAM;IAAEG,YAAY;IAAEC;EAA2B,CAAC,GAAGlC,OAAO,CAC3D,MAAMK,mBAAmB,CAACuB,eAAe,CAAC,EAC1C,CAACA,eAAe,CACjB,CAAC;EAED,MAAMO,WAAW,GAAGnC,OAAO,CAC1B,MACCI,2BAA2B,CAAC;IAC3BK,QAAQ,EAAEoB,gBAAgB;IAC1BnB,OAAO,EAAEkB,eAAe;IACxBjB,IAAI,EAAEmB,YAAY;IAClBG,YAAY;IACZC;EACD,CAAC,CAAC,EACH,CACCL,gBAAgB,EAChBD,eAAe,EACfE,YAAY,EACZG,YAAY,EACZC,0BAA0B,CAE5B,CAAC;EAED,OAAO;IACNE,KAAK,EAAE;MACN3B,QAAQ,EAAEoB,gBAAgB;MAC1BnB,OAAO,EAAEkB,eAAe;MACxBjB,IAAI,EAAEmB,YAAY;MAClBE,WAAW;MACXG,WAAW;MACXE,OAAO,EAAET,eAAe,CAACS;IAC1B,CAAC;IACDxB;EACD,CAAC;AACF,CACD,CAAC","ignoreList":[]}
+{"version":3,"names":["useMemo","useScreenTransitionsAdapterOptionalContext","useBlankStackStore","createProvider","deriveDescriptorDerivations","getAncestorKeys","DescriptorsProvider","useDescriptorsStore","guarded","previous","current","next","routeKey","children","blankStackCurrent","store","scenesByKey","descriptor","undefined","blankStackPrevious","previousDescriptor","blankStackNext","nextDescriptor","adapterContext","adapterScene","scenes","routeIndexByKey","get","resolvedCurrent","resolvedPrevious","resolvedNext","Error","descriptors","ancestorKeys","derivations","value","options"],"sourceRoot":"../../../../../src","sources":["providers/screen/descriptors/descriptors.provider.tsx"],"mappings":";;AACA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,0CAA0C,QAAQ,mDAAmD;AAC9G,SAASC,kBAAkB,QAAQ,+CAA+C;AAElF,OAAOC,cAAc,MAAM,gCAAgC;AAE3D,SAASC,2BAA2B,QAAQ,yCAAyC;AACrF,SAASC,eAAe,QAAQ,6BAA6B;;AAE7D;AACA;AACA;AACA;AACA;;AA6BA,OAAO,MAAM;EAAEC,mBAAmB;EAAEC;AAAoB,CAAC,GAAGJ,cAAc,CACzE,aAAa,EACb;EAAEK,OAAO,EAAE;AAAK,CACjB,CAAC,CACA,CAAC;EAAEC,QAAQ;EAAEC,OAAO;EAAEC,IAAI;EAAEC,QAAQ;EAAEC;AAAS,CAAC,KAAK;EACpD,MAAMC,iBAAiB,GAAGZ,kBAAkB,CAAEa,KAAK,IAClDH,QAAQ,GAAGG,KAAK,EAAEC,WAAW,CAACJ,QAAQ,CAAC,EAAEK,UAAU,GAAGC,SACvD,CAAC;EACD,MAAMC,kBAAkB,GAAGjB,kBAAkB,CAAEa,KAAK,IACnDH,QAAQ,GAAGG,KAAK,EAAEC,WAAW,CAACJ,QAAQ,CAAC,EAAEQ,kBAAkB,GAAGF,SAC/D,CAAC;EACD,MAAMG,cAAc,GAAGnB,kBAAkB,CAAEa,KAAK,IAC/CH,QAAQ,GAAGG,KAAK,EAAEC,WAAW,CAACJ,QAAQ,CAAC,EAAEU,cAAc,GAAGJ,SAC3D,CAAC;EACD,MAAMK,cAAc,GAAGtB,0CAA0C,CAAC,CAAC;EACnE,MAAMuB,YAAY,GAAGZ,QAAQ,GACzBW,cAAc,EAAEP,WAAW,GAAGJ,QAAQ,CAAC,IACzCW,cAAc,EAAEE,MAAM,CACrBF,cAAc,CAACG,eAAe,CAACC,GAAG,CAACf,QAAQ,CAAC,IAAI,CAAC,CAAC,CAClD,GACAM,SAAS;EAEZ,MAAMU,eAAe,GACpBlB,OAAO,IAAII,iBAAiB,IAAIU,YAAY,EAAEP,UAAU;EACzD,MAAMY,gBAAgB,GACrBpB,QAAQ,IAAIU,kBAAkB,IAAIK,YAAY,EAAEJ,kBAAkB;EACnE,MAAMU,YAAY,GAAGnB,IAAI,IAAIU,cAAc,IAAIG,YAAY,EAAEF,cAAc;EAE3E,IAAI,CAACM,eAAe,EAAE;IACrB,MAAM,IAAIG,KAAK,CACd,sBAAsBnB,QAAQ,IAAI,SAAS,kBAC5C,CAAC;EACF;EAEA,MAAMoB,WAAW,GAAGhC,OAAO,CAC1B,OAAO;IACNS,QAAQ,EAAEoB,gBAAgB;IAC1BnB,OAAO,EAAEkB,eAAe;IACxBjB,IAAI,EAAEmB;EACP,CAAC,CAAC,EACF,CAACD,gBAAgB,EAAED,eAAe,EAAEE,YAAY,CACjD,CAAC;EAED,MAAMG,YAAY,GAAGjC,OAAO,CAC3B,MAAMK,eAAe,CAACuB,eAAe,CAAC,EACtC,CAACA,eAAe,CACjB,CAAC;EAED,MAAMM,WAAW,GAAGlC,OAAO,CAC1B,MACCI,2BAA2B,CAAC;IAC3BK,QAAQ,EAAEoB,gBAAgB;IAC1BnB,OAAO,EAAEkB,eAAe;IACxBjB,IAAI,EAAEmB,YAAY;IAClBG;EACD,CAAC,CAAC,EACH,CAACJ,gBAAgB,EAAED,eAAe,EAAEE,YAAY,EAAEG,YAAY,CAC/D,CAAC;EAED,OAAO;IACNE,KAAK,EAAE;MACN1B,QAAQ,EAAEoB,gBAAgB;MAC1BnB,OAAO,EAAEkB,eAAe;MACxBjB,IAAI,EAAEmB,YAAY;MAClBE,WAAW;MACXE,WAAW;MACXE,OAAO,EAAER,eAAe,CAACQ;IAC1B,CAAC;IACDvB;EACD,CAAC;AACF,CACD,CAAC","ignoreList":[]}

package/lib/module/providers/screen/descriptors/helpers/derive-descriptor-derivations.js

@@ -5,8 +5,7 @@ export function deriveDescriptorDerivations({
   previous,
   current,
   next,
-  ancestorKeys,
-  ancestorDestinationPairKey
+  ancestorKeys
 }) {
   const previousScreenKey = previous?.route.key;
   const currentScreenKey = current.route.key;
@@ -24,7 +23,6 @@ export function deriveDescriptorDerivations({
     nextScreenKey,
     sourcePairKey,
     destinationPairKey,
-    ancestorDestinationPairKey,
     parentScreenKey: ancestorKeys[0],
     isFirstKey,
     isTopMostScreen,

package/lib/module/providers/screen/descriptors/helpers/derive-descriptor-derivations.js.map

@@ -1 +1 @@
-{"version":3,"names":["createScreenPairKey","deriveDescriptorDerivations","previous","current","next","ancestorKeys","ancestorDestinationPairKey","previousScreenKey","route","key","currentScreenKey","nextScreenKey","sourcePairKey","undefined","destinationPairKey","navigationState","navigation","getState","routes","isFirstKey","findIndex","isTopMostScreen","hasConfiguredInterpolator","options","screenStyleInterpolator","parentScreenKey"],"sourceRoot":"../../../../../../src","sources":["providers/screen/descriptors/helpers/derive-descriptor-derivations.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,sDAAsD;AA0B1F,OAAO,SAASC,2BAA2BA,CAAC;EAC3CC,QAAQ;EACRC,OAAO;EACPC,IAAI;EACJC,YAAY;EACZC;AACO,CAAC,EAAyB;EACjC,MAAMC,iBAAiB,GAAGL,QAAQ,EAAEM,KAAK,CAACC,GAAG;EAC7C,MAAMC,gBAAgB,GAAGP,OAAO,CAACK,KAAK,CAACC,GAAG;EAC1C,MAAME,aAAa,GAAGP,IAAI,EAAEI,KAAK,CAACC,GAAG;EACrC,MAAMG,aAAa,GAAGD,aAAa,GAChCX,mBAAmB,CAACU,gBAAgB,EAAEC,aAAa,CAAC,GACpDE,SAAS;EACZ,MAAMC,kBAAkB,GAAGP,iBAAiB,GACzCP,mBAAmB,CAACO,iBAAiB,EAAEG,gBAAgB,CAAC,GACxDG,SAAS;EAEZ,MAAME,eAAe,GAAGZ,OAAO,CAACa,UAAU,CAACC,QAAQ,CAAC,CAAC;EACrD,MAAMC,MAAM,GAAGH,eAAe,EAAEG,MAAM,IAAI,EAAE;EAC5C,MAAMC,UAAU,GACfD,MAAM,CAACE,SAAS,CAAEZ,KAAK,IAAKA,KAAK,CAACC,GAAG,KAAKN,OAAO,CAACK,KAAK,CAACC,GAAG,CAAC,KAAK,CAAC;EACnE,MAAMY,eAAe,GAAG,CAACjB,IAAI;EAC7B,MAAMkB,yBAAyB,GAC9B,CAAC,CAACnB,OAAO,CAACoB,OAAO,CAACC,uBAAuB,IACzC,CAAC,CAACpB,IAAI,EAAEmB,OAAO,EAAEC,uBAAuB;EAEzC,OAAO;IACNjB,iBAAiB;IACjBG,gBAAgB;IAChBC,aAAa;IACbC,aAAa;IACbE,kBAAkB;IAClBR,0BAA0B;IAC1BmB,eAAe,EAAEpB,YAAY,CAAC,CAAC,CAAC;IAChCc,UAAU;IACVE,eAAe;IACfhB,YAAY;IACZiB;EACD,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["createScreenPairKey","deriveDescriptorDerivations","previous","current","next","ancestorKeys","previousScreenKey","route","key","currentScreenKey","nextScreenKey","sourcePairKey","undefined","destinationPairKey","navigationState","navigation","getState","routes","isFirstKey","findIndex","isTopMostScreen","hasConfiguredInterpolator","options","screenStyleInterpolator","parentScreenKey"],"sourceRoot":"../../../../../../src","sources":["providers/screen/descriptors/helpers/derive-descriptor-derivations.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,sDAAsD;AAwB1F,OAAO,SAASC,2BAA2BA,CAAC;EAC3CC,QAAQ;EACRC,OAAO;EACPC,IAAI;EACJC;AACO,CAAC,EAAyB;EACjC,MAAMC,iBAAiB,GAAGJ,QAAQ,EAAEK,KAAK,CAACC,GAAG;EAC7C,MAAMC,gBAAgB,GAAGN,OAAO,CAACI,KAAK,CAACC,GAAG;EAC1C,MAAME,aAAa,GAAGN,IAAI,EAAEG,KAAK,CAACC,GAAG;EACrC,MAAMG,aAAa,GAAGD,aAAa,GAChCV,mBAAmB,CAACS,gBAAgB,EAAEC,aAAa,CAAC,GACpDE,SAAS;EACZ,MAAMC,kBAAkB,GAAGP,iBAAiB,GACzCN,mBAAmB,CAACM,iBAAiB,EAAEG,gBAAgB,CAAC,GACxDG,SAAS;EAEZ,MAAME,eAAe,GAAGX,OAAO,CAACY,UAAU,CAACC,QAAQ,CAAC,CAAC;EACrD,MAAMC,MAAM,GAAGH,eAAe,EAAEG,MAAM,IAAI,EAAE;EAC5C,MAAMC,UAAU,GACfD,MAAM,CAACE,SAAS,CAAEZ,KAAK,IAAKA,KAAK,CAACC,GAAG,KAAKL,OAAO,CAACI,KAAK,CAACC,GAAG,CAAC,KAAK,CAAC;EACnE,MAAMY,eAAe,GAAG,CAAChB,IAAI;EAC7B,MAAMiB,yBAAyB,GAC9B,CAAC,CAAClB,OAAO,CAACmB,OAAO,CAACC,uBAAuB,IACzC,CAAC,CAACnB,IAAI,EAAEkB,OAAO,EAAEC,uBAAuB;EAEzC,OAAO;IACNjB,iBAAiB;IACjBG,gBAAgB;IAChBC,aAAa;IACbC,aAAa;IACbE,kBAAkB;IAClBW,eAAe,EAAEnB,YAAY,CAAC,CAAC,CAAC;IAChCa,UAAU;IACVE,eAAe;IACff,YAAY;IACZgB;EACD,CAAC;AACF","ignoreList":[]}

package/lib/module/providers/screen/descriptors/helpers/get-ancestor-keys.js

@@ -1,19 +1,13 @@
 "use strict";
 
-import { createScreenPairKey } from "../../../../stores/bounds/helpers/link-pairs.helpers";
 /**
  * Builds nested navigator ancestor keys from immediate parent to root.
- * The nearest ancestor destination pair lets child routes attach measurements
- * to the transition owned by the parent stack.
  */
-export function getAncestorKeyState(current) {
+export function getAncestorKeys(current) {
   const ancestors = [];
-  let ancestorDestinationPairKey;
   const nav = current.navigation;
   if (typeof nav?.getParent !== "function") {
-    return {
-      ancestorKeys: ancestors
-    };
+    return ancestors;
   }
   let parent = nav.getParent();
   while (parent) {
@@ -22,20 +16,10 @@ export function getAncestorKeyState(current) {
       const focusedRoute = state.routes[state.index];
       if (focusedRoute?.key) {
         ancestors.push(focusedRoute.key);
-        const previousRoute = state.routes[state.index - 1];
-        if (!ancestorDestinationPairKey && previousRoute?.key) {
-          ancestorDestinationPairKey = createScreenPairKey(previousRoute.key, focusedRoute.key);
-        }
       }
     }
     parent = parent.getParent();
   }
-  return {
-    ancestorKeys: ancestors,
-    ancestorDestinationPairKey
-  };
-}
-export function getAncestorKeys(current) {
-  return getAncestorKeyState(current).ancestorKeys;
+  return ancestors;
 }
 //# sourceMappingURL=get-ancestor-keys.js.map

package/lib/module/providers/screen/descriptors/helpers/get-ancestor-keys.js.map

@@ -1 +1 @@
-{"version":3,"names":["createScreenPairKey","getAncestorKeyState","current","ancestors","ancestorDestinationPairKey","nav","navigation","getParent","ancestorKeys","parent","state","getState","routes","index","undefined","focusedRoute","key","push","previousRoute","getAncestorKeys"],"sourceRoot":"../../../../../../src","sources":["providers/screen/descriptors/helpers/get-ancestor-keys.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,sDAAsD;AAS1F;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,mBAAmBA,CAClCC,OAA4B,EACT;EACnB,MAAMC,SAAmB,GAAG,EAAE;EAC9B,IAAIC,0BAAqD;EACzD,MAAMC,GAAG,GAAGH,OAAO,CAACI,UAAiB;EAErC,IAAI,OAAOD,GAAG,EAAEE,SAAS,KAAK,UAAU,EAAE;IACzC,OAAO;MAAEC,YAAY,EAAEL;IAAU,CAAC;EACnC;EAEA,IAAIM,MAAM,GAAGJ,GAAG,CAACE,SAAS,CAAC,CAAC;EAE5B,OAAOE,MAAM,EAAE;IACd,MAAMC,KAAK,GAAGD,MAAM,CAACE,QAAQ,CAAC,CAAC;IAC/B,IAAID,KAAK,EAAEE,MAAM,IAAIF,KAAK,CAACG,KAAK,KAAKC,SAAS,EAAE;MAC/C,MAAMC,YAAY,GAAGL,KAAK,CAACE,MAAM,CAACF,KAAK,CAACG,KAAK,CAAC;MAC9C,IAAIE,YAAY,EAAEC,GAAG,EAAE;QACtBb,SAAS,CAACc,IAAI,CAACF,YAAY,CAACC,GAAG,CAAC;QAEhC,MAAME,aAAa,GAAGR,KAAK,CAACE,MAAM,CAACF,KAAK,CAACG,KAAK,GAAG,CAAC,CAAC;QACnD,IAAI,CAACT,0BAA0B,IAAIc,aAAa,EAAEF,GAAG,EAAE;UACtDZ,0BAA0B,GAAGJ,mBAAmB,CAC/CkB,aAAa,CAACF,GAAG,EACjBD,YAAY,CAACC,GACd,CAAC;QACF;MACD;IACD;IACAP,MAAM,GAAGA,MAAM,CAACF,SAAS,CAAC,CAAC;EAC5B;EAEA,OAAO;IACNC,YAAY,EAAEL,SAAS;IACvBC;EACD,CAAC;AACF;AAEA,OAAO,SAASe,eAAeA,CAACjB,OAA4B,EAAY;EACvE,OAAOD,mBAAmB,CAACC,OAAO,CAAC,CAACM,YAAY;AACjD","ignoreList":[]}
+{"version":3,"names":["getAncestorKeys","current","ancestors","nav","navigation","getParent","parent","state","getState","routes","index","undefined","focusedRoute","key","push"],"sourceRoot":"../../../../../../src","sources":["providers/screen/descriptors/helpers/get-ancestor-keys.ts"],"mappings":";;AAEA;AACA;AACA;AACA,OAAO,SAASA,eAAeA,CAACC,OAA4B,EAAY;EACvE,MAAMC,SAAmB,GAAG,EAAE;EAC9B,MAAMC,GAAG,GAAGF,OAAO,CAACG,UAAiB;EAErC,IAAI,OAAOD,GAAG,EAAEE,SAAS,KAAK,UAAU,EAAE;IACzC,OAAOH,SAAS;EACjB;EAEA,IAAII,MAAM,GAAGH,GAAG,CAACE,SAAS,CAAC,CAAC;EAE5B,OAAOC,MAAM,EAAE;IACd,MAAMC,KAAK,GAAGD,MAAM,CAACE,QAAQ,CAAC,CAAC;IAC/B,IAAID,KAAK,EAAEE,MAAM,IAAIF,KAAK,CAACG,KAAK,KAAKC,SAAS,EAAE;MAC/C,MAAMC,YAAY,GAAGL,KAAK,CAACE,MAAM,CAACF,KAAK,CAACG,KAAK,CAAC;MAC9C,IAAIE,YAAY,EAAEC,GAAG,EAAE;QACtBX,SAAS,CAACY,IAAI,CAACF,YAAY,CAACC,GAAG,CAAC;MACjC;IACD;IACAP,MAAM,GAAGA,MAAM,CAACD,SAAS,CAAC,CAAC;EAC5B;EAEA,OAAOH,SAAS;AACjB","ignoreList":[]}

package/lib/module/providers/screen/styles/helpers/resolve-interpolator-style-handoff.js

@@ -46,16 +46,16 @@ const mergeSlots = (frozen, live) => {
   }
   return merged;
 };
-const composeFrozenAndLiveStyles = (frozen, live) => {
+const composeCurrentAndNextStyles = (current, next) => {
   "worklet";
 
   const composed = {
-    ...frozen
+    ...current
   };
-  for (const slotId in live) {
-    const liveSlot = live[slotId];
-    if (liveSlot) {
-      composed[slotId] = mergeSlots(frozen[slotId], liveSlot);
+  for (const slotId in next) {
+    const nextSlot = next[slotId];
+    if (nextSlot) {
+      composed[slotId] = mergeSlots(current[slotId], nextSlot);
     }
   }
   return composed;
@@ -63,26 +63,27 @@ const composeFrozenAndLiveStyles = (frozen, live) => {
 export const resolveInterpolatorStyleHandoff = ({
   currentOwnsInterpolator,
   currentStylesMap,
-  nextStylesMap,
-  frozenCurrentStylesMap
+  nextStylesMap
 }) => {
   "worklet";
 
   if (currentOwnsInterpolator) {
     return {
-      localStylesMaps: currentStylesMap ? [currentStylesMap] : [],
-      nextFrozenCurrentStylesMap: currentStylesMap ?? frozenCurrentStylesMap
+      localStylesMaps: currentStylesMap ? [currentStylesMap] : []
     };
   }
   if (!nextStylesMap) {
     return {
-      localStylesMaps: frozenCurrentStylesMap ? [frozenCurrentStylesMap] : [],
-      nextFrozenCurrentStylesMap: frozenCurrentStylesMap
+      localStylesMaps: currentStylesMap ? [currentStylesMap] : []
+    };
+  }
+  if (!currentStylesMap) {
+    return {
+      localStylesMaps: [nextStylesMap]
     };
   }
   return {
-    localStylesMaps: [composeFrozenAndLiveStyles(frozenCurrentStylesMap, nextStylesMap)],
-    nextFrozenCurrentStylesMap: frozenCurrentStylesMap
+    localStylesMaps: [composeCurrentAndNextStyles(currentStylesMap, nextStylesMap)]
   };
 };
 //# sourceMappingURL=resolve-interpolator-style-handoff.js.map

package/lib/module/providers/screen/styles/helpers/resolve-interpolator-style-handoff.js.map

@@ -1 +1 @@
-{"version":3,"names":["mergeBuckets","frozen","live","composeTransforms","merged","key","liveValue","undefined","frozenValue","Array","isArray","mergeSlots","style","props","boundsLocalTransform","composeFrozenAndLiveStyles","composed","slotId","liveSlot","resolveInterpolatorStyleHandoff","currentOwnsInterpolator","currentStylesMap","nextStylesMap","frozenCurrentStylesMap","localStylesMaps","nextFrozenCurrentStylesMap"],"sourceRoot":"../../../../../../src","sources":["providers/screen/styles/helpers/resolve-interpolator-style-handoff.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["mergeBuckets","frozen","live","composeTransforms","merged","key","liveValue","undefined","frozenValue","Array","isArray","mergeSlots","style","props","boundsLocalTransform","composeCurrentAndNextStyles","current","next","composed","slotId","nextSlot","resolveInterpolatorStyleHandoff","currentOwnsInterpolator","currentStylesMap","nextStylesMap","localStylesMaps"],"sourceRoot":"../../../../../../src","sources":["providers/screen/styles/helpers/resolve-interpolator-style-handoff.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/providers/screen/styles/hooks/use-interpolated-style-maps.js

@@ -78,10 +78,10 @@ const runInterpolator = ({
  * normal interpolator selection once the gesture-driven close is no longer in
  * play.
  *
- * At an ownership handoff, the last current-owner styles are frozen. The next
- * owner replaces matching scalar keys and composes its live transforms after
- * the frozen transforms. The previous interpolator is not evaluated again until
- * it regains ownership.
+ * At an ownership handoff, the current interpolator remains live but is
+ * evaluated without the next-screen relationship. The next owner replaces
+ * matching scalar keys and composes its live transforms after the current
+ * screen's self-owned transforms.
  */
 export const useInterpolatedStylesMap = ({
   enabled,
@@ -119,7 +119,6 @@ export const useInterpolatedStylesMap = ({
   } = SystemStore.getBag(activeScreenKey);
   const isGesturingDuringCloseAnimation = useSharedValue(false);
   const initialDestinationStylesReady = useSharedValue(0);
-  const frozenCurrentStylesMap = useSharedValue(NO_STYLES);
   const shouldPrepareInitialDestinationStyles = enabled && !!destinationPairKey && !nextScreenKey && !!currentInterpolator;
   useAnimatedReaction(() => {
     "worklet";
@@ -180,14 +179,19 @@ export const useInterpolatedStylesMap = ({
     const nextReady = currentOwnsInterpolator ? 0 : 1;
     nextInterpolatorReady.set(nextReady);
     const interpolatorOptionsOwner = currentOwnsInterpolator ? "current" : "next";
-    const selectedFrame = selectInterpolatorFrame(props, isInGestureMode);
-    const currentResult = currentOwnsInterpolator ? runInterpolator({
+
+    // Once the next interpolator owns the relationship, the current
+    // interpolator remains responsible only for its own live presentation.
+    // This preserves snap-point transforms without letting current-screen
+    // unfocus rules compete with the next screen's outgoing transition.
+    const currentSelectedFrame = selectInterpolatorFrame(props, isInGestureMode || !!nextInterpolator);
+    const currentResult = runInterpolator({
       interpolator: currentInterpolator,
       props,
-      selectedFrame,
+      selectedFrame: currentSelectedFrame,
       bounds: boundsAccessor,
       transition
-    }) : undefined;
+    });
     const initialDestinationStyleGate = resolveInitialDestinationStyleGate({
       shouldPrepareStyles: shouldPrepareInitialDestinationStyles,
       isVisibilityBlocked: visibilityBlocked.get(),
@@ -202,18 +206,15 @@ export const useInterpolatedStylesMap = ({
       const handoff = resolveInterpolatorStyleHandoff({
         currentOwnsInterpolator: true,
         currentStylesMap: currentResult?.stylesMap,
-        nextStylesMap: undefined,
-        frozenCurrentStylesMap: frozenCurrentStylesMap.get()
+        nextStylesMap: undefined
       });
-      if (handoff.nextFrozenCurrentStylesMap !== frozenCurrentStylesMap.get()) {
-        frozenCurrentStylesMap.set(handoff.nextFrozenCurrentStylesMap);
-      }
       return handoff.localStylesMaps.length ? handoff.localStylesMaps : NO_STYLE_LAYERS;
     }
+    const nextSelectedFrame = selectInterpolatorFrame(props, false);
     const nextResult = runInterpolator({
       interpolator: nextInterpolator,
       props,
-      selectedFrame,
+      selectedFrame: nextSelectedFrame,
       bounds: boundsAccessor,
       transition
     });
@@ -222,8 +223,7 @@ export const useInterpolatedStylesMap = ({
     const handoff = resolveInterpolatorStyleHandoff({
       currentOwnsInterpolator: false,
       currentStylesMap: currentResult?.stylesMap,
-      nextStylesMap: nextResult?.stylesMap,
-      frozenCurrentStylesMap: frozenCurrentStylesMap.get()
+      nextStylesMap: nextResult?.stylesMap
     });
     return handoff.localStylesMaps.length ? handoff.localStylesMaps : NO_STYLE_LAYERS;
   });

package/lib/module/providers/screen/styles/hooks/use-interpolated-style-maps.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","useAnimatedReaction","useDerivedValue","useSharedValue","NO_STYLES","AnimationStore","LifecycleTransitionRequestKind","SystemStore","logger","useScreenAnimationStore","useBuildBoundsAccessor","useBuildTransitionAccessor","readScreenAnimationRevisions","syncSelectedInterpolatorOptions","useDescriptorsStore","syncScreenOptionsOverrides","useScreenOptionsStore","collectInterpolatorSharedValues","normalizeSlots","resolveInterpolatorStyleHandoff","selectInterpolatorFrame","stripInterpolatorOptions","hasCloseTransitionFinished","isOpenTransitionBlocked","resolveInitialDestinationStyleGate","NO_STYLE_LAYERS","normalizeRawStyleMap","rawStyleMap","stylesMap","runInterpolator","interpolator","props","selectedFrame","bounds","transition","undefined","raw","_","__DEV__","warn","useInterpolatedStylesMap","enabled","visibilityBlocked","currentScreenKey","s","derivations","nextScreenKey","destinationPairKey","screenOptions","screenInterpolatorProps","screenInterpolatorPropsRevision","selectedInterpolatorOptions","nextInterpolator","currentInterpolator","ancestorScreenAnimationSources","descendantScreenAnimationSources","boundsAccessor","nextInterpolatorReady","interpolatorSharedValues","activeScreenKey","closing","activeClosing","entering","activeEntering","getBag","animationProgress","activeAnimationProgress","pendingLifecycleRequestKind","activePendingLifecycleRequestKind","pendingLifecycleStartBlockCount","activePendingLifecycleStartBlockCount","isGesturingDuringCloseAnimation","initialDestinationStylesReady","frozenCurrentStylesMap","shouldPrepareInitialDestinationStyles","get","isVisibilityBlocked","styleGate","shouldPrepareStyles","stylesReady","shouldMarkStylesReady","set","localStylesMaps","current","next","isDragging","gesture","dragging","isNextClosing","isInGestureMode","isPendingOpen","Open","activeOpening","isOpeningBlocked","opening","hasCloseFinished","currentOwnsInterpolator","nextReady","interpolatorOptionsOwner","currentResult","initialDestinationStyleGate","shouldWithholdStyles","options","handoff","currentStylesMap","nextStylesMap","nextFrozenCurrentStylesMap","length","nextResult"],"sourceRoot":"../../../../../../src","sources":["providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useMemo","useAnimatedReaction","useDerivedValue","useSharedValue","NO_STYLES","AnimationStore","LifecycleTransitionRequestKind","SystemStore","logger","useScreenAnimationStore","useBuildBoundsAccessor","useBuildTransitionAccessor","readScreenAnimationRevisions","syncSelectedInterpolatorOptions","useDescriptorsStore","syncScreenOptionsOverrides","useScreenOptionsStore","collectInterpolatorSharedValues","normalizeSlots","resolveInterpolatorStyleHandoff","selectInterpolatorFrame","stripInterpolatorOptions","hasCloseTransitionFinished","isOpenTransitionBlocked","resolveInitialDestinationStyleGate","NO_STYLE_LAYERS","normalizeRawStyleMap","rawStyleMap","stylesMap","runInterpolator","interpolator","props","selectedFrame","bounds","transition","undefined","raw","_","__DEV__","warn","useInterpolatedStylesMap","enabled","visibilityBlocked","currentScreenKey","s","derivations","nextScreenKey","destinationPairKey","screenOptions","screenInterpolatorProps","screenInterpolatorPropsRevision","selectedInterpolatorOptions","nextInterpolator","currentInterpolator","ancestorScreenAnimationSources","descendantScreenAnimationSources","boundsAccessor","nextInterpolatorReady","interpolatorSharedValues","activeScreenKey","closing","activeClosing","entering","activeEntering","getBag","animationProgress","activeAnimationProgress","pendingLifecycleRequestKind","activePendingLifecycleRequestKind","pendingLifecycleStartBlockCount","activePendingLifecycleStartBlockCount","isGesturingDuringCloseAnimation","initialDestinationStylesReady","shouldPrepareInitialDestinationStyles","get","isVisibilityBlocked","styleGate","shouldPrepareStyles","stylesReady","shouldMarkStylesReady","set","localStylesMaps","current","next","isDragging","gesture","dragging","isNextClosing","isInGestureMode","isPendingOpen","Open","activeOpening","isOpeningBlocked","opening","hasCloseFinished","currentOwnsInterpolator","nextReady","interpolatorOptionsOwner","currentSelectedFrame","currentResult","initialDestinationStyleGate","shouldWithholdStyles","options","handoff","currentStylesMap","nextStylesMap","length","nextSelectedFrame","nextResult"],"sourceRoot":"../../../../../../src","sources":["providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"mappings":"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","ignoreList":[]}