react-native-screen-transitions 3.10.0 → 3.11.1

package/lib/module/shared/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/shared/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":["shared/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":["shared/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/shared/components/boundary/portal/utils/naming.js

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

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

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

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

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

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

@@ -1 +1 @@
-{"version":3,"names":["useImperativeHandle","useLayoutEffect","useMemo","useRef","useAnimatedRef","useDescriptorsStore","useComposedSlotStyles","useSlotStackingStyles","createBoundTag","createProvider","logger","useBoundaryMeasurement","resolveBoundaryPortal","MULTIPLE_TARGETS_WARNING","TARGET_OUTSIDE_ROOT_WARNING","BoundaryRootProvider","useBoundaryRootContext","useBoundaryRootStore","guarded","children","config","enabled","escapeClipping","forwardedRef","group","handoff","hasTarget","id","style","targetCount","targetStyle","requestedBoundTag","String","portalRuntime","currentScreenKey","s","derivations","currentActivity","descriptors","current","activity","retainedBoundTagRef","shouldRetainClosingBoundTag","boundTag","hasConfiguredInterpolator","runtimeEnabled","shouldAttachAssociatedStyles","shouldEscapeBoundaryRootToScreenHost","associatedStyles","tag","associatedStackingStyles","rootRef","measurementRef","__DEV__","warnOnce","measuredRef","shouldRenderBoundaryRootThroughPortal","handoffEnabled","attachedStyle","undefined","value","ref","shouldRenderHandoffHost"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/providers/boundary-root.provider.tsx"],"mappings":";;AAAA,SAGCA,mBAAmB,EACnBC,eAAe,EACfC,OAAO,EACPC,MAAM,QACA,OAAO;AAGd,SAASC,cAAc,QAAQ,yBAAyB;AACxD,SAASC,mBAAmB,QAAQ,uCAAuC;AAC3E,SACCC,qBAAqB,EACrBC,qBAAqB,QACf,kCAAkC;AACzC,SAASC,cAAc,QAAQ,mDAAmD;AAElF,OAAOC,cAAc,MAAM,gCAAgC;AAC3D,SAASC,MAAM,QAAQ,uBAAuB;AAC9C,SAASC,sBAAsB,QAAQ,mCAAmC;AAC1E,SAECC,qBAAqB,QACf,gCAAgC;AASvC;AACA,MAAMC,wBAAwB,GAC7B,kIAAkI;AAEnI,OAAO,MAAMC,2BAA2B,GACvC,gHAAgH;AA4BjH,OAAO,MAAM;EACZC,oBAAoB;EACpBC,sBAAsB;EACtBC;AACD,CAAC,GAAGR,cAAc,CAAC,cAAc,EAAE;EAAES,OAAO,EAAE;AAAM,CAAC,CAAC,CAIrD,CAAC;EACAC,QAAQ;EACRC,MAAM;EACNC,OAAO,GAAG,IAAI;EACdC,cAAc;EACdC,YAAY;EACZC,KAAK;EACLC,OAAO;EACPC,SAAS;EACTC,EAAE;EACFC,KAAK;EACLC,WAAW;EACXC;AACD,CAAC,KAAK;EACL,MAAMC,iBAAiB,GAAG7B,OAAO,CAChC,MAAMM,cAAc,CAACwB,MAAM,CAACL,EAAE,CAAC,EAAEH,KAAK,CAAC,EACvC,CAACG,EAAE,EAAEH,KAAK,CACX,CAAC;EACD,MAAMS,aAAa,GAAGrB,qBAAqB,CAAC;IAC3Ca,OAAO;IACPH;EACD,CAAC,CAAC;EAEF,MAAMY,gBAAgB,GAAG7B,mBAAmB,CAC1C8B,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,gBACtB,CAAC;EACD,MAAMG,eAAe,GAAGhC,mBAAmB,CACzC8B,CAAC,IAAKA,CAAC,CAACG,WAAW,CAACC,OAAO,CAACC,QAC9B,CAAC;EACD,MAAMC,mBAAmB,GAAGtC,MAAM,CAAC4B,iBAAiB,CAAC;EACrD,MAAMW,2BAA2B,GAChCT,aAAa,CAACR,OAAO,IAAIY,eAAe,KAAK,SAAS;;EAEvD;EACA;EACA;EACA,IAAI,CAACK,2BAA2B,EAAE;IACjCD,mBAAmB,CAACF,OAAO,GAAGR,iBAAiB;EAChD;EAEA,MAAMY,QAAQ,GAAGF,mBAAmB,CAACF,OAAO;EAC5C,MAAMK,yBAAyB,GAAGvC,mBAAmB,CACnD8B,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACQ,yBACtB,CAAC;EACD,MAAMC,cAAc,GAAGxB,OAAO,IAAIuB,yBAAyB;EAC3D;EACA;EACA,MAAME,4BAA4B,GAAGzB,OAAO;EAC5C,MAAM0B,oCAAoC,GAAGd,aAAa,CAACX,cAAc;EAEzE,MAAM0B,gBAAgB,GAAG1C,qBAAqB,CAACqC,QAAQ,CAACM,GAAG,EAAErB,KAAK,CAAC;EACnE,MAAMsB,wBAAwB,GAAG3C,qBAAqB,CAACoC,QAAQ,CAACM,GAAG,CAAC;EACpE,MAAME,OAAO,GAAG/C,cAAc,CAAO,CAAC;EACtC,MAAMgD,cAAc,GAAGhD,cAAc,CAAO,CAAC;EAE7CH,eAAe,CAAC,MAAM;IACrB,IAAIoD,OAAO,IAAIxB,WAAW,GAAG,CAAC,EAAE;MAC/BnB,MAAM,CAAC4C,QAAQ,CAAC,2BAA2B,EAAEzC,wBAAwB,CAAC;IACvE;EACD,CAAC,EAAE,CAACgB,WAAW,CAAC,CAAC;EAEjB,MAAM0B,WAAW,GAChB7B,SAAS,IAAIqB,oCAAoC,GAC9CK,cAAc,GACdD,OAAO;EAEXnD,mBAAmB,CAACuB,YAAY,EAAE,MAAM4B,OAAO,CAACZ,OAAc,EAAE,CAACY,OAAO,CAAC,CAAC;EAE1ExC,sBAAsB,CAAC;IACtBgC,QAAQ;IACRtB,OAAO;IACPwB,cAAc;IACdX,gBAAgB;IAChBqB,WAAW;IACX3B,KAAK,EAAEF,SAAS,GAAGI,WAAW,GAAGF,KAAK;IACtCH,OAAO,EAAEQ,aAAa,CAACR,OAAO;IAC9BH,cAAc,EAAEW,aAAa,CAACX,cAAc;IAC5CF;EACD,CAAC,CAAC;EAEF,MAAMoC,qCAAqC,GAC1CT,oCAAoC,IAAI,CAACrB,SAAS;EACnD,MAAM+B,cAAc,GAAGpC,OAAO,IAAIY,aAAa,CAACR,OAAO;EACvD;EACA;EACA;EACA;EACA;EACA;EACA;EACA,MAAMiC,aAAa,GAAGZ,4BAA4B,GAC/CpB,SAAS,GACRwB,wBAAwB,GACxBM,qCAAqC,GACpCG,SAAS,GACTX,gBAAgB,GAClBW,SAAS;EAEZ,MAAMC,KAAK,GAAG1D,OAAO,CACpB,OAAO;IACNwD,aAAa;IACbf,QAAQ;IACRT,gBAAgB;IAChBuB,cAAc;IACdL,cAAc;IACdnB,aAAa;IACb4B,GAAG,EAAEV,OAAO;IACZK,qCAAqC;IACrCM,uBAAuB,EAAEL,cAAc,IAAI,CAAC/B;EAC7C,CAAC,CAAC,EACF,CACCgC,aAAa,EACbf,QAAQ,EACRT,gBAAgB,EAChBuB,cAAc,EACd/B,SAAS,EACT0B,cAAc,EACdnB,aAAa,EACbkB,OAAO,EACPK,qCAAqC,CAEvC,CAAC;EAED,OAAO;IACNI,KAAK;IACLzC,QAAQ,EAAEA,QAAQ,CAACyC,KAAK;EACzB,CAAC;AACF,CACD,CAAC","ignoreList":[]}
+{"version":3,"names":["useImperativeHandle","useLayoutEffect","useMemo","useRef","useAnimatedRef","useDescriptorsStore","useComposedSlotStyles","useSlotStackingStyles","useBlankStackStore","createBoundTag","createProvider","logger","useBoundaryMeasurement","resolveBoundaryPortal","MULTIPLE_TARGETS_WARNING","TARGET_OUTSIDE_ROOT_WARNING","BoundaryRootProvider","useBoundaryRootStore","guarded","children","config","enabled","escapeClipping","forwardedRef","group","handoff","hasTarget","id","style","targetCount","targetStyle","requestedBoundTag","String","portalRuntime","currentScreenKey","s","derivations","isCurrentScreenClosing","store","scenesByKey","activity","retainedBoundTagRef","shouldRetainClosingBoundTag","current","boundTag","hasConfiguredInterpolator","runtimeEnabled","shouldAttachAssociatedStyles","shouldEscapeBoundaryRootToScreenHost","associatedStyles","tag","associatedStackingStyles","rootRef","measurementRef","__DEV__","warnOnce","measuredRef","shouldRenderBoundaryRootThroughPortal","handoffEnabled","attachedStyle","undefined","value","ref","shouldRenderHandoffHost"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/providers/boundary-root.provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/boundary/utils/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/shared/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":["shared/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":["shared/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/shared/components/boundary/utils/measured-bounds.js

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1 +1 @@
-{"version":3,"names":["useState","runOnJS","useAnimatedReaction","useDescriptors","useScreenOptionsContext","useStackCoreContext","StackType","useBackdropPointerEvents","current","screenOptions","flags","runtimeBackdropBehavior","setRuntimeBackdropBehavior","undefined","get","backdropBehavior","next","previous","isComponentStack","STACK_TYPE","COMPONENT","options","pointerEvents","isBackdropActive"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/hooks/use-backdrop-pointer-events.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,OAAO;AAChC,SAASC,OAAO,EAAEC,mBAAmB,QAAQ,yBAAyB;AACtE,SAASC,cAAc,QAAQ,uCAAuC;AACtE,SAASC,uBAAuB,QAAQ,mCAAmC;AAC3E,SAASC,mBAAmB,QAAQ,wCAAwC;AAE5E,SAASC,SAAS,QAAQ,4BAA4B;AAQtD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,wBAAwBA,CAAA,EAAgC;EACvE,MAAM;IAAEC;EAAQ,CAAC,GAAGL,cAAc,CAAC,CAAC;EACpC,MAAMM,aAAa,GAAGL,uBAAuB,CAAC,CAAC;EAC/C,MAAM;IAAEM;EAAM,CAAC,GAAGL,mBAAmB,CAAC,CAAC;EACvC,MAAM,CAACM,uBAAuB,EAAEC,0BAA0B,CAAC,GAAGZ,QAAQ,CAEpEa,SAAS,CAAC;EAEZX,mBAAmB,CAClB,MAAMO,aAAa,CAACK,GAAG,CAAC,CAAC,CAACC,gBAAgB,EAC1C,CAACC,IAAI,EAAEC,QAAQ,KAAK;IACnB,SAAS;;IACT,IAAID,IAAI,KAAKC,QAAQ,EAAE;MACtBhB,OAAO,CAACW,0BAA0B,CAAC,CAACI,IAAI,CAAC;IAC1C;EACD,CAAC,EACD,CAACP,aAAa,CACf,CAAC;EAED,MAAMS,gBAAgB,GAAGR,KAAK,CAACS,UAAU,KAAKb,SAAS,CAACc,SAAS;EACjE,MAAML,gBAAkC,GACvCJ,uBAAuB,IACvBH,OAAO,CAACa,OAAO,CAACN,gBAAgB,KAC/BG,gBAAgB,GAAG,aAAa,GAAG,OAAO,CAAC;EAE7C,MAAMI,aAAa,GAClBP,gBAAgB,KAAK,aAAa,GAAG,UAAU,GAAGF,SAAS;EAE5D,MAAMU,gBAAgB,GACrBR,gBAAgB,KAAK,SAAS,IAAIA,gBAAgB,KAAK,UAAU;EAElE,OAAO;IAAEO,aAAa;IAAEP,gBAAgB;IAAEQ;EAAiB,CAAC;AAC7D","ignoreList":[]}
+{"version":3,"names":["useState","runOnJS","useAnimatedReaction","useDescriptorsStore","useScreenOptionsStore","useStackCoreStore","StackType","useBackdropPointerEvents","screenOptions","descriptorBackdropBehavior","store","options","backdropBehavior","stackType","flags","STACK_TYPE","runtimeBackdropBehavior","setRuntimeBackdropBehavior","undefined","get","next","previous","isComponentStack","COMPONENT","pointerEvents","isBackdropActive"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/hooks/use-backdrop-pointer-events.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,OAAO;AAChC,SAASC,OAAO,EAAEC,mBAAmB,QAAQ,yBAAyB;AACtE,SAASC,mBAAmB,QAAQ,uCAAuC;AAC3E,SAASC,qBAAqB,QAAQ,mCAAmC;AACzE,SAASC,iBAAiB,QAAQ,wCAAwC;AAE1E,SAASC,SAAS,QAAQ,4BAA4B;AAQtD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,wBAAwBA,CAAA,EAAgC;EACvE,MAAMC,aAAa,GAAGJ,qBAAqB,CAAC,CAAC;EAC7C,MAAMK,0BAA0B,GAAGN,mBAAmB,CACpDO,KAAK,IAAKA,KAAK,CAACC,OAAO,CAACC,gBAC1B,CAAC;EACD,MAAMC,SAAS,GAAGR,iBAAiB,CAAEK,KAAK,IAAKA,KAAK,CAACI,KAAK,CAACC,UAAU,CAAC;EACtE,MAAM,CAACC,uBAAuB,EAAEC,0BAA0B,CAAC,GAAGjB,QAAQ,CAEpEkB,SAAS,CAAC;EAEZhB,mBAAmB,CAClB,MAAMM,aAAa,CAACW,GAAG,CAAC,CAAC,CAACP,gBAAgB,EAC1C,CAACQ,IAAI,EAAEC,QAAQ,KAAK;IACnB,SAAS;;IACT,IAAID,IAAI,KAAKC,QAAQ,EAAE;MACtBpB,OAAO,CAACgB,0BAA0B,CAAC,CAACG,IAAI,CAAC;IAC1C;EACD,CAAC,EACD,CAACZ,aAAa,CACf,CAAC;EAED,MAAMc,gBAAgB,GAAGT,SAAS,KAAKP,SAAS,CAACiB,SAAS;EAC1D,MAAMX,gBAAkC,GACvCI,uBAAuB,IACvBP,0BAA0B,KACzBa,gBAAgB,GAAG,aAAa,GAAG,OAAO,CAAC;EAE7C,MAAME,aAAa,GAClBZ,gBAAgB,KAAK,aAAa,GAAG,UAAU,GAAGM,SAAS;EAE5D,MAAMO,gBAAgB,GACrBb,gBAAgB,KAAK,SAAS,IAAIA,gBAAgB,KAAK,UAAU;EAElE,OAAO;IAAEY,aAAa;IAAEZ,gBAAgB;IAAEa;EAAiB,CAAC;AAC7D","ignoreList":[]}

package/lib/module/shared/components/screen-container/hooks/use-content-layout.js

@@ -3,20 +3,16 @@
 import { useCallback } from "react";
 import { useWindowDimensions } from "react-native";
 import { runOnUI } from "react-native-reanimated";
-import { useDescriptorDerivations, useDescriptors } from "../../../providers/screen/descriptors";
+import { useDescriptorsStore } from "../../../providers/screen/descriptors";
 import { AnimationStore } from "../../../stores/animation.store";
 import { LifecycleTransitionRequestKind, SystemStore } from "../../../stores/system.store";
 export function useContentLayout() {
-  const {
-    current
-  } = useDescriptors();
-  const {
-    isFirstKey
-  } = useDescriptorDerivations();
+  const routeKey = useDescriptorsStore(store => store.derivations.currentScreenKey);
+  const isFirstKey = useDescriptorsStore(store => store.derivations.isFirstKey);
+  const experimental_animateOnInitialMount = useDescriptorsStore(store => store.options.experimental_animateOnInitialMount);
   const {
     height: screenHeight
   } = useWindowDimensions();
-  const routeKey = current.route.key;
   const animations = AnimationStore.getBag(routeKey);
   const system = SystemStore.getBag(routeKey);
   const {
@@ -27,7 +23,6 @@ export function useContentLayout() {
   const {
     requestLifecycleTransition
   } = system.actions;
-  const experimental_animateOnInitialMount = current.options.experimental_animateOnInitialMount;
   return useCallback(event => {
     const {
       width,

package/lib/module/shared/components/screen-container/hooks/use-content-layout.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useWindowDimensions","runOnUI","useDescriptorDerivations","useDescriptors","AnimationStore","LifecycleTransitionRequestKind","SystemStore","useContentLayout","current","isFirstKey","height","screenHeight","routeKey","route","key","animations","getBag","system","targetProgress","resolvedAutoSnapPoint","measuredContentLayout","requestLifecycleTransition","actions","experimental_animateOnInitialMount","options","event","width","nativeEvent","layout","fraction","Math","min","nextWidth","nextHeight","nextFraction","set","isFirstMeasurement","get","transitionProgress","progressAnimating","Open"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/hooks/use-content-layout.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAAiCC,mBAAmB,QAAQ,cAAc;AAC1E,SAASC,OAAO,QAAQ,yBAAyB;AACjD,SACCC,wBAAwB,EACxBC,cAAc,QACR,uCAAuC;AAC9C,SAASC,cAAc,QAAQ,iCAAiC;AAChE,SACCC,8BAA8B,EAC9BC,WAAW,QACL,8BAA8B;AAErC,OAAO,SAASC,gBAAgBA,CAAA,EAAG;EAClC,MAAM;IAAEC;EAAQ,CAAC,GAAGL,cAAc,CAAC,CAAC;EACpC,MAAM;IAAEM;EAAW,CAAC,GAAGP,wBAAwB,CAAC,CAAC;EACjD,MAAM;IAAEQ,MAAM,EAAEC;EAAa,CAAC,GAAGX,mBAAmB,CAAC,CAAC;EACtD,MAAMY,QAAQ,GAAGJ,OAAO,CAACK,KAAK,CAACC,GAAG;EAClC,MAAMC,UAAU,GAAGX,cAAc,CAACY,MAAM,CAACJ,QAAQ,CAAC;EAClD,MAAMK,MAAM,GAAGX,WAAW,CAACU,MAAM,CAACJ,QAAQ,CAAC;EAE3C,MAAM;IAAEM,cAAc;IAAEC,qBAAqB;IAAEC;EAAsB,CAAC,GACrEH,MAAM;EACP,MAAM;IAAEI;EAA2B,CAAC,GAAGJ,MAAM,CAACK,OAAO;EAErD,MAAMC,kCAAkC,GACvCf,OAAO,CAACgB,OAAO,CAACD,kCAAkC;EAEnD,OAAOxB,WAAW,CAChB0B,KAAwB,IAAK;IAC7B,MAAM;MAAEC,KAAK;MAAEhB;IAAO,CAAC,GAAGe,KAAK,CAACE,WAAW,CAACC,MAAM;IAClD,IAAIF,KAAK,IAAI,CAAC,IAAIhB,MAAM,IAAI,CAAC,EAAE;IAE/B,MAAMmB,QAAQ,GAAGC,IAAI,CAACC,GAAG,CAACrB,MAAM,GAAGC,YAAY,EAAE,CAAC,CAAC;IAEnDV,OAAO,CAAC,CAAC+B,SAAiB,EAAEC,UAAkB,EAAEC,YAAoB,KAAK;MACxE,SAAS;;MACTd,qBAAqB,CAACe,GAAG,CAAC;QACzBT,KAAK,EAAEM,SAAS;QAChBtB,MAAM,EAAEuB;MACT,CAAC,CAAC;MAEF,MAAMG,kBAAkB,GAAGjB,qBAAqB,CAACkB,GAAG,CAAC,CAAC,IAAI,CAAC;MAC3DlB,qBAAqB,CAACgB,GAAG,CAACD,YAAY,CAAC;MAEvC,IACC,CAACE,kBAAkB,IACnBrB,UAAU,CAACuB,kBAAkB,CAACD,GAAG,CAAC,CAAC,KAAK,CAAC,IACzCtB,UAAU,CAACwB,iBAAiB,CAACF,GAAG,CAAC,CAAC,KAAK,CAAC,EACvC;QACD;MACD;MAEA,IAAI5B,UAAU,IAAI,CAACc,kCAAkC,EAAE;QACtDL,cAAc,CAACiB,GAAG,CAACD,YAAY,CAAC;QAChCnB,UAAU,CAACuB,kBAAkB,CAACH,GAAG,CAACD,YAAY,CAAC;QAC/C;MACD;MAEAb,0BAA0B,CACzBhB,8BAA8B,CAACmC,IAAI,EACnCN,YACD,CAAC;IACF,CAAC,CAAC,CAACR,KAAK,EAAEhB,MAAM,EAAEmB,QAAQ,CAAC;EAC5B,CAAC,EACD,CACCd,UAAU,EACVG,cAAc,EACdC,qBAAqB,EACrBC,qBAAqB,EACrBX,UAAU,EACVE,YAAY,EACZY,kCAAkC,EAClCF,0BAA0B,CAE5B,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["useCallback","useWindowDimensions","runOnUI","useDescriptorsStore","AnimationStore","LifecycleTransitionRequestKind","SystemStore","useContentLayout","routeKey","store","derivations","currentScreenKey","isFirstKey","experimental_animateOnInitialMount","options","height","screenHeight","animations","getBag","system","targetProgress","resolvedAutoSnapPoint","measuredContentLayout","requestLifecycleTransition","actions","event","width","nativeEvent","layout","fraction","Math","min","nextWidth","nextHeight","nextFraction","set","isFirstMeasurement","get","transitionProgress","progressAnimating","Open"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/hooks/use-content-layout.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAAiCC,mBAAmB,QAAQ,cAAc;AAC1E,SAASC,OAAO,QAAQ,yBAAyB;AACjD,SAASC,mBAAmB,QAAQ,uCAAuC;AAC3E,SAASC,cAAc,QAAQ,iCAAiC;AAChE,SACCC,8BAA8B,EAC9BC,WAAW,QACL,8BAA8B;AAErC,OAAO,SAASC,gBAAgBA,CAAA,EAAG;EAClC,MAAMC,QAAQ,GAAGL,mBAAmB,CAClCM,KAAK,IAAKA,KAAK,CAACC,WAAW,CAACC,gBAC9B,CAAC;EACD,MAAMC,UAAU,GAAGT,mBAAmB,CACpCM,KAAK,IAAKA,KAAK,CAACC,WAAW,CAACE,UAC9B,CAAC;EACD,MAAMC,kCAAkC,GAAGV,mBAAmB,CAC5DM,KAAK,IAAKA,KAAK,CAACK,OAAO,CAACD,kCAC1B,CAAC;EACD,MAAM;IAAEE,MAAM,EAAEC;EAAa,CAAC,GAAGf,mBAAmB,CAAC,CAAC;EACtD,MAAMgB,UAAU,GAAGb,cAAc,CAACc,MAAM,CAACV,QAAQ,CAAC;EAClD,MAAMW,MAAM,GAAGb,WAAW,CAACY,MAAM,CAACV,QAAQ,CAAC;EAE3C,MAAM;IAAEY,cAAc;IAAEC,qBAAqB;IAAEC;EAAsB,CAAC,GACrEH,MAAM;EACP,MAAM;IAAEI;EAA2B,CAAC,GAAGJ,MAAM,CAACK,OAAO;EAErD,OAAOxB,WAAW,CAChByB,KAAwB,IAAK;IAC7B,MAAM;MAAEC,KAAK;MAAEX;IAAO,CAAC,GAAGU,KAAK,CAACE,WAAW,CAACC,MAAM;IAClD,IAAIF,KAAK,IAAI,CAAC,IAAIX,MAAM,IAAI,CAAC,EAAE;IAE/B,MAAMc,QAAQ,GAAGC,IAAI,CAACC,GAAG,CAAChB,MAAM,GAAGC,YAAY,EAAE,CAAC,CAAC;IAEnDd,OAAO,CAAC,CAAC8B,SAAiB,EAAEC,UAAkB,EAAEC,YAAoB,KAAK;MACxE,SAAS;;MACTZ,qBAAqB,CAACa,GAAG,CAAC;QACzBT,KAAK,EAAEM,SAAS;QAChBjB,MAAM,EAAEkB;MACT,CAAC,CAAC;MAEF,MAAMG,kBAAkB,GAAGf,qBAAqB,CAACgB,GAAG,CAAC,CAAC,IAAI,CAAC;MAC3DhB,qBAAqB,CAACc,GAAG,CAACD,YAAY,CAAC;MAEvC,IACC,CAACE,kBAAkB,IACnBnB,UAAU,CAACqB,kBAAkB,CAACD,GAAG,CAAC,CAAC,KAAK,CAAC,IACzCpB,UAAU,CAACsB,iBAAiB,CAACF,GAAG,CAAC,CAAC,KAAK,CAAC,EACvC;QACD;MACD;MAEA,IAAIzB,UAAU,IAAI,CAACC,kCAAkC,EAAE;QACtDO,cAAc,CAACe,GAAG,CAACD,YAAY,CAAC;QAChCjB,UAAU,CAACqB,kBAAkB,CAACH,GAAG,CAACD,YAAY,CAAC;QAC/C;MACD;MAEAX,0BAA0B,CACzBlB,8BAA8B,CAACmC,IAAI,EACnCN,YACD,CAAC;IACF,CAAC,CAAC,CAACR,KAAK,EAAEX,MAAM,EAAEc,QAAQ,CAAC;EAC5B,CAAC,EACD,CACCZ,UAAU,EACVG,cAAc,EACdC,qBAAqB,EACrBC,qBAAqB,EACrBV,UAAU,EACVI,YAAY,EACZH,kCAAkC,EAClCU,0BAA0B,CAE5B,CAAC;AACF","ignoreList":[]}

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

@@ -5,7 +5,7 @@ import { Pressable, StyleSheet } from "react-native";
 import Animated, { runOnUI } from "react-native-reanimated";
 import { DefaultSnapSpec } from "../../../configs/specs";
 import { useNavigationHelpers } from "../../../hooks/navigation/use-navigation-helpers";
-import { useDescriptors } from "../../../providers/screen/descriptors";
+import { useDescriptorsStore } from "../../../providers/screen/descriptors";
 import { useSlotProps, useSlotStyles } from "../../../providers/screen/styles";
 import { AnimationStore } from "../../../stores/animation.store";
 import { GestureStore } from "../../../stores/gesture.store";
@@ -18,14 +18,14 @@ export const BackdropLayer = /*#__PURE__*/memo(function BackdropLayer({
   backdropBehavior,
   isBackdropActive
 }) {
-  const {
-    current
-  } = useDescriptors();
   const {
     dismissScreen
   } = useNavigationHelpers();
-  const BackdropComponent = current.options.backdropComponent;
-  const routeKey = current.route.key;
+  const routeKey = useDescriptorsStore(store => store.derivations.currentScreenKey);
+  const BackdropComponent = useDescriptorsStore(store => store.options.backdropComponent);
+  const rawSnapPoints = useDescriptorsStore(store => store.options.snapPoints);
+  const canDismiss = useDescriptorsStore(store => store.options.gestureEnabled !== false);
+  const transitionSpec = useDescriptorsStore(store => store.options.transitionSpec);
   const animations = AnimationStore.getBag(routeKey);
   const {
     targetProgress,
@@ -39,16 +39,12 @@ export const BackdropLayer = /*#__PURE__*/memo(function BackdropLayer({
       return;
     }
     if (backdropBehavior === "collapse") {
-      const rawSnapPoints = current.options.snapPoints;
-      const canDismiss = current.options.gestureEnabled !== false;
-
       // No snap points → fallback to dismiss
       if (!rawSnapPoints || rawSnapPoints.length === 0) {
         dismissScreen();
         return;
       }
       const gestures = GestureStore.getBag(routeKey);
-      const transitionSpec = current.options.transitionSpec;
       runOnUI(() => {
         "worklet";
 
@@ -74,6 +70,7 @@ export const BackdropLayer = /*#__PURE__*/memo(function BackdropLayer({
         };
         animateToProgress({
           target,
+          markEntering: false,
           spec,
           animations,
           targetProgress,
@@ -82,7 +79,7 @@ export const BackdropLayer = /*#__PURE__*/memo(function BackdropLayer({
         });
       })();
     }
-  }, [animations, targetProgress, animationProgress, resolvedAutoSnapPoint, backdropBehavior, current, dismissScreen, routeKey]);
+  }, [animations, targetProgress, animationProgress, resolvedAutoSnapPoint, backdropBehavior, rawSnapPoints, canDismiss, transitionSpec, dismissScreen, routeKey]);
   const animatedBackdropStyle = useSlotStyles("backdrop");
   const animatedBackdropProps = useSlotProps("backdrop");
   const backdropPointerEvents = isBackdropActive ? "auto" : "none";