react-native-screen-transitions 3.11.3 → 3.13.0-beta.0

package/lib/commonjs/shared/components/boundary/portal/components/boundary-content-portal/helpers/active-handoff-receiver.js

@@ -3,7 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.resolvePreviousHandoffReceiver = exports.resolveHandoffAttachmentCandidate = exports.resolveActiveHandoffReceiver = void 0;
+exports.resolvePreviousHandoffReceiver = exports.resolveNestedHandoffAttachmentCandidate = exports.resolveHandoffAttachmentCandidate = exports.resolveActiveHandoffReceiver = exports.hasNestedHandoffTopology = void 0;
+const hasNestedHandoffTopology = ({
+  inheritedSourcePair,
+  pairDestinationScreenKey,
+  transitionDestinationScreenKey
+}) => {
+  "worklet";
+
+  return inheritedSourcePair || !!pairDestinationScreenKey && pairDestinationScreenKey !== transitionDestinationScreenKey;
+};
+exports.hasNestedHandoffTopology = hasNestedHandoffTopology;
 const resolveActiveHandoffReceiver = ({
   focusedIndex,
   routes,
@@ -64,4 +74,20 @@ const resolveHandoffAttachmentCandidate = ({
   return activeReceiverScreenKey;
 };
 exports.resolveHandoffAttachmentCandidate = resolveHandoffAttachmentCandidate;
+const resolveNestedHandoffAttachmentCandidate = ({
+  attachedReceiverScreenKey,
+  currentScreenKey,
+  hasActiveCloseFinished,
+  interpolatorReady,
+  pairDestinationScreenKey
+}) => {
+  "worklet";
+
+  if (hasActiveCloseFinished) return currentScreenKey;
+  if (interpolatorReady && pairDestinationScreenKey) {
+    return pairDestinationScreenKey;
+  }
+  return attachedReceiverScreenKey;
+};
+exports.resolveNestedHandoffAttachmentCandidate = resolveNestedHandoffAttachmentCandidate;
 //# sourceMappingURL=active-handoff-receiver.js.map

package/lib/commonjs/shared/components/boundary/portal/components/boundary-content-portal/helpers/active-handoff-receiver.js.map

@@ -1 +1 @@
-{"version":3,"names":["resolveActiveHandoffReceiver","focusedIndex","routes","scenes","index","length","scene","activity","route","key","exports","resolvePreviousHandoffReceiver","previousIndex","previousScene","resolveHandoffAttachmentCandidate","activeReceiverClosing","activeReceiverScreenKey","attachedReceiverScreenKey","hasActiveCloseFinished","interpolatorReady","pairChangedDuringClose","pairDestinationScreenKey","previousReceiverScreenKey"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-content-portal/helpers/active-handoff-receiver.ts"],"mappings":";;;;;;AAeO,MAAMA,4BAA4B,GAAGA,CAAC;EAC5CC,YAAY;EACZC,MAAM;EACNC;AACmC,CAAC,KAAoB;EACxD,KAAK,IAAIC,KAAK,GAAGD,MAAM,CAACE,MAAM,GAAG,CAAC,EAAED,KAAK,IAAI,CAAC,EAAEA,KAAK,EAAE,EAAE;IACxD,MAAME,KAAK,GAAGH,MAAM,CAACC,KAAK,CAAC;IAC3B,IAAIE,KAAK,EAAEC,QAAQ,KAAK,SAAS,EAAE;MAClC,OAAOD,KAAK,CAACE,KAAK,CAACC,GAAG;IACvB;EACD;EAEA,OAAOP,MAAM,CAACD,YAAY,CAAC,EAAEQ,GAAG,IAAI,IAAI;AACzC,CAAC;AAACC,OAAA,CAAAV,4BAAA,GAAAA,4BAAA;AAEK,MAAMW,8BAA8B,GAAGA,CAAC;EAC9CV,YAAY;EACZC,MAAM;EACNC;AACmC,CAAC,KAAoB;EACxD,KAAK,IAAIC,KAAK,GAAGD,MAAM,CAACE,MAAM,GAAG,CAAC,EAAED,KAAK,IAAI,CAAC,EAAEA,KAAK,EAAE,EAAE;IACxD,IAAID,MAAM,CAACC,KAAK,CAAC,EAAEG,QAAQ,KAAK,SAAS,EAAE;MAC1C;IACD;IAEA,KAAK,IAAIK,aAAa,GAAGR,KAAK,GAAG,CAAC,EAAEQ,aAAa,IAAI,CAAC,EAAEA,aAAa,EAAE,EAAE;MACxE,MAAMC,aAAa,GAAGV,MAAM,CAACS,aAAa,CAAC;MAC3C,IAAIC,aAAa,EAAEN,QAAQ,KAAK,SAAS,EAAE;QAC1C,OAAOM,aAAa,EAAEL,KAAK,CAACC,GAAG,IAAI,IAAI;MACxC;IACD;EACD;EAEA,OAAOP,MAAM,CAACD,YAAY,CAAC,EAAEQ,GAAG,IAAI,IAAI;AACzC,CAAC;AAACC,OAAA,CAAAC,8BAAA,GAAAA,8BAAA;AAEK,MAAMG,iCAAiC,GAAGA,CAAC;EACjDC,qBAAqB;EACrBC,uBAAuB;EACvBC,yBAAyB;EACzBC,sBAAsB;EACtBC,iBAAiB;EACjBC,sBAAsB,GAAG,KAAK;EAC9BC,wBAAwB;EACxBC;AAUD,CAAC,KAAK;EACL,SAAS;;EAET,IACCP,qBAAqB,IACrBI,iBAAiB,IACjBE,wBAAwB,IACxBD,sBAAsB,EACrB;IACD,OAAOC,wBAAwB;EAChC;EAEA,IACCH,sBAAsB,IACtBD,yBAAyB,KAAKD,uBAAuB,EACpD;IACD,OAAOM,yBAAyB;EACjC;EAEA,IAAIJ,sBAAsB,EAAE;IAC3B,OAAOD,yBAAyB;EACjC;EAEA,IACCF,qBAAqB,IACrBE,yBAAyB,KAAKD,uBAAuB,IACrDG,iBAAiB,IACjBE,wBAAwB,EACvB;IACD,OAAOA,wBAAwB;EAChC;EAEA,OAAOL,uBAAuB;AAC/B,CAAC;AAACN,OAAA,CAAAI,iCAAA,GAAAA,iCAAA","ignoreList":[]}
+{"version":3,"names":["hasNestedHandoffTopology","inheritedSourcePair","pairDestinationScreenKey","transitionDestinationScreenKey","exports","resolveActiveHandoffReceiver","focusedIndex","routes","scenes","index","length","scene","activity","route","key","resolvePreviousHandoffReceiver","previousIndex","previousScene","resolveHandoffAttachmentCandidate","activeReceiverClosing","activeReceiverScreenKey","attachedReceiverScreenKey","hasActiveCloseFinished","interpolatorReady","pairChangedDuringClose","previousReceiverScreenKey","resolveNestedHandoffAttachmentCandidate","currentScreenKey"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-content-portal/helpers/active-handoff-receiver.ts"],"mappings":"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","ignoreList":[]}

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

@@ -22,15 +22,25 @@ const useBoundaryContentPortalAttachment = ({
   boundaryId
 }) => {
   const {
-    nextInterpolatorReady,
     slotsMap
   } = (0, _styles.useScreenSlots)();
   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 transitionSourcePairKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.transitionSourcePairKey);
+  const transitionDestinationScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.transitionDestinationScreenKey);
+  const isNestedSource = !sourcePairKey && !!transitionSourcePairKey;
+  const resolvedSourcePairKey = sourcePairKey ?? transitionSourcePairKey;
+  const resolvedDestinationScreenKey = nextScreenKey ?? transitionDestinationScreenKey;
+  const destinationSlots = (0, _styles.useScreenSlots)(resolvedDestinationScreenKey ?? currentScreenKey);
+  const unavailableInterpolatorReady = (0, _reactNativeReanimated.useSharedValue)(0);
+  const interpolatorReady = destinationSlots?.interpolatorReady ?? unavailableInterpolatorReady;
   const activeReceiverScreenKey = (0, _useStack.useStack)(_activeHandoffReceiver.resolveActiveHandoffReceiver);
   const previousReceiverScreenKey = (0, _useStack.useStack)(_activeHandoffReceiver.resolvePreviousHandoffReceiver);
   const activeReceiverAnimationProgress = _system.SystemStore.getValue(activeReceiverScreenKey ?? currentScreenKey, "animationProgress");
   const activeReceiverClosing = _animation.AnimationStore.getValue(activeReceiverScreenKey ?? currentScreenKey, "closing");
+  const nestedDestinationAnimationProgress = _system.SystemStore.getValue(isNestedSource && resolvedDestinationScreenKey ? resolvedDestinationScreenKey : currentScreenKey, "animationProgress");
+  const nestedDestinationClosing = _animation.AnimationStore.getValue(isNestedSource && resolvedDestinationScreenKey ? resolvedDestinationScreenKey : currentScreenKey, "closing");
   const attachedReceiverScreenKey = (0, _reactNativeReanimated.useSharedValue)(currentScreenKey);
   const sourcePairBeforeClose = (0, _reactNativeReanimated.useSharedValue)(null);
   const teleportProps = (0, _reactNativeReanimated.useAnimatedProps)(() => {
@@ -43,27 +53,38 @@ const useBoundaryContentPortalAttachment = ({
       ...slotProps
     } = slot?.props ?? {};
     const shouldTeleport = (0, _teleportControl.isTeleportEnabled)(teleport);
-    const closing = activeReceiverClosing.get();
-    const animationProgress = activeReceiverAnimationProgress.get();
+    const closing = isNestedSource ? nestedDestinationClosing.get() : activeReceiverClosing.get();
+    const animationProgress = isNestedSource ? nestedDestinationAnimationProgress.get() : activeReceiverAnimationProgress.get();
     if (!closing) {
-      sourcePairBeforeClose.set(sourcePairKey ?? null);
+      sourcePairBeforeClose.set(resolvedSourcePairKey ?? null);
     }
-    const pairChangedDuringClose = !!closing && !!sourcePairKey && sourcePairKey !== sourcePairBeforeClose.get();
+    const pairChangedDuringClose = !!closing && !!resolvedSourcePairKey && resolvedSourcePairKey !== sourcePairBeforeClose.get();
     const hasActiveCloseFinished = (0, _transitionVisualState.hasCloseTransitionFinished)({
       closing,
       animationProgress
     });
-    const pair = sourcePairKey ? _state.pairs.get()[sourcePairKey] : null;
+    const pair = resolvedSourcePairKey ? _state.pairs.get()[resolvedSourcePairKey] : null;
     const link = pair?.links[(0, _linkPairs.getLinkKeyFromTag)(boundaryId)];
     const pairDestination = link?.status === "complete" && (!link.group || pair?.groups[link.group]?.activeId === (0, _linkPairs.getLinkKeyFromTag)(boundaryId)) ? link.destination.screenKey : null;
-    const interpolatorReady = nextInterpolatorReady.get();
+    const isInterpolatorReady = interpolatorReady.get();
     const attachedScreenKey = attachedReceiverScreenKey.get();
-    const nextReceiverScreenKey = (0, _activeHandoffReceiver.resolveHandoffAttachmentCandidate)({
+    const usesNestedReceiver = (0, _activeHandoffReceiver.hasNestedHandoffTopology)({
+      inheritedSourcePair: isNestedSource,
+      pairDestinationScreenKey: pairDestination,
+      transitionDestinationScreenKey: resolvedDestinationScreenKey
+    });
+    const nextReceiverScreenKey = usesNestedReceiver ? (0, _activeHandoffReceiver.resolveNestedHandoffAttachmentCandidate)({
+      attachedReceiverScreenKey: attachedScreenKey,
+      currentScreenKey,
+      hasActiveCloseFinished,
+      interpolatorReady: !!isInterpolatorReady,
+      pairDestinationScreenKey: pairDestination
+    }) : (0, _activeHandoffReceiver.resolveHandoffAttachmentCandidate)({
       activeReceiverClosing: !!closing,
       activeReceiverScreenKey,
       attachedReceiverScreenKey: attachedScreenKey,
       hasActiveCloseFinished,
-      interpolatorReady: !!interpolatorReady,
+      interpolatorReady: !!isInterpolatorReady,
       pairChangedDuringClose,
       pairDestinationScreenKey: pairDestination,
       previousReceiverScreenKey
@@ -71,8 +92,8 @@ const useBoundaryContentPortalAttachment = ({
     const receiverEntry = nextReceiverScreenKey ? (0, _entries.getEntry)(boundaryId, nextReceiverScreenKey) : null;
     const receiverReady = receiverEntry?.handoff === true;
     const returningFromActiveClose = hasActiveCloseFinished && attachedScreenKey === activeReceiverScreenKey;
-    const activatingPairDestination = !!pairDestination && !!interpolatorReady && nextReceiverScreenKey === pairDestination;
-    const canActivateReceiver = returningFromActiveClose || activatingPairDestination || animationProgress > 0;
+    const activatingPairDestination = !!pairDestination && !!isInterpolatorReady && nextReceiverScreenKey === pairDestination;
+    const canActivateReceiver = usesNestedReceiver ? nextReceiverScreenKey === attachedScreenKey || hasActiveCloseFinished || activatingPairDestination : returningFromActiveClose || activatingPairDestination || animationProgress > 0;
     if (nextReceiverScreenKey && receiverReady && canActivateReceiver) {
       attachedReceiverScreenKey.set(nextReceiverScreenKey);
     }

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_useStack","_descriptors","_styles","_transitionVisualState","_animation","_linkPairs","_entries","_state","_system","_naming","_teleportControl","_activeHandoffReceiver","_hostName","useBoundaryContentPortalAttachment","boundaryId","nextInterpolatorReady","slotsMap","useScreenSlots","currentScreenKey","useDescriptorsStore","s","derivations","sourcePairKey","activeReceiverScreenKey","useStack","resolveActiveHandoffReceiver","previousReceiverScreenKey","resolvePreviousHandoffReceiver","activeReceiverAnimationProgress","SystemStore","getValue","activeReceiverClosing","AnimationStore","attachedReceiverScreenKey","useSharedValue","sourcePairBeforeClose","teleportProps","useAnimatedProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldTeleport","isTeleportEnabled","closing","animationProgress","set","pairChangedDuringClose","hasActiveCloseFinished","hasCloseTransitionFinished","pair","pairs","link","links","getLinkKeyFromTag","pairDestination","status","group","groups","activeId","destination","screenKey","interpolatorReady","attachedScreenKey","nextReceiverScreenKey","resolveHandoffAttachmentCandidate","pairDestinationScreenKey","receiverEntry","getEntry","receiverReady","handoff","returningFromActiveClose","activatingPairDestination","canActivateReceiver","targetScreenKey","targetHostName","createBoundaryContentPortalHostName","PORTAL_HOST_NAME_RESET_VALUE","hostName","exports"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-content-portal/hooks/use-boundary-content-portal-attachment.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,sBAAA,GAAAJ,OAAA;AACA,IAAAK,UAAA,GAAAL,OAAA;AACA,IAAAM,UAAA,GAAAN,OAAA;AACA,IAAAO,QAAA,GAAAP,OAAA;AACA,IAAAQ,MAAA,GAAAR,OAAA;AACA,IAAAS,OAAA,GAAAT,OAAA;AACA,IAAAU,OAAA,GAAAV,OAAA;AACA,IAAAW,gBAAA,GAAAX,OAAA;AACA,IAAAY,sBAAA,GAAAZ,OAAA;AAKA,IAAAa,SAAA,GAAAb,OAAA;AAMO,MAAMc,kCAAkC,GAAGA,CAAC;EAClDC;AACyC,CAAC,KAAK;EAC/C,MAAM;IAAEC,qBAAqB;IAAEC;EAAS,CAAC,GAAG,IAAAC,sBAAc,EAAC,CAAC;EAE5D,MAAMC,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;EAE7E,MAAMC,uBAAuB,GAAG,IAAAC,kBAAQ,EAACC,mDAA4B,CAAC;EACtE,MAAMC,yBAAyB,GAAG,IAAAF,kBAAQ,EAACG,qDAA8B,CAAC;EAE1E,MAAMC,+BAA+B,GAAGC,mBAAW,CAACC,QAAQ,CAC3DP,uBAAuB,IAAIL,gBAAgB,EAC3C,mBACD,CAAC;EAED,MAAMa,qBAAqB,GAAGC,yBAAc,CAACF,QAAQ,CACpDP,uBAAuB,IAAIL,gBAAgB,EAC3C,SACD,CAAC;EAED,MAAMe,yBAAyB,GAAG,IAAAC,qCAAc,EAAChB,gBAAgB,CAAC;EAClE,MAAMiB,qBAAqB,GAAG,IAAAD,qCAAc,EAAgB,IAAI,CAAC;EAEjE,MAAME,aAAa,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IAC5C,SAAS;;IAET,MAAMC,IAAI,GAAGtB,QAAQ,CAACuB,GAAG,CAAC,CAAC,CAACzB,UAAU,CAAC;IACvC,MAAM;MACL0B,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IAErB,MAAMC,cAAc,GAAG,IAAAC,kCAAiB,EAACJ,QAAQ,CAAC;IAClD,MAAMK,OAAO,GAAGhB,qBAAqB,CAACQ,GAAG,CAAC,CAAC;IAC3C,MAAMS,iBAAiB,GAAGpB,+BAA+B,CAACW,GAAG,CAAC,CAAC;IAE/D,IAAI,CAACQ,OAAO,EAAE;MACbZ,qBAAqB,CAACc,GAAG,CAAC3B,aAAa,IAAI,IAAI,CAAC;IACjD;IAEA,MAAM4B,sBAAsB,GAC3B,CAAC,CAACH,OAAO,IACT,CAAC,CAACzB,aAAa,IACfA,aAAa,KAAKa,qBAAqB,CAACI,GAAG,CAAC,CAAC;IAE9C,MAAMY,sBAAsB,GAAG,IAAAC,iDAA0B,EAAC;MACzDL,OAAO;MACPC;IACD,CAAC,CAAC;IAEF,MAAMK,IAAI,GAAG/B,aAAa,GAAGgC,YAAK,CAACf,GAAG,CAAC,CAAC,CAACjB,aAAa,CAAC,GAAG,IAAI;IAC9D,MAAMiC,IAAI,GAAGF,IAAI,EAAEG,KAAK,CAAC,IAAAC,4BAAiB,EAAC3C,UAAU,CAAC,CAAC;IAEvD,MAAM4C,eAAe,GACpBH,IAAI,EAAEI,MAAM,KAAK,UAAU,KAC1B,CAACJ,IAAI,CAACK,KAAK,IACXP,IAAI,EAAEQ,MAAM,CAACN,IAAI,CAACK,KAAK,CAAC,EAAEE,QAAQ,KAAK,IAAAL,4BAAiB,EAAC3C,UAAU,CAAC,CAAC,GACnEyC,IAAI,CAACQ,WAAW,CAACC,SAAS,GAC1B,IAAI;IAER,MAAMC,iBAAiB,GAAGlD,qBAAqB,CAACwB,GAAG,CAAC,CAAC;IACrD,MAAM2B,iBAAiB,GAAGjC,yBAAyB,CAACM,GAAG,CAAC,CAAC;IAEzD,MAAM4B,qBAAqB,GAAG,IAAAC,wDAAiC,EAAC;MAC/DrC,qBAAqB,EAAE,CAAC,CAACgB,OAAO;MAChCxB,uBAAuB;MACvBU,yBAAyB,EAAEiC,iBAAiB;MAC5Cf,sBAAsB;MACtBc,iBAAiB,EAAE,CAAC,CAACA,iBAAiB;MACtCf,sBAAsB;MACtBmB,wBAAwB,EAAEX,eAAe;MACzChC;IACD,CAAC,CAAC;IAEF,MAAM4C,aAAa,GAAGH,qBAAqB,GACxC,IAAAI,iBAAQ,EAACzD,UAAU,EAAEqD,qBAAqB,CAAC,GAC3C,IAAI;IAEP,MAAMK,aAAa,GAAGF,aAAa,EAAEG,OAAO,KAAK,IAAI;IAErD,MAAMC,wBAAwB,GAC7BvB,sBAAsB,IAAIe,iBAAiB,KAAK3C,uBAAuB;IAExE,MAAMoD,yBAAyB,GAC9B,CAAC,CAACjB,eAAe,IACjB,CAAC,CAACO,iBAAiB,IACnBE,qBAAqB,KAAKT,eAAe;IAE1C,MAAMkB,mBAAmB,GACxBF,wBAAwB,IACxBC,yBAAyB,IACzB3B,iBAAiB,GAAG,CAAC;IAEtB,IAAImB,qBAAqB,IAAIK,aAAa,IAAII,mBAAmB,EAAE;MAClE3C,yBAAyB,CAACgB,GAAG,CAACkB,qBAAqB,CAAC;IACrD;IAEA,MAAMU,eAAe,GAAGhC,cAAc,GACnCZ,yBAAyB,CAACM,GAAG,CAAC,CAAC,GAC/B,IAAI;IAEP,MAAMuC,cAAc,GAAGD,eAAe,GACnC,IAAAE,6CAAmC,EAACF,eAAe,EAAE/D,UAAU,CAAC,GAChEkE,oCAA4B;IAE/B,OAAO;MACN,GAAGrC,SAAS;MACZsC,QAAQ,EAAEH;IACX,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IAAE1C;EAAc,CAAC;AACzB,CAAC;AAAC8C,OAAA,CAAArE,kCAAA,GAAAA,kCAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_useStack","_descriptors","_styles","_transitionVisualState","_animation","_linkPairs","_entries","_state","_system","_naming","_teleportControl","_activeHandoffReceiver","_hostName","useBoundaryContentPortalAttachment","boundaryId","slotsMap","useScreenSlots","currentScreenKey","useDescriptorsStore","s","derivations","nextScreenKey","sourcePairKey","transitionSourcePairKey","transitionDestinationScreenKey","isNestedSource","resolvedSourcePairKey","resolvedDestinationScreenKey","destinationSlots","unavailableInterpolatorReady","useSharedValue","interpolatorReady","activeReceiverScreenKey","useStack","resolveActiveHandoffReceiver","previousReceiverScreenKey","resolvePreviousHandoffReceiver","activeReceiverAnimationProgress","SystemStore","getValue","activeReceiverClosing","AnimationStore","nestedDestinationAnimationProgress","nestedDestinationClosing","attachedReceiverScreenKey","sourcePairBeforeClose","teleportProps","useAnimatedProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldTeleport","isTeleportEnabled","closing","animationProgress","set","pairChangedDuringClose","hasActiveCloseFinished","hasCloseTransitionFinished","pair","pairs","link","links","getLinkKeyFromTag","pairDestination","status","group","groups","activeId","destination","screenKey","isInterpolatorReady","attachedScreenKey","usesNestedReceiver","hasNestedHandoffTopology","inheritedSourcePair","pairDestinationScreenKey","nextReceiverScreenKey","resolveNestedHandoffAttachmentCandidate","resolveHandoffAttachmentCandidate","receiverEntry","getEntry","receiverReady","handoff","returningFromActiveClose","activatingPairDestination","canActivateReceiver","targetScreenKey","targetHostName","createBoundaryContentPortalHostName","PORTAL_HOST_NAME_RESET_VALUE","hostName","exports"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-content-portal/hooks/use-boundary-content-portal-attachment.ts"],"mappings":"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","ignoreList":[]}

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

@@ -9,7 +9,9 @@ var _reactNative = require("react-native");
 var _reactNativeReanimated = _interopRequireWildcard(require("react-native-reanimated"));
 var _constants = require("../../../../../../constants");
 var _composeSlotStyle = require("../../../../../../providers/screen/styles/helpers/compose-slot-style");
+var _coordinator = require("../../../../../../stores/bounds/internals/coordinator");
 var _teleport = require("../../../teleport");
+var _hostReadiness = require("../helpers/host-readiness");
 var _localMeasurement = require("../helpers/local-measurement");
 var _offsetStyle = require("../helpers/offset-style");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -34,8 +36,13 @@ const PortalBoundaryHost = exports.PortalBoundaryHost = /*#__PURE__*/(0, _react.
   }, ready => {
     "worklet";
 
+    host.portalHostReady.set((0, _hostReadiness.resolveReadyPortalHostName)({
+      currentReadyHostName: host.portalHostReady.get(),
+      hostName: host.portalHostName,
+      ready
+    }));
     if (ready) {
-      host.portalHostReady.set(true);
+      (0, _coordinator.markBoundaryPortalReady)(host.pairKey, host.boundaryId);
     }
   });
   const hostStyle = (0, _reactNativeReanimated.useAnimatedStyle)(() => {

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","_teleport","_localMeasurement","_offsetStyle","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","AnimatedPortalBoundaryHost","NativePortalHost","Animated","createAnimatedComponent","getCurrentBoundaryBounds","host","resolveBoundaryLocalMeasurement","localMeasurement","pairKey","PortalBoundaryHost","exports","memo","hostBounds","hostMeasurementKey","measuredHostKey","style","useAnimatedReaction","ready","portalHostReady","hostStyle","useAnimatedStyle","boundaryBounds","NO_STYLES","resolvePortalOffsetStyle","bounds","contentFrameStyle","height","width","slotStyle","slot","slotsMap","boundaryId","composeSlotStyleWithLocalTransform","undefined","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","_coordinator","_teleport","_hostReadiness","_localMeasurement","_offsetStyle","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","AnimatedPortalBoundaryHost","NativePortalHost","Animated","createAnimatedComponent","getCurrentBoundaryBounds","host","resolveBoundaryLocalMeasurement","localMeasurement","pairKey","PortalBoundaryHost","exports","memo","hostBounds","hostMeasurementKey","measuredHostKey","style","useAnimatedReaction","ready","portalHostReady","resolveReadyPortalHostName","currentReadyHostName","hostName","portalHostName","markBoundaryPortalReady","boundaryId","hostStyle","useAnimatedStyle","boundaryBounds","NO_STYLES","resolvePortalOffsetStyle","bounds","contentFrameStyle","height","width","slotStyle","slot","slotsMap","composeSlotStyleWithLocalTransform","undefined","boundsLocalTransform","jsx","View","pointerEvents","PORTAL_POINTER_EVENTS","collapsable","children","name","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/helpers/attachment.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shouldAttachBoundaryPortal = void 0;
+var _teleportControl = require("../../../utils/teleport-control");
+const shouldAttachBoundaryPortal = ({
+  focused,
+  portalHostReady,
+  slotActive,
+  teleport
+}) => {
+  "worklet";
+
+  return slotActive && !focused && portalHostReady && (0, _teleportControl.isTeleportEnabled)(teleport);
+};
+exports.shouldAttachBoundaryPortal = shouldAttachBoundaryPortal;
+//# sourceMappingURL=attachment.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_teleportControl","require","shouldAttachBoundaryPortal","focused","portalHostReady","slotActive","teleport","isTeleportEnabled","exports"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/helpers/attachment.ts"],"mappings":";;;;;;AACA,IAAAA,gBAAA,GAAAC,OAAA;AAEO,MAAMC,0BAA0B,GAAGA,CAAC;EAC1CC,OAAO;EACPC,eAAe;EACfC,UAAU;EACVC;AAMD,CAAC,KAAK;EACL,SAAS;;EACT,OACCD,UAAU,IAAI,CAACF,OAAO,IAAIC,eAAe,IAAI,IAAAG,kCAAiB,EAACD,QAAQ,CAAC;AAE1E,CAAC;AAACE,OAAA,CAAAN,0BAAA,GAAAA,0BAAA","ignoreList":[]}

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

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveReadyPortalHostName = void 0;
+const resolveReadyPortalHostName = ({
+  currentReadyHostName,
+  hostName,
+  ready
+}) => {
+  "worklet";
+
+  if (ready) return hostName;
+  return currentReadyHostName === hostName ? null : currentReadyHostName;
+};
+exports.resolveReadyPortalHostName = resolveReadyPortalHostName;
+//# sourceMappingURL=host-readiness.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["resolveReadyPortalHostName","currentReadyHostName","hostName","ready","exports"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/helpers/host-readiness.ts"],"mappings":";;;;;;AAAO,MAAMA,0BAA0B,GAAGA,CAAC;EAC1CC,oBAAoB;EACpBC,QAAQ;EACRC;AAKD,CAAC,KAAK;EACL,SAAS;;EAET,IAAIA,KAAK,EAAE,OAAOD,QAAQ;EAC1B,OAAOD,oBAAoB,KAAKC,QAAQ,GAAG,IAAI,GAAGD,oBAAoB;AACvE,CAAC;AAACG,OAAA,CAAAJ,0BAAA,GAAAA,0BAAA","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/helpers/local-measurement.js

@@ -3,7 +3,28 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.resolveBoundaryLocalMeasurement = void 0;
+exports.resolveBoundaryPortalPairKey = exports.resolveBoundaryLocalMeasurement = exports.resolveActiveBoundaryPortalPairKey = void 0;
+var _linkPairs = require("../../../../../../stores/bounds/helpers/link-pairs.helpers");
+var _teleportControl = require("../../../utils/teleport-control");
+const resolveBoundaryPortalPairKey = measurement => {
+  "worklet";
+
+  return measurement?.pairKey ?? null;
+};
+exports.resolveBoundaryPortalPairKey = resolveBoundaryPortalPairKey;
+const resolveActiveBoundaryPortalPairKey = (measurement, slot, boundaryId, pairsState) => {
+  "worklet";
+
+  if (!measurement) return null;
+  const group = (0, _linkPairs.getGroupKeyFromTag)(boundaryId);
+  if (group) {
+    const activeId = pairsState[measurement.pairKey]?.groups[group]?.activeId;
+    if (activeId !== (0, _linkPairs.getLinkKeyFromTag)(boundaryId)) return null;
+  }
+  if (slot && !(0, _teleportControl.isTeleportEnabled)(slot.props?.teleport)) return null;
+  return measurement.pairKey;
+};
+exports.resolveActiveBoundaryPortalPairKey = resolveActiveBoundaryPortalPairKey;
 const resolveBoundaryLocalMeasurement = (measurement, pairKey) => {
   "worklet";
 

package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/helpers/local-measurement.js.map

@@ -1 +1 @@
-{"version":3,"names":["resolveBoundaryLocalMeasurement","measurement","pairKey","bounds","exports"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/helpers/local-measurement.ts"],"mappings":";;;;;;AAGO,MAAMA,+BAA+B,GAAGA,CAC9CC,WAA4C,EAC5CC,OAAsB,KAClB;EACJ,SAAS;;EACT,OAAOD,WAAW,EAAEC,OAAO,KAAKA,OAAO,GAAGD,WAAW,CAACE,MAAM,GAAG,IAAI;AACpE,CAAC;AAACC,OAAA,CAAAJ,+BAAA,GAAAA,+BAAA","ignoreList":[]}
+{"version":3,"names":["_linkPairs","require","_teleportControl","resolveBoundaryPortalPairKey","measurement","pairKey","exports","resolveActiveBoundaryPortalPairKey","slot","boundaryId","pairsState","group","getGroupKeyFromTag","activeId","groups","getLinkKeyFromTag","isTeleportEnabled","props","teleport","resolveBoundaryLocalMeasurement","bounds"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/helpers/local-measurement.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAUA,IAAAC,gBAAA,GAAAD,OAAA;AAEO,MAAME,4BAA4B,GACxCC,WAA4C,IAClB;EAC1B,SAAS;;EACT,OAAOA,WAAW,EAAEC,OAAO,IAAI,IAAI;AACpC,CAAC;AAACC,OAAA,CAAAH,4BAAA,GAAAA,4BAAA;AAEK,MAAMI,kCAAkC,GAAGA,CACjDH,WAA4C,EAC5CI,IAA+C,EAC/CC,UAAkB,EAClBC,UAA0B,KACA;EAC1B,SAAS;;EACT,IAAI,CAACN,WAAW,EAAE,OAAO,IAAI;EAE7B,MAAMO,KAAK,GAAG,IAAAC,6BAAkB,EAACH,UAAU,CAAC;EAC5C,IAAIE,KAAK,EAAE;IACV,MAAME,QAAQ,GAAGH,UAAU,CAACN,WAAW,CAACC,OAAO,CAAC,EAAES,MAAM,CAACH,KAAK,CAAC,EAAEE,QAAQ;IACzE,IAAIA,QAAQ,KAAK,IAAAE,4BAAiB,EAACN,UAAU,CAAC,EAAE,OAAO,IAAI;EAC5D;EAEA,IAAID,IAAI,IAAI,CAAC,IAAAQ,kCAAiB,EAACR,IAAI,CAACS,KAAK,EAAEC,QAAQ,CAAC,EAAE,OAAO,IAAI;EACjE,OAAOd,WAAW,CAACC,OAAO;AAC3B,CAAC;AAACC,OAAA,CAAAC,kCAAA,GAAAA,kCAAA;AAEK,MAAMY,+BAA+B,GAAGA,CAC9Cf,WAA4C,EAC5CC,OAAsB,KAClB;EACJ,SAAS;;EACT,OAAOD,WAAW,EAAEC,OAAO,KAAKA,OAAO,GAAGD,WAAW,CAACgB,MAAM,GAAG,IAAI;AACpE,CAAC;AAACd,OAAA,CAAAa,+BAAA,GAAAA,+BAAA","ignoreList":[]}

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

@@ -6,12 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.useActivePortalBoundaryHost = void 0;
 var _react = require("react");
 var _reactNativeReanimated = require("react-native-reanimated");
-var _links = require("../../../../../../stores/bounds/internals/links");
+var _state = require("../../../../../../stores/bounds/internals/state");
 var _naming = require("../../../utils/naming");
+var _teleportControl = require("../../../utils/teleport-control");
+var _localMeasurement = require("../helpers/local-measurement");
 var _portalBoundaryHost = require("../stores/portal-boundary-host.store");
 const useActivePortalBoundaryHost = ({
   boundaryId,
-  currentScreenKey,
   escapeHostKey,
   localMeasurement,
   portalHostName,
@@ -25,24 +26,23 @@ const useActivePortalBoundaryHost = ({
   (0, _reactNativeReanimated.useAnimatedReaction)(() => {
     "worklet";
 
-    const pairKey = (0, _links.getPairKeyForSource)(boundaryId, currentScreenKey);
-    const measurement = localMeasurement.get();
-    if (!pairKey || measurement?.pairKey !== pairKey) {
-      return null;
-    }
-    return pairKey;
+    return (0, _localMeasurement.resolveActiveBoundaryPortalPairKey)(localMeasurement.get(), slotsMap.get()[boundaryId], boundaryId, _state.pairs.get());
   }, (pairKey, previousPairKey) => {
     "worklet";
 
     if (pairKey === previousPairKey) {
       return;
     }
+    const slot = slotsMap.get()[boundaryId];
+    if (pairKey === null && localMeasurement.get() !== null && slot && !(0, _teleportControl.isTeleportEnabled)(slot.props?.teleport)) {
+      localMeasurement.set(null);
+    }
     (0, _reactNativeReanimated.runOnJS)(updateActivePairKey)(pairKey);
   });
   (0, _react.useLayoutEffect)(() => {
     if (!activePairKey || !escapeHostKey) {
       portalHostName.set(null);
-      portalHostReady.set(false);
+      portalHostReady.set(null);
       return;
     }
     const nextPortalHostName = (0, _naming.createBoundaryPortalHostName)(escapeHostKey, boundaryId, activePairKey);
@@ -58,7 +58,7 @@ const useActivePortalBoundaryHost = ({
     portalHostName.set(nextPortalHostName);
     return () => {
       portalHostName.set(null);
-      portalHostReady.set(false);
+      portalHostReady.set(null);
       (0, _portalBoundaryHost.unmountPortalBoundaryHostByName)(nextPortalHostName);
     };
   }, [activePairKey, boundaryId, escapeHostKey, localMeasurement, portalHostName, portalHostReady, slotsMap]);

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","_links","_naming","_portalBoundaryHost","useActivePortalBoundaryHost","boundaryId","currentScreenKey","escapeHostKey","localMeasurement","portalHostName","portalHostReady","slotsMap","activePairKey","setActivePairKey","useState","updateActivePairKey","useCallback","pairKey","useAnimatedReaction","getPairKeyForSource","measurement","get","previousPairKey","runOnJS","useLayoutEffect","set","nextPortalHostName","createBoundaryPortalHostName","mountPortalBoundaryHost","hostKey","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;AAIA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,mBAAA,GAAAJ,OAAA;AAeO,MAAMK,2BAA2B,GAAGA,CAAC;EAC3CC,UAAU;EACVC,gBAAgB;EAChBC,aAAa;EACbC,gBAAgB;EAChBC,cAAc;EACdC,eAAe;EACfC;AACkC,CAAC,KAAK;EACxC,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAG,IAAAC,eAAQ,EACjD,IACD,CAAC;EAED,MAAMC,mBAAmB,GAAG,IAAAC,kBAAW,EAAEC,OAA6B,IAAK;IAC1EJ,gBAAgB,CAACI,OAAO,CAAC;EAC1B,CAAC,EAAE,EAAE,CAAC;EAEN,IAAAC,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,MAAMD,OAAO,GAAG,IAAAE,0BAAmB,EAACd,UAAU,EAAEC,gBAAgB,CAAC;IACjE,MAAMc,WAAW,GAAGZ,gBAAgB,CAACa,GAAG,CAAC,CAAC;IAC1C,IAAI,CAACJ,OAAO,IAAIG,WAAW,EAAEH,OAAO,KAAKA,OAAO,EAAE;MACjD,OAAO,IAAI;IACZ;IAEA,OAAOA,OAAO;EACf,CAAC,EACD,CAACA,OAAO,EAAEK,eAAe,KAAK;IAC7B,SAAS;;IACT,IAAIL,OAAO,KAAKK,eAAe,EAAE;MAChC;IACD;IAEA,IAAAC,8BAAO,EAACR,mBAAmB,CAAC,CAACE,OAAO,CAAC;EACtC,CACD,CAAC;EAED,IAAAO,sBAAe,EAAC,MAAM;IACrB,IAAI,CAACZ,aAAa,IAAI,CAACL,aAAa,EAAE;MACrCE,cAAc,CAACgB,GAAG,CAAC,IAAI,CAAC;MACxBf,eAAe,CAACe,GAAG,CAAC,KAAK,CAAC;MAC1B;IACD;IAEA,MAAMC,kBAAkB,GAAG,IAAAC,oCAA4B,EACtDpB,aAAa,EACbF,UAAU,EACVO,aACD,CAAC;IAED,IAAAgB,2CAAuB,EAAC;MACvBvB,UAAU;MACVwB,OAAO,EAAEtB,aAAa;MACtBC,gBAAgB;MAChBS,OAAO,EAAEL,aAAa;MACtBH,cAAc,EAAEiB,kBAAkB;MAClChB,eAAe;MACfC;IACD,CAAC,CAAC;IACFF,cAAc,CAACgB,GAAG,CAACC,kBAAkB,CAAC;IAEtC,OAAO,MAAM;MACZjB,cAAc,CAACgB,GAAG,CAAC,IAAI,CAAC;MACxBf,eAAe,CAACe,GAAG,CAAC,KAAK,CAAC;MAC1B,IAAAK,mDAA+B,EAACJ,kBAAkB,CAAC;IACpD,CAAC;EACF,CAAC,EAAE,CACFd,aAAa,EACbP,UAAU,EACVE,aAAa,EACbC,gBAAgB,EAChBC,cAAc,EACdC,eAAe,EACfC,QAAQ,CACR,CAAC;AACH,CAAC;AAACoB,OAAA,CAAA3B,2BAAA,GAAAA,2BAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_state","_naming","_teleportControl","_localMeasurement","_portalBoundaryHost","useActivePortalBoundaryHost","boundaryId","escapeHostKey","localMeasurement","portalHostName","portalHostReady","slotsMap","activePairKey","setActivePairKey","useState","updateActivePairKey","useCallback","pairKey","useAnimatedReaction","resolveActiveBoundaryPortalPairKey","get","pairs","previousPairKey","slot","isTeleportEnabled","props","teleport","set","runOnJS","useLayoutEffect","nextPortalHostName","createBoundaryPortalHostName","mountPortalBoundaryHost","hostKey","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;AAIA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,gBAAA,GAAAJ,OAAA;AACA,IAAAK,iBAAA,GAAAL,OAAA;AACA,IAAAM,mBAAA,GAAAN,OAAA;AAcO,MAAMO,2BAA2B,GAAGA,CAAC;EAC3CC,UAAU;EACVC,aAAa;EACbC,gBAAgB;EAChBC,cAAc;EACdC,eAAe;EACfC;AACkC,CAAC,KAAK;EACxC,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAG,IAAAC,eAAQ,EACjD,IACD,CAAC;EAED,MAAMC,mBAAmB,GAAG,IAAAC,kBAAW,EAAEC,OAA6B,IAAK;IAC1EJ,gBAAgB,CAACI,OAAO,CAAC;EAC1B,CAAC,EAAE,EAAE,CAAC;EAEN,IAAAC,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,OAAO,IAAAC,oDAAkC,EACxCX,gBAAgB,CAACY,GAAG,CAAC,CAAC,EACtBT,QAAQ,CAACS,GAAG,CAAC,CAAC,CAACd,UAAU,CAAC,EAC1BA,UAAU,EACVe,YAAK,CAACD,GAAG,CAAC,CACX,CAAC;EACF,CAAC,EACD,CAACH,OAAO,EAAEK,eAAe,KAAK;IAC7B,SAAS;;IACT,IAAIL,OAAO,KAAKK,eAAe,EAAE;MAChC;IACD;IAEA,MAAMC,IAAI,GAAGZ,QAAQ,CAACS,GAAG,CAAC,CAAC,CAACd,UAAU,CAAC;IACvC,IACCW,OAAO,KAAK,IAAI,IAChBT,gBAAgB,CAACY,GAAG,CAAC,CAAC,KAAK,IAAI,IAC/BG,IAAI,IACJ,CAAC,IAAAC,kCAAiB,EAACD,IAAI,CAACE,KAAK,EAAEC,QAAQ,CAAC,EACvC;MACDlB,gBAAgB,CAACmB,GAAG,CAAC,IAAI,CAAC;IAC3B;IAEA,IAAAC,8BAAO,EAACb,mBAAmB,CAAC,CAACE,OAAO,CAAC;EACtC,CACD,CAAC;EAED,IAAAY,sBAAe,EAAC,MAAM;IACrB,IAAI,CAACjB,aAAa,IAAI,CAACL,aAAa,EAAE;MACrCE,cAAc,CAACkB,GAAG,CAAC,IAAI,CAAC;MACxBjB,eAAe,CAACiB,GAAG,CAAC,IAAI,CAAC;MACzB;IACD;IAEA,MAAMG,kBAAkB,GAAG,IAAAC,oCAA4B,EACtDxB,aAAa,EACbD,UAAU,EACVM,aACD,CAAC;IAED,IAAAoB,2CAAuB,EAAC;MACvB1B,UAAU;MACV2B,OAAO,EAAE1B,aAAa;MACtBC,gBAAgB;MAChBS,OAAO,EAAEL,aAAa;MACtBH,cAAc,EAAEqB,kBAAkB;MAClCpB,eAAe;MACfC;IACD,CAAC,CAAC;IACFF,cAAc,CAACkB,GAAG,CAACG,kBAAkB,CAAC;IAEtC,OAAO,MAAM;MACZrB,cAAc,CAACkB,GAAG,CAAC,IAAI,CAAC;MACxBjB,eAAe,CAACiB,GAAG,CAAC,IAAI,CAAC;MACzB,IAAAO,mDAA+B,EAACJ,kBAAkB,CAAC;IACpD,CAAC;EACF,CAAC,EAAE,CACFlB,aAAa,EACbN,UAAU,EACVC,aAAa,EACbC,gBAAgB,EAChBC,cAAc,EACdC,eAAe,EACfC,QAAQ,CACR,CAAC;AACH,CAAC;AAACwB,OAAA,CAAA9B,2BAAA,GAAAA,2BAAA","ignoreList":[]}

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

@@ -4,12 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useBoundaryPortalAttachment = void 0;
+var _native = require("@react-navigation/native");
 var _reactNativeReanimated = require("react-native-reanimated");
 var _descriptors = require("../../../../../../providers/screen/descriptors");
 var _styles = require("../../../../../../providers/screen/styles");
+var _state = require("../../../../../../stores/bounds/internals/state");
 var _boundaryRoot = require("../../../../providers/boundary-root.provider");
 var _naming = require("../../../utils/naming");
-var _teleportControl = require("../../../utils/teleport-control");
+var _attachment = require("../helpers/attachment");
+var _localMeasurement = require("../helpers/local-measurement");
 var _hostRegistry = require("../stores/host-registry.store");
 var _useActivePortalBoundaryHost = require("./use-active-portal-boundary-host");
 const useBoundaryPortalAttachment = ({
@@ -22,15 +25,18 @@ const useBoundaryPortalAttachment = ({
     return root.localMeasurement;
   });
   const currentScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.currentScreenKey);
+  // React Navigation resolves focus through the entire parent navigator chain.
+  // A leaf that is still selected in its own one-screen stack becomes unfocused
+  // when any ancestor route is covered.
+  const focused = (0, _native.useIsFocused)();
   const {
     slotsMap
   } = (0, _styles.useScreenSlots)();
   const portalHostName = (0, _reactNativeReanimated.useSharedValue)(null);
-  const portalHostReady = (0, _reactNativeReanimated.useSharedValue)(false);
+  const portalHostReady = (0, _reactNativeReanimated.useSharedValue)(null);
   const escapeHostKey = (0, _hostRegistry.useActiveHostKey)(currentScreenKey);
   (0, _useActivePortalBoundaryHost.useActivePortalBoundaryHost)({
     boundaryId,
-    currentScreenKey,
     escapeHostKey,
     localMeasurement,
     portalHostName,
@@ -46,13 +52,19 @@ const useBoundaryPortalAttachment = ({
       teleport,
       ...slotProps
     } = slot?.props ?? {};
-    const shouldAttach = slot !== undefined && (0, _teleportControl.isTeleportEnabled)(teleport) && portalHostReady.get();
-    const hostName = shouldAttach ? portalHostName.get() : _naming.PORTAL_HOST_NAME_RESET_VALUE;
+    const activePortalHostName = portalHostName.get();
+    const shouldAttach = (0, _attachment.shouldAttachBoundaryPortal)({
+      focused,
+      portalHostReady: activePortalHostName !== null && portalHostReady.get() === activePortalHostName,
+      slotActive: (0, _localMeasurement.resolveActiveBoundaryPortalPairKey)(localMeasurement.get(), slot, boundaryId, _state.pairs.get()) !== null && slot !== undefined,
+      teleport
+    });
+    const hostName = shouldAttach ? activePortalHostName : _naming.PORTAL_HOST_NAME_RESET_VALUE;
     return {
       ...slotProps,
       hostName
     };
-  });
+  }, [focused]);
   return {
     teleportProps
   };

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","_boundaryRoot","_naming","_teleportControl","_hostRegistry","_useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","localMeasurement","useBoundaryRootStore","root","Error","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,aAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,gBAAA,GAAAL,OAAA;AACA,IAAAM,aAAA,GAAAN,OAAA;AACA,IAAAO,4BAAA,GAAAP,OAAA;AAMO,MAAMQ,2BAA2B,GAAGA,CAAC;EAC3CC;AACkC,CAAC,KAAK;EACxC,MAAMC,gBAAgB,GAAG,IAAAC,kCAAoB,EAAEC,IAAI,IAAK;IACvD,IAAI,CAACA,IAAI,EAAE;MACV,MAAM,IAAIC,KAAK,CAAC,sDAAsD,CAAC;IACxE;IAEA,OAAOD,IAAI,CAACF,gBAAgB;EAC7B,CAAC,CAAC;EACF,MAAMI,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;IAC3BhB,UAAU;IACVK,gBAAgB;IAChBS,aAAa;IACbb,gBAAgB;IAChBU,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,CAACpB,UAAU,CAAC;IACvC,MAAM;MACLqB,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IAErB,MAAMC,YAAY,GACjBP,IAAI,KAAKQ,SAAS,IAClB,IAAAC,kCAAiB,EAACL,QAAQ,CAAC,IAC3BV,eAAe,CAACO,GAAG,CAAC,CAAC;IAEtB,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,CAAAhC,2BAAA,GAAAA,2BAAA","ignoreList":[]}
+{"version":3,"names":["_native","require","_reactNativeReanimated","_descriptors","_styles","_state","_boundaryRoot","_naming","_attachment","_localMeasurement","_hostRegistry","_useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","localMeasurement","useBoundaryRootStore","root","Error","currentScreenKey","useDescriptorsStore","s","derivations","focused","useIsFocused","slotsMap","useScreenSlots","portalHostName","useSharedValue","portalHostReady","escapeHostKey","useActiveHostKey","useActivePortalBoundaryHost","teleportProps","useAnimatedProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","activePortalHostName","shouldAttach","shouldAttachBoundaryPortal","slotActive","resolveActiveBoundaryPortalPairKey","pairs","undefined","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,OAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,MAAA,GAAAJ,OAAA;AACA,IAAAK,aAAA,GAAAL,OAAA;AACA,IAAAM,OAAA,GAAAN,OAAA;AACA,IAAAO,WAAA,GAAAP,OAAA;AACA,IAAAQ,iBAAA,GAAAR,OAAA;AACA,IAAAS,aAAA,GAAAT,OAAA;AACA,IAAAU,4BAAA,GAAAV,OAAA;AAMO,MAAMW,2BAA2B,GAAGA,CAAC;EAC3CC;AACkC,CAAC,KAAK;EACxC,MAAMC,gBAAgB,GAAG,IAAAC,kCAAoB,EAAEC,IAAI,IAAK;IACvD,IAAI,CAACA,IAAI,EAAE;MACV,MAAM,IAAIC,KAAK,CAAC,sDAAsD,CAAC;IACxE;IAEA,OAAOD,IAAI,CAACF,gBAAgB;EAC7B,CAAC,CAAC;EACF,MAAMI,gBAAgB,GAAG,IAAAC,gCAAmB,EAC1CC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACH,gBACtB,CAAC;EACD;EACA;EACA;EACA,MAAMI,OAAO,GAAG,IAAAC,oBAAY,EAAC,CAAC;EAC9B,MAAM;IAAEC;EAAS,CAAC,GAAG,IAAAC,sBAAc,EAAC,CAAC;EACrC,MAAMC,cAAc,GAAG,IAAAC,qCAAc,EAAgB,IAAI,CAAC;EAC1D,MAAMC,eAAe,GAAG,IAAAD,qCAAc,EAAgB,IAAI,CAAC;EAC3D,MAAME,aAAa,GAAG,IAAAC,8BAAgB,EAACZ,gBAAgB,CAAC;EAExD,IAAAa,wDAA2B,EAAC;IAC3BlB,UAAU;IACVgB,aAAa;IACbf,gBAAgB;IAChBY,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,CAACtB,UAAU,CAAC;IACvC,MAAM;MACLuB,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IAErB,MAAMC,oBAAoB,GAAGf,cAAc,CAACS,GAAG,CAAC,CAAC;IACjD,MAAMO,YAAY,GAAG,IAAAC,sCAA0B,EAAC;MAC/CrB,OAAO;MACPM,eAAe,EACda,oBAAoB,KAAK,IAAI,IAC7Bb,eAAe,CAACO,GAAG,CAAC,CAAC,KAAKM,oBAAoB;MAC/CG,UAAU,EACT,IAAAC,oDAAkC,EACjC/B,gBAAgB,CAACqB,GAAG,CAAC,CAAC,EACtBD,IAAI,EACJrB,UAAU,EACViC,YAAK,CAACX,GAAG,CAAC,CACX,CAAC,KAAK,IAAI,IAAID,IAAI,KAAKa,SAAS;MACjCT;IACD,CAAC,CAAC;IAEF,MAAMU,QAAQ,GAAGN,YAAY,GAC1BD,oBAAoB,GACpBQ,oCAA4B;IAE/B,OAAO;MACN,GAAGV,SAAS;MACZS;IACD,CAAC;EACF,CAAC,EAAE,CAAC1B,OAAO,CAAC,CAAC;EAEb,OAAO;IAAEU;EAAc,CAAC;AACzB,CAAC;AAACkB,OAAA,CAAAtC,2BAAA,GAAAA,2BAAA","ignoreList":[]}

package/lib/commonjs/shared/components/overlay/helpers/create-overlay-interpolator-frame.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createOverlayInterpolatorFrame = void 0;
+var _derivations = require("../../../providers/screen/animation/helpers/derivations");
+const createOverlayInterpolatorFrame = ({
+  overlayFrame,
+  driverFrame,
+  previousOverlayFrame
+}) => {
+  "worklet";
+
+  const current = overlayFrame.current;
+  const driverIsCurrent = driverFrame.current.route.key === current.route.key;
+  const frame = {
+    ...overlayFrame,
+    previous: previousOverlayFrame?.current,
+    current,
+    next: driverIsCurrent ? undefined : driverFrame.current,
+    layouts: current.layouts
+  };
+  (0, _derivations.updateDerivations)(frame);
+  frame.stackProgress = frame.progress;
+  frame.logicallySettled = frame.active.settled;
+  return frame;
+};
+exports.createOverlayInterpolatorFrame = createOverlayInterpolatorFrame;
+//# sourceMappingURL=create-overlay-interpolator-frame.js.map

package/lib/commonjs/shared/components/overlay/helpers/create-overlay-interpolator-frame.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_derivations","require","createOverlayInterpolatorFrame","overlayFrame","driverFrame","previousOverlayFrame","current","driverIsCurrent","route","key","frame","previous","next","undefined","layouts","updateDerivations","stackProgress","progress","logicallySettled","active","settled","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/helpers/create-overlay-interpolator-frame.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAGO,MAAMC,8BAA8B,GAAGA,CAAC;EAC9CC,YAAY;EACZC,WAAW;EACXC;AAKD,CAAC,KAA8B;EAC9B,SAAS;;EACT,MAAMC,OAAO,GAAGH,YAAY,CAACG,OAAO;EACpC,MAAMC,eAAe,GAAGH,WAAW,CAACE,OAAO,CAACE,KAAK,CAACC,GAAG,KAAKH,OAAO,CAACE,KAAK,CAACC,GAAG;EAC3E,MAAMC,KAA8B,GAAG;IACtC,GAAGP,YAAY;IACfQ,QAAQ,EAAEN,oBAAoB,EAAEC,OAAO;IACvCA,OAAO;IACPM,IAAI,EAAEL,eAAe,GAAGM,SAAS,GAAGT,WAAW,CAACE,OAAO;IACvDQ,OAAO,EAAER,OAAO,CAACQ;EAClB,CAAC;EAED,IAAAC,8BAAiB,EAACL,KAAK,CAAC;EACxBA,KAAK,CAACM,aAAa,GAAGN,KAAK,CAACO,QAAQ;EACpCP,KAAK,CAACQ,gBAAgB,GAAGR,KAAK,CAACS,MAAM,CAACC,OAAO;EAE7C,OAAOV,KAAK;AACb,CAAC;AAACW,OAAA,CAAAnB,8BAAA,GAAAA,8BAAA","ignoreList":[]}

package/lib/commonjs/shared/components/overlay/helpers/get-active-overlay.js

@@ -3,38 +3,56 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getActiveFloatOverlay = getActiveFloatOverlay;
+exports.getFloatOverlayStack = getFloatOverlayStack;
+exports.getFloatOverlayTransitions = getFloatOverlayTransitions;
 var _visibility = require("../../../utils/overlay/visibility");
-/**
- * Find the active float overlay from scenes.
- * Scans from the top of the stack downward to find the first screen
- * with a visible overlay.
- */
-function getActiveFloatOverlay(scenes, index, transitionsAlwaysOn) {
-  if (scenes.length === 0) {
-    return null;
+const resolveOverlayActivity = (scene, distanceFromTop) => {
+  if (distanceFromTop === 0 && scene.activity === "closing") {
+    return "closing";
+  }
+  if (distanceFromTop === 0) {
+    return "active";
+  }
+  if (distanceFromTop === 1) {
+    return "inert";
   }
+  return "inactive";
+};
 
-  // When navigating back, closing scenes are kept at the top of the local stack
-  // while the focused index already points to the destination screen. We need to
-  // start scanning from the actual top of the stack so the overlay can animate
-  // out together with its closing screen instead of disappearing immediately.
-  const startIndex = Math.max(index, scenes.length - 1);
-  for (let i = startIndex; i >= 0; i--) {
-    const scene = scenes[i];
+/**
+ * Finds every visible floating-overlay checkpoint in stack order.
+ *
+ * The newest checkpoint owns the active overlay. Its immediate predecessor
+ * remains visible and inert; all older checkpoints are retained but inactive.
+ * This mirrors the screen activity window without making plain screens create
+ * a new overlay checkpoint.
+ */
+function getFloatOverlayStack(scenes, transitionsAlwaysOn) {
+  const candidates = [];
+  for (let index = 0; index < scenes.length; index += 1) {
+    const scene = scenes[index];
     const options = scene?.descriptor?.options;
-
-    // Skip screens without enableTransitions (native-stack only)
     if (!transitionsAlwaysOn && !options?.enableTransitions) {
       continue;
     }
     if ((0, _visibility.isOverlayVisible)(options)) {
-      return {
+      candidates.push({
         scene,
-        overlayIndex: i
-      };
+        overlayIndex: index
+      });
     }
   }
-  return null;
+  const topIndex = candidates.length - 1;
+  return candidates.map((candidate, index) => ({
+    ...candidate,
+    activity: resolveOverlayActivity(candidate.scene, topIndex - index)
+  }));
+}
+function getFloatOverlayTransitions(overlayStack, scenes) {
+  const topScene = scenes[scenes.length - 1];
+  return overlayStack.map((entry, index) => ({
+    ...entry,
+    driverScene: overlayStack[index + 1]?.scene ?? topScene ?? entry.scene
+  }));
 }
 //# sourceMappingURL=get-active-overlay.js.map

package/lib/commonjs/shared/components/overlay/helpers/get-active-overlay.js.map

@@ -1 +1 @@
-{"version":3,"names":["_visibility","require","getActiveFloatOverlay","scenes","index","transitionsAlwaysOn","length","startIndex","Math","max","i","scene","options","descriptor","enableTransitions","isOverlayVisible","overlayIndex"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/helpers/get-active-overlay.ts"],"mappings":";;;;;;AACA,IAAAA,WAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,SAASC,qBAAqBA,CACpCC,MAAoB,EACpBC,KAAa,EACbC,mBAA4B,EACyB;EACrD,IAAIF,MAAM,CAACG,MAAM,KAAK,CAAC,EAAE;IACxB,OAAO,IAAI;EACZ;;EAEA;EACA;EACA;EACA;EACA,MAAMC,UAAU,GAAGC,IAAI,CAACC,GAAG,CAACL,KAAK,EAAED,MAAM,CAACG,MAAM,GAAG,CAAC,CAAC;EAErD,KAAK,IAAII,CAAC,GAAGH,UAAU,EAAEG,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;IACrC,MAAMC,KAAK,GAAGR,MAAM,CAACO,CAAC,CAAC;IACvB,MAAME,OAAO,GAAGD,KAAK,EAAEE,UAAU,EAAED,OAAO;;IAE1C;IACA,IAAI,CAACP,mBAAmB,IAAI,CAACO,OAAO,EAAEE,iBAAiB,EAAE;MACxD;IACD;IAEA,IAAI,IAAAC,4BAAgB,EAACH,OAAO,CAAC,EAAE;MAC9B,OAAO;QAAED,KAAK;QAAEK,YAAY,EAAEN;MAAE,CAAC;IAClC;EACD;EAEA,OAAO,IAAI;AACZ","ignoreList":[]}
+{"version":3,"names":["_visibility","require","resolveOverlayActivity","scene","distanceFromTop","activity","getFloatOverlayStack","scenes","transitionsAlwaysOn","candidates","index","length","options","descriptor","enableTransitions","isOverlayVisible","push","overlayIndex","topIndex","map","candidate","getFloatOverlayTransitions","overlayStack","topScene","entry","driverScene"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/helpers/get-active-overlay.ts"],"mappings":";;;;;;;AACA,IAAAA,WAAA,GAAAC,OAAA;AAgBA,MAAMC,sBAAsB,GAAGA,CAC9BC,KAAiB,EACjBC,eAAuB,KACG;EAC1B,IAAIA,eAAe,KAAK,CAAC,IAAID,KAAK,CAACE,QAAQ,KAAK,SAAS,EAAE;IAC1D,OAAO,SAAS;EACjB;EAEA,IAAID,eAAe,KAAK,CAAC,EAAE;IAC1B,OAAO,QAAQ;EAChB;EAEA,IAAIA,eAAe,KAAK,CAAC,EAAE;IAC1B,OAAO,OAAO;EACf;EAEA,OAAO,UAAU;AAClB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASE,oBAAoBA,CACnCC,MAAoB,EACpBC,mBAA4B,EACN;EACtB,MAAMC,UAA8B,GAAG,EAAE;EAEzC,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGH,MAAM,CAACI,MAAM,EAAED,KAAK,IAAI,CAAC,EAAE;IACtD,MAAMP,KAAK,GAAGI,MAAM,CAACG,KAAK,CAAC;IAC3B,MAAME,OAAO,GAAGT,KAAK,EAAEU,UAAU,EAAED,OAAO;IAE1C,IAAI,CAACJ,mBAAmB,IAAI,CAACI,OAAO,EAAEE,iBAAiB,EAAE;MACxD;IACD;IAEA,IAAI,IAAAC,4BAAgB,EAACH,OAAO,CAAC,EAAE;MAC9BH,UAAU,CAACO,IAAI,CAAC;QAAEb,KAAK;QAAEc,YAAY,EAAEP;MAAM,CAAC,CAAC;IAChD;EACD;EAEA,MAAMQ,QAAQ,GAAGT,UAAU,CAACE,MAAM,GAAG,CAAC;EACtC,OAAOF,UAAU,CAACU,GAAG,CAAC,CAACC,SAAS,EAAEV,KAAK,MAAM;IAC5C,GAAGU,SAAS;IACZf,QAAQ,EAAEH,sBAAsB,CAACkB,SAAS,CAACjB,KAAK,EAAEe,QAAQ,GAAGR,KAAK;EACnE,CAAC,CAAC,CAAC;AACJ;AAEO,SAASW,0BAA0BA,CACzCC,YAAiC,EACjCf,MAAoB,EACY;EAChC,MAAMgB,QAAQ,GAAGhB,MAAM,CAACA,MAAM,CAACI,MAAM,GAAG,CAAC,CAAC;EAE1C,OAAOW,YAAY,CAACH,GAAG,CAAC,CAACK,KAAK,EAAEd,KAAK,MAAM;IAC1C,GAAGc,KAAK;IACRC,WAAW,EAAEH,YAAY,CAACZ,KAAK,GAAG,CAAC,CAAC,EAAEP,KAAK,IAAIoB,QAAQ,IAAIC,KAAK,CAACrB;EAClE,CAAC,CAAC,CAAC;AACJ","ignoreList":[]}