react-native-screen-transitions 3.11.0 → 3.11.1

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");
@@ -38,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: {
@@ -52,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";
 
@@ -59,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.
@@ -73,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)();
@@ -89,37 +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 (!destinationEnabled || !initialDestinationPairKey || isBlockingLifecycleStart.get() <= 0) {
+    if (!canReceiveDestination || hasFinishedInitialMeasurement.get() || isBlockingLifecycleStart.get() <= 0) {
       return null;
     }
     if (progress.get() > 0) {
       return null;
     }
     const retryTick = retryToken.get();
-    const sourceScreenKey = (0, _linkPairs.getSourceScreenKeyFromPairKey)(initialDestinationPairKey);
+    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,
-      destinationPairKey,
-      ancestorDestinationPairKey,
+      pairKey,
       linkId: linkKey,
       group,
       destinationPresent: (0, _entries.getEntry)(tag, currentScreenKey) !== null,
-      sourcePresent: (0, _entries.getEntry)(tag, sourceScreenKey) !== null,
+      sourcePresent: sourceScreenKey !== null,
       linkState: _state.pairs.get()
     });
     return [signal?.pairKey ?? null, signal?.action ?? null, retryTick];
   }, (next, previous) => {
     "worklet";
 
-    if (!next) {
+    if (!next || hasFinishedInitialMeasurement.get()) {
       return;
     }
     const [measurePairKey, action, retryTick] = next;
-    if (!measurePairKey || !action) {
+    if (!action) {
       return;
     }
     const previousMeasurePairKey = previous?.[0];
@@ -137,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","sourceScreenKey","getSourceScreenKeyFromPairKey","signal","getInitialDestinationMeasurementSignal","linkId","destinationPresent","getEntry","sourcePresent","linkState","pairs","pairKey","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":[]}
+{"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,6 +7,7 @@ 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 _refreshSignals = require("../../utils/refresh-signals");
 const useRefreshBoundary = ({
@@ -20,9 +21,6 @@ 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;
@@ -35,13 +33,13 @@ const useRefreshBoundary = ({
     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,

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_descriptors","_animation","_state","_refreshSignals","useRefreshBoundary","enabled","boundTag","measureBoundary","linkKey","group","currentScreenKey","useDescriptorsStore","s","derivations","nextScreenKey","sourcePairKey","destinationPairKey","ancestorDestinationPairKey","refreshScreenKey","refreshWillAnimate","AnimationStore","getValue","refreshClosing","useAnimatedReaction","shouldRefresh","get","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;AAGA,IAAAI,eAAA,GAAAJ,OAAA;AAQO,MAAMK,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,MAAMC,aAAa,GAAG,IAAAJ,gCAAmB,EAAEC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACE,aAAa,CAAC;EAC7E,MAAMC,kBAAkB,GAAG,IAAAL,gCAAmB,EAC5CC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACG,kBACtB,CAAC;EACD,MAAMC,0BAA0B,GAAG,IAAAN,gCAAmB,EACpDC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACI,0BACtB,CAAC;EACD;EACA;EACA,MAAMC,gBAAgB,GAAGJ,aAAa,IAAIJ,gBAAgB;EAC1D,MAAMS,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,GAAGnB,OAAO,IAAI,CAAC,CAACc,kBAAkB,CAACM,GAAG,CAAC,CAAC;IAC3D,IAAI,CAACD,aAAa,EAAE;MACnB,OAAO,IAAI;IACZ;IAEA,OAAO,IAAAE,wCAAwB,EAAC;MAC/BrB,OAAO;MACPK,gBAAgB;MAChBK,aAAa;MACbC,kBAAkB;MAClBC,0BAA0B;MAC1BH,aAAa;MACba,MAAM,EAAEnB,OAAO;MACfC,KAAK;MACLe,aAAa;MACbI,OAAO,EAAE,CAAC,CAACN,cAAc,CAACG,GAAG,CAAC,CAAC;MAC/BI,SAAS,EAAEC,YAAK,CAACL,GAAG,CAAC;IACtB,CAAC,CAAC;EACH,CAAC,EACD,CAACM,aAAa,EAAEC,iBAAiB,KAAK;IACrC,SAAS;;IAET,IACC,CAACD,aAAa,IACdA,aAAa,CAACE,MAAM,KAAKD,iBAAiB,EAAEC,MAAM,EACjD;MACD;IACD;IAEA1B,eAAe,CAAC;MACf2B,IAAI,EAAEH,aAAa,CAACG,IAAI;MACxBC,OAAO,EAAEJ,aAAa,CAACI;IACxB,CAAC,CAAC;EACH,CACD,CAAC;AACF,CAAC;AAACC,OAAA,CAAAhC,kBAAA,GAAAA,kBAAA","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/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":[]}

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

@@ -12,7 +12,6 @@ var _composeSlotStyle = require("../../../../../../providers/screen/styles/helpe
 var _links = require("../../../../../../stores/bounds/internals/links");
 var _system = require("../../../../../../stores/system.store");
 var _teleport = require("../../../teleport");
-var _hasLocalSlot = require("../helpers/has-local-slot");
 var _offsetStyle = require("../helpers/offset-style");
 var _hostBounds = require("../stores/host-bounds.store");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -33,7 +32,10 @@ const PortalBoundaryHost = exports.PortalBoundaryHost = /*#__PURE__*/(0, _react.
       return;
     }
     const link = (0, _links.getLink)(host.pairKey, host.boundaryId);
-    const hasGeometry = link?.source !== null && link !== undefined && (0, _hostBounds.getPortalHostBounds)(host.hostKey) !== null && (0, _hasLocalSlot.hasLocalSlot)(host.localStylesMaps.get(), host.boundaryId);
+    const hasSource = !!link?.source;
+    const hasHostBounds = (0, _hostBounds.getPortalHostBounds)(host.hostKey) !== null;
+    const hasSlot = host.slotsMap.get()[host.boundaryId] !== undefined;
+    const hasGeometry = hasSource && hasHostBounds && hasSlot;
     if (!hasGeometry) {
       geometryReadyFrames.set(0);
       return;
@@ -81,19 +83,6 @@ const PortalBoundaryHost = exports.PortalBoundaryHost = /*#__PURE__*/(0, _react.
   const slotStyle = (0, _reactNativeReanimated.useAnimatedStyle)(() => {
     "worklet";
 
-    // `slotsMap` is the resolved map: it may contain real interpolator output,
-    // inherited styles, or resolver-created reset patches for slots that just
-    // disappeared. Normal components need those reset patches so stale styles
-    // clear correctly.
-    //
-    // A screen-level portal host is different. It is only the temporary visual
-    // receiver for teleported content, not the original component that needs a
-    // cleanup frame. If the current local interpolator layers did not emit this
-    // boundary id, any resolved style here is cleanup/stale residue and should
-    // not be drawn by the host.
-    if (!(0, _hasLocalSlot.hasLocalSlot)(host.localStylesMaps.get(), host.boundaryId)) {
-      return _constants.NO_STYLES;
-    }
     const slot = host.slotsMap.get()[host.boundaryId];
     return (0, _composeSlotStyle.composeSlotStyleWithLocalTransform)(slot?.style ?? _constants.NO_STYLES, undefined, slot?.boundsLocalTransform);
   });

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireWildcard","_constants","_composeSlotStyle","_links","_system","_teleport","_hasLocalSlot","_offsetStyle","_hostBounds","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","AnimatedPortalBoundaryHost","NativePortalHost","Animated","createAnimatedComponent","PortalBoundaryHost","exports","memo","host","style","geometryReadyFrames","useSharedValue","unblockLifecycleStart","SystemStore","getBag","screenKey","actions","handleFrame","useCallback","portalHostReady","link","getLink","pairKey","boundaryId","hasGeometry","source","undefined","getPortalHostBounds","hostKey","hasLocalSlot","localStylesMaps","useFrameCallback","hostStyle","useAnimatedStyle","NO_STYLES","sourceBounds","bounds","isCrossScreenPortal","resolvePortalOffsetStyle","placement","contentFrameStyle","height","width","slotStyle","slot","slotsMap","composeSlotStyleWithLocalTransform","boundsLocalTransform","jsx","View","pointerEvents","PORTAL_POINTER_EVENTS","collapsable","children","name","portalHostName","styles","content","StyleSheet","create","I18nManager","isRTL","end","position","top","left"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireWildcard","_constants","_composeSlotStyle","_links","_system","_teleport","_offsetStyle","_hostBounds","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","AnimatedPortalBoundaryHost","NativePortalHost","Animated","createAnimatedComponent","PortalBoundaryHost","exports","memo","host","style","geometryReadyFrames","useSharedValue","unblockLifecycleStart","SystemStore","getBag","screenKey","actions","handleFrame","useCallback","portalHostReady","link","getLink","pairKey","boundaryId","hasSource","source","hasHostBounds","getPortalHostBounds","hostKey","hasSlot","slotsMap","undefined","hasGeometry","useFrameCallback","hostStyle","useAnimatedStyle","NO_STYLES","sourceBounds","bounds","isCrossScreenPortal","resolvePortalOffsetStyle","placement","contentFrameStyle","height","width","slotStyle","slot","composeSlotStyleWithLocalTransform","boundsLocalTransform","jsx","View","pointerEvents","PORTAL_POINTER_EVENTS","collapsable","children","name","portalHostName","styles","content","StyleSheet","create","I18nManager","isRTL","end","position","top","left"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -6,57 +6,55 @@ Object.defineProperty(exports, "__esModule", {
 exports.useActivePortalBoundaryHost = void 0;
 var _react = require("react");
 var _reactNativeReanimated = require("react-native-reanimated");
-var _state = require("../../../../../../stores/bounds/internals/state");
+var _links = require("../../../../../../stores/bounds/internals/links");
 var _naming = require("../../../utils/naming");
-var _activePair = require("../helpers/active-pair");
 var _portalBoundaryHost = require("../stores/portal-boundary-host.store");
 const useActivePortalBoundaryHost = ({
   boundaryId,
   currentScreenKey,
   escapeHostKey,
-  localStylesMaps,
   portalHostName,
   portalHostReady,
-  slotsMap,
-  sourcePairKey
+  slotsMap
 }) => {
-  const [hasActiveLink, setHasActiveLink] = (0, _react.useState)(false);
-  const sourcePairKeyRef = (0, _react.useRef)(sourcePairKey);
-  sourcePairKeyRef.current = sourcePairKey;
-  const updateActiveLink = (0, _react.useCallback)((observedSourcePairKey, nextHasActiveLink) => {
-    if (sourcePairKeyRef.current !== observedSourcePairKey) {
+  const [activePortal, setActivePortal] = (0, _react.useState)(null);
+  const activePairKeyRef = (0, _react.useRef)(null);
+  const updateActivePortal = (0, _react.useCallback)(pairKey => {
+    if (activePairKeyRef.current === pairKey) {
       return;
     }
-    setHasActiveLink(nextHasActiveLink);
+    activePairKeyRef.current = pairKey;
+    setActivePortal(pairKey ? {
+      pairKey
+    } : null);
   }, []);
   (0, _reactNativeReanimated.useAnimatedReaction)(() => {
     "worklet";
 
-    return (0, _activePair.hasActiveBoundaryPortalLink)({
-      boundaryId,
-      pairsState: _state.pairs.get(),
-      sourcePairKey
-    });
-  }, (nextHasActiveLink, previousHasActiveLink) => {
+    const isBoundaryAnimating = slotsMap.get()[boundaryId] !== undefined;
+    if (!isBoundaryAnimating) {
+      return null;
+    }
+    return (0, _links.getPairKeyForSource)(boundaryId, currentScreenKey);
+  }, (pairKey, previousPairKey) => {
     "worklet";
 
-    if (nextHasActiveLink === previousHasActiveLink) {
+    if (pairKey === previousPairKey) {
       return;
     }
-    (0, _reactNativeReanimated.runOnJS)(updateActiveLink)(sourcePairKey, nextHasActiveLink);
+    (0, _reactNativeReanimated.runOnJS)(updateActivePortal)(pairKey);
   });
   (0, _react.useLayoutEffect)(() => {
-    if (!hasActiveLink || !sourcePairKey || !escapeHostKey) {
+    if (!activePortal || !escapeHostKey) {
       portalHostName.set(null);
       portalHostReady.set(false);
       return;
     }
-    const nextPortalHostName = (0, _naming.createBoundaryPortalHostName)(escapeHostKey, boundaryId, sourcePairKey);
+    const nextPortalHostName = (0, _naming.createBoundaryPortalHostName)(escapeHostKey, boundaryId, activePortal.pairKey);
     (0, _portalBoundaryHost.mountPortalBoundaryHost)({
       boundaryId,
       hostKey: escapeHostKey,
-      localStylesMaps,
-      pairKey: sourcePairKey,
+      pairKey: activePortal.pairKey,
       portalHostName: nextPortalHostName,
       portalHostReady,
       screenKey: currentScreenKey,
@@ -68,7 +66,7 @@ const useActivePortalBoundaryHost = ({
       portalHostReady.set(false);
       (0, _portalBoundaryHost.unmountPortalBoundaryHostByName)(nextPortalHostName);
     };
-  }, [boundaryId, currentScreenKey, escapeHostKey, localStylesMaps, portalHostName, portalHostReady, sourcePairKey, slotsMap, hasActiveLink]);
+  }, [activePortal, boundaryId, currentScreenKey, escapeHostKey, portalHostName, portalHostReady, slotsMap]);
 };
 exports.useActivePortalBoundaryHost = useActivePortalBoundaryHost;
 //# sourceMappingURL=use-active-portal-boundary-host.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_state","_naming","_activePair","_portalBoundaryHost","useActivePortalBoundaryHost","boundaryId","currentScreenKey","escapeHostKey","localStylesMaps","portalHostName","portalHostReady","slotsMap","sourcePairKey","hasActiveLink","setHasActiveLink","useState","sourcePairKeyRef","useRef","current","updateActiveLink","useCallback","observedSourcePairKey","nextHasActiveLink","useAnimatedReaction","hasActiveBoundaryPortalLink","pairsState","pairs","get","previousHasActiveLink","runOnJS","useLayoutEffect","set","nextPortalHostName","createBoundaryPortalHostName","mountPortalBoundaryHost","hostKey","pairKey","screenKey","unmountPortalBoundaryHostByName","exports"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AAMA,IAAAE,MAAA,GAAAF,OAAA;AAGA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,WAAA,GAAAJ,OAAA;AACA,IAAAK,mBAAA,GAAAL,OAAA;AAgBO,MAAMM,2BAA2B,GAAGA,CAAC;EAC3CC,UAAU;EACVC,gBAAgB;EAChBC,aAAa;EACbC,eAAe;EACfC,cAAc;EACdC,eAAe;EACfC,QAAQ;EACRC;AACkC,CAAC,KAAK;EACxC,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAG,IAAAC,eAAQ,EAAC,KAAK,CAAC;EACzD,MAAMC,gBAAgB,GAAG,IAAAC,aAAM,EAACL,aAAa,CAAC;EAC9CI,gBAAgB,CAACE,OAAO,GAAGN,aAAa;EAExC,MAAMO,gBAAgB,GAAG,IAAAC,kBAAW,EACnC,CACCC,qBAAgD,EAChDC,iBAA0B,KACtB;IACJ,IAAIN,gBAAgB,CAACE,OAAO,KAAKG,qBAAqB,EAAE;MACvD;IACD;IAEAP,gBAAgB,CAACQ,iBAAiB,CAAC;EACpC,CAAC,EACD,EACD,CAAC;EAED,IAAAC,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,OAAO,IAAAC,uCAA2B,EAAC;MAClCnB,UAAU;MACVoB,UAAU,EAAEC,YAAK,CAACC,GAAG,CAAC,CAAC;MACvBf;IACD,CAAC,CAAC;EACH,CAAC,EACD,CAACU,iBAAiB,EAAEM,qBAAqB,KAAK;IAC7C,SAAS;;IACT,IAAIN,iBAAiB,KAAKM,qBAAqB,EAAE;MAChD;IACD;IAEA,IAAAC,8BAAO,EAACV,gBAAgB,CAAC,CAACP,aAAa,EAAEU,iBAAiB,CAAC;EAC5D,CACD,CAAC;EAED,IAAAQ,sBAAe,EAAC,MAAM;IACrB,IAAI,CAACjB,aAAa,IAAI,CAACD,aAAa,IAAI,CAACL,aAAa,EAAE;MACvDE,cAAc,CAACsB,GAAG,CAAC,IAAI,CAAC;MACxBrB,eAAe,CAACqB,GAAG,CAAC,KAAK,CAAC;MAC1B;IACD;IAEA,MAAMC,kBAAkB,GAAG,IAAAC,oCAA4B,EACtD1B,aAAa,EACbF,UAAU,EACVO,aACD,CAAC;IAED,IAAAsB,2CAAuB,EAAC;MACvB7B,UAAU;MACV8B,OAAO,EAAE5B,aAAa;MACtBC,eAAe;MACf4B,OAAO,EAAExB,aAAa;MACtBH,cAAc,EAAEuB,kBAAkB;MAClCtB,eAAe;MACf2B,SAAS,EAAE/B,gBAAgB;MAC3BK;IACD,CAAC,CAAC;IACFF,cAAc,CAACsB,GAAG,CAACC,kBAAkB,CAAC;IAEtC,OAAO,MAAM;MACZvB,cAAc,CAACsB,GAAG,CAAC,IAAI,CAAC;MACxBrB,eAAe,CAACqB,GAAG,CAAC,KAAK,CAAC;MAC1B,IAAAO,mDAA+B,EAACN,kBAAkB,CAAC;IACpD,CAAC;EACF,CAAC,EAAE,CACF3B,UAAU,EACVC,gBAAgB,EAChBC,aAAa,EACbC,eAAe,EACfC,cAAc,EACdC,eAAe,EACfE,aAAa,EACbD,QAAQ,EACRE,aAAa,CACb,CAAC;AACH,CAAC;AAAC0B,OAAA,CAAAnC,2BAAA,GAAAA,2BAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_links","_naming","_portalBoundaryHost","useActivePortalBoundaryHost","boundaryId","currentScreenKey","escapeHostKey","portalHostName","portalHostReady","slotsMap","activePortal","setActivePortal","useState","activePairKeyRef","useRef","updateActivePortal","useCallback","pairKey","current","useAnimatedReaction","isBoundaryAnimating","get","undefined","getPairKeyForSource","previousPairKey","runOnJS","useLayoutEffect","set","nextPortalHostName","createBoundaryPortalHostName","mountPortalBoundaryHost","hostKey","screenKey","unmountPortalBoundaryHostByName","exports"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AAKA,IAAAE,MAAA,GAAAF,OAAA;AAGA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,mBAAA,GAAAJ,OAAA;AAkBO,MAAMK,2BAA2B,GAAGA,CAAC;EAC3CC,UAAU;EACVC,gBAAgB;EAChBC,aAAa;EACbC,cAAc;EACdC,eAAe;EACfC;AACkC,CAAC,KAAK;EACxC,MAAM,CAACC,YAAY,EAAEC,eAAe,CAAC,GAAG,IAAAC,eAAQ,EAAsB,IAAI,CAAC;EAC3E,MAAMC,gBAAgB,GAAG,IAAAC,aAAM,EAAuB,IAAI,CAAC;EAE3D,MAAMC,kBAAkB,GAAG,IAAAC,kBAAW,EAAEC,OAA6B,IAAK;IACzE,IAAIJ,gBAAgB,CAACK,OAAO,KAAKD,OAAO,EAAE;MACzC;IACD;IAEAJ,gBAAgB,CAACK,OAAO,GAAGD,OAAO;IAClCN,eAAe,CAACM,OAAO,GAAG;MAAEA;IAAQ,CAAC,GAAG,IAAI,CAAC;EAC9C,CAAC,EAAE,EAAE,CAAC;EAEN,IAAAE,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,MAAMC,mBAAmB,GAAGX,QAAQ,CAACY,GAAG,CAAC,CAAC,CAACjB,UAAU,CAAC,KAAKkB,SAAS;IACpE,IAAI,CAACF,mBAAmB,EAAE;MACzB,OAAO,IAAI;IACZ;IAEA,OAAO,IAAAG,0BAAmB,EAACnB,UAAU,EAAEC,gBAAgB,CAAC;EACzD,CAAC,EACD,CAACY,OAAO,EAAEO,eAAe,KAAK;IAC7B,SAAS;;IACT,IAAIP,OAAO,KAAKO,eAAe,EAAE;MAChC;IACD;IAEA,IAAAC,8BAAO,EAACV,kBAAkB,CAAC,CAACE,OAAO,CAAC;EACrC,CACD,CAAC;EAED,IAAAS,sBAAe,EAAC,MAAM;IACrB,IAAI,CAAChB,YAAY,IAAI,CAACJ,aAAa,EAAE;MACpCC,cAAc,CAACoB,GAAG,CAAC,IAAI,CAAC;MACxBnB,eAAe,CAACmB,GAAG,CAAC,KAAK,CAAC;MAC1B;IACD;IAEA,MAAMC,kBAAkB,GAAG,IAAAC,oCAA4B,EACtDvB,aAAa,EACbF,UAAU,EACVM,YAAY,CAACO,OACd,CAAC;IAED,IAAAa,2CAAuB,EAAC;MACvB1B,UAAU;MACV2B,OAAO,EAAEzB,aAAa;MACtBW,OAAO,EAAEP,YAAY,CAACO,OAAO;MAC7BV,cAAc,EAAEqB,kBAAkB;MAClCpB,eAAe;MACfwB,SAAS,EAAE3B,gBAAgB;MAC3BI;IACD,CAAC,CAAC;IACFF,cAAc,CAACoB,GAAG,CAACC,kBAAkB,CAAC;IAEtC,OAAO,MAAM;MACZrB,cAAc,CAACoB,GAAG,CAAC,IAAI,CAAC;MACxBnB,eAAe,CAACmB,GAAG,CAAC,KAAK,CAAC;MAC1B,IAAAM,mDAA+B,EAACL,kBAAkB,CAAC;IACpD,CAAC;EACF,CAAC,EAAE,CACFlB,YAAY,EACZN,UAAU,EACVC,gBAAgB,EAChBC,aAAa,EACbC,cAAc,EACdC,eAAe,EACfC,QAAQ,CACR,CAAC;AACH,CAAC;AAACyB,OAAA,CAAA/B,2BAAA,GAAAA,2BAAA","ignoreList":[]}

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

@@ -7,40 +7,26 @@ exports.useBoundaryPortalAttachment = void 0;
 var _reactNativeReanimated = require("react-native-reanimated");
 var _descriptors = require("../../../../../../providers/screen/descriptors");
 var _styles = require("../../../../../../providers/screen/styles");
-var _transitionVisualState = require("../../../../../../providers/screen/styles/helpers/transition-visual-state");
-var _animation = require("../../../../../../stores/animation.store");
-var _state = require("../../../../../../stores/bounds/internals/state");
-var _system = require("../../../../../../stores/system.store");
 var _naming = require("../../../utils/naming");
 var _teleportControl = require("../../../utils/teleport-control");
-var _activePair = require("../helpers/active-pair");
 var _hostRegistry = require("../stores/host-registry.store");
 var _useActivePortalBoundaryHost = require("./use-active-portal-boundary-host");
 const useBoundaryPortalAttachment = ({
   boundaryId
 }) => {
-  const sourcePairKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.sourcePairKey);
   const currentScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.currentScreenKey);
-  const nextScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.nextScreenKey);
-  const destinationScreenKey = nextScreenKey ?? currentScreenKey;
-  const destinationAnimationProgress = _system.SystemStore.getValue(destinationScreenKey, "animationProgress");
-  const destinationClosing = _animation.AnimationStore.getValue(destinationScreenKey, "closing");
   const {
-    localStylesMaps,
     slotsMap
   } = (0, _styles.useScreenSlots)();
   const portalHostName = (0, _reactNativeReanimated.useSharedValue)(null);
   const portalHostReady = (0, _reactNativeReanimated.useSharedValue)(false);
-  const attachedDestination = (0, _reactNativeReanimated.useSharedValue)(null);
   const escapeHostKey = (0, _hostRegistry.useActiveHostKey)(currentScreenKey);
   (0, _useActivePortalBoundaryHost.useActivePortalBoundaryHost)({
     boundaryId,
     currentScreenKey,
     escapeHostKey,
-    localStylesMaps,
     portalHostName,
     portalHostReady,
-    sourcePairKey,
     slotsMap
   });
   const teleportProps = (0, _reactNativeReanimated.useAnimatedProps)(() => {
@@ -52,30 +38,11 @@ const useBoundaryPortalAttachment = ({
       teleport,
       ...slotProps
     } = slot?.props ?? {};
-    const shouldTeleport = (0, _teleportControl.isTeleportEnabled)(teleport);
-    const hostName = portalHostName.get();
-    const hasActiveLink = (0, _activePair.hasActiveBoundaryPortalLink)({
-      boundaryId,
-      pairsState: _state.pairs.get(),
-      sourcePairKey
-    });
-    const hasAttachableHost = shouldTeleport && hasActiveLink && portalHostReady.get() && hostName;
-    if (hasAttachableHost) {
-      attachedDestination.set({
-        animationProgress: destinationAnimationProgress,
-        closing: destinationClosing
-      });
-    }
-    const attached = attachedDestination.get();
-    const hasAttachedCloseFinished = attached !== null && (0, _transitionVisualState.hasCloseTransitionFinished)({
-      animationProgress: attached.animationProgress.get(),
-      closing: attached.closing.get()
-    });
-    const canAttach = hasAttachableHost && !hasAttachedCloseFinished;
-    const targetHostName = canAttach ? hostName : _naming.PORTAL_HOST_NAME_RESET_VALUE;
+    const shouldAttach = slot !== undefined && (0, _teleportControl.isTeleportEnabled)(teleport) && portalHostReady.get();
+    const hostName = shouldAttach ? portalHostName.get() : _naming.PORTAL_HOST_NAME_RESET_VALUE;
     return {
       ...slotProps,
-      hostName: targetHostName
+      hostName
     };
   });
   return {

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_descriptors","_styles","_transitionVisualState","_animation","_state","_system","_naming","_teleportControl","_activePair","_hostRegistry","_useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","sourcePairKey","useDescriptorsStore","s","derivations","currentScreenKey","nextScreenKey","destinationScreenKey","destinationAnimationProgress","SystemStore","getValue","destinationClosing","AnimationStore","localStylesMaps","slotsMap","useScreenSlots","portalHostName","useSharedValue","portalHostReady","attachedDestination","escapeHostKey","useActiveHostKey","useActivePortalBoundaryHost","teleportProps","useAnimatedProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldTeleport","isTeleportEnabled","hostName","hasActiveLink","hasActiveBoundaryPortalLink","pairsState","pairs","hasAttachableHost","set","animationProgress","closing","attached","hasAttachedCloseFinished","hasCloseTransitionFinished","canAttach","targetHostName","PORTAL_HOST_NAME_RESET_VALUE","exports"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_descriptors","_styles","_naming","_teleportControl","_hostRegistry","_useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","currentScreenKey","useDescriptorsStore","s","derivations","slotsMap","useScreenSlots","portalHostName","useSharedValue","portalHostReady","escapeHostKey","useActiveHostKey","useActivePortalBoundaryHost","teleportProps","useAnimatedProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldAttach","undefined","isTeleportEnabled","hostName","PORTAL_HOST_NAME_RESET_VALUE","exports"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,gBAAA,GAAAJ,OAAA;AACA,IAAAK,aAAA,GAAAL,OAAA;AACA,IAAAM,4BAAA,GAAAN,OAAA;AAMO,MAAMO,2BAA2B,GAAGA,CAAC;EAC3CC;AACkC,CAAC,KAAK;EACxC,MAAMC,gBAAgB,GAAG,IAAAC,gCAAmB,EAC1CC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACH,gBACtB,CAAC;EACD,MAAM;IAAEI;EAAS,CAAC,GAAG,IAAAC,sBAAc,EAAC,CAAC;EACrC,MAAMC,cAAc,GAAG,IAAAC,qCAAc,EAAgB,IAAI,CAAC;EAC1D,MAAMC,eAAe,GAAG,IAAAD,qCAAc,EAAC,KAAK,CAAC;EAC7C,MAAME,aAAa,GAAG,IAAAC,8BAAgB,EAACV,gBAAgB,CAAC;EAExD,IAAAW,wDAA2B,EAAC;IAC3BZ,UAAU;IACVC,gBAAgB;IAChBS,aAAa;IACbH,cAAc;IACdE,eAAe;IACfJ;EACD,CAAC,CAAC;EAEF,MAAMQ,aAAa,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IAC5C,SAAS;;IAET,MAAMC,IAAI,GAAGV,QAAQ,CAACW,GAAG,CAAC,CAAC,CAAChB,UAAU,CAAC;IACvC,MAAM;MACLiB,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IACrB,MAAMC,YAAY,GACjBP,IAAI,KAAKQ,SAAS,IAClB,IAAAC,kCAAiB,EAACL,QAAQ,CAAC,IAC3BV,eAAe,CAACO,GAAG,CAAC,CAAC;IACtB,MAAMS,QAAQ,GAAGH,YAAY,GAC1Bf,cAAc,CAACS,GAAG,CAAC,CAAC,GACpBU,oCAA4B;IAE/B,OAAO;MACN,GAAGN,SAAS;MACZK;IACD,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IAAEZ;EAAc,CAAC;AACzB,CAAC;AAACc,OAAA,CAAA5B,2BAAA,GAAAA,2BAAA","ignoreList":[]}