react-native-screen-transitions 3.10.0 → 3.11.1

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.useHostMeasurement = void 0;
 var _react = require("react");
 var _reactNativeReanimated = require("react-native-reanimated");
-var _origin = require("../../../../../../providers/screen/origin.provider");
 var _scroll = require("../../../../../../stores/scroll.store");
 var _visibilityBlockOffset = require("../../../../../../utils/visibility-block-offset");
 var _measuredBounds = require("../../../../utils/measured-bounds");
@@ -23,10 +22,6 @@ const useHostMeasurement = ({
 }) => {
   const hostRef = (0, _reactNativeReanimated.useAnimatedRef)();
   const scrollMetadata = _scroll.ScrollStore.getValue(screenKey, "metadata");
-  const [canRenderHosts, setCanRenderHosts] = (0, _react.useState)(false);
-  const {
-    originRef
-  } = (0, _origin.useOriginContext)();
   const hasMeasuredHost = (0, _reactNativeReanimated.useSharedValue)(false);
   const retryToken = (0, _reactNativeReanimated.useSharedValue)(0);
   (0, _reactNativeReanimated.useAnimatedReaction)(() => {
@@ -48,8 +43,7 @@ const useHostMeasurement = ({
       return;
     }
     const measured = (0, _reactNativeReanimated.measure)(hostRef);
-    const measuredOrigin = (0, _reactNativeReanimated.measure)(originRef);
-    if (!measured || !measuredOrigin) {
+    if (!measured) {
       (0, _reactNativeReanimated.cancelAnimation)(retryToken);
       retryToken.set((0, _reactNativeReanimated.withDelay)(HOST_MEASUREMENT_RETRY_DELAY_MS, (0, _reactNativeReanimated.withTiming)(retryToken.get() + 1, {
         duration: 0
@@ -57,22 +51,20 @@ const useHostMeasurement = ({
       return;
     }
     (0, _reactNativeReanimated.cancelAnimation)(retryToken);
-    hasMeasuredHost.set(true);
 
     // A measurement taken mid rubber-band would bake the transient
     // overscroll displacement into the host frame. Store the at-rest
     // position instead; clamped scroll deltas share that basis.
     const currentScroll = scrollMetadata.get();
     const overscrollNormalized = capturesScroll ? (0, _measuredBounds.adjustedMeasuredBoundsForOverscrollDeltas)(measured, currentScroll) : measured;
-    const normalizedMeasured = (0, _measuredBounds.normalizeMeasuredBoundsWithVisibilityGate)({
+    const correctedMeasured = (0, _measuredBounds.correctMeasuredBoundsForVisibilityGate)({
       measured: overscrollNormalized,
-      origin: measuredOrigin,
       visibilityBlocked: visibilityBlocked.get(),
       visibilityBlockOffset: (0, _visibilityBlockOffset.getVisibilityBlockOffset)(viewportHeight),
       viewportWidth,
       viewportHeight
     });
-    if (!(0, _measuredBounds.isMeasurementInViewport)(normalizedMeasured, viewportWidth, viewportHeight)) {
+    if (correctedMeasured.width <= 0 || correctedMeasured.height <= 0) {
       (0, _reactNativeReanimated.cancelAnimation)(retryToken);
       retryToken.set((0, _reactNativeReanimated.withDelay)(HOST_MEASUREMENT_RETRY_DELAY_MS, (0, _reactNativeReanimated.withTiming)(retryToken.get() + 1, {
         duration: 0
@@ -80,15 +72,15 @@ const useHostMeasurement = ({
       return;
     }
     (0, _hostBounds.setPortalHostBounds)(hostKey, {
-      x: normalizedMeasured.x,
-      y: normalizedMeasured.y,
-      width: normalizedMeasured.width,
-      height: normalizedMeasured.height,
-      pageX: normalizedMeasured.pageX,
-      pageY: normalizedMeasured.pageY,
+      x: correctedMeasured.x,
+      y: correctedMeasured.y,
+      width: correctedMeasured.width,
+      height: correctedMeasured.height,
+      pageX: correctedMeasured.pageX,
+      pageY: correctedMeasured.pageY,
       scroll: capturesScroll ? currentScroll : null
     });
-    (0, _reactNativeReanimated.runOnJS)(setCanRenderHosts)(true);
+    hasMeasuredHost.set(true);
   });
   (0, _react.useLayoutEffect)(() => {
     return () => {
@@ -96,7 +88,6 @@ const useHostMeasurement = ({
     };
   }, [hostKey]);
   return {
-    canRenderHosts,
     hostRef
   };
 };

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_origin","_scroll","_visibilityBlockOffset","_measuredBounds","_hostBounds","HOST_MEASUREMENT_RETRY_DELAY_MS","useHostMeasurement","capturesScroll","enabled","hostKey","screenKey","visibilityBlocked","viewportHeight","viewportWidth","hostRef","useAnimatedRef","scrollMetadata","ScrollStore","getValue","canRenderHosts","setCanRenderHosts","useState","originRef","useOriginContext","hasMeasuredHost","useSharedValue","retryToken","useAnimatedReaction","get","state","cancelAnimation","hasAlreadyMeasured","measured","measure","measuredOrigin","set","withDelay","withTiming","duration","currentScroll","overscrollNormalized","adjustedMeasuredBoundsForOverscrollDeltas","normalizedMeasured","normalizeMeasuredBoundsWithVisibilityGate","origin","visibilityBlockOffset","getVisibilityBlockOffset","isMeasurementInViewport","setPortalHostBounds","x","y","width","height","pageX","pageY","scroll","runOnJS","useLayoutEffect","runOnUI","clearPortalHostBounds","exports"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_scroll","_visibilityBlockOffset","_measuredBounds","_hostBounds","HOST_MEASUREMENT_RETRY_DELAY_MS","useHostMeasurement","capturesScroll","enabled","hostKey","screenKey","visibilityBlocked","viewportHeight","viewportWidth","hostRef","useAnimatedRef","scrollMetadata","ScrollStore","getValue","hasMeasuredHost","useSharedValue","retryToken","useAnimatedReaction","get","state","cancelAnimation","hasAlreadyMeasured","measured","measure","set","withDelay","withTiming","duration","currentScroll","overscrollNormalized","adjustedMeasuredBoundsForOverscrollDeltas","correctedMeasured","correctMeasuredBoundsForVisibilityGate","visibilityBlockOffset","getVisibilityBlockOffset","width","height","setPortalHostBounds","x","y","pageX","pageY","scroll","useLayoutEffect","runOnUI","clearPortalHostBounds","exports"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.ts"],"mappings":"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","ignoreList":[]}

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

@@ -29,7 +29,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;
 };
 const mountPortalBoundaryHost = host => {
   const previous = activeBoundaryHosts.get(host.portalHostName);

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","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","exports","unmountPortalBoundaryHostByName","delete","subscribe","add","useActivePortalBoundaryHosts","useSyncExternalStore"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAoBA,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;AAEM,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;AAACgB,OAAA,CAAAJ,uBAAA,GAAAA,uBAAA;AAEK,MAAMK,+BAA+B,GAC3CT,cAAyC,IACrC;EACJ,IAAI,CAACA,cAAc,IAAI,CAAClB,mBAAmB,CAAC4B,MAAM,CAACV,cAAc,CAAC,EAAE;IACnE;EACD;EAEAR,IAAI,CAAC,CAAC;AACP,CAAC;AAACgB,OAAA,CAAAC,+BAAA,GAAAA,+BAAA;AAEF,MAAME,SAAS,GAAIlB,QAAoB,IAAK;EAC3Cb,SAAS,CAACgC,GAAG,CAACnB,QAAQ,CAAC;EAEvB,OAAO,MAAM;IACZb,SAAS,CAAC8B,MAAM,CAACjB,QAAQ,CAAC;EAC3B,CAAC;AACF,CAAC;AAEM,MAAMoB,4BAA4B,GAAIvB,OAAe,IAAK;EAChE,OAAO,IAAAwB,2BAAoB,EAC1BH,SAAS,EACT,MAAM3B,QAAQ,CAACC,YAAY,CAACK,OAAO,CAAC,IAAIX,WAAW,EACnD,MAAMA,WACP,CAAC;AACF,CAAC;AAAC6B,OAAA,CAAAK,4BAAA,GAAAA,4BAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","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","exports","unmountPortalBoundaryHostByName","delete","subscribe","add","useActivePortalBoundaryHosts","useSyncExternalStore"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAkBA,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;AAEM,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;AAACe,OAAA,CAAAJ,uBAAA,GAAAA,uBAAA;AAEK,MAAMK,+BAA+B,GAC3CT,cAAyC,IACrC;EACJ,IAAI,CAACA,cAAc,IAAI,CAACjB,mBAAmB,CAAC2B,MAAM,CAACV,cAAc,CAAC,EAAE;IACnE;EACD;EAEAP,IAAI,CAAC,CAAC;AACP,CAAC;AAACe,OAAA,CAAAC,+BAAA,GAAAA,+BAAA;AAEF,MAAME,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;AAEM,MAAMmB,4BAA4B,GAAItB,OAAe,IAAK;EAChE,OAAO,IAAAuB,2BAAoB,EAC1BH,SAAS,EACT,MAAM1B,QAAQ,CAACC,YAAY,CAACK,OAAO,CAAC,IAAIX,WAAW,EACnD,MAAMA,WACP,CAAC;AACF,CAAC;AAAC4B,OAAA,CAAAK,4BAAA,GAAAA,4BAAA","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/portal/utils/naming.js

@@ -3,6 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PORTAL_HOST_NAME_RESET_VALUE = void 0;
+exports.createBoundaryPortalHostName = exports.PORTAL_HOST_NAME_RESET_VALUE = void 0;
+const BOUNDARY_PORTAL_HOST_NAME_SUFFIX = "-portal-host";
+const createBoundaryPortalHostName = (hostKey, boundaryId, pairKey) => {
+  "worklet";
+
+  return `${hostKey}-${pairKey ? `${pairKey}-` : ""}${boundaryId}${BOUNDARY_PORTAL_HOST_NAME_SUFFIX}`;
+};
+exports.createBoundaryPortalHostName = createBoundaryPortalHostName;
 const PORTAL_HOST_NAME_RESET_VALUE = exports.PORTAL_HOST_NAME_RESET_VALUE = null;
 //# sourceMappingURL=naming.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["PORTAL_HOST_NAME_RESET_VALUE","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/portal/utils/naming.ts"],"mappings":";;;;;;AAAO,MAAMA,4BAA4B,GAAAC,OAAA,CAAAD,4BAAA,GAAG,IAAI","ignoreList":[]}
+{"version":3,"names":["BOUNDARY_PORTAL_HOST_NAME_SUFFIX","createBoundaryPortalHostName","hostKey","boundaryId","pairKey","exports","PORTAL_HOST_NAME_RESET_VALUE"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/portal/utils/naming.ts"],"mappings":";;;;;;AAAA,MAAMA,gCAAgC,GAAG,cAAc;AAEhD,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;AAACK,OAAA,CAAAJ,4BAAA,GAAAA,4BAAA;AAEK,MAAMK,4BAA4B,GAAAD,OAAA,CAAAC,4BAAA,GAAG,IAAI","ignoreList":[]}

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

@@ -3,11 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useBoundaryRootStore = exports.useBoundaryRootContext = exports.TARGET_OUTSIDE_ROOT_WARNING = exports.BoundaryRootProvider = void 0;
+exports.useBoundaryRootStore = exports.TARGET_OUTSIDE_ROOT_WARNING = exports.BoundaryRootProvider = void 0;
 var _react = require("react");
 var _reactNativeReanimated = require("react-native-reanimated");
 var _descriptors = require("../../../providers/screen/descriptors");
 var _styles = require("../../../providers/screen/styles");
+var _blankStack = require("../../../providers/stack/blank-stack.provider");
 var _linkPairs = require("../../../stores/bounds/helpers/link-pairs.helpers");
 var _createProvider = _interopRequireDefault(require("../../../utils/create-provider"));
 var _logger = require("../../../utils/logger");
@@ -19,7 +20,6 @@ const MULTIPLE_TARGETS_WARNING = "Multiple Boundary.Target elements were rendere
 const TARGET_OUTSIDE_ROOT_WARNING = exports.TARGET_OUTSIDE_ROOT_WARNING = "Boundary.Target must be rendered inside Transition.Boundary or a component created by createBoundaryComponent.";
 const {
   BoundaryRootProvider,
-  useBoundaryRootContext,
   useBoundaryRootStore
 } = (0, _createProvider.default)("BoundaryRoot", {
   guarded: false
@@ -43,9 +43,9 @@ const {
     escapeClipping
   });
   const currentScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.currentScreenKey);
-  const currentActivity = (0, _descriptors.useDescriptorsStore)(s => s.descriptors.current.activity);
+  const isCurrentScreenClosing = (0, _blankStack.useBlankStackStore)(store => store?.scenesByKey[currentScreenKey]?.activity === "closing");
   const retainedBoundTagRef = (0, _react.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
@@ -109,6 +109,5 @@ const {
   };
 });
 exports.useBoundaryRootStore = useBoundaryRootStore;
-exports.useBoundaryRootContext = useBoundaryRootContext;
 exports.BoundaryRootProvider = BoundaryRootProvider;
 //# sourceMappingURL=boundary-root.provider.js.map

package/lib/commonjs/shared/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":["shared/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":["shared/components/boundary/providers/boundary-root.provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/utils/destination-signals.js

@@ -10,18 +10,22 @@ 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/commonjs/shared/components/boundary/utils/destination-signals.js.map

@@ -1 +1 @@
-{"version":3,"names":["_linkPairs","require","getInitialDestinationMeasurementSignal","params","enabled","destinationPairKey","ancestorDestinationPairKey","linkId","group","destinationPresent","sourcePresent","linkState","pairKey","action","linkKey","getLinkKeyFromTag","activeGroupId","getActiveGroupId","link","links","destination","source","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/utils/destination-signals.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAoBO,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,GAAG,IAAAC,4BAAiB,EAACR,MAAM,CAAC;EACzC,MAAMS,aAAa,GAClBR,KAAK,IAAIG,SAAS,GAAG,IAAAM,2BAAgB,EAACN,SAAS,EAAEC,OAAO,EAAEJ,KAAK,CAAC,GAAG,IAAI;EAExE,IAAIQ,aAAa,IAAIA,aAAa,KAAKF,OAAO,EAAE;IAC/C,OAAO;MAAEF,OAAO;MAAEC,MAAM,EAAE;IAAU,CAAC;EACtC;EAEA,MAAMK,IAAI,GAAGP,SAAS,GAAGC,OAAO,CAAC,EAAEO,KAAK,GAAGL,OAAO,CAAC;EAEnD,IAAI,CAACI,IAAI,EAAEE,WAAW,EAAE;IACvB,OAAO;MAAER,OAAO;MAAEC,MAAM,EAAE;IAAU,CAAC;EACtC;EAEA,IAAI,CAACK,IAAI,CAACG,MAAM,EAAE;IACjB,OAAO;MAAET,OAAO;MAAEC,MAAM,EAAE;IAAO,CAAC;EACnC;EAEA,OAAO;IAAED,OAAO;IAAEC,MAAM,EAAE;EAAW,CAAC;AACvC,CAAC;AAACS,OAAA,CAAApB,sCAAA,GAAAA,sCAAA","ignoreList":[]}
+{"version":3,"names":["_linkPairs","require","getInitialDestinationMeasurementSignal","params","enabled","pairKey","linkId","group","destinationPresent","sourcePresent","linkState","action","linkKey","getLinkKeyFromTag","activeGroupId","getActiveGroupId","link","links","destination","source","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/utils/destination-signals.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAoBO,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,GAAG,IAAAC,4BAAiB,EAACP,MAAM,CAAC;EACzC,MAAMQ,aAAa,GAClBP,KAAK,IAAIG,SAAS,GAAG,IAAAK,2BAAgB,EAACL,SAAS,EAAEL,OAAO,EAAEE,KAAK,CAAC,GAAG,IAAI;EAExE,IAAIO,aAAa,IAAIA,aAAa,KAAKF,OAAO,EAAE;IAC/C,OAAO;MAAEP,OAAO;MAAEM,MAAM,EAAE;IAAU,CAAC;EACtC;EAEA,MAAMK,IAAI,GAAGN,SAAS,GAAGL,OAAO,CAAC,EAAEY,KAAK,GAAGL,OAAO,CAAC;EAEnD,IAAI,CAACI,IAAI,EAAEE,WAAW,EAAE;IACvB,OAAO;MAAEb,OAAO;MAAEM,MAAM,EAAE;IAAU,CAAC;EACtC;EAEA,IAAI,CAACK,IAAI,CAACG,MAAM,EAAE;IACjB,OAAO;MAAEd,OAAO;MAAEM,MAAM,EAAE;IAAO,CAAC;EACnC;EAEA,OAAO;IAAEN,OAAO;IAAEM,MAAM,EAAE;EAAW,CAAC;AACvC,CAAC;AAACS,OAAA,CAAAlB,sCAAA,GAAAA,sCAAA","ignoreList":[]}

package/lib/commonjs/shared/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/shared/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":["shared/components/boundary/utils/measured-bounds.ts"],"mappings":"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","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":["shared/components/boundary/utils/measured-bounds.ts"],"mappings":"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","ignoreList":[]}

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

@@ -24,43 +24,35 @@ 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("|"));
   }
 
@@ -73,7 +65,7 @@ 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/commonjs/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","exports"],"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;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","linkId","group","shouldRefresh","closing","linkState","sourcePair","participates","links","sourceRequests","join","refreshDestinationPairKey","activeId","groups","exports"],"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;AAEM,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;AAACI,OAAA,CAAAnB,wBAAA,GAAAA,wBAAA","ignoreList":[]}

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

@@ -7,7 +7,6 @@ exports.createTransitionAwareComponent = createTransitionAwareComponent;
 var _react = require("react");
 var _reactNativeGestureHandler = require("react-native-gesture-handler");
 var _reactNativeReanimated = _interopRequireWildcard(require("react-native-reanimated"));
-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");
@@ -22,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,
@@ -75,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, _reactNativeReanimated.runOnUI)(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/shared/components/create-transition-aware-component.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeGestureHandler","_reactNativeReanimated","_interopRequireWildcard","_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","runOnUI","collapsable","memo"],"sourceRoot":"../../../../src","sources":["shared/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":["shared/components/create-transition-aware-component.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -19,13 +19,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";
@@ -34,8 +30,8 @@ function useBackdropPointerEvents() {
       (0, _reactNativeReanimated.runOnJS)(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 {