react-native-screen-transitions 3.10.0 → 3.11.1

package/lib/commonjs/shared/components/activity/variants/activity-screen.js

@@ -11,6 +11,7 @@ var _reactNativeScreens = require("react-native-screens");
 var _constants = require("../../../constants");
 var _useStack = require("../../../hooks/navigation/use-stack");
 var _useSharedValueState = require("../../../hooks/reanimated/use-shared-value-state");
+var _blankStack = require("../../../providers/stack/blank-stack.provider");
 var _animation = require("../../../stores/animation.store");
 var _helpers = require("../helpers");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -29,12 +30,27 @@ const PointerEventsByActivity = {
 const ActivityScreen = exports.ActivityScreen = /*#__PURE__*/(0, _react.memo)(function ActivityScreen({
   activity,
   children,
-  inactiveBehavior = _helpers.DEFAULT_INACTIVE_BEHAVIOR,
+  inactiveBehavior,
   paintDriverRouteKey,
-  hasNestedState
+  hasNestedState,
+  routeKey
 }) {
+  const stackActivity = (0, _blankStack.useBlankStackStore)(store => routeKey ? store?.scenesByKey[routeKey]?.activity : undefined);
+  const stackInactiveBehavior = (0, _blankStack.useBlankStackStore)(store => routeKey ? store?.scenesByKey[routeKey]?.descriptor.options?.inactiveBehavior : undefined);
+  const stackRoute = (0, _blankStack.useBlankStackStore)(store => routeKey ? store?.scenesByKey[routeKey]?.route : undefined);
+  const stackPaintDriverRouteKey = (0, _blankStack.useBlankStackStore)(store => {
+    if (!routeKey || !store) {
+      return undefined;
+    }
+    const routeIndex = store.routeKeys.indexOf(routeKey);
+    return store.routeKeys[routeIndex + 2];
+  });
+  const resolvedActivity = activity ?? stackActivity ?? "active";
+  const resolvedInactiveBehavior = inactiveBehavior ?? stackInactiveBehavior ?? _helpers.DEFAULT_INACTIVE_BEHAVIOR;
+  const resolvedPaintDriverRouteKey = paintDriverRouteKey ?? stackPaintDriverRouteKey;
+  const resolvedHasNestedState = hasNestedState ?? (stackRoute ? "state" in stackRoute : false);
   const nativeScreenDisabled = (0, _useStack.useStack)(s => s.flags.DISABLE_NATIVE_SCREENS);
-  const paintDriverAnimations = paintDriverRouteKey ? _animation.AnimationStore.getBag(paintDriverRouteKey) : undefined;
+  const paintDriverAnimations = resolvedPaintDriverRouteKey ? _animation.AnimationStore.getBag(resolvedPaintDriverRouteKey) : undefined;
 
   /**
    * Avoid hiding inactive content until the screen that exposes it has settled.
@@ -52,12 +68,12 @@ const ActivityScreen = exports.ActivityScreen = /*#__PURE__*/(0, _react.memo)(fu
     return paintDriverAnimations.transitionProgress.get() >= 1;
   });
   const isPaintDriverSettledOnJS = (0, _useSharedValueState.useSharedValueState)(isPaintDriverSettled);
-  let activityState = ActivityStateByActivity[activity];
+  let activityState = ActivityStateByActivity[resolvedActivity];
   let shouldFreeze = false;
-  let visible = activity !== "inactive";
+  let visible = resolvedActivity !== "inactive";
   const shouldWaitForPaintDriver = !isPaintDriverSettledOnJS;
-  if (activity === "inactive") {
-    if (inactiveBehavior === "keep") {
+  if (resolvedActivity === "inactive") {
+    if (resolvedInactiveBehavior === "keep") {
       activityState = 1;
       visible = true;
     } else if (shouldWaitForPaintDriver) {
@@ -65,7 +81,7 @@ const ActivityScreen = exports.ActivityScreen = /*#__PURE__*/(0, _react.memo)(fu
       // a blank frame during the transition.
       activityState = 1;
       visible = true;
-    } else if (inactiveBehavior === "pause") {
+    } else if (resolvedInactiveBehavior === "pause") {
       activityState = 1;
       shouldFreeze = true;
       visible = true;
@@ -77,8 +93,8 @@ const ActivityScreen = exports.ActivityScreen = /*#__PURE__*/(0, _react.memo)(fu
       visible = false;
     }
   }
-  const shouldUnmount = inactiveBehavior === "unmount" && activity === "inactive" && !hasNestedState && isPaintDriverSettledOnJS;
-  const pointerEvents = PointerEventsByActivity[activity];
+  const shouldUnmount = resolvedInactiveBehavior === "unmount" && resolvedActivity === "inactive" && !resolvedHasNestedState && isPaintDriverSettledOnJS;
+  const pointerEvents = PointerEventsByActivity[resolvedActivity];
   if (shouldUnmount) {
     return null;
   }

package/lib/commonjs/shared/components/activity/variants/activity-screen.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_reactNativeScreens","_constants","_useStack","_useSharedValueState","_animation","_helpers","_jsxRuntime","ActivityStateByActivity","active","inert","inactive","closing","PointerEventsByActivity","ActivityScreen","exports","memo","activity","children","inactiveBehavior","DEFAULT_INACTIVE_BEHAVIOR","paintDriverRouteKey","hasNestedState","nativeScreenDisabled","useStack","s","flags","DISABLE_NATIVE_SCREENS","paintDriverAnimations","AnimationStore","getBag","undefined","isPaintDriverSettled","useDerivedValue","transitionProgress","get","isPaintDriverSettledOnJS","useSharedValueState","activityState","shouldFreeze","visible","shouldWaitForPaintDriver","shouldUnmount","pointerEvents","style","StyleSheet","absoluteFill","styles","hidden","IS_WEB","jsx","View","collapsable","Screen","HIDDEN_SCREEN_OFFSET","create","transform","translateY"],"sourceRoot":"../../../../../../src","sources":["shared/components/activity/variants/activity-screen.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_reactNativeScreens","_constants","_useStack","_useSharedValueState","_blankStack","_animation","_helpers","_jsxRuntime","ActivityStateByActivity","active","inert","inactive","closing","PointerEventsByActivity","ActivityScreen","exports","memo","activity","children","inactiveBehavior","paintDriverRouteKey","hasNestedState","routeKey","stackActivity","useBlankStackStore","store","scenesByKey","undefined","stackInactiveBehavior","descriptor","options","stackRoute","route","stackPaintDriverRouteKey","routeIndex","routeKeys","indexOf","resolvedActivity","resolvedInactiveBehavior","DEFAULT_INACTIVE_BEHAVIOR","resolvedPaintDriverRouteKey","resolvedHasNestedState","nativeScreenDisabled","useStack","s","flags","DISABLE_NATIVE_SCREENS","paintDriverAnimations","AnimationStore","getBag","isPaintDriverSettled","useDerivedValue","transitionProgress","get","isPaintDriverSettledOnJS","useSharedValueState","activityState","shouldFreeze","visible","shouldWaitForPaintDriver","shouldUnmount","pointerEvents","style","StyleSheet","absoluteFill","styles","hidden","IS_WEB","jsx","View","collapsable","Screen","HIDDEN_SCREEN_OFFSET","create","transform","translateY"],"sourceRoot":"../../../../../../src","sources":["shared/components/activity/variants/activity-screen.tsx"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAF,OAAA;AACA,IAAAG,mBAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,SAAA,GAAAL,OAAA;AACA,IAAAM,oBAAA,GAAAN,OAAA;AACA,IAAAO,WAAA,GAAAP,OAAA;AACA,IAAAQ,UAAA,GAAAR,OAAA;AAEA,IAAAS,QAAA,GAAAT,OAAA;AAA8E,IAAAU,WAAA,GAAAV,OAAA;AAG9E,MAAMW,uBAAuB,GAAG;EAC/BC,MAAM,EAAE,CAAC;EACTC,KAAK,EAAE,CAAC;EACRC,QAAQ,EAAE,CAAC;EACXC,OAAO,EAAE;AACV,CAAqD;AAErD,MAAMC,uBAAuB,GAAG;EAC/BJ,MAAM,EAAE,MAAM;EACdC,KAAK,EAAE,MAAM;EACbC,QAAQ,EAAE,MAAM;EAChBC,OAAO,EAAE;AACV,CAAkE;AAW3D,MAAME,cAAc,GAAAC,OAAA,CAAAD,cAAA,gBAAG,IAAAE,WAAI,EAAC,SAASF,cAAcA,CAAC;EAC1DG,QAAQ;EACRC,QAAQ;EACRC,gBAAgB;EAChBC,mBAAmB;EACnBC,cAAc;EACdC;AACoB,CAAC,EAAE;EACvB,MAAMC,aAAa,GAAG,IAAAC,8BAAkB,EAAEC,KAAK,IAC9CH,QAAQ,GAAGG,KAAK,EAAEC,WAAW,CAACJ,QAAQ,CAAC,EAAEL,QAAQ,GAAGU,SACrD,CAAC;EACD,MAAMC,qBAAqB,GAAG,IAAAJ,8BAAkB,EAAEC,KAAK,IACtDH,QAAQ,GAELG,KAAK,EAAEC,WAAW,CAACJ,QAAQ,CAAC,EAAEO,UAAU,CAACC,OAAO,EAG9CX,gBAAgB,GAClBQ,SACJ,CAAC;EACD,MAAMI,UAAU,GAAG,IAAAP,8BAAkB,EAAEC,KAAK,IAC3CH,QAAQ,GAAGG,KAAK,EAAEC,WAAW,CAACJ,QAAQ,CAAC,EAAEU,KAAK,GAAGL,SAClD,CAAC;EACD,MAAMM,wBAAwB,GAAG,IAAAT,8BAAkB,EAAEC,KAAK,IAAK;IAC9D,IAAI,CAACH,QAAQ,IAAI,CAACG,KAAK,EAAE;MACxB,OAAOE,SAAS;IACjB;IAEA,MAAMO,UAAU,GAAGT,KAAK,CAACU,SAAS,CAACC,OAAO,CAACd,QAAQ,CAAC;IACpD,OAAOG,KAAK,CAACU,SAAS,CAACD,UAAU,GAAG,CAAC,CAAC;EACvC,CAAC,CAAC;EACF,MAAMG,gBAAgB,GAAGpB,QAAQ,IAAIM,aAAa,IAAI,QAAQ;EAC9D,MAAMe,wBAAwB,GAC7BnB,gBAAgB,IAAIS,qBAAqB,IAAIW,kCAAyB;EACvE,MAAMC,2BAA2B,GAChCpB,mBAAmB,IAAIa,wBAAwB;EAChD,MAAMQ,sBAAsB,GAC3BpB,cAAc,KAAKU,UAAU,GAAG,OAAO,IAAIA,UAAU,GAAG,KAAK,CAAC;EAC/D,MAAMW,oBAAoB,GAAG,IAAAC,kBAAQ,EAAEC,CAAC,IAAKA,CAAC,CAACC,KAAK,CAACC,sBAAsB,CAAC;EAC5E,MAAMC,qBAAqB,GAAGP,2BAA2B,GACtDQ,yBAAc,CAACC,MAAM,CAACT,2BAA2B,CAAC,GAClDb,SAAS;;EAEZ;AACD;AACA;AACA;AACA;AACA;AACA;EACC,MAAMuB,oBAAoB,GAAG,IAAAC,sCAAe,EAAC,MAAM;IAClD,SAAS;;IAET,IAAI,CAACJ,qBAAqB,EAAE;MAC3B,OAAO,KAAK;IACb;IAEA,OAAOA,qBAAqB,CAACK,kBAAkB,CAACC,GAAG,CAAC,CAAC,IAAI,CAAC;EAC3D,CAAC,CAAC;EAEF,MAAMC,wBAAwB,GAAG,IAAAC,wCAAmB,EAACL,oBAAoB,CAAC;EAE1E,IAAIM,aAA4B,GAAGhD,uBAAuB,CAAC6B,gBAAgB,CAAC;EAC5E,IAAIoB,YAAY,GAAG,KAAK;EACxB,IAAIC,OAAO,GAAGrB,gBAAgB,KAAK,UAAU;EAE7C,MAAMsB,wBAAwB,GAAG,CAACL,wBAAwB;EAE1D,IAAIjB,gBAAgB,KAAK,UAAU,EAAE;IACpC,IAAIC,wBAAwB,KAAK,MAAM,EAAE;MACxCkB,aAAa,GAAG,CAAC;MACjBE,OAAO,GAAG,IAAI;IACf,CAAC,MAAM,IAAIC,wBAAwB,EAAE;MACpC;MACA;MACAH,aAAa,GAAG,CAAC;MACjBE,OAAO,GAAG,IAAI;IACf,CAAC,MAAM,IAAIpB,wBAAwB,KAAK,OAAO,EAAE;MAChDkB,aAAa,GAAG,CAAC;MACjBC,YAAY,GAAG,IAAI;MACnBC,OAAO,GAAG,IAAI;IACf,CAAC,MAAM;MACN;MACA;MACAF,aAAa,GAAG,CAAC;MACjBC,YAAY,GAAG,IAAI;MACnBC,OAAO,GAAG,KAAK;IAChB;EACD;EAEA,MAAME,aAAa,GAClBtB,wBAAwB,KAAK,SAAS,IACtCD,gBAAgB,KAAK,UAAU,IAC/B,CAACI,sBAAsB,IACvBa,wBAAwB;EAEzB,MAAMO,aAAa,GAAGhD,uBAAuB,CAACwB,gBAAgB,CAAC;EAE/D,IAAIuB,aAAa,EAAE;IAClB,OAAO,IAAI;EACZ;EAEA,MAAME,KAAK,GAAG,CAACC,uBAAU,CAACC,YAAY,EAAEN,OAAO,GAAG/B,SAAS,GAAGsC,MAAM,CAACC,MAAM,CAAC;EAE5E,IAAIC,iBAAM,IAAIzB,oBAAoB,EAAE;IACnC,oBACC,IAAAnC,WAAA,CAAA6D,GAAA,EAACtE,YAAA,CAAAuE,IAAI;MAACP,KAAK,EAAEA,KAAM;MAACD,aAAa,EAAEA,aAAc;MAACS,WAAW,EAAE,KAAM;MAAApD,QAAA,EACnEA;IAAQ,CACJ,CAAC;EAET;EAEA,oBACC,IAAAX,WAAA,CAAA6D,GAAA,EAACpE,mBAAA,CAAAuE,MAAM;IACNT,KAAK,EAAEA,KAAM;IACbN,aAAa,EAAEA,aAAc;IAC7BC,YAAY,EAAEA,YAAa;IAC3BI,aAAa,EAAEA,aAAc;IAC7BS,WAAW,EAAE,KAAM;IAAApD,QAAA,EAElBA;EAAQ,CACF,CAAC;AAEX,CAAC,CAAC;AAEF,MAAMsD,oBAAoB,GAAG,MAAM;AACnC,MAAMP,MAAM,GAAGF,uBAAU,CAACU,MAAM,CAAC;EAChCP,MAAM,EAAE;IACP;IACA;IACA;IACA;IACA;IACAQ,SAAS,EAAE,CAAC;MAAEC,UAAU,EAAEH;IAAqB,CAAC;EACjD;AACD,CAAC,CAAC","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/components/boundary-target.js

@@ -22,7 +22,7 @@ const BoundaryTargetInner = props => {
     style,
     ...rest
   } = props;
-  const rootContext = (0, _boundaryRoot.useBoundaryRootContext)();
+  const rootContext = (0, _boundaryRoot.useBoundaryRootStore)();
   const boundaryId = rootContext?.boundTag.tag;
   const isActiveTarget = active === true && rootContext !== null;
   const portalRuntime = rootContext?.portalRuntime;

package/lib/commonjs/shared/components/boundary/components/boundary-target.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_interopRequireDefault","_styles","_logger","_boundaryContentPortal","_boundaryPortal","_boundaryRoot","_jsxRuntime","e","__esModule","default","BOUNDARY_TARGET_ACTIVE_PROP","exports","BoundaryTargetInner","props","active","children","pointerEvents","style","rest","rootContext","useBoundaryRootContext","boundaryId","boundTag","tag","isActiveTarget","portalRuntime","handoffEnabled","shouldEscapeTargetToScreenHost","escapeClipping","shouldApplyAssociatedStyleInline","shouldApplyPortalLayoutStyle","associatedTargetStyles","useComposedSlotStyles","portalLayoutStyle","useSlotLayoutStyles","measurementRef","undefined","useLayoutEffect","__DEV__","logger","warn","TARGET_OUTSIDE_ROOT_WARNING","jsx","BoundaryPortal","enabled","placeholderRef","View","ref","collapsable","BoundaryContentPortalHost","screenKey","currentScreenKey","BoundaryContentPortal","BoundaryTarget","memo"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/components/boundary-target.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_interopRequireDefault","_styles","_logger","_boundaryContentPortal","_boundaryPortal","_boundaryRoot","_jsxRuntime","e","__esModule","default","BOUNDARY_TARGET_ACTIVE_PROP","exports","BoundaryTargetInner","props","active","children","pointerEvents","style","rest","rootContext","useBoundaryRootStore","boundaryId","boundTag","tag","isActiveTarget","portalRuntime","handoffEnabled","shouldEscapeTargetToScreenHost","escapeClipping","shouldApplyAssociatedStyleInline","shouldApplyPortalLayoutStyle","associatedTargetStyles","useComposedSlotStyles","portalLayoutStyle","useSlotLayoutStyles","measurementRef","undefined","useLayoutEffect","__DEV__","logger","warn","TARGET_OUTSIDE_ROOT_WARNING","jsx","BoundaryPortal","enabled","placeholderRef","View","ref","collapsable","BoundaryContentPortalHost","screenKey","currentScreenKey","BoundaryContentPortal","BoundaryTarget","memo"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/components/boundary-target.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useInitialDestinationMeasurement = void 0;
 var _react = require("react");
 var _reactNativeReanimated = require("react-native-reanimated");
+var _useStack = require("../../../../hooks/navigation/use-stack");
 var _descriptors = require("../../../../providers/screen/descriptors");
 var _animation = require("../../../../stores/animation.store");
 var _linkPairs = require("../../../../stores/bounds/helpers/link-pairs.helpers");
@@ -15,7 +16,9 @@ var _state = require("../../../../stores/bounds/internals/state");
 var _system = require("../../../../stores/system.store");
 var _logger = require("../../../../utils/logger");
 var _destinationSignals = require("../../utils/destination-signals");
-const HANDSHAKE_RETRY_DELAY_MS = 100;
+// A missed layout should be retried on the next frame. The previous 100 ms
+// interval made each ordinary Android layout miss visibly delay navigation.
+const HANDSHAKE_RETRY_DELAY_MS = 16;
 /**
  * A destination whose initial handshake never completes must not hold the
  * transition gate forever. After this budget, release the block with a warning
@@ -36,9 +39,13 @@ const useInitialDestinationMeasurement = ({
   const currentScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.currentScreenKey);
   const nextScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.nextScreenKey);
   const destinationPairKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.destinationPairKey);
-  const ancestorDestinationPairKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.ancestorDestinationPairKey);
   const destinationEnabled = enabled && !nextScreenKey;
-  const initialDestinationPairKey = destinationPairKey ?? ancestorDestinationPairKey;
+  const canReceiveDestination = destinationEnabled && !!destinationPairKey;
+  const preferredSourceScreenKey = destinationPairKey ? (0, _linkPairs.getSourceScreenKeyFromPairKey)(destinationPairKey) : undefined;
+  const stackScenes = (0, _useStack.useStack)(store => store.scenes);
+  // A retained closing screen can still have registered boundaries, but it
+  // cannot own a new transition link.
+  const closingSourceScreenKeys = (0, _react.useMemo)(() => stackScenes.filter(scene => scene.activity === "closing").map(scene => scene.route.key), [stackScenes]);
   const progress = _animation.AnimationStore.getValue(currentScreenKey, "transitionProgress");
   const {
     actions: {
@@ -50,6 +57,7 @@ const useInitialDestinationMeasurement = ({
   const retryToken = (0, _reactNativeReanimated.useSharedValue)(0);
   const handshakeRetries = (0, _reactNativeReanimated.useSharedValue)(0);
   const hasGivenUp = (0, _reactNativeReanimated.useSharedValue)(0);
+  const hasFinishedInitialMeasurement = (0, _reactNativeReanimated.useSharedValue)(0);
   const releaseLifecycleStartBlock = (0, _react.useCallback)(() => {
     "worklet";
 
@@ -57,12 +65,17 @@ const useInitialDestinationMeasurement = ({
     if (!isBlockingLifecycleStart.get()) {
       return;
     }
+    hasFinishedInitialMeasurement.set(1);
     isBlockingLifecycleStart.set(0);
     unblockLifecycleStart();
-  }, [isBlockingLifecycleStart, retryToken, unblockLifecycleStart]);
+  }, [hasFinishedInitialMeasurement, isBlockingLifecycleStart, retryToken, unblockLifecycleStart]);
   const claimLifecycleStartBlock = (0, _react.useCallback)(() => {
     "worklet";
 
+    if (!canReceiveDestination || hasFinishedInitialMeasurement.get() || !(0, _entries.getMatchingSourceScreenKey)(tag, currentScreenKey)) {
+      return;
+    }
+
     // The progress check and block claim must share one UI-thread operation.
     // Otherwise a JS-thread layout effect can observe zero, enqueue the block,
     // and let the opening animation start before that block reaches the UI thread.
@@ -71,9 +84,9 @@ const useInitialDestinationMeasurement = ({
     }
     blockLifecycleStart();
     isBlockingLifecycleStart.set(1);
-  }, [blockLifecycleStart, isBlockingLifecycleStart, progress]);
+  }, [blockLifecycleStart, canReceiveDestination, currentScreenKey, hasFinishedInitialMeasurement, isBlockingLifecycleStart, progress, tag]);
   (0, _react.useLayoutEffect)(() => {
-    if (!destinationEnabled || !initialDestinationPairKey) {
+    if (!canReceiveDestination) {
       return;
     }
     (0, _reactNativeReanimated.runOnUI)(claimLifecycleStartBlock)();
@@ -87,28 +100,37 @@ const useInitialDestinationMeasurement = ({
       // runtime so it serializes with the handshake's guarded release.
       (0, _reactNativeReanimated.runOnUI)(releaseLifecycleStartBlock)();
     };
-  }, [claimLifecycleStartBlock, destinationEnabled, escapeClipping, initialDestinationPairKey, releaseLifecycleStartBlock]);
+  }, [claimLifecycleStartBlock, escapeClipping, canReceiveDestination, releaseLifecycleStartBlock]);
   (0, _reactNativeReanimated.useAnimatedReaction)(() => {
     "worklet";
 
+    if (!canReceiveDestination || hasFinishedInitialMeasurement.get() || isBlockingLifecycleStart.get() <= 0) {
+      return null;
+    }
+    if (progress.get() > 0) {
+      return null;
+    }
     const retryTick = retryToken.get();
-    const isWaitingForOpenToStart = progress.get() <= 0;
-    const sourceScreenKey = initialDestinationPairKey ? (0, _linkPairs.getSourceScreenKeyFromPairKey)(initialDestinationPairKey) : undefined;
+    const sourceScreenKey = (0, _entries.getMatchingSourceScreenKey)(tag, currentScreenKey, preferredSourceScreenKey, closingSourceScreenKeys);
+    const pairKey = sourceScreenKey ? (0, _linkPairs.createScreenPairKey)(sourceScreenKey, currentScreenKey) : undefined;
     const signal = (0, _destinationSignals.getInitialDestinationMeasurementSignal)({
-      enabled: destinationEnabled && isWaitingForOpenToStart && isBlockingLifecycleStart.get() > 0,
-      destinationPairKey,
-      ancestorDestinationPairKey,
+      enabled: destinationEnabled,
+      pairKey,
       linkId: linkKey,
       group,
       destinationPresent: (0, _entries.getEntry)(tag, currentScreenKey) !== null,
-      sourcePresent: sourceScreenKey !== undefined && (0, _entries.getEntry)(tag, sourceScreenKey) !== null,
-      linkState: initialDestinationPairKey ? _state.pairs.get() : undefined
+      sourcePresent: sourceScreenKey !== null,
+      linkState: _state.pairs.get()
     });
     return [signal?.pairKey ?? null, signal?.action ?? null, retryTick];
-  }, ([measurePairKey, action, retryTick], previous) => {
+  }, (next, previous) => {
     "worklet";
 
-    if (!measurePairKey || !action) {
+    if (!next || hasFinishedInitialMeasurement.get()) {
+      return;
+    }
+    const [measurePairKey, action, retryTick] = next;
+    if (!action) {
       return;
     }
     const previousMeasurePairKey = previous?.[0];
@@ -126,17 +148,18 @@ const useInitialDestinationMeasurement = ({
       handshakeRetries.set(0);
       return;
     }
-    if (action === "measure") {
+    if (action === "measure" && measurePairKey) {
       measureBoundary({
         type: "destination",
         pairKey: measurePairKey
       });
     }
-    const link = (0, _links.getLink)(measurePairKey, linkKey);
+    const link = measurePairKey ? (0, _links.getLink)(measurePairKey, linkKey) : null;
     const linkComplete = !!link?.source && !!link.destination;
     if (linkComplete || action === "complete") {
       (0, _reactNativeReanimated.cancelAnimation)(retryToken);
       handshakeRetries.set(0);
+      hasFinishedInitialMeasurement.set(1);
       if (escapeClipping) {
         // Screen-level escape has a second readiness phase after destination
         // matching: the host must commit before the transition starts, or

package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_descriptors","_animation","_linkPairs","_entries","_links","_state","_system","_logger","_destinationSignals","HANDSHAKE_RETRY_DELAY_MS","MAX_HANDSHAKE_RETRIES","useInitialDestinationMeasurement","boundTag","enabled","escapeClipping","measureBoundary","tag","linkKey","group","currentScreenKey","useDescriptorsStore","s","derivations","nextScreenKey","destinationPairKey","ancestorDestinationPairKey","destinationEnabled","initialDestinationPairKey","progress","AnimationStore","getValue","actions","blockLifecycleStart","unblockLifecycleStart","SystemStore","getBag","isBlockingLifecycleStart","useSharedValue","retryToken","handshakeRetries","hasGivenUp","releaseLifecycleStartBlock","useCallback","cancelAnimation","get","set","claimLifecycleStartBlock","useLayoutEffect","runOnUI","useAnimatedReaction","retryTick","isWaitingForOpenToStart","sourceScreenKey","getSourceScreenKeyFromPairKey","undefined","signal","getInitialDestinationMeasurementSignal","linkId","destinationPresent","getEntry","sourcePresent","linkState","pairs","pairKey","action","measurePairKey","previous","previousMeasurePairKey","previousAction","previousRetryTick","shouldHandleSignal","type","link","getLink","linkComplete","source","destination","logger","warn","withDelay","withTiming","duration","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_useStack","_descriptors","_animation","_linkPairs","_entries","_links","_state","_system","_logger","_destinationSignals","HANDSHAKE_RETRY_DELAY_MS","MAX_HANDSHAKE_RETRIES","useInitialDestinationMeasurement","boundTag","enabled","escapeClipping","measureBoundary","tag","linkKey","group","currentScreenKey","useDescriptorsStore","s","derivations","nextScreenKey","destinationPairKey","destinationEnabled","canReceiveDestination","preferredSourceScreenKey","getSourceScreenKeyFromPairKey","undefined","stackScenes","useStack","store","scenes","closingSourceScreenKeys","useMemo","filter","scene","activity","map","route","key","progress","AnimationStore","getValue","actions","blockLifecycleStart","unblockLifecycleStart","SystemStore","getBag","isBlockingLifecycleStart","useSharedValue","retryToken","handshakeRetries","hasGivenUp","hasFinishedInitialMeasurement","releaseLifecycleStartBlock","useCallback","cancelAnimation","get","set","claimLifecycleStartBlock","getMatchingSourceScreenKey","useLayoutEffect","runOnUI","useAnimatedReaction","retryTick","sourceScreenKey","pairKey","createScreenPairKey","signal","getInitialDestinationMeasurementSignal","linkId","destinationPresent","getEntry","sourcePresent","linkState","pairs","action","next","previous","measurePairKey","previousMeasurePairKey","previousAction","previousRetryTick","shouldHandleSignal","type","link","getLink","linkComplete","source","destination","logger","warn","withDelay","withTiming","duration","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-initial-source-measurement.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useInitialSourceMeasurement = void 0;
 var _reactNativeReanimated = require("react-native-reanimated");
 var _descriptors = require("../../../../providers/screen/descriptors");
+var _links = require("../../../../stores/bounds/internals/links");
 var _state = require("../../../../stores/bounds/internals/state");
 var _sourceSignals = require("../../utils/source-signals");
 const useInitialSourceMeasurement = params => {
@@ -14,11 +15,12 @@ const useInitialSourceMeasurement = params => {
     measureBoundary,
     boundTag
   } = params;
-  const sourcePairKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.sourcePairKey);
+  const currentScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.currentScreenKey);
   const lastSourceCaptureSignal = (0, _reactNativeReanimated.useSharedValue)(null);
   (0, _reactNativeReanimated.useAnimatedReaction)(() => {
     "worklet";
 
+    const sourcePairKey = (0, _links.getPairKeyForSource)(boundTag.tag, currentScreenKey) ?? undefined;
     return (0, _sourceSignals.getInitialSourceCaptureSignal)({
       enabled,
       sourcePairKey,

package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-initial-source-measurement.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_descriptors","_state","_sourceSignals","useInitialSourceMeasurement","params","enabled","measureBoundary","boundTag","sourcePairKey","useDescriptorsStore","s","derivations","lastSourceCaptureSignal","useSharedValue","useAnimatedReaction","getInitialSourceCaptureSignal","linkId","linkKey","group","linkState","pairs","get","undefined","captureSignal","set","signal","type","pairKey","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/hooks/lifecycles/use-initial-source-measurement.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AAGA,IAAAG,cAAA,GAAAH,OAAA;AAEO,MAAMI,2BAA2B,GAAIC,MAI3C,IAAK;EACL,MAAM;IAAEC,OAAO;IAAEC,eAAe;IAAEC;EAAS,CAAC,GAAGH,MAAM;EACrD,MAAMI,aAAa,GAAG,IAAAC,gCAAmB,EAAEC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACH,aAAa,CAAC;EAC7E,MAAMI,uBAAuB,GAAG,IAAAC,qCAAc,EAAgB,IAAI,CAAC;EAEnE,IAAAC,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,OAAO,IAAAC,4CAA6B,EAAC;MACpCV,OAAO;MACPG,aAAa;MACbQ,MAAM,EAAET,QAAQ,CAACU,OAAO;MACxBC,KAAK,EAAEX,QAAQ,CAACW,KAAK;MACrBC,SAAS,EAAEX,aAAa,GAAGY,YAAK,CAACC,GAAG,CAAC,CAAC,GAAGC;IAC1C,CAAC,CAAC;EACH,CAAC,EACAC,aAAa,IAAK;IAClB,SAAS;;IACT,IAAI,CAAClB,OAAO,IAAI,CAACkB,aAAa,EAAE;MAC/BX,uBAAuB,CAACY,GAAG,CAAC,IAAI,CAAC;MACjC;IACD;IAEA,IAAIZ,uBAAuB,CAACS,GAAG,CAAC,CAAC,KAAKE,aAAa,CAACE,MAAM,EAAE;MAC3D;IACD;IAEAb,uBAAuB,CAACY,GAAG,CAACD,aAAa,CAACE,MAAM,CAAC;IACjDnB,eAAe,CAAC;MACfoB,IAAI,EAAE,QAAQ;MACdC,OAAO,EAAEJ,aAAa,CAACI;IACxB,CAAC,CAAC;EACH,CACD,CAAC;AACF,CAAC;AAACC,OAAA,CAAAzB,2BAAA,GAAAA,2BAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_descriptors","_links","_state","_sourceSignals","useInitialSourceMeasurement","params","enabled","measureBoundary","boundTag","currentScreenKey","useDescriptorsStore","s","derivations","lastSourceCaptureSignal","useSharedValue","useAnimatedReaction","sourcePairKey","getPairKeyForSource","tag","undefined","getInitialSourceCaptureSignal","linkId","linkKey","group","linkState","pairs","get","captureSignal","set","signal","type","pairKey","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/hooks/lifecycles/use-initial-source-measurement.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AAGA,IAAAI,cAAA,GAAAJ,OAAA;AAEO,MAAMK,2BAA2B,GAAIC,MAI3C,IAAK;EACL,MAAM;IAAEC,OAAO;IAAEC,eAAe;IAAEC;EAAS,CAAC,GAAGH,MAAM;EACrD,MAAMI,gBAAgB,GAAG,IAAAC,gCAAmB,EAC1CC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACH,gBACtB,CAAC;EACD,MAAMI,uBAAuB,GAAG,IAAAC,qCAAc,EAAgB,IAAI,CAAC;EAEnE,IAAAC,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,MAAMC,aAAa,GAClB,IAAAC,0BAAmB,EAACT,QAAQ,CAACU,GAAG,EAAET,gBAAgB,CAAC,IAAIU,SAAS;IACjE,OAAO,IAAAC,4CAA6B,EAAC;MACpCd,OAAO;MACPU,aAAa;MACbK,MAAM,EAAEb,QAAQ,CAACc,OAAO;MACxBC,KAAK,EAAEf,QAAQ,CAACe,KAAK;MACrBC,SAAS,EAAER,aAAa,GAAGS,YAAK,CAACC,GAAG,CAAC,CAAC,GAAGP;IAC1C,CAAC,CAAC;EACH,CAAC,EACAQ,aAAa,IAAK;IAClB,SAAS;;IACT,IAAI,CAACrB,OAAO,IAAI,CAACqB,aAAa,EAAE;MAC/Bd,uBAAuB,CAACe,GAAG,CAAC,IAAI,CAAC;MACjC;IACD;IAEA,IAAIf,uBAAuB,CAACa,GAAG,CAAC,CAAC,KAAKC,aAAa,CAACE,MAAM,EAAE;MAC3D;IACD;IAEAhB,uBAAuB,CAACe,GAAG,CAACD,aAAa,CAACE,MAAM,CAAC;IACjDtB,eAAe,CAAC;MACfuB,IAAI,EAAE,QAAQ;MACdC,OAAO,EAAEJ,aAAa,CAACI;IACxB,CAAC,CAAC;EACH,CACD,CAAC;AACF,CAAC;AAACC,OAAA,CAAA5B,2BAAA,GAAAA,2BAAA","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-refresh-boundary.js

@@ -7,8 +7,8 @@ exports.useRefreshBoundary = void 0;
 var _reactNativeReanimated = require("react-native-reanimated");
 var _descriptors = require("../../../../providers/screen/descriptors");
 var _animation = require("../../../../stores/animation.store");
+var _links = require("../../../../stores/bounds/internals/links");
 var _state = require("../../../../stores/bounds/internals/state");
-var _gesture = require("../../../../stores/gesture.store");
 var _refreshSignals = require("../../utils/refresh-signals");
 const useRefreshBoundary = ({
   enabled,
@@ -21,38 +21,29 @@ const useRefreshBoundary = ({
   } = boundTag;
   const currentScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.currentScreenKey);
   const nextScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.nextScreenKey);
-  const sourcePairKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.sourcePairKey);
-  const destinationPairKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.destinationPairKey);
-  const ancestorDestinationPairKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.ancestorDestinationPairKey);
   // Source-side boundaries refresh from the next screen's lifecycle pulse.
   // Destination-side boundaries have no next screen, so they refresh from self.
   const refreshScreenKey = nextScreenKey ?? currentScreenKey;
   const refreshWillAnimate = _animation.AnimationStore.getValue(refreshScreenKey, "willAnimate");
   const refreshClosing = _animation.AnimationStore.getValue(refreshScreenKey, "closing");
-  const refreshEntering = _animation.AnimationStore.getValue(refreshScreenKey, "entering");
-  const refreshAnimating = _animation.AnimationStore.getValue(refreshScreenKey, "progressAnimating");
-  const refreshProgress = _animation.AnimationStore.getValue(refreshScreenKey, "transitionProgress");
-  const refreshDragging = _gesture.GestureStore.getValue(refreshScreenKey, "dragging");
-  const refreshDismissing = _gesture.GestureStore.getValue(refreshScreenKey, "dismissing");
-  const refreshSettling = _gesture.GestureStore.getValue(refreshScreenKey, "settling");
   (0, _reactNativeReanimated.useAnimatedReaction)(() => {
     "worklet";
 
+    const shouldRefresh = enabled && !!refreshWillAnimate.get();
+    if (!shouldRefresh) {
+      return null;
+    }
+    const sourcePairKey = (0, _links.getPairKeyForSource)(boundTag.tag, currentScreenKey) ?? undefined;
+    const destinationPairKey = (0, _links.getPairKeyForDestination)(boundTag.tag, currentScreenKey) ?? undefined;
     return (0, _refreshSignals.getRefreshBoundarySignal)({
       enabled,
       currentScreenKey,
       sourcePairKey,
       destinationPairKey,
-      ancestorDestinationPairKey,
-      nextScreenKey,
       linkId: linkKey,
       group,
-      shouldRefresh: !!refreshWillAnimate.get(),
+      shouldRefresh,
       closing: !!refreshClosing.get(),
-      entering: !!refreshEntering.get(),
-      animating: !!refreshAnimating.get(),
-      progress: refreshProgress.get(),
-      gestureInProgress: !!refreshDragging.get() || !!refreshDismissing.get() || !!refreshSettling.get(),
       linkState: _state.pairs.get()
     });
   }, (refreshSignal, prevRefreshSignal) => {

package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-refresh-boundary.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_descriptors","_animation","_state","_gesture","_refreshSignals","useRefreshBoundary","enabled","boundTag","measureBoundary","linkKey","group","currentScreenKey","useDescriptorsStore","s","derivations","nextScreenKey","sourcePairKey","destinationPairKey","ancestorDestinationPairKey","refreshScreenKey","refreshWillAnimate","AnimationStore","getValue","refreshClosing","refreshEntering","refreshAnimating","refreshProgress","refreshDragging","GestureStore","refreshDismissing","refreshSettling","useAnimatedReaction","getRefreshBoundarySignal","linkId","shouldRefresh","get","closing","entering","animating","progress","gestureInProgress","linkState","pairs","refreshSignal","prevRefreshSignal","signal","type","pairKey","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/hooks/lifecycles/use-refresh-boundary.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_descriptors","_animation","_links","_state","_refreshSignals","useRefreshBoundary","enabled","boundTag","measureBoundary","linkKey","group","currentScreenKey","useDescriptorsStore","s","derivations","nextScreenKey","refreshScreenKey","refreshWillAnimate","AnimationStore","getValue","refreshClosing","useAnimatedReaction","shouldRefresh","get","sourcePairKey","getPairKeyForSource","tag","undefined","destinationPairKey","getPairKeyForDestination","getRefreshBoundarySignal","linkId","closing","linkState","pairs","refreshSignal","prevRefreshSignal","signal","type","pairKey","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/hooks/lifecycles/use-refresh-boundary.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AAIA,IAAAI,MAAA,GAAAJ,OAAA;AAGA,IAAAK,eAAA,GAAAL,OAAA;AAQO,MAAMM,kBAAkB,GAAGA,CAAC;EAClCC,OAAO;EACPC,QAAQ;EACRC;AACyB,CAAC,KAAK;EAC/B,MAAM;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGH,QAAQ;EACnC,MAAMI,gBAAgB,GAAG,IAAAC,gCAAmB,EAC1CC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACH,gBACtB,CAAC;EACD,MAAMI,aAAa,GAAG,IAAAH,gCAAmB,EAAEC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACC,aAAa,CAAC;EAC7E;EACA;EACA,MAAMC,gBAAgB,GAAGD,aAAa,IAAIJ,gBAAgB;EAC1D,MAAMM,kBAAkB,GAAGC,yBAAc,CAACC,QAAQ,CACjDH,gBAAgB,EAChB,aACD,CAAC;EACD,MAAMI,cAAc,GAAGF,yBAAc,CAACC,QAAQ,CAACH,gBAAgB,EAAE,SAAS,CAAC;EAE3E,IAAAK,0CAAmB,EAClB,MAAM;IACL,SAAS;;IAET,MAAMC,aAAa,GAAGhB,OAAO,IAAI,CAAC,CAACW,kBAAkB,CAACM,GAAG,CAAC,CAAC;IAC3D,IAAI,CAACD,aAAa,EAAE;MACnB,OAAO,IAAI;IACZ;IACA,MAAME,aAAa,GAClB,IAAAC,0BAAmB,EAAClB,QAAQ,CAACmB,GAAG,EAAEf,gBAAgB,CAAC,IAAIgB,SAAS;IACjE,MAAMC,kBAAkB,GACvB,IAAAC,+BAAwB,EAACtB,QAAQ,CAACmB,GAAG,EAAEf,gBAAgB,CAAC,IAAIgB,SAAS;IAEtE,OAAO,IAAAG,wCAAwB,EAAC;MAC/BxB,OAAO;MACPK,gBAAgB;MAChBa,aAAa;MACbI,kBAAkB;MAClBG,MAAM,EAAEtB,OAAO;MACfC,KAAK;MACLY,aAAa;MACbU,OAAO,EAAE,CAAC,CAACZ,cAAc,CAACG,GAAG,CAAC,CAAC;MAC/BU,SAAS,EAAEC,YAAK,CAACX,GAAG,CAAC;IACtB,CAAC,CAAC;EACH,CAAC,EACD,CAACY,aAAa,EAAEC,iBAAiB,KAAK;IACrC,SAAS;;IAET,IACC,CAACD,aAAa,IACdA,aAAa,CAACE,MAAM,KAAKD,iBAAiB,EAAEC,MAAM,EACjD;MACD;IACD;IAEA7B,eAAe,CAAC;MACf8B,IAAI,EAAEH,aAAa,CAACG,IAAI;MACxBC,OAAO,EAAEJ,aAAa,CAACI;IACxB,CAAC,CAAC;EACH,CACD,CAAC;AACF,CAAC;AAACC,OAAA,CAAAnC,kBAAA,GAAAA,kBAAA","ignoreList":[]}

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

@@ -50,10 +50,11 @@ const useBoundaryMeasurement = ({
     escapeClipping
   });
 
-  // Register/unregister this boundary in the presence map so source/destination
-  // matching can resolve across concrete screen keys.
+  // Presence and source capture must not depend on this screen owning an
+  // interpolator: a nested source can participate in a transition owned by a
+  // different navigator.
   (0, _useBoundaryPresence.useBoundaryPresence)({
-    enabled: runtimeEnabled,
+    enabled,
     boundTag,
     currentScreenKey,
     boundaryConfig,
@@ -61,7 +62,7 @@ const useBoundaryMeasurement = ({
     escapeClipping
   });
   (0, _useInitialSourceMeasurement.useInitialSourceMeasurement)({
-    enabled: runtimeEnabled,
+    enabled,
     measureBoundary,
     boundTag
   });

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_styles","_useBoundaryPresence","_useInitialDestinationMeasurement","_useInitialSourceMeasurement","_useRefreshBoundary","_useMeasurer","useBoundaryMeasurement","boundTag","enabled","runtimeEnabled","currentScreenKey","measuredRef","style","handoff","escapeClipping","config","anchor","scaleMode","target","method","boundaryConfig","useMemo","preparedStyles","prepareStyleForBounds","measureBoundary","useMeasurer","measuredAnimatedRef","useBoundaryPresence","useInitialSourceMeasurement","useInitialDestinationMeasurement","useRefreshBoundary","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/hooks/use-boundary-measurement.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAIA,IAAAC,OAAA,GAAAD,OAAA;AAEA,IAAAE,oBAAA,GAAAF,OAAA;AACA,IAAAG,iCAAA,GAAAH,OAAA;AACA,IAAAI,4BAAA,GAAAJ,OAAA;AACA,IAAAK,mBAAA,GAAAL,OAAA;AACA,IAAAM,YAAA,GAAAN,OAAA;AAkBA;AACA;AACA;AACA;AACA;AACO,MAAMO,sBAAsB,GAAGA,CAAC;EACtCC,QAAQ;EACRC,OAAO;EACPC,cAAc;EACdC,gBAAgB;EAChBC,WAAW;EACXC,KAAK;EACLC,OAAO;EACPC,cAAc;EACdC;AAC6B,CAAC,KAAK;EACnC,MAAM;IAAEC,MAAM;IAAEC,SAAS;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGJ,MAAM;EACpD,MAAMK,cAAc,GAAG,IAAAC,cAAO,EAC7B,OAAO;IAAEL,MAAM;IAAEC,SAAS;IAAEC,MAAM;IAAEC;EAAO,CAAC,CAAC,EAC7C,CAACH,MAAM,EAAEC,SAAS,EAAEC,MAAM,EAAEC,MAAM,CACnC,CAAC;EAED,MAAMG,cAAc,GAAG,IAAAD,cAAO,EAAC,MAAM,IAAAE,6BAAqB,EAACX,KAAK,CAAC,EAAE,CAACA,KAAK,CAAC,CAAC;EAE3E,MAAMY,eAAe,GAAG,IAAAC,wBAAW,EAAC;IACnCjB,OAAO;IACPD,QAAQ;IACRG,gBAAgB;IAChBY,cAAc;IACdI,mBAAmB,EAAEf,WAAW;IAChCE,OAAO;IACPC;EACD,CAAC,CAAC;;EAEF;EACA;EACA,IAAAa,wCAAmB,EAAC;IACnBnB,OAAO,EAAEC,cAAc;IACvBF,QAAQ;IACRG,gBAAgB;IAChBU,cAAc;IACdP,OAAO;IACPC;EACD,CAAC,CAAC;EAEF,IAAAc,wDAA2B,EAAC;IAC3BpB,OAAO,EAAEC,cAAc;IACvBe,eAAe;IACfjB;EACD,CAAC,CAAC;EAEF,IAAAsB,kEAAgC,EAAC;IAChCtB,QAAQ;IACRC,OAAO,EAAEC,cAAc;IACvBK,cAAc;IACdU;EACD,CAAC,CAAC;EAEF,IAAAM,sCAAkB,EAAC;IAClBtB,OAAO,EAAEC,cAAc;IACvBF,QAAQ;IACRiB;EACD,CAAC,CAAC;AACH,CAAC;AAACO,OAAA,CAAAzB,sBAAA,GAAAA,sBAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_styles","_useBoundaryPresence","_useInitialDestinationMeasurement","_useInitialSourceMeasurement","_useRefreshBoundary","_useMeasurer","useBoundaryMeasurement","boundTag","enabled","runtimeEnabled","currentScreenKey","measuredRef","style","handoff","escapeClipping","config","anchor","scaleMode","target","method","boundaryConfig","useMemo","preparedStyles","prepareStyleForBounds","measureBoundary","useMeasurer","measuredAnimatedRef","useBoundaryPresence","useInitialSourceMeasurement","useInitialDestinationMeasurement","useRefreshBoundary","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/hooks/use-boundary-measurement.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAIA,IAAAC,OAAA,GAAAD,OAAA;AAEA,IAAAE,oBAAA,GAAAF,OAAA;AACA,IAAAG,iCAAA,GAAAH,OAAA;AACA,IAAAI,4BAAA,GAAAJ,OAAA;AACA,IAAAK,mBAAA,GAAAL,OAAA;AACA,IAAAM,YAAA,GAAAN,OAAA;AAkBA;AACA;AACA;AACA;AACA;AACO,MAAMO,sBAAsB,GAAGA,CAAC;EACtCC,QAAQ;EACRC,OAAO;EACPC,cAAc;EACdC,gBAAgB;EAChBC,WAAW;EACXC,KAAK;EACLC,OAAO;EACPC,cAAc;EACdC;AAC6B,CAAC,KAAK;EACnC,MAAM;IAAEC,MAAM;IAAEC,SAAS;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGJ,MAAM;EACpD,MAAMK,cAAc,GAAG,IAAAC,cAAO,EAC7B,OAAO;IAAEL,MAAM;IAAEC,SAAS;IAAEC,MAAM;IAAEC;EAAO,CAAC,CAAC,EAC7C,CAACH,MAAM,EAAEC,SAAS,EAAEC,MAAM,EAAEC,MAAM,CACnC,CAAC;EAED,MAAMG,cAAc,GAAG,IAAAD,cAAO,EAAC,MAAM,IAAAE,6BAAqB,EAACX,KAAK,CAAC,EAAE,CAACA,KAAK,CAAC,CAAC;EAE3E,MAAMY,eAAe,GAAG,IAAAC,wBAAW,EAAC;IACnCjB,OAAO;IACPD,QAAQ;IACRG,gBAAgB;IAChBY,cAAc;IACdI,mBAAmB,EAAEf,WAAW;IAChCE,OAAO;IACPC;EACD,CAAC,CAAC;;EAEF;EACA;EACA;EACA,IAAAa,wCAAmB,EAAC;IACnBnB,OAAO;IACPD,QAAQ;IACRG,gBAAgB;IAChBU,cAAc;IACdP,OAAO;IACPC;EACD,CAAC,CAAC;EAEF,IAAAc,wDAA2B,EAAC;IAC3BpB,OAAO;IACPgB,eAAe;IACfjB;EACD,CAAC,CAAC;EAEF,IAAAsB,kEAAgC,EAAC;IAChCtB,QAAQ;IACRC,OAAO,EAAEC,cAAc;IACvBK,cAAc;IACdU;EACD,CAAC,CAAC;EAEF,IAAAM,sCAAkB,EAAC;IAClBtB,OAAO,EAAEC,cAAc;IACvBF,QAAQ;IACRiB;EACD,CAAC,CAAC;AACH,CAAC;AAACO,OAAA,CAAAzB,sBAAA,GAAAA,sBAAA","ignoreList":[]}

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

@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useMeasurer = void 0;
 var _react = require("react");
 var _reactNative = require("react-native");
-var _reactNativeReanimated = require("react-native-reanimated");
 var _measuredBoundsWrites = require("../../../providers/helpers/measured-bounds-writes");
-var _origin = require("../../../providers/screen/origin.provider");
 var _styles = require("../../../providers/screen/styles");
 var _scroll = require("../../../stores/scroll.store");
 var _system = require("../../../stores/system.store");
@@ -30,9 +28,6 @@ const useMeasurer = ({
   const scrollState = _scroll.ScrollStore.getValue(currentScreenKey, "coordination");
   const scrollMetadata = _scroll.ScrollStore.getValue(currentScreenKey, "metadata");
   const pendingLifecycleStartBlockCount = _system.SystemStore.getValue(currentScreenKey, "pendingLifecycleStartBlockCount");
-  const {
-    originRef
-  } = (0, _origin.useOriginContext)();
   const {
     visibilityBlocked
   } = (0, _styles.useScreenSlots)();
@@ -41,12 +36,10 @@ const useMeasurer = ({
 
     if (!enabled) return;
     const measured = (0, _measuredBounds.measureWithOverscrollAwareness)(measuredAnimatedRef, scrollState.get());
-    const measuredOrigin = (0, _reactNativeReanimated.measure)(originRef);
-    if (!measured || !measuredOrigin) return;
-    const normalizedMeasured = (0, _measuredBounds.normalizeMeasuredBoundsWithVisibilityGate)({
+    if (!measured) return;
+    const correctedMeasured = (0, _measuredBounds.correctMeasuredBoundsForVisibilityGate)({
       measured,
-      origin: measuredOrigin,
-      visibilityBlocked: escapeClipping && visibilityBlocked.get(),
+      visibilityBlocked: visibilityBlocked.get(),
       visibilityBlockOffset: (0, _visibilityBlockOffset.getVisibilityBlockOffset)(viewportHeight),
       viewportWidth,
       viewportHeight
@@ -60,9 +53,9 @@ const useMeasurer = ({
      * lifecycle blocked until a valid retry lands.
      */
     const shouldGuardDestinationViewport = pendingLifecycleStartBlockCount.get() > 0 || !!boundTag.group;
-    const viewportAllowsDestinationWrite = target.type !== "destination" || !shouldGuardDestinationViewport || (0, _measuredBounds.isMeasurementInViewport)(normalizedMeasured, viewportWidth, viewportHeight);
+    const viewportAllowsDestinationWrite = target.type !== "destination" || !shouldGuardDestinationViewport || (0, _measuredBounds.isMeasurementInViewport)(correctedMeasured, viewportWidth, viewportHeight);
     if (!viewportAllowsDestinationWrite) return;
-    const measuredWithScroll = (0, _measuredBounds.attachScrollSnapshotToMeasuredBounds)(normalizedMeasured, scrollMetadata.get());
+    const measuredWithScroll = (0, _measuredBounds.attachScrollSnapshotToMeasuredBounds)(correctedMeasured, scrollMetadata.get());
     (0, _measuredBoundsWrites.applyMeasuredBoundsWrites)({
       entryTag: boundTag.tag,
       linkId: boundTag.linkKey,
@@ -74,7 +67,7 @@ const useMeasurer = ({
       handoff,
       escapeClipping
     });
-  }, [enabled, boundTag, currentScreenKey, preparedStyles, measuredAnimatedRef, handoff, escapeClipping, viewportWidth, viewportHeight, scrollState, scrollMetadata, pendingLifecycleStartBlockCount, originRef, visibilityBlocked]);
+  }, [enabled, boundTag, currentScreenKey, preparedStyles, measuredAnimatedRef, handoff, escapeClipping, viewportWidth, viewportHeight, scrollState, scrollMetadata, pendingLifecycleStartBlockCount, visibilityBlocked]);
 };
 exports.useMeasurer = useMeasurer;
 //# sourceMappingURL=use-measurer.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_measuredBoundsWrites","_origin","_styles","_scroll","_system","_visibilityBlockOffset","_measuredBounds","useMeasurer","enabled","boundTag","currentScreenKey","preparedStyles","measuredAnimatedRef","handoff","escapeClipping","width","viewportWidth","height","viewportHeight","useWindowDimensions","scrollState","ScrollStore","getValue","scrollMetadata","pendingLifecycleStartBlockCount","SystemStore","originRef","useOriginContext","visibilityBlocked","useScreenSlots","useCallback","target","measured","measureWithOverscrollAwareness","get","measuredOrigin","measure","normalizedMeasured","normalizeMeasuredBoundsWithVisibilityGate","origin","visibilityBlockOffset","getVisibilityBlockOffset","shouldGuardDestinationViewport","group","viewportAllowsDestinationWrite","type","isMeasurementInViewport","measuredWithScroll","attachScrollSnapshotToMeasuredBounds","applyMeasuredBoundsWrites","entryTag","tag","linkId","linkKey","linkWrite","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/hooks/use-measurer.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_measuredBoundsWrites","_styles","_scroll","_system","_visibilityBlockOffset","_measuredBounds","useMeasurer","enabled","boundTag","currentScreenKey","preparedStyles","measuredAnimatedRef","handoff","escapeClipping","width","viewportWidth","height","viewportHeight","useWindowDimensions","scrollState","ScrollStore","getValue","scrollMetadata","pendingLifecycleStartBlockCount","SystemStore","visibilityBlocked","useScreenSlots","useCallback","target","measured","measureWithOverscrollAwareness","get","correctedMeasured","correctMeasuredBoundsForVisibilityGate","visibilityBlockOffset","getVisibilityBlockOffset","shouldGuardDestinationViewport","group","viewportAllowsDestinationWrite","type","isMeasurementInViewport","measuredWithScroll","attachScrollSnapshotToMeasuredBounds","applyMeasuredBoundsWrites","entryTag","tag","linkId","linkKey","linkWrite","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/hooks/use-measurer.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,qBAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AAEA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AACA,IAAAM,sBAAA,GAAAN,OAAA;AAEA,IAAAO,eAAA,GAAAP,OAAA;AAiBO,MAAMQ,WAAW,GAAGA,CAAC;EAC3BC,OAAO;EACPC,QAAQ;EACRC,gBAAgB;EAChBC,cAAc;EACdC,mBAAmB;EACnBC,OAAO;EACPC;AACkB,CAAC,KAAsB;EACzC,MAAM;IAAEC,KAAK,EAAEC,aAAa;IAAEC,MAAM,EAAEC;EAAe,CAAC,GACrD,IAAAC,gCAAmB,EAAC,CAAC;EAEtB,MAAMC,WAAW,GAAGC,mBAAW,CAACC,QAAQ,CAACZ,gBAAgB,EAAE,cAAc,CAAC;EAC1E,MAAMa,cAAc,GAAGF,mBAAW,CAACC,QAAQ,CAACZ,gBAAgB,EAAE,UAAU,CAAC;EACzE,MAAMc,+BAA+B,GAAGC,mBAAW,CAACH,QAAQ,CAC3DZ,gBAAgB,EAChB,iCACD,CAAC;EACD,MAAM;IAAEgB;EAAkB,CAAC,GAAG,IAAAC,sBAAc,EAAC,CAAC;EAE9C,OAAO,IAAAC,kBAAW,EAChBC,MAAM,IAAK;IACX,SAAS;;IACT,IAAI,CAACrB,OAAO,EAAE;IAEd,MAAMsB,QAAQ,GAAG,IAAAC,8CAA8B,EAC9CnB,mBAAmB,EACnBQ,WAAW,CAACY,GAAG,CAAC,CACjB,CAAC;IAED,IAAI,CAACF,QAAQ,EAAE;IAEf,MAAMG,iBAAiB,GAAG,IAAAC,sDAAsC,EAAC;MAChEJ,QAAQ;MACRJ,iBAAiB,EAAEA,iBAAiB,CAACM,GAAG,CAAC,CAAC;MAC1CG,qBAAqB,EAAE,IAAAC,+CAAwB,EAAClB,cAAc,CAAC;MAC/DF,aAAa;MACbE;IACD,CAAC,CAAC;;IAEF;AACH;AACA;AACA;AACA;AACA;AACA;IACG,MAAMmB,8BAA8B,GACnCb,+BAA+B,CAACQ,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAACvB,QAAQ,CAAC6B,KAAK;IAE9D,MAAMC,8BAA8B,GACnCV,MAAM,CAACW,IAAI,KAAK,aAAa,IAC7B,CAACH,8BAA8B,IAC/B,IAAAI,uCAAuB,EACtBR,iBAAiB,EACjBjB,aAAa,EACbE,cACD,CAAC;IAEF,IAAI,CAACqB,8BAA8B,EAAE;IAErC,MAAMG,kBAAkB,GAAG,IAAAC,oDAAoC,EAC9DV,iBAAiB,EACjBV,cAAc,CAACS,GAAG,CAAC,CACpB,CAAC;IAED,IAAAY,+CAAyB,EAAC;MACzBC,QAAQ,EAAEpC,QAAQ,CAACqC,GAAG;MACtBC,MAAM,EAAEtC,QAAQ,CAACuC,OAAO;MACxBV,KAAK,EAAE7B,QAAQ,CAAC6B,KAAK;MACrB5B,gBAAgB;MAChBoB,QAAQ,EAAEY,kBAAkB;MAC5B/B,cAAc;MACdsC,SAAS,EAAEpB,MAAM;MACjBhB,OAAO;MACPC;IACD,CAAC,CAAC;EACH,CAAC,EACD,CACCN,OAAO,EACPC,QAAQ,EACRC,gBAAgB,EAChBC,cAAc,EACdC,mBAAmB,EACnBC,OAAO,EACPC,cAAc,EACdE,aAAa,EACbE,cAAc,EACdE,WAAW,EACXG,cAAc,EACdC,+BAA+B,EAC/BE,iBAAiB,CAEnB,CAAC;AACF,CAAC;AAACwB,OAAA,CAAA3C,WAAA,GAAAA,WAAA","ignoreList":[]}

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

@@ -34,7 +34,7 @@ const BoundaryContentPortalHost = exports.BoundaryContentPortalHost = /*#__PURE_
 });
 const styles = _reactNative.StyleSheet.create({
   host: {
-    ..._reactNative.StyleSheet.absoluteFillObject,
+    ..._reactNative.StyleSheet.flatten(_reactNative.StyleSheet.absoluteFill),
     overflow: "visible"
   }
 });

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireDefault","_teleport","_hostName","_jsxRuntime","e","__esModule","default","AnimatedPortalHost","NativePortalHost","Animated","createAnimatedComponent","BoundaryContentPortalHost","exports","memo","boundaryId","children","enabled","screenKey","jsx","Fragment","portalHostName","createBoundaryContentPortalHostName","jsxs","name","pointerEvents","PORTAL_POINTER_EVENTS","style","styles","host","StyleSheet","create","absoluteFillObject","overflow"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-content-portal/components/host.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,SAAA,GAAAJ,OAAA;AACA,IAAAK,SAAA,GAAAL,OAAA;AAA2E,IAAAM,WAAA,GAAAN,OAAA;AAAA,SAAAG,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE3E,MAAMG,kBAAkB,GAAGC,0BAAgB,GACxCC,8BAAQ,CAACC,uBAAuB,CAACF,0BAAgB,CAAC,GAClD,IAAI;AASA,MAAMG,yBAAyB,GAAAC,OAAA,CAAAD,yBAAA,gBAAG,IAAAE,WAAI,EAC5C,SAASF,yBAAyBA,CAAC;EAClCG,UAAU;EACVC,QAAQ;EACRC,OAAO;EACPC;AAC+B,CAAC,EAAE;EAClC,IAAI,CAACD,OAAO,IAAI,CAACT,kBAAkB,EAAE;IACpC,oBAAO,IAAAJ,WAAA,CAAAe,GAAA,EAAAf,WAAA,CAAAgB,QAAA;MAAAJ,QAAA,EAAGA;IAAQ,CAAG,CAAC;EACvB;EAEA,MAAMK,cAAc,GAAG,IAAAC,6CAAmC,EACzDJ,SAAS,EACTH,UACD,CAAC;EAED,oBACC,IAAAX,WAAA,CAAAmB,IAAA,EAAAnB,WAAA,CAAAgB,QAAA;IAAAJ,QAAA,GACEA,QAAQ,eACT,IAAAZ,WAAA,CAAAe,GAAA,EAACX,kBAAkB;MAClBgB,IAAI,EAAEH,cAAe;MACrBI,aAAa,EAAEC,+BAAsB;MACrCC,KAAK,EAAEC,MAAM,CAACC;IAAK,CACnB,CAAC;EAAA,CACD,CAAC;AAEL,CACD,CAAC;AAED,MAAMD,MAAM,GAAGE,uBAAU,CAACC,MAAM,CAAC;EAChCF,IAAI,EAAE;IACL,GAAGC,uBAAU,CAACE,kBAAkB;IAChCC,QAAQ,EAAE;EACX;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireDefault","_teleport","_hostName","_jsxRuntime","e","__esModule","default","AnimatedPortalHost","NativePortalHost","Animated","createAnimatedComponent","BoundaryContentPortalHost","exports","memo","boundaryId","children","enabled","screenKey","jsx","Fragment","portalHostName","createBoundaryContentPortalHostName","jsxs","name","pointerEvents","PORTAL_POINTER_EVENTS","style","styles","host","StyleSheet","create","flatten","absoluteFill","overflow"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-content-portal/components/host.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,SAAA,GAAAJ,OAAA;AACA,IAAAK,SAAA,GAAAL,OAAA;AAA2E,IAAAM,WAAA,GAAAN,OAAA;AAAA,SAAAG,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE3E,MAAMG,kBAAkB,GAAGC,0BAAgB,GACxCC,8BAAQ,CAACC,uBAAuB,CAACF,0BAAgB,CAAC,GAClD,IAAI;AASA,MAAMG,yBAAyB,GAAAC,OAAA,CAAAD,yBAAA,gBAAG,IAAAE,WAAI,EAC5C,SAASF,yBAAyBA,CAAC;EAClCG,UAAU;EACVC,QAAQ;EACRC,OAAO;EACPC;AAC+B,CAAC,EAAE;EAClC,IAAI,CAACD,OAAO,IAAI,CAACT,kBAAkB,EAAE;IACpC,oBAAO,IAAAJ,WAAA,CAAAe,GAAA,EAAAf,WAAA,CAAAgB,QAAA;MAAAJ,QAAA,EAAGA;IAAQ,CAAG,CAAC;EACvB;EAEA,MAAMK,cAAc,GAAG,IAAAC,6CAAmC,EACzDJ,SAAS,EACTH,UACD,CAAC;EAED,oBACC,IAAAX,WAAA,CAAAmB,IAAA,EAAAnB,WAAA,CAAAgB,QAAA;IAAAJ,QAAA,GACEA,QAAQ,eACT,IAAAZ,WAAA,CAAAe,GAAA,EAACX,kBAAkB;MAClBgB,IAAI,EAAEH,cAAe;MACrBI,aAAa,EAAEC,+BAAsB;MACrCC,KAAK,EAAEC,MAAM,CAACC;IAAK,CACnB,CAAC;EAAA,CACD,CAAC;AAEL,CACD,CAAC;AAED,MAAMD,MAAM,GAAGE,uBAAU,CAACC,MAAM,CAAC;EAChCF,IAAI,EAAE;IACL,GAAGC,uBAAU,CAACE,OAAO,CAACF,uBAAU,CAACG,YAAY,CAAC;IAC9CC,QAAQ,EAAE;EACX;AACD,CAAC,CAAC","ignoreList":[]}