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

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

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

package/lib/commonjs/components/boundary/utils/measured-bounds.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.normalizeMeasuredBoundsWithVisibilityGate = exports.normalizeMeasuredBoundsToOrigin = exports.measureWithOverscrollAwareness = exports.isMeasurementInViewport = exports.attachScrollSnapshotToMeasuredBounds = exports.adjustedMeasuredBoundsForOverscrollDeltas = void 0;
+exports.measureWithOverscrollAwareness = exports.isMeasurementInViewport = exports.correctMeasuredBoundsForVisibilityGate = exports.attachScrollSnapshotToMeasuredBounds = exports.adjustedMeasuredBoundsForOverscrollDeltas = void 0;
 var _reactNativeReanimated = require("react-native-reanimated");
 var _scroll = require("../../../stores/scroll.store");
 const SCROLL_MEASUREMENT_EPSILON = 1;
@@ -37,16 +37,6 @@ const adjustedMeasuredBoundsForOverscrollDeltas = (measured, scrollState) => {
   };
 };
 exports.adjustedMeasuredBoundsForOverscrollDeltas = adjustedMeasuredBoundsForOverscrollDeltas;
-const normalizeMeasuredBoundsToOrigin = (measured, origin) => {
-  "worklet";
-
-  return {
-    ...measured,
-    pageX: measured.pageX - origin.pageX,
-    pageY: measured.pageY - origin.pageY
-  };
-};
-exports.normalizeMeasuredBoundsToOrigin = normalizeMeasuredBoundsToOrigin;
 const isMeasurementInViewport = (measured, viewportWidth, viewportHeight) => {
   "worklet";
 
@@ -60,9 +50,8 @@ const isMeasurementInViewport = (measured, viewportWidth, viewportHeight) => {
   return centerX >= -toleranceX && centerX <= viewportWidth + toleranceX && centerY >= -toleranceY && centerY <= viewportHeight + toleranceY;
 };
 exports.isMeasurementInViewport = isMeasurementInViewport;
-const normalizeMeasuredBoundsWithVisibilityGate = ({
+const correctMeasuredBoundsForVisibilityGate = ({
   measured,
-  origin,
   visibilityBlocked,
   visibilityBlockOffset,
   viewportWidth,
@@ -70,31 +59,30 @@ 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;
 };
-exports.normalizeMeasuredBoundsWithVisibilityGate = normalizeMeasuredBoundsWithVisibilityGate;
+exports.correctMeasuredBoundsForVisibilityGate = correctMeasuredBoundsForVisibilityGate;
 const measureWithOverscrollAwareness = (ref, scrollState) => {
   "worklet";
 

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_scroll","SCROLL_MEASUREMENT_EPSILON","getOverscrollDelta","axisState","clampedOffset","clampScrollAxisOffset","delta","offset","Math","abs","adjustedMeasuredBoundsForOverscrollDeltas","measured","scrollState","deltaX","horizontal","deltaY","vertical","x","y","pageX","pageY","exports","normalizeMeasuredBoundsToOrigin","origin","isMeasurementInViewport","viewportWidth","viewportHeight","width","height","toleranceX","toleranceY","centerX","centerY","normalizeMeasuredBoundsWithVisibilityGate","visibilityBlocked","visibilityBlockOffset","normalized","measuredAhead","originAhead","measureWithOverscrollAwareness","ref","measure","attachScrollSnapshotToMeasuredBounds","scroll","cloneScrollMetadataState"],"sourceRoot":"../../../../../src","sources":["components/boundary/utils/measured-bounds.ts"],"mappings":";;;;;;AACA,IAAAA,sBAAA,GAAAC,OAAA;AAKA,IAAAC,OAAA,GAAAD,OAAA;AAUA,MAAME,0BAA0B,GAAG,CAAC;AAMpC,MAAMC,kBAAkB,GACvBC,SAAoD,IACxC;EACZ,SAAS;;EACT,MAAMC,aAAa,GAAG,IAAAC,6BAAqB,EAACF,SAAS,CAAC;EACtD,IAAI,CAACA,SAAS,IAAIC,aAAa,KAAK,IAAI,EAAE;IACzC,OAAO,CAAC;EACT;EAEA,MAAME,KAAK,GAAGH,SAAS,CAACI,MAAM,GAAGH,aAAa;EAE9C,OAAOI,IAAI,CAACC,GAAG,CAACH,KAAK,CAAC,GAAGL,0BAA0B,GAAGK,KAAK,GAAG,CAAC;AAChE,CAAC;AAEM,MAAMI,yCAAyC,GAAGA,CACxDC,QAA4B,EAC5BC,WAA4D,KACpC;EACxB,SAAS;;EAET,IAAI,CAACA,WAAW,EAAE;IACjB,OAAOD,QAAQ;EAChB;EAEA,MAAME,MAAM,GAAGX,kBAAkB,CAACU,WAAW,CAACE,UAAU,CAAC;EACzD,MAAMC,MAAM,GAAGb,kBAAkB,CAACU,WAAW,CAACI,QAAQ,CAAC;EAEvD,IAAIH,MAAM,KAAK,CAAC,IAAIE,MAAM,KAAK,CAAC,EAAE;IACjC,OAAOJ,QAAQ;EAChB;EAEA,OAAO;IACN,GAAGA,QAAQ;IACXM,CAAC,EAAEN,QAAQ,CAACM,CAAC,GAAGJ,MAAM;IACtBK,CAAC,EAAEP,QAAQ,CAACO,CAAC,GAAGH,MAAM;IACtBI,KAAK,EAAER,QAAQ,CAACQ,KAAK,GAAGN,MAAM;IAC9BO,KAAK,EAAET,QAAQ,CAACS,KAAK,GAAGL;EACzB,CAAC;AACF,CAAC;AAACM,OAAA,CAAAX,yCAAA,GAAAA,yCAAA;AAEK,MAAMY,+BAA+B,GAAGA,CAC9CX,QAA4B,EAC5BY,MAA0B,KACF;EACxB,SAAS;;EACT,OAAO;IACN,GAAGZ,QAAQ;IACXQ,KAAK,EAAER,QAAQ,CAACQ,KAAK,GAAGI,MAAM,CAACJ,KAAK;IACpCC,KAAK,EAAET,QAAQ,CAACS,KAAK,GAAGG,MAAM,CAACH;EAChC,CAAC;AACF,CAAC;AAACC,OAAA,CAAAC,+BAAA,GAAAA,+BAAA;AAEK,MAAME,uBAAuB,GAAGA,CACtCb,QAA4B,EAC5Bc,aAAqB,EACrBC,cAAsB,KACT;EACb,SAAS;;EAET,IAAIf,QAAQ,CAACgB,KAAK,IAAI,CAAC,IAAIhB,QAAQ,CAACiB,MAAM,IAAI,CAAC,EAAE;IAChD,OAAO,KAAK;EACb;EAEA,MAAMC,UAAU,GAAGJ,aAAa,GAAG,IAAI;EACvC,MAAMK,UAAU,GAAGJ,cAAc,GAAG,IAAI;EACxC,MAAMK,OAAO,GAAGpB,QAAQ,CAACQ,KAAK,GAAGR,QAAQ,CAACgB,KAAK,GAAG,CAAC;EACnD,MAAMK,OAAO,GAAGrB,QAAQ,CAACS,KAAK,GAAGT,QAAQ,CAACiB,MAAM,GAAG,CAAC;EAEpD,OACCG,OAAO,IAAI,CAACF,UAAU,IACtBE,OAAO,IAAIN,aAAa,GAAGI,UAAU,IACrCG,OAAO,IAAI,CAACF,UAAU,IACtBE,OAAO,IAAIN,cAAc,GAAGI,UAAU;AAExC,CAAC;AAACT,OAAA,CAAAG,uBAAA,GAAAA,uBAAA;AAEK,MAAMS,yCAAyC,GAAGA,CAAC;EACzDtB,QAAQ;EACRY,MAAM;EACNW,iBAAiB;EACjBC,qBAAqB;EACrBV,aAAa;EACbC;AAQD,CAAC,KAAyB;EACzB,SAAS;;EACT,MAAMU,UAAU,GAAGd,+BAA+B,CAACX,QAAQ,EAAEY,MAAM,CAAC;EAEpE,IACC,CAACW,iBAAiB,IAClBC,qBAAqB,IAAI,CAAC,IAC1BX,uBAAuB,CAACY,UAAU,EAAEX,aAAa,EAAEC,cAAc,CAAC,EACjE;IACD,OAAOU,UAAU;EAClB;;EAEA;EACA;EACA;EACA,MAAMC,aAAa,GAAG;IACrB,GAAGD,UAAU;IACbhB,KAAK,EAAEgB,UAAU,CAAChB,KAAK,GAAGe;EAC3B,CAAC;EACD,IAAIX,uBAAuB,CAACa,aAAa,EAAEZ,aAAa,EAAEC,cAAc,CAAC,EAAE;IAC1E,OAAOW,aAAa;EACrB;EAEA,MAAMC,WAAW,GAAG;IACnB,GAAGF,UAAU;IACbhB,KAAK,EAAEgB,UAAU,CAAChB,KAAK,GAAGe;EAC3B,CAAC;EACD,IAAIX,uBAAuB,CAACc,WAAW,EAAEb,aAAa,EAAEC,cAAc,CAAC,EAAE;IACxE,OAAOY,WAAW;EACnB;EAEA,OAAOF,UAAU;AAClB,CAAC;AAACf,OAAA,CAAAY,yCAAA,GAAAA,yCAAA;AAEK,MAAMM,8BAA8B,GAAGA,CAC7CC,GAAsB,EACtB5B,WAAsC,KACP;EAC/B,SAAS;;EACT,MAAMD,QAAQ,GAAG,IAAA8B,8BAAO,EAACD,GAAG,CAAC;EAC7B,IAAI,CAAC7B,QAAQ,EAAE,OAAO,IAAI;EAE1B,OAAOD,yCAAyC,CAACC,QAAQ,EAAEC,WAAW,CAAC;AACxE,CAAC;AAACS,OAAA,CAAAkB,8BAAA,GAAAA,8BAAA;AAEK,MAAMG,oCAAoC,GAAGA,CACnD/B,QAA4B,EAC5BgC,MAA8C,KAChB;EAC9B,SAAS;;EAET,OAAO;IACN,GAAGhC,QAAQ;IACXgC,MAAM,EAAE,IAAAC,gCAAwB,EAACD,MAAM;EACxC,CAAC;AACF,CAAC;AAACtB,OAAA,CAAAqB,oCAAA,GAAAA,oCAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_scroll","SCROLL_MEASUREMENT_EPSILON","getOverscrollDelta","axisState","clampedOffset","clampScrollAxisOffset","delta","offset","Math","abs","adjustedMeasuredBoundsForOverscrollDeltas","measured","scrollState","deltaX","horizontal","deltaY","vertical","x","y","pageX","pageY","exports","isMeasurementInViewport","viewportWidth","viewportHeight","width","height","toleranceX","toleranceY","centerX","centerY","correctMeasuredBoundsForVisibilityGate","visibilityBlocked","visibilityBlockOffset","visibilityOffsetApplied","inverseVisibilityOffsetApplied","measureWithOverscrollAwareness","ref","measure","attachScrollSnapshotToMeasuredBounds","scroll","cloneScrollMetadataState"],"sourceRoot":"../../../../../src","sources":["components/boundary/utils/measured-bounds.ts"],"mappings":";;;;;;AACA,IAAAA,sBAAA,GAAAC,OAAA;AAKA,IAAAC,OAAA,GAAAD,OAAA;AAUA,MAAME,0BAA0B,GAAG,CAAC;AAMpC,MAAMC,kBAAkB,GACvBC,SAAoD,IACxC;EACZ,SAAS;;EACT,MAAMC,aAAa,GAAG,IAAAC,6BAAqB,EAACF,SAAS,CAAC;EACtD,IAAI,CAACA,SAAS,IAAIC,aAAa,KAAK,IAAI,EAAE;IACzC,OAAO,CAAC;EACT;EAEA,MAAME,KAAK,GAAGH,SAAS,CAACI,MAAM,GAAGH,aAAa;EAE9C,OAAOI,IAAI,CAACC,GAAG,CAACH,KAAK,CAAC,GAAGL,0BAA0B,GAAGK,KAAK,GAAG,CAAC;AAChE,CAAC;AAEM,MAAMI,yCAAyC,GAAGA,CACxDC,QAA4B,EAC5BC,WAA4D,KACpC;EACxB,SAAS;;EAET,IAAI,CAACA,WAAW,EAAE;IACjB,OAAOD,QAAQ;EAChB;EAEA,MAAME,MAAM,GAAGX,kBAAkB,CAACU,WAAW,CAACE,UAAU,CAAC;EACzD,MAAMC,MAAM,GAAGb,kBAAkB,CAACU,WAAW,CAACI,QAAQ,CAAC;EAEvD,IAAIH,MAAM,KAAK,CAAC,IAAIE,MAAM,KAAK,CAAC,EAAE;IACjC,OAAOJ,QAAQ;EAChB;EAEA,OAAO;IACN,GAAGA,QAAQ;IACXM,CAAC,EAAEN,QAAQ,CAACM,CAAC,GAAGJ,MAAM;IACtBK,CAAC,EAAEP,QAAQ,CAACO,CAAC,GAAGH,MAAM;IACtBI,KAAK,EAAER,QAAQ,CAACQ,KAAK,GAAGN,MAAM;IAC9BO,KAAK,EAAET,QAAQ,CAACS,KAAK,GAAGL;EACzB,CAAC;AACF,CAAC;AAACM,OAAA,CAAAX,yCAAA,GAAAA,yCAAA;AAEK,MAAMY,uBAAuB,GAAGA,CACtCX,QAA4B,EAC5BY,aAAqB,EACrBC,cAAsB,KACT;EACb,SAAS;;EAET,IAAIb,QAAQ,CAACc,KAAK,IAAI,CAAC,IAAId,QAAQ,CAACe,MAAM,IAAI,CAAC,EAAE;IAChD,OAAO,KAAK;EACb;EAEA,MAAMC,UAAU,GAAGJ,aAAa,GAAG,IAAI;EACvC,MAAMK,UAAU,GAAGJ,cAAc,GAAG,IAAI;EACxC,MAAMK,OAAO,GAAGlB,QAAQ,CAACQ,KAAK,GAAGR,QAAQ,CAACc,KAAK,GAAG,CAAC;EACnD,MAAMK,OAAO,GAAGnB,QAAQ,CAACS,KAAK,GAAGT,QAAQ,CAACe,MAAM,GAAG,CAAC;EAEpD,OACCG,OAAO,IAAI,CAACF,UAAU,IACtBE,OAAO,IAAIN,aAAa,GAAGI,UAAU,IACrCG,OAAO,IAAI,CAACF,UAAU,IACtBE,OAAO,IAAIN,cAAc,GAAGI,UAAU;AAExC,CAAC;AAACP,OAAA,CAAAC,uBAAA,GAAAA,uBAAA;AAEK,MAAMS,sCAAsC,GAAGA,CAAC;EACtDpB,QAAQ;EACRqB,iBAAiB;EACjBC,qBAAqB;EACrBV,aAAa;EACbC;AAOD,CAAC,KAAyB;EACzB,SAAS;;EAET,IACC,CAACQ,iBAAiB,IAClBC,qBAAqB,IAAI,CAAC,IAC1BX,uBAAuB,CAACX,QAAQ,EAAEY,aAAa,EAAEC,cAAc,CAAC,EAC/D;IACD,OAAOb,QAAQ;EAChB;;EAEA;EACA;EACA;EACA,MAAMuB,uBAAuB,GAAG;IAC/B,GAAGvB,QAAQ;IACXS,KAAK,EAAET,QAAQ,CAACS,KAAK,GAAGa;EACzB,CAAC;EACD,IACCX,uBAAuB,CACtBY,uBAAuB,EACvBX,aAAa,EACbC,cACD,CAAC,EACA;IACD,OAAOU,uBAAuB;EAC/B;EAEA,MAAMC,8BAA8B,GAAG;IACtC,GAAGxB,QAAQ;IACXS,KAAK,EAAET,QAAQ,CAACS,KAAK,GAAGa;EACzB,CAAC;EACD,IACCX,uBAAuB,CACtBa,8BAA8B,EAC9BZ,aAAa,EACbC,cACD,CAAC,EACA;IACD,OAAOW,8BAA8B;EACtC;EAEA,OAAOxB,QAAQ;AAChB,CAAC;AAACU,OAAA,CAAAU,sCAAA,GAAAA,sCAAA;AAEK,MAAMK,8BAA8B,GAAGA,CAC7CC,GAAsB,EACtBzB,WAAsC,KACP;EAC/B,SAAS;;EACT,MAAMD,QAAQ,GAAG,IAAA2B,8BAAO,EAACD,GAAG,CAAC;EAC7B,IAAI,CAAC1B,QAAQ,EAAE,OAAO,IAAI;EAE1B,OAAOD,yCAAyC,CAACC,QAAQ,EAAEC,WAAW,CAAC;AACxE,CAAC;AAACS,OAAA,CAAAe,8BAAA,GAAAA,8BAAA;AAEK,MAAMG,oCAAoC,GAAGA,CACnD5B,QAA4B,EAC5B6B,MAA8C,KAChB;EAC9B,SAAS;;EAET,OAAO;IACN,GAAG7B,QAAQ;IACX6B,MAAM,EAAE,IAAAC,gCAAwB,EAACD,MAAM;EACxC,CAAC;AACF,CAAC;AAACnB,OAAA,CAAAkB,oCAAA,GAAAA,oCAAA","ignoreList":[]}

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

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

package/lib/commonjs/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","exports"],"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;AAEM,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;AAACG,OAAA,CAAAxB,wBAAA,GAAAA,wBAAA","ignoreList":[]}
+{"version":3,"names":["SOURCE_SIGNAL_PREFIX","DESTINATION_SIGNAL_PREFIX","buildRefreshSignal","type","pairKey","key","prefix","signal","getRefreshBoundarySignal","params","enabled","currentScreenKey","sourcePairKey","destinationPairKey","ancestorDestinationPairKey","nextScreenKey","linkId","group","shouldRefresh","closing","linkState","sourcePair","participates","links","sourceRequests","join","refreshDestinationPairKey","undefined","activeId","groups","exports"],"sourceRoot":"../../../../../src","sources":["components/boundary/utils/refresh-signals.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/components/create-transition-aware-component.js

@@ -7,8 +7,6 @@ exports.createTransitionAwareComponent = createTransitionAwareComponent;
 var _react = require("react");
 var _reactNativeGestureHandler = require("react-native-gesture-handler");
 var _reactNativeReanimated = _interopRequireWildcard(require("react-native-reanimated"));
-var _reactNativeWorklets = require("react-native-worklets");
-var _registerBounds = require("../providers/register-bounds.provider");
 var _scrollCoordination = require("../providers/screen/gestures/scroll-coordination");
 var _styles = require("../providers/screen/styles");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -23,7 +21,6 @@ function createTransitionAwareComponent(Wrapped, options = {}) {
   const AnimatedComponent = alreadyAnimated ? Wrapped : _reactNativeReanimated.default.createAnimatedComponent(Wrapped);
   const ScrollableInner = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
     const {
-      remeasureOnFocus: _remeasureOnFocus,
       onScroll: userOnScroll,
       onMomentumScrollEnd: userOnMomentumScrollEnd,
       onScrollEndDrag: userOnScrollEndDrag,
@@ -76,40 +73,22 @@ function createTransitionAwareComponent(Wrapped, options = {}) {
       children: coordinatedScrollableComponent
     });
   });
-  const Inner = /*#__PURE__*/(0, _react.forwardRef)((props, _) => {
+  const Inner = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
     const {
       children,
       style,
-      sharedBoundTag,
       styleId,
-      onPress,
-      remeasureOnFocus,
       animatedProps: userAnimatedProps,
       ...rest
     } = props;
-    const animatedRef = (0, _reactNativeReanimated.useAnimatedRef)();
-    const associatedId = sharedBoundTag || styleId;
-    const associatedStyles = (0, _styles.useSlotStyles)(associatedId);
-    const associatedProps = (0, _styles.useSlotProps)(associatedId);
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_registerBounds.RegisterBoundsProvider, {
-      animatedRef: animatedRef,
-      style: style,
-      onPress: onPress,
-      sharedBoundTag: sharedBoundTag,
-      remeasureOnFocus: remeasureOnFocus,
-      children: ({
-        captureActiveOnPress,
-        handleInitialLayout
-      }) => /*#__PURE__*/(0, _jsxRuntime.jsx)(AnimatedComponent, {
-        ...rest,
-        ref: animatedRef,
-        style: [style, associatedStyles],
-        animatedProps: userAnimatedProps ?? associatedProps,
-        onPress: captureActiveOnPress,
-        onLayout: () => (0, _reactNativeWorklets.scheduleOnUI)(handleInitialLayout),
-        collapsable: !sharedBoundTag,
-        children: children
-      })
+    const associatedStyles = (0, _styles.useSlotStyles)(styleId);
+    const associatedProps = (0, _styles.useSlotProps)(styleId);
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(AnimatedComponent, {
+      ...rest,
+      ref: ref,
+      style: [style, associatedStyles],
+      animatedProps: userAnimatedProps ?? associatedProps,
+      children: children
     });
   });
   if (isScrollable) {

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeGestureHandler","_reactNativeReanimated","_interopRequireWildcard","_reactNativeWorklets","_registerBounds","_scrollCoordination","_styles","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","createTransitionAwareComponent","Wrapped","options","isScrollable","alreadyAnimated","AnimatedComponent","Animated","createAnimatedComponent","ScrollableInner","forwardRef","props","ref","remeasureOnFocus","_remeasureOnFocus","onScroll","userOnScroll","onMomentumScrollEnd","userOnMomentumScrollEnd","onScrollEndDrag","userOnScrollEndDrag","children","contentContainerStyle","scrollableProps","scrollDirection","horizontal","scrollHandler","scrollEventsEnabled","onContentSizeChange","onLayout","nativeGesture","metadataOwnerProviderValue","useScrollGestureCoordination","direction","composedScrollHandler","useComposedEventHandler","scrollableComponent","jsx","undefined","scrollEventThrottle","coordinatedScrollableComponent","GestureDetector","gesture","ScrollMetadataOwnerProvider","value","Inner","_","style","sharedBoundTag","styleId","onPress","animatedProps","userAnimatedProps","rest","animatedRef","useAnimatedRef","associatedId","associatedStyles","useSlotStyles","associatedProps","useSlotProps","RegisterBoundsProvider","captureActiveOnPress","handleInitialLayout","scheduleOnUI","collapsable","memo"],"sourceRoot":"../../../src","sources":["components/create-transition-aware-component.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeGestureHandler","_reactNativeReanimated","_interopRequireWildcard","_scrollCoordination","_styles","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","createTransitionAwareComponent","Wrapped","options","isScrollable","alreadyAnimated","AnimatedComponent","Animated","createAnimatedComponent","ScrollableInner","forwardRef","props","ref","onScroll","userOnScroll","onMomentumScrollEnd","userOnMomentumScrollEnd","onScrollEndDrag","userOnScrollEndDrag","children","contentContainerStyle","scrollableProps","scrollDirection","horizontal","scrollHandler","scrollEventsEnabled","onContentSizeChange","onLayout","nativeGesture","metadataOwnerProviderValue","useScrollGestureCoordination","direction","composedScrollHandler","useComposedEventHandler","scrollableComponent","jsx","undefined","scrollEventThrottle","coordinatedScrollableComponent","GestureDetector","gesture","ScrollMetadataOwnerProvider","value","Inner","style","styleId","animatedProps","userAnimatedProps","rest","associatedStyles","useSlotStyles","associatedProps","useSlotProps","memo"],"sourceRoot":"../../../src","sources":["components/create-transition-aware-component.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -20,13 +20,9 @@ var _stack = require("../../../types/stack.types");
  * - Other stacks default to 'block' (undefined = normal touch handling)
  */
 function useBackdropPointerEvents() {
-  const {
-    current
-  } = (0, _descriptors.useDescriptors)();
-  const screenOptions = (0, _options.useScreenOptionsContext)();
-  const {
-    flags
-  } = (0, _core.useStackCoreContext)();
+  const screenOptions = (0, _options.useScreenOptionsStore)();
+  const descriptorBackdropBehavior = (0, _descriptors.useDescriptorsStore)(store => store.options.backdropBehavior);
+  const stackType = (0, _core.useStackCoreStore)(store => store.flags.STACK_TYPE);
   const [runtimeBackdropBehavior, setRuntimeBackdropBehavior] = (0, _react.useState)(undefined);
   (0, _reactNativeReanimated.useAnimatedReaction)(() => screenOptions.get().backdropBehavior, (next, previous) => {
     "worklet";
@@ -35,8 +31,8 @@ function useBackdropPointerEvents() {
       (0, _reactNativeWorklets.scheduleOnRN)(setRuntimeBackdropBehavior, next);
     }
   }, [screenOptions]);
-  const isComponentStack = flags.STACK_TYPE === _stack.StackType.COMPONENT;
-  const backdropBehavior = runtimeBackdropBehavior ?? current.options.backdropBehavior ?? (isComponentStack ? "passthrough" : "block");
+  const isComponentStack = stackType === _stack.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/commonjs/components/screen-container/hooks/use-backdrop-pointer-events.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_reactNativeWorklets","_descriptors","_options","_core","_stack","useBackdropPointerEvents","current","useDescriptors","screenOptions","useScreenOptionsContext","flags","useStackCoreContext","runtimeBackdropBehavior","setRuntimeBackdropBehavior","useState","undefined","useAnimatedReaction","get","backdropBehavior","next","previous","scheduleOnRN","isComponentStack","STACK_TYPE","StackType","COMPONENT","options","pointerEvents","isBackdropActive"],"sourceRoot":"../../../../../src","sources":["components/screen-container/hooks/use-backdrop-pointer-events.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,oBAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AACA,IAAAI,QAAA,GAAAJ,OAAA;AACA,IAAAK,KAAA,GAAAL,OAAA;AAEA,IAAAM,MAAA,GAAAN,OAAA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASO,wBAAwBA,CAAA,EAAgC;EACvE,MAAM;IAAEC;EAAQ,CAAC,GAAG,IAAAC,2BAAc,EAAC,CAAC;EACpC,MAAMC,aAAa,GAAG,IAAAC,gCAAuB,EAAC,CAAC;EAC/C,MAAM;IAAEC;EAAM,CAAC,GAAG,IAAAC,yBAAmB,EAAC,CAAC;EACvC,MAAM,CAACC,uBAAuB,EAAEC,0BAA0B,CAAC,GAAG,IAAAC,eAAQ,EAEpEC,SAAS,CAAC;EAEZ,IAAAC,0CAAmB,EAClB,MAAMR,aAAa,CAACS,GAAG,CAAC,CAAC,CAACC,gBAAgB,EAC1C,CAACC,IAAI,EAAEC,QAAQ,KAAK;IACnB,SAAS;;IACT,IAAID,IAAI,KAAKC,QAAQ,EAAE;MACtB,IAAAC,iCAAY,EAACR,0BAA0B,EAAEM,IAAI,CAAC;IAC/C;EACD,CAAC,EACD,CAACX,aAAa,CACf,CAAC;EAED,MAAMc,gBAAgB,GAAGZ,KAAK,CAACa,UAAU,KAAKC,gBAAS,CAACC,SAAS;EACjE,MAAMP,gBAAkC,GACvCN,uBAAuB,IACvBN,OAAO,CAACoB,OAAO,CAACR,gBAAgB,KAC/BI,gBAAgB,GAAG,aAAa,GAAG,OAAO,CAAC;EAE7C,MAAMK,aAAa,GAClBT,gBAAgB,KAAK,aAAa,GAAG,UAAU,GAAGH,SAAS;EAE5D,MAAMa,gBAAgB,GACrBV,gBAAgB,KAAK,SAAS,IAAIA,gBAAgB,KAAK,UAAU;EAElE,OAAO;IAAES,aAAa;IAAET,gBAAgB;IAAEU;EAAiB,CAAC;AAC7D","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_reactNativeWorklets","_descriptors","_options","_core","_stack","useBackdropPointerEvents","screenOptions","useScreenOptionsStore","descriptorBackdropBehavior","useDescriptorsStore","store","options","backdropBehavior","stackType","useStackCoreStore","flags","STACK_TYPE","runtimeBackdropBehavior","setRuntimeBackdropBehavior","useState","undefined","useAnimatedReaction","get","next","previous","scheduleOnRN","isComponentStack","StackType","COMPONENT","pointerEvents","isBackdropActive"],"sourceRoot":"../../../../../src","sources":["components/screen-container/hooks/use-backdrop-pointer-events.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,oBAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AACA,IAAAI,QAAA,GAAAJ,OAAA;AACA,IAAAK,KAAA,GAAAL,OAAA;AAEA,IAAAM,MAAA,GAAAN,OAAA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASO,wBAAwBA,CAAA,EAAgC;EACvE,MAAMC,aAAa,GAAG,IAAAC,8BAAqB,EAAC,CAAC;EAC7C,MAAMC,0BAA0B,GAAG,IAAAC,gCAAmB,EACpDC,KAAK,IAAKA,KAAK,CAACC,OAAO,CAACC,gBAC1B,CAAC;EACD,MAAMC,SAAS,GAAG,IAAAC,uBAAiB,EAAEJ,KAAK,IAAKA,KAAK,CAACK,KAAK,CAACC,UAAU,CAAC;EACtE,MAAM,CAACC,uBAAuB,EAAEC,0BAA0B,CAAC,GAAG,IAAAC,eAAQ,EAEpEC,SAAS,CAAC;EAEZ,IAAAC,0CAAmB,EAClB,MAAMf,aAAa,CAACgB,GAAG,CAAC,CAAC,CAACV,gBAAgB,EAC1C,CAACW,IAAI,EAAEC,QAAQ,KAAK;IACnB,SAAS;;IACT,IAAID,IAAI,KAAKC,QAAQ,EAAE;MACtB,IAAAC,iCAAY,EAACP,0BAA0B,EAAEK,IAAI,CAAC;IAC/C;EACD,CAAC,EACD,CAACjB,aAAa,CACf,CAAC;EAED,MAAMoB,gBAAgB,GAAGb,SAAS,KAAKc,gBAAS,CAACC,SAAS;EAC1D,MAAMhB,gBAAkC,GACvCK,uBAAuB,IACvBT,0BAA0B,KACzBkB,gBAAgB,GAAG,aAAa,GAAG,OAAO,CAAC;EAE7C,MAAMG,aAAa,GAClBjB,gBAAgB,KAAK,aAAa,GAAG,UAAU,GAAGQ,SAAS;EAE5D,MAAMU,gBAAgB,GACrBlB,gBAAgB,KAAK,SAAS,IAAIA,gBAAgB,KAAK,UAAU;EAElE,OAAO;IAAEiB,aAAa;IAAEjB,gBAAgB;IAAEkB;EAAiB,CAAC;AAC7D","ignoreList":[]}

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

@@ -11,16 +11,12 @@ var _descriptors = require("../../../providers/screen/descriptors");
 var _animation = require("../../../stores/animation.store");
 var _system = require("../../../stores/system.store");
 function useContentLayout() {
-  const {
-    current
-  } = (0, _descriptors.useDescriptors)();
-  const {
-    isFirstKey
-  } = (0, _descriptors.useDescriptorDerivations)();
+  const routeKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.currentScreenKey);
+  const isFirstKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.isFirstKey);
+  const experimental_animateOnInitialMount = (0, _descriptors.useDescriptorsStore)(store => store.options.experimental_animateOnInitialMount);
   const {
     height: screenHeight
   } = (0, _reactNative.useWindowDimensions)();
-  const routeKey = current.route.key;
   const animations = _animation.AnimationStore.getBag(routeKey);
   const system = _system.SystemStore.getBag(routeKey);
   const {
@@ -31,7 +27,6 @@ function useContentLayout() {
   const {
     requestLifecycleTransition
   } = system.actions;
-  const experimental_animateOnInitialMount = current.options.experimental_animateOnInitialMount;
   return (0, _react.useCallback)(event => {
     const {
       width,

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeWorklets","_descriptors","_animation","_system","useContentLayout","current","useDescriptors","isFirstKey","useDescriptorDerivations","height","screenHeight","useWindowDimensions","routeKey","route","key","animations","AnimationStore","getBag","system","SystemStore","targetProgress","resolvedAutoSnapPoint","measuredContentLayout","requestLifecycleTransition","actions","experimental_animateOnInitialMount","options","useCallback","event","width","nativeEvent","layout","fraction","Math","min","scheduleOnUI","nextWidth","nextHeight","nextFraction","set","isFirstMeasurement","get","transitionProgress","progressAnimating","LifecycleTransitionRequestKind","Open"],"sourceRoot":"../../../../../src","sources":["components/screen-container/hooks/use-content-layout.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,oBAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AAIA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAKO,SAASM,gBAAgBA,CAAA,EAAG;EAClC,MAAM;IAAEC;EAAQ,CAAC,GAAG,IAAAC,2BAAc,EAAC,CAAC;EACpC,MAAM;IAAEC;EAAW,CAAC,GAAG,IAAAC,qCAAwB,EAAC,CAAC;EACjD,MAAM;IAAEC,MAAM,EAAEC;EAAa,CAAC,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EACtD,MAAMC,QAAQ,GAAGP,OAAO,CAACQ,KAAK,CAACC,GAAG;EAClC,MAAMC,UAAU,GAAGC,yBAAc,CAACC,MAAM,CAACL,QAAQ,CAAC;EAClD,MAAMM,MAAM,GAAGC,mBAAW,CAACF,MAAM,CAACL,QAAQ,CAAC;EAE3C,MAAM;IAAEQ,cAAc;IAAEC,qBAAqB;IAAEC;EAAsB,CAAC,GACrEJ,MAAM;EACP,MAAM;IAAEK;EAA2B,CAAC,GAAGL,MAAM,CAACM,OAAO;EAErD,MAAMC,kCAAkC,GACvCpB,OAAO,CAACqB,OAAO,CAACD,kCAAkC;EAEnD,OAAO,IAAAE,kBAAW,EAChBC,KAAwB,IAAK;IAC7B,MAAM;MAAEC,KAAK;MAAEpB;IAAO,CAAC,GAAGmB,KAAK,CAACE,WAAW,CAACC,MAAM;IAClD,IAAIF,KAAK,IAAI,CAAC,IAAIpB,MAAM,IAAI,CAAC,EAAE;IAE/B,MAAMuB,QAAQ,GAAGC,IAAI,CAACC,GAAG,CAACzB,MAAM,GAAGC,YAAY,EAAE,CAAC,CAAC;IAEnD,IAAAyB,iCAAY,EACX,CAACC,SAAiB,EAAEC,UAAkB,EAAEC,YAAoB,KAAK;MAChE,SAAS;;MACThB,qBAAqB,CAACiB,GAAG,CAAC;QACzBV,KAAK,EAAEO,SAAS;QAChB3B,MAAM,EAAE4B;MACT,CAAC,CAAC;MAEF,MAAMG,kBAAkB,GAAGnB,qBAAqB,CAACoB,GAAG,CAAC,CAAC,IAAI,CAAC;MAC3DpB,qBAAqB,CAACkB,GAAG,CAACD,YAAY,CAAC;MAEvC,IACC,CAACE,kBAAkB,IACnBzB,UAAU,CAAC2B,kBAAkB,CAACD,GAAG,CAAC,CAAC,KAAK,CAAC,IACzC1B,UAAU,CAAC4B,iBAAiB,CAACF,GAAG,CAAC,CAAC,KAAK,CAAC,EACvC;QACD;MACD;MAEA,IAAIlC,UAAU,IAAI,CAACkB,kCAAkC,EAAE;QACtDL,cAAc,CAACmB,GAAG,CAACD,YAAY,CAAC;QAChCvB,UAAU,CAAC2B,kBAAkB,CAACH,GAAG,CAACD,YAAY,CAAC;QAC/C;MACD;MAEAf,0BAA0B,CACzBqB,sCAA8B,CAACC,IAAI,EACnCP,YACD,CAAC;IACF,CAAC,EACDT,KAAK,EACLpB,MAAM,EACNuB,QACD,CAAC;EACF,CAAC,EACD,CACCjB,UAAU,EACVK,cAAc,EACdC,qBAAqB,EACrBC,qBAAqB,EACrBf,UAAU,EACVG,YAAY,EACZe,kCAAkC,EAClCF,0BAA0B,CAE5B,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeWorklets","_descriptors","_animation","_system","useContentLayout","routeKey","useDescriptorsStore","store","derivations","currentScreenKey","isFirstKey","experimental_animateOnInitialMount","options","height","screenHeight","useWindowDimensions","animations","AnimationStore","getBag","system","SystemStore","targetProgress","resolvedAutoSnapPoint","measuredContentLayout","requestLifecycleTransition","actions","useCallback","event","width","nativeEvent","layout","fraction","Math","min","scheduleOnUI","nextWidth","nextHeight","nextFraction","set","isFirstMeasurement","get","transitionProgress","progressAnimating","LifecycleTransitionRequestKind","Open"],"sourceRoot":"../../../../../src","sources":["components/screen-container/hooks/use-content-layout.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,oBAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAKO,SAASM,gBAAgBA,CAAA,EAAG;EAClC,MAAMC,QAAQ,GAAG,IAAAC,gCAAmB,EAClCC,KAAK,IAAKA,KAAK,CAACC,WAAW,CAACC,gBAC9B,CAAC;EACD,MAAMC,UAAU,GAAG,IAAAJ,gCAAmB,EACpCC,KAAK,IAAKA,KAAK,CAACC,WAAW,CAACE,UAC9B,CAAC;EACD,MAAMC,kCAAkC,GAAG,IAAAL,gCAAmB,EAC5DC,KAAK,IAAKA,KAAK,CAACK,OAAO,CAACD,kCAC1B,CAAC;EACD,MAAM;IAAEE,MAAM,EAAEC;EAAa,CAAC,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EACtD,MAAMC,UAAU,GAAGC,yBAAc,CAACC,MAAM,CAACb,QAAQ,CAAC;EAClD,MAAMc,MAAM,GAAGC,mBAAW,CAACF,MAAM,CAACb,QAAQ,CAAC;EAE3C,MAAM;IAAEgB,cAAc;IAAEC,qBAAqB;IAAEC;EAAsB,CAAC,GACrEJ,MAAM;EACP,MAAM;IAAEK;EAA2B,CAAC,GAAGL,MAAM,CAACM,OAAO;EAErD,OAAO,IAAAC,kBAAW,EAChBC,KAAwB,IAAK;IAC7B,MAAM;MAAEC,KAAK;MAAEf;IAAO,CAAC,GAAGc,KAAK,CAACE,WAAW,CAACC,MAAM;IAClD,IAAIF,KAAK,IAAI,CAAC,IAAIf,MAAM,IAAI,CAAC,EAAE;IAE/B,MAAMkB,QAAQ,GAAGC,IAAI,CAACC,GAAG,CAACpB,MAAM,GAAGC,YAAY,EAAE,CAAC,CAAC;IAEnD,IAAAoB,iCAAY,EACX,CAACC,SAAiB,EAAEC,UAAkB,EAAEC,YAAoB,KAAK;MAChE,SAAS;;MACTd,qBAAqB,CAACe,GAAG,CAAC;QACzBV,KAAK,EAAEO,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,IACnBvB,UAAU,CAACyB,kBAAkB,CAACD,GAAG,CAAC,CAAC,KAAK,CAAC,IACzCxB,UAAU,CAAC0B,iBAAiB,CAACF,GAAG,CAAC,CAAC,KAAK,CAAC,EACvC;QACD;MACD;MAEA,IAAI9B,UAAU,IAAI,CAACC,kCAAkC,EAAE;QACtDU,cAAc,CAACiB,GAAG,CAACD,YAAY,CAAC;QAChCrB,UAAU,CAACyB,kBAAkB,CAACH,GAAG,CAACD,YAAY,CAAC;QAC/C;MACD;MAEAb,0BAA0B,CACzBmB,sCAA8B,CAACC,IAAI,EACnCP,YACD,CAAC;IACF,CAAC,EACDT,KAAK,EACLf,MAAM,EACNkB,QACD,CAAC;EACF,CAAC,EACD,CACCf,UAAU,EACVK,cAAc,EACdC,qBAAqB,EACrBC,qBAAqB,EACrBb,UAAU,EACVI,YAAY,EACZH,kCAAkC,EAClCa,0BAA0B,CAE5B,CAAC;AACF","ignoreList":[]}

package/lib/commonjs/components/screen-container/layers/backdrop.js

@@ -24,14 +24,14 @@ const BackdropLayer = exports.BackdropLayer = /*#__PURE__*/(0, _react.memo)(func
   backdropBehavior,
   isBackdropActive
 }) {
-  const {
-    current
-  } = (0, _descriptors.useDescriptors)();
   const {
     dismissScreen
   } = (0, _useNavigationHelpers.useNavigationHelpers)();
-  const BackdropComponent = current.options.backdropComponent;
-  const routeKey = current.route.key;
+  const routeKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.currentScreenKey);
+  const BackdropComponent = (0, _descriptors.useDescriptorsStore)(store => store.options.backdropComponent);
+  const rawSnapPoints = (0, _descriptors.useDescriptorsStore)(store => store.options.snapPoints);
+  const canDismiss = (0, _descriptors.useDescriptorsStore)(store => store.options.gestureEnabled !== false);
+  const transitionSpec = (0, _descriptors.useDescriptorsStore)(store => store.options.transitionSpec);
   const animations = _animation.AnimationStore.getBag(routeKey);
   const {
     targetProgress,
@@ -45,16 +45,12 @@ const BackdropLayer = exports.BackdropLayer = /*#__PURE__*/(0, _react.memo)(func
       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 = _gesture.GestureStore.getBag(routeKey);
-      const transitionSpec = current.options.transitionSpec;
       (0, _reactNativeWorklets.scheduleOnUI)(() => {
         "worklet";
 
@@ -80,6 +76,7 @@ const BackdropLayer = exports.BackdropLayer = /*#__PURE__*/(0, _react.memo)(func
         };
         (0, _animateToProgress.animateToProgress)({
           target,
+          markEntering: false,
           spec,
           animations,
           targetProgress,
@@ -88,7 +85,7 @@ const BackdropLayer = exports.BackdropLayer = /*#__PURE__*/(0, _react.memo)(func
         });
       });
     }
-  }, [animations, targetProgress, animationProgress, resolvedAutoSnapPoint, backdropBehavior, current, dismissScreen, routeKey]);
+  }, [animations, targetProgress, animationProgress, resolvedAutoSnapPoint, backdropBehavior, rawSnapPoints, canDismiss, transitionSpec, dismissScreen, routeKey]);
   const animatedBackdropStyle = (0, _styles.useSlotStyles)("backdrop");
   const animatedBackdropProps = (0, _styles.useSlotProps)("backdrop");
   const backdropPointerEvents = isBackdropActive ? "auto" : "none";

package/lib/commonjs/components/screen-container/layers/backdrop.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireDefault","_reactNativeWorklets","_specs","_useNavigationHelpers","_descriptors","_styles","_animation","_gesture","_system","_animateToProgress","_findCollapseTarget","_renderComponent","_jsxRuntime","e","__esModule","default","BackdropLayer","exports","memo","backdropBehavior","isBackdropActive","current","useDescriptors","dismissScreen","useNavigationHelpers","BackdropComponent","options","backdropComponent","routeKey","route","key","animations","AnimationStore","getBag","targetProgress","animationProgress","resolvedAutoSnapPoint","SystemStore","AnimatedBackdropComponent","useMemo","usesLayerRenderProps","Animated","createAnimatedComponent","handleBackdropPress","useCallback","rawSnapPoints","snapPoints","canDismiss","gestureEnabled","length","gestures","GestureStore","transitionSpec","scheduleOnUI","resolvedSnaps","i","point","resolvedPoint","get","push","target","shouldDismiss","findCollapseTarget","transitionProgress","dismissing","set","spec","open","expand","DefaultSnapSpec","close","collapse","animateToProgress","onAnimationFinish","undefined","animatedBackdropStyle","useSlotStyles","animatedBackdropProps","useSlotProps","backdropPointerEvents","backdropStyles","StyleSheet","absoluteFill","backdropProps","jsx","Pressable","style","pointerEvents","onPress","children","animatedProps","styles","props","View"],"sourceRoot":"../../../../../src","sources":["components/screen-container/layers/backdrop.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireDefault","_reactNativeWorklets","_specs","_useNavigationHelpers","_descriptors","_styles","_animation","_gesture","_system","_animateToProgress","_findCollapseTarget","_renderComponent","_jsxRuntime","e","__esModule","default","BackdropLayer","exports","memo","backdropBehavior","isBackdropActive","dismissScreen","useNavigationHelpers","routeKey","useDescriptorsStore","store","derivations","currentScreenKey","BackdropComponent","options","backdropComponent","rawSnapPoints","snapPoints","canDismiss","gestureEnabled","transitionSpec","animations","AnimationStore","getBag","targetProgress","animationProgress","resolvedAutoSnapPoint","SystemStore","AnimatedBackdropComponent","useMemo","usesLayerRenderProps","Animated","createAnimatedComponent","handleBackdropPress","useCallback","length","gestures","GestureStore","scheduleOnUI","resolvedSnaps","i","point","resolvedPoint","get","push","target","shouldDismiss","findCollapseTarget","transitionProgress","dismissing","set","spec","open","expand","DefaultSnapSpec","close","collapse","animateToProgress","markEntering","onAnimationFinish","undefined","animatedBackdropStyle","useSlotStyles","animatedBackdropProps","useSlotProps","backdropPointerEvents","backdropStyles","StyleSheet","absoluteFill","backdropProps","jsx","Pressable","style","pointerEvents","onPress","children","animatedProps","styles","props","View"],"sourceRoot":"../../../../../src","sources":["components/screen-container/layers/backdrop.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/components/screen-container/layers/content.js

@@ -10,7 +10,6 @@ var _reactNativeGestureHandler = require("react-native-gesture-handler");
 var _reactNativeReanimated = _interopRequireDefault(require("react-native-reanimated"));
 var _descriptors = require("../../../providers/screen/descriptors");
 var _gestures = require("../../../providers/screen/gestures");
-var _origin = require("../../../providers/screen/origin.provider");
 var _styles = require("../../../providers/screen/styles");
 var _host = require("../../boundary/portal/components/boundary-portal/components/host");
 var _useContentLayout = require("../hooks/use-content-layout");
@@ -26,17 +25,14 @@ const ContentLayer = exports.ContentLayer = /*#__PURE__*/(0, _react.memo)(({
   pointerEvents,
   isBackdropActive
 }) => {
-  const {
-    current
-  } = (0, _descriptors.useDescriptors)();
-  const gestureContext = (0, _gestures.useGestureContext)();
-  const ContentComponent = current.options.contentComponent;
-  const isNavigationMaskEnabled = !!current.options.navigationMaskEnabled;
+  const gestureContext = (0, _gestures.useGestureStore)();
+  const ContentComponent = (0, _descriptors.useDescriptorsStore)(store => store.options.contentComponent);
+  const isNavigationMaskEnabled = (0, _descriptors.useDescriptorsStore)(store => !!store.options.navigationMaskEnabled);
+  const hasAutoSnapPoint = (0, _descriptors.useDescriptorsStore)(store => store.options.snapPoints?.includes("auto") ?? false);
   const contentPointerEvents = isBackdropActive ? "box-none" : pointerEvents;
   const AnimatedContentComponent = (0, _react.useMemo)(() => {
     return ContentComponent && !(0, _renderComponent.usesLayerRenderProps)(ContentComponent) ? _reactNativeReanimated.default.createAnimatedComponent(ContentComponent) : null;
   }, [ContentComponent]);
-  const hasAutoSnapPoint = current.options.snapPoints?.includes("auto") ?? false;
   const handleContentLayout = (0, _useContentLayout.useContentLayout)();
   const animatedContentStyle = (0, _styles.useSlotStyles)("content");
   const animatedContentProps = (0, _styles.useSlotProps)("content");
@@ -45,15 +41,13 @@ const ContentLayer = exports.ContentLayer = /*#__PURE__*/(0, _react.memo)(({
   const contentChildren = /*#__PURE__*/(0, _jsxRuntime.jsx)(_maybeMaskedNavigationContainer.MaybeMaskedNavigationContainer, {
     pointerEvents: contentPointerEvents,
     enabled: isNavigationMaskEnabled,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_surfaceContainer.SurfaceContainer, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_surfaceContainer.SurfaceContainer, {
       pointerEvents: contentPointerEvents,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_origin.OriginProvider, {
-        children: [hasAutoSnapPoint ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-          collapsable: false,
-          onLayout: handleContentLayout,
-          children: children
-        }) : children, /*#__PURE__*/(0, _jsxRuntime.jsx)(_host.ScreenFallbackHost, {})]
-      })
+      children: [hasAutoSnapPoint ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+        collapsable: false,
+        onLayout: handleContentLayout,
+        children: children
+      }) : children, /*#__PURE__*/(0, _jsxRuntime.jsx)(_host.ScreenFallbackHost, {})]
     })
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeGestureHandler.GestureDetector, {

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeGestureHandler","_reactNativeReanimated","_interopRequireDefault","_descriptors","_gestures","_origin","_styles","_host","_useContentLayout","_maybeMaskedNavigationContainer","_renderComponent","_surfaceContainer","_jsxRuntime","e","__esModule","default","ContentLayer","exports","memo","children","pointerEvents","isBackdropActive","current","useDescriptors","gestureContext","useGestureContext","ContentComponent","options","contentComponent","isNavigationMaskEnabled","navigationMaskEnabled","contentPointerEvents","AnimatedContentComponent","useMemo","usesLayerRenderProps","Animated","createAnimatedComponent","hasAutoSnapPoint","snapPoints","includes","handleContentLayout","useContentLayout","animatedContentStyle","useSlotStyles","animatedContentProps","useSlotProps","contentStyles","styles","content","contentProps","contentChildren","jsx","MaybeMaskedNavigationContainer","enabled","SurfaceContainer","jsxs","OriginProvider","View","collapsable","onLayout","ScreenFallbackHost","GestureDetector","gesture","detectorGesture","style","animatedProps","props","StyleSheet","create","flex"],"sourceRoot":"../../../../../src","sources":["components/screen-container/layers/content.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeGestureHandler","_reactNativeReanimated","_interopRequireDefault","_descriptors","_gestures","_styles","_host","_useContentLayout","_maybeMaskedNavigationContainer","_renderComponent","_surfaceContainer","_jsxRuntime","e","__esModule","default","ContentLayer","exports","memo","children","pointerEvents","isBackdropActive","gestureContext","useGestureStore","ContentComponent","useDescriptorsStore","store","options","contentComponent","isNavigationMaskEnabled","navigationMaskEnabled","hasAutoSnapPoint","snapPoints","includes","contentPointerEvents","AnimatedContentComponent","useMemo","usesLayerRenderProps","Animated","createAnimatedComponent","handleContentLayout","useContentLayout","animatedContentStyle","useSlotStyles","animatedContentProps","useSlotProps","contentStyles","styles","content","contentProps","contentChildren","jsx","MaybeMaskedNavigationContainer","enabled","jsxs","SurfaceContainer","View","collapsable","onLayout","ScreenFallbackHost","GestureDetector","gesture","detectorGesture","style","animatedProps","props","StyleSheet","create","flex"],"sourceRoot":"../../../../../src","sources":["components/screen-container/layers/content.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/components/screen-container/layers/surface-container.js

@@ -15,12 +15,8 @@ const SurfaceContainer = exports.SurfaceContainer = /*#__PURE__*/(0, _react.memo
   children,
   pointerEvents
 }) => {
-  const {
-    current
-  } = (0, _descriptors.useDescriptors)();
-
   /** @deprecated Use `contentComponent` instead. */
-  const DeprecatedSurfaceComponent = current.options.surfaceComponent;
+  const DeprecatedSurfaceComponent = (0, _descriptors.useDescriptorsStore)(store => store.options.surfaceComponent);
   const AnimatedSurfaceComponent = (0, _react.useMemo)(() => {
     return DeprecatedSurfaceComponent ? _reactNativeReanimated.default.createAnimatedComponent(DeprecatedSurfaceComponent) : null;
   }, [DeprecatedSurfaceComponent]);