react-native-screen-transitions 3.9.0-alpha.2 → 3.9.0-beta.0

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

@@ -3,21 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useActiveHostKey = exports.unregisterHost = exports.resetHostRegistry = exports.registerHost = exports.getHostCapturesScroll = exports.getActiveScrollHost = exports.getActiveHostKey = void 0;
+exports.useActiveHostKey = exports.unregisterHost = exports.resetHostRegistry = exports.registerHost = exports.getActiveHostKey = void 0;
 var _react = require("react");
-var _reactNativeReanimated = require("react-native-reanimated");
 const EMPTY_SNAPSHOT = {};
 const listeners = new Set();
 const hostStacks = new Map();
 let snapshot = EMPTY_SNAPSHOT;
 
 /**
- * UI-readable mirror of each screen's active host, kept only for hosts that
- * capture scroll. Measurement worklets read it to record which scroll-scoped
- * host a source boundary originated from — at measure time, without any React
- * subscription on the boundary itself.
+ * The active host for a screen. Stack ordering is the load-bearing invariant:
+ * `registerHost` unshifts fallback hosts to the front and pushes real hosts to
+ * the back, so the active host is the last real (non-fallback) host, falling
+ * back to the first entry and finally to the screen's own key.
  */
-const activeScrollHosts = (0, _reactNativeReanimated.makeMutable)({});
 const getActiveHostFromStack = (screenKey, stack) => {
   if (!stack || stack.length === 0) {
     return screenKey;
@@ -37,23 +35,8 @@ const buildSnapshot = () => {
   }
   return nextSnapshot;
 };
-const buildScrollHostSnapshot = () => {
-  const nextSnapshot = {};
-  for (const [screenKey, stack] of hostStacks) {
-    const activeHostKey = getActiveHostFromStack(screenKey, stack);
-    const activeHost = stack.find(host => host.hostKey === activeHostKey);
-    if (activeHost?.capturesScroll) {
-      nextSnapshot[screenKey] = {
-        hostKey: activeHost.hostKey,
-        capturesScroll: true
-      };
-    }
-  }
-  return nextSnapshot;
-};
 const emit = () => {
   snapshot = buildSnapshot();
-  activeScrollHosts.set(buildScrollHostSnapshot());
   for (const listener of listeners) {
     listener();
   }
@@ -101,28 +84,7 @@ exports.unregisterHost = unregisterHost;
 const getActiveHostKey = screenKey => {
   return snapshot[screenKey] ?? screenKey;
 };
-
-/**
- * The screen's active host, if it captures scroll. Worklet-safe: measurement
- * code calls this on the UI thread while writing source bounds.
- */
 exports.getActiveHostKey = getActiveHostKey;
-const getActiveScrollHost = screenKey => {
-  "worklet";
-
-  return activeScrollHosts.get()[screenKey] ?? null;
-};
-exports.getActiveScrollHost = getActiveScrollHost;
-const getHostCapturesScroll = hostKey => {
-  for (const stack of hostStacks.values()) {
-    const host = stack.find(registration => registration.hostKey === hostKey);
-    if (host) {
-      return host.capturesScroll;
-    }
-  }
-  return false;
-};
-exports.getHostCapturesScroll = getHostCapturesScroll;
 const useActiveHostKey = screenKey => {
   return (0, _react.useSyncExternalStore)(subscribe, () => screenKey ? getActiveHostKey(screenKey) : undefined, () => undefined);
 };
@@ -130,7 +92,6 @@ exports.useActiveHostKey = useActiveHostKey;
 const resetHostRegistry = () => {
   hostStacks.clear();
   snapshot = EMPTY_SNAPSHOT;
-  activeScrollHosts.set({});
   emit();
 };
 exports.resetHostRegistry = resetHostRegistry;

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","EMPTY_SNAPSHOT","listeners","Set","hostStacks","Map","snapshot","activeScrollHosts","makeMutable","getActiveHostFromStack","screenKey","stack","length","index","host","fallback","hostKey","buildSnapshot","nextSnapshot","buildScrollHostSnapshot","activeHostKey","activeHost","find","capturesScroll","emit","set","listener","subscribe","add","delete","registerHost","registration","get","previousActiveHostKey","nextStack","filter","unshift","push","exports","unregisterHost","getActiveHostKey","getActiveScrollHost","getHostCapturesScroll","values","useActiveHostKey","useSyncExternalStore","undefined","resetHostRegistry","clear"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/portal/stores/host-registry.store.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","EMPTY_SNAPSHOT","listeners","Set","hostStacks","Map","snapshot","getActiveHostFromStack","screenKey","stack","length","index","host","fallback","hostKey","buildSnapshot","nextSnapshot","emit","listener","subscribe","add","delete","registerHost","registration","get","previousActiveHostKey","nextStack","filter","unshift","push","set","exports","unregisterHost","getActiveHostKey","useActiveHostKey","useSyncExternalStore","undefined","resetHostRegistry","clear"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/portal/stores/host-registry.store.ts"],"mappings":"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","ignoreList":[]}

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useActivePortalBoundaryHosts = exports.unmountPortalBoundaryHost = exports.mountPortalBoundaryHost = void 0;
+exports.useActivePortalBoundaryHosts = exports.unmountPortalBoundaryHost = exports.mountPortalBoundaryHost = exports.dropStalePortalBoundaryHosts = void 0;
 var _react = require("react");
 const EMPTY_HOSTS = [];
 const listeners = new Set();
@@ -29,24 +29,56 @@ const emit = () => {
   }
 };
 const isSameHost = (a, b) => {
-  return a.boundaryId === b.boundaryId && a.capturesScroll === b.capturesScroll && a.hostKey === b.hostKey && a.pairKey === b.pairKey && a.screenKey === b.screenKey;
+  return a.boundaryId === b.boundaryId && a.escapeClipping === b.escapeClipping && a.hostKey === b.hostKey && a.localStylesMaps === b.localStylesMaps && a.pairKey === b.pairKey && a.portalHostName === b.portalHostName && a.screenKey === b.screenKey && a.slotsMap === b.slotsMap;
 };
 const mountPortalBoundaryHost = host => {
-  const previous = activeBoundaryHosts.get(host.boundaryId);
+  const previous = activeBoundaryHosts.get(host.portalHostName);
   if (previous && isSameHost(previous, host)) {
     return;
   }
-  activeBoundaryHosts.set(host.boundaryId, host);
+  activeBoundaryHosts.set(host.portalHostName, host);
   emit();
 };
 exports.mountPortalBoundaryHost = mountPortalBoundaryHost;
 const unmountPortalBoundaryHost = boundaryId => {
-  if (!activeBoundaryHosts.delete(boundaryId)) {
+  let didDelete = false;
+  for (const [hostEntryKey, host] of activeBoundaryHosts) {
+    if (host.boundaryId !== boundaryId) {
+      continue;
+    }
+    activeBoundaryHosts.delete(hostEntryKey);
+    didDelete = true;
+  }
+  if (!didDelete) {
     return;
   }
   emit();
 };
+
+/**
+ * Post-handoff GC: drop every receiver for this boundary except the one now
+ * visible (`keepPortalHostName`). Called once the new host is confirmed on
+ * screen so the superseded receivers stop rendering.
+ */
 exports.unmountPortalBoundaryHost = unmountPortalBoundaryHost;
+const dropStalePortalBoundaryHosts = ({
+  boundaryId,
+  keepPortalHostName
+}) => {
+  let didDelete = false;
+  for (const [hostEntryKey, host] of activeBoundaryHosts) {
+    if (host.boundaryId !== boundaryId || host.portalHostName === keepPortalHostName) {
+      continue;
+    }
+    activeBoundaryHosts.delete(hostEntryKey);
+    didDelete = true;
+  }
+  if (!didDelete) {
+    return;
+  }
+  emit();
+};
+exports.dropStalePortalBoundaryHosts = dropStalePortalBoundaryHosts;
 const subscribe = listener => {
   listeners.add(listener);
   return () => {

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","EMPTY_HOSTS","listeners","Set","activeBoundaryHosts","Map","snapshot","hostsByScope","buildSnapshot","host","values","hosts","hostKey","push","emit","listener","isSameHost","a","b","boundaryId","capturesScroll","pairKey","screenKey","mountPortalBoundaryHost","previous","get","set","exports","unmountPortalBoundaryHost","delete","subscribe","add","useActivePortalBoundaryHosts","useSyncExternalStore"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/portal/stores/portal-boundary-host.store.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAcA,MAAMC,WAAuC,GAAG,EAAE;AAElD,MAAMC,SAAS,GAAG,IAAIC,GAAG,CAAa,CAAC;AACvC,MAAMC,mBAAmB,GAAG,IAAIC,GAAG,CAAmC,CAAC;AAEvE,IAAIC,QAAwB,GAAG;EAC9BC,YAAY,EAAE,CAAC;AAChB,CAAC;AAED,MAAMC,aAAa,GAAGA,CAAA,KAAsB;EAC3C,MAAMD,YAAwD,GAAG,CAAC,CAAC;EAEnE,KAAK,MAAME,IAAI,IAAIL,mBAAmB,CAACM,MAAM,CAAC,CAAC,EAAE;IAChD,MAAMC,KAAK,GAAGJ,YAAY,CAACE,IAAI,CAACG,OAAO,CAAC,IAAI,EAAE;IAC9CD,KAAK,CAACE,IAAI,CAACJ,IAAI,CAAC;IAChBF,YAAY,CAACE,IAAI,CAACG,OAAO,CAAC,GAAGD,KAAK;EACnC;EAEA,OAAO;IACNJ;EACD,CAAC;AACF,CAAC;AAED,MAAMO,IAAI,GAAGA,CAAA,KAAM;EAClBR,QAAQ,GAAGE,aAAa,CAAC,CAAC;EAE1B,KAAK,MAAMO,QAAQ,IAAIb,SAAS,EAAE;IACjCa,QAAQ,CAAC,CAAC;EACX;AACD,CAAC;AAED,MAAMC,UAAU,GAAGA,CAClBC,CAA2B,EAC3BC,CAA2B,KACvB;EACJ,OACCD,CAAC,CAACE,UAAU,KAAKD,CAAC,CAACC,UAAU,IAC7BF,CAAC,CAACG,cAAc,KAAKF,CAAC,CAACE,cAAc,IACrCH,CAAC,CAACL,OAAO,KAAKM,CAAC,CAACN,OAAO,IACvBK,CAAC,CAACI,OAAO,KAAKH,CAAC,CAACG,OAAO,IACvBJ,CAAC,CAACK,SAAS,KAAKJ,CAAC,CAACI,SAAS;AAE7B,CAAC;AAEM,MAAMC,uBAAuB,GAAId,IAA8B,IAAK;EAC1E,MAAMe,QAAQ,GAAGpB,mBAAmB,CAACqB,GAAG,CAAChB,IAAI,CAACU,UAAU,CAAC;EACzD,IAAIK,QAAQ,IAAIR,UAAU,CAACQ,QAAQ,EAAEf,IAAI,CAAC,EAAE;IAC3C;EACD;EAEAL,mBAAmB,CAACsB,GAAG,CAACjB,IAAI,CAACU,UAAU,EAAEV,IAAI,CAAC;EAC9CK,IAAI,CAAC,CAAC;AACP,CAAC;AAACa,OAAA,CAAAJ,uBAAA,GAAAA,uBAAA;AAEK,MAAMK,yBAAyB,GAAIT,UAAkB,IAAK;EAChE,IAAI,CAACf,mBAAmB,CAACyB,MAAM,CAACV,UAAU,CAAC,EAAE;IAC5C;EACD;EAEAL,IAAI,CAAC,CAAC;AACP,CAAC;AAACa,OAAA,CAAAC,yBAAA,GAAAA,yBAAA;AAEF,MAAME,SAAS,GAAIf,QAAoB,IAAK;EAC3Cb,SAAS,CAAC6B,GAAG,CAAChB,QAAQ,CAAC;EAEvB,OAAO,MAAM;IACZb,SAAS,CAAC2B,MAAM,CAACd,QAAQ,CAAC;EAC3B,CAAC;AACF,CAAC;AAEM,MAAMiB,4BAA4B,GAAIpB,OAAe,IAAK;EAChE,OAAO,IAAAqB,2BAAoB,EAC1BH,SAAS,EACT,MAAMxB,QAAQ,CAACC,YAAY,CAACK,OAAO,CAAC,IAAIX,WAAW,EACnD,MAAMA,WACP,CAAC;AACF,CAAC;AAAC0B,OAAA,CAAAK,4BAAA,GAAAA,4BAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","EMPTY_HOSTS","listeners","Set","activeBoundaryHosts","Map","snapshot","hostsByScope","buildSnapshot","host","values","hosts","hostKey","push","emit","listener","isSameHost","a","b","boundaryId","escapeClipping","localStylesMaps","pairKey","portalHostName","screenKey","slotsMap","mountPortalBoundaryHost","previous","get","set","exports","unmountPortalBoundaryHost","didDelete","hostEntryKey","delete","dropStalePortalBoundaryHosts","keepPortalHostName","subscribe","add","useActivePortalBoundaryHosts","useSyncExternalStore"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/portal/stores/portal-boundary-host.store.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/portal/teleport.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isTeleportAvailable = exports.NativePortalProvider = exports.NativePortalHost = exports.NativePortal = void 0;
+var _react = require("react");
 /**
  * `react-native-teleport` is an optional peer dependency. The require sits in a
  * try/catch so Metro treats it as an optional dependency — an absent module no
@@ -13,11 +14,23 @@ exports.isTeleportAvailable = exports.NativePortalProvider = exports.NativePorta
  * rendering; everything else keeps working.
  */
 let mod = null;
+let managerMod = null;
+let providerViewMod = null;
 try {
   mod = require("react-native-teleport");
+  managerMod = require("react-native-teleport/lib/module/contexts/PortalManager");
+  providerViewMod = require("react-native-teleport/lib/module/views/PortalProvider");
 } catch {}
-const isTeleportAvailable = exports.isTeleportAvailable = mod !== null;
+const NativePortalProviderView = providerViewMod?.default ?? null;
+const PortalManagerProvider = managerMod?.PortalManagerProvider ?? null;
+const SafeNativePortalProvider = PortalManagerProvider ? ({
+  children
+}) => {
+  const managedChildren = /*#__PURE__*/(0, _react.createElement)(PortalManagerProvider, null, children);
+  return NativePortalProviderView ? /*#__PURE__*/(0, _react.createElement)(NativePortalProviderView, null, managedChildren) : managedChildren;
+} : null;
+const isTeleportAvailable = exports.isTeleportAvailable = mod !== null && SafeNativePortalProvider !== null;
 const NativePortal = exports.NativePortal = mod?.Portal ?? null;
-const NativePortalProvider = exports.NativePortalProvider = mod?.PortalProvider ?? null;
+const NativePortalProvider = exports.NativePortalProvider = SafeNativePortalProvider;
 const NativePortalHost = exports.NativePortalHost = mod?.PortalHost ?? null;
 //# sourceMappingURL=teleport.js.map

package/lib/commonjs/shared/components/boundary/portal/teleport.js.map

@@ -1 +1 @@
-{"version":3,"names":["mod","require","isTeleportAvailable","exports","NativePortal","Portal","NativePortalProvider","PortalProvider","NativePortalHost","PortalHost"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/portal/teleport.ts"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,IAAIA,GAAQ,GAAG,IAAI;AACnB,IAAI;EACHA,GAAG,GAAGC,OAAO,CAAC,uBAAuB,CAAC;AACvC,CAAC,CAAC,MAAM,CAAC;AAEF,MAAMC,mBAAmB,GAAAC,OAAA,CAAAD,mBAAA,GAAGF,GAAG,KAAK,IAAI;AACxC,MAAMI,YAAuC,GAAAD,OAAA,CAAAC,YAAA,GAAGJ,GAAG,EAAEK,MAAM,IAAI,IAAI;AACnE,MAAMC,oBAA+C,GAAAH,OAAA,CAAAG,oBAAA,GAC3DN,GAAG,EAAEO,cAAc,IAAI,IAAI;AACrB,MAAMC,gBAA2C,GAAAL,OAAA,CAAAK,gBAAA,GACvDR,GAAG,EAAES,UAAU,IAAI,IAAI","ignoreList":[]}
+{"version":3,"names":["_react","require","mod","managerMod","providerViewMod","NativePortalProviderView","default","PortalManagerProvider","SafeNativePortalProvider","children","managedChildren","createElement","isTeleportAvailable","exports","NativePortal","Portal","NativePortalProvider","NativePortalHost","PortalHost"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/portal/teleport.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,IAAIC,GAAQ,GAAG,IAAI;AACnB,IAAIC,UAAe,GAAG,IAAI;AAC1B,IAAIC,eAAoB,GAAG,IAAI;AAC/B,IAAI;EACHF,GAAG,GAAGD,OAAO,CAAC,uBAAuB,CAAC;EACtCE,UAAU,GAAGF,OAAO,CAAC,yDAAyD,CAAC;EAC/EG,eAAe,GAAGH,OAAO,CAAC,uDAAuD,CAAC;AACnF,CAAC,CAAC,MAAM,CAAC;AAET,MAAMI,wBAAuE,GAC5ED,eAAe,EAAEE,OAAO,IAAI,IAAI;AACjC,MAAMC,qBAAoE,GACzEJ,UAAU,EAAEI,qBAAqB,IAAI,IAAI;AAE1C,MAAMC,wBAAuE,GAC5ED,qBAAqB,GAClB,CAAC;EAAEE;AAAkC,CAAC,KAAK;EAC3C,MAAMC,eAAe,gBAAG,IAAAC,oBAAa,EACpCJ,qBAAqB,EACrB,IAAI,EACJE,QACD,CAAC;EAED,OAAOJ,wBAAwB,gBAC5B,IAAAM,oBAAa,EAACN,wBAAwB,EAAE,IAAI,EAAEK,eAAe,CAAC,GAC9DA,eAAe;AACnB,CAAC,GACA,IAAI;AAED,MAAME,mBAAmB,GAAAC,OAAA,CAAAD,mBAAA,GAC/BV,GAAG,KAAK,IAAI,IAAIM,wBAAwB,KAAK,IAAI;AAC3C,MAAMM,YAAuC,GAAAD,OAAA,CAAAC,YAAA,GAAGZ,GAAG,EAAEa,MAAM,IAAI,IAAI;AACnE,MAAMC,oBAA+C,GAAAH,OAAA,CAAAG,oBAAA,GAC3DR,wBAAwB;AAClB,MAAMS,gBAA2C,GAAAJ,OAAA,CAAAI,gBAAA,GACvDf,GAAG,EAAEgB,UAAU,IAAI,IAAI","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/portal/utils/has-local-slot.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasLocalSlot = void 0;
+const hasLocalSlot = (localStylesMaps, slotId) => {
+  "worklet";
+
+  for (let index = 0; index < localStylesMaps.length; index++) {
+    if (localStylesMaps[index]?.[slotId] !== undefined) {
+      return true;
+    }
+  }
+  return false;
+};
+exports.hasLocalSlot = hasLocalSlot;
+//# sourceMappingURL=has-local-slot.js.map

package/lib/commonjs/shared/components/boundary/portal/utils/has-local-slot.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["hasLocalSlot","localStylesMaps","slotId","index","length","undefined","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/portal/utils/has-local-slot.ts"],"mappings":";;;;;;AAEO,MAAMA,YAAY,GAAGA,CAC3BC,eAAiC,EACjCC,MAAc,KACV;EACJ,SAAS;;EAET,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGF,eAAe,CAACG,MAAM,EAAED,KAAK,EAAE,EAAE;IAC5D,IAAIF,eAAe,CAACE,KAAK,CAAC,GAAGD,MAAM,CAAC,KAAKG,SAAS,EAAE;MACnD,OAAO,IAAI;IACZ;EACD;EAEA,OAAO,KAAK;AACb,CAAC;AAACC,OAAA,CAAAN,YAAA,GAAAA,YAAA","ignoreList":[]}

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

@@ -3,13 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createPortalBoundaryHostName = exports.PORTAL_HOST_NAME_RESET_VALUE = void 0;
+exports.createPortalBoundaryHostName = exports.createBoundaryLocalPortalHostName = exports.PORTAL_HOST_NAME_RESET_VALUE = void 0;
 const PORTAL_HOST_NAME_RESET_VALUE = exports.PORTAL_HOST_NAME_RESET_VALUE = null;
 const PORTAL_HOST_NAME_SUFFIX = "-portal-host";
-const createPortalBoundaryHostName = (hostKey, boundaryId) => {
+const BOUNDARY_LOCAL_PORTAL_HOST_NAME_SUFFIX = "-boundary-local-portal-host";
+const createPortalBoundaryHostName = (hostKey, boundaryId, pairKey) => {
   "worklet";
 
-  return `${hostKey}-${boundaryId}${PORTAL_HOST_NAME_SUFFIX}`;
+  return `${hostKey}-${pairKey ? `${pairKey}-` : ""}${boundaryId}${PORTAL_HOST_NAME_SUFFIX}`;
 };
 exports.createPortalBoundaryHostName = createPortalBoundaryHostName;
+const createBoundaryLocalPortalHostName = (screenKey, boundaryId) => {
+  "worklet";
+
+  return `${screenKey}-${boundaryId}${BOUNDARY_LOCAL_PORTAL_HOST_NAME_SUFFIX}`;
+};
+exports.createBoundaryLocalPortalHostName = createBoundaryLocalPortalHostName;
 //# sourceMappingURL=naming.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["PORTAL_HOST_NAME_RESET_VALUE","exports","PORTAL_HOST_NAME_SUFFIX","createPortalBoundaryHostName","hostKey","boundaryId"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/portal/utils/naming.ts"],"mappings":";;;;;;AAAO,MAAMA,4BAA4B,GAAAC,OAAA,CAAAD,4BAAA,GAAG,IAAI;AAChD,MAAME,uBAAuB,GAAG,cAAc;AAEvC,MAAMC,4BAA4B,GAAGA,CAC3CC,OAAe,EACfC,UAAkB,KACd;EACJ,SAAS;;EACT,OAAO,GAAGD,OAAO,IAAIC,UAAU,GAAGH,uBAAuB,EAAE;AAC5D,CAAC;AAACD,OAAA,CAAAE,4BAAA,GAAAA,4BAAA","ignoreList":[]}
+{"version":3,"names":["PORTAL_HOST_NAME_RESET_VALUE","exports","PORTAL_HOST_NAME_SUFFIX","BOUNDARY_LOCAL_PORTAL_HOST_NAME_SUFFIX","createPortalBoundaryHostName","hostKey","boundaryId","pairKey","createBoundaryLocalPortalHostName","screenKey"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/portal/utils/naming.ts"],"mappings":";;;;;;AAAO,MAAMA,4BAA4B,GAAAC,OAAA,CAAAD,4BAAA,GAAG,IAAI;AAChD,MAAME,uBAAuB,GAAG,cAAc;AAC9C,MAAMC,sCAAsC,GAAG,6BAA6B;AAErE,MAAMC,4BAA4B,GAAGA,CAC3CC,OAAe,EACfC,UAAkB,EAClBC,OAAuB,KACnB;EACJ,SAAS;;EACT,OAAO,GAAGF,OAAO,IAAIE,OAAO,GAAG,GAAGA,OAAO,GAAG,GAAG,EAAE,GAAGD,UAAU,GAAGJ,uBAAuB,EAAE;AAC3F,CAAC;AAACD,OAAA,CAAAG,4BAAA,GAAAA,4BAAA;AAEK,MAAMI,iCAAiC,GAAGA,CAChDC,SAAiB,EACjBH,UAAkB,KACd;EACJ,SAAS;;EACT,OAAO,GAAGG,SAAS,IAAIH,UAAU,GAAGH,sCAAsC,EAAE;AAC7E,CAAC;AAACF,OAAA,CAAAO,iCAAA,GAAAA,iCAAA","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/portal/utils/offset-style.js

@@ -4,67 +4,47 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resolvePortalOffsetStyle = void 0;
-var _reactNativeReanimated = require("react-native-reanimated");
 var _scroll = require("../../../../stores/scroll.store");
 var _hostBounds = require("../stores/host-bounds.store");
+/**
+ * The two portal coordinate cases we support:
+ *
+ * - same-screen: source and host live on the same screen; re-base the stored
+ *   host frame onto the source measurement's scroll snapshot.
+ * - cross-screen: source and host live on different screens; the host is the
+ *   replacement coordinate space, so destination scroll is inherited naturally
+ *   from host placement instead of manually propagated.
+ */
+
 const resolvePortalOffsetStyle = ({
-  alignHostToBoundsScroll = false,
   bounds,
-  boundsCurrentScroll,
-  compensateSourceScroll = false,
-  currentScroll,
-  hostCurrentScroll,
   hostKey,
-  hostProgress = 0,
-  includeScrollOffsets = true,
   placement,
-  position = "relative",
-  sourceCurrentScroll,
-  trackSourceScroll = false
+  landingShift
 }) => {
   "worklet";
 
   const hostBounds = (0, _hostBounds.getPortalHostBounds)(hostKey);
-  const shouldAlignHostToBoundsScroll = placement ? placement === "same-screen" : alignHostToBoundsScroll;
-  const shouldCompensateSourceScroll = trackSourceScroll || compensateSourceScroll;
-  const shouldIncludeHostScrollOffsets = placement ? placement === "cross-screen-close" : includeScrollOffsets;
   const boundsScrollSnapshot = bounds.scroll ?? null;
-  const sourceScrollSnapshot = shouldCompensateSourceScroll ? boundsScrollSnapshot : null;
-  const sourceScrollDeltaX = shouldCompensateSourceScroll ? (0, _scroll.getClampedScrollAxisDelta)(sourceCurrentScroll ?? null, sourceScrollSnapshot, "horizontal") : 0;
-  const sourceScrollDeltaY = shouldCompensateSourceScroll ? (0, _scroll.getClampedScrollAxisDelta)(sourceCurrentScroll ?? null, sourceScrollSnapshot, "vertical") : 0;
-  const sourcePageX = bounds.pageX - sourceScrollDeltaX;
-  const sourcePageY = bounds.pageY - sourceScrollDeltaY;
-  const boundsScroll = shouldIncludeHostScrollOffsets ? boundsScrollSnapshot ?? boundsCurrentScroll ?? currentScroll ?? null : null;
   const hostBoundsScrollSnapshot = hostBounds?.scroll ?? null;
-  const hostBoundsScroll = shouldIncludeHostScrollOffsets ? hostBoundsScrollSnapshot : null;
-  const resolvedHostCurrentScroll = hostCurrentScroll ?? boundsScroll ?? hostBoundsScroll ?? null;
-  const hostSnapshotDeltaX = shouldAlignHostToBoundsScroll && !shouldIncludeHostScrollOffsets ? (0, _scroll.getClampedScrollAxisDelta)(boundsScrollSnapshot, hostBoundsScrollSnapshot, "horizontal") : 0;
-  const hostSnapshotDeltaY = shouldAlignHostToBoundsScroll && !shouldIncludeHostScrollOffsets ? (0, _scroll.getClampedScrollAxisDelta)(boundsScrollSnapshot, hostBoundsScrollSnapshot, "vertical") : 0;
-  // Deltas are clamped to the layout range: iOS rubber-band offsets are
-  // outside the real scroll range and must not become coordinate-space deltas.
-  const hostScrollDeltaX = (0, _scroll.getClampedScrollAxisDelta)(resolvedHostCurrentScroll, hostBoundsScroll, "horizontal");
-  const hostScrollDeltaY = (0, _scroll.getClampedScrollAxisDelta)(resolvedHostCurrentScroll, hostBoundsScroll, "vertical");
-  const adjustedHostPageX = hostBounds ? hostBounds.pageX - hostSnapshotDeltaX - (0, _reactNativeReanimated.interpolate)(hostProgress, [0, 1], [hostScrollDeltaX, 0]) : 0;
-  const adjustedHostPageY = hostBounds ? hostBounds.pageY - hostSnapshotDeltaY - (0, _reactNativeReanimated.interpolate)(hostProgress, [0, 1], [hostScrollDeltaY, 0]) : 0;
-  const boundsScrollDeltaX = shouldIncludeHostScrollOffsets ? (0, _scroll.getClampedScrollAxisDelta)(currentScroll ?? null, boundsScroll, "horizontal") : 0;
-  const boundsScrollDeltaY = shouldIncludeHostScrollOffsets ? (0, _scroll.getClampedScrollAxisDelta)(currentScroll ?? null, boundsScroll, "vertical") : 0;
-  const offsetX = hostBounds ? sourcePageX - adjustedHostPageX : sourcePageX - boundsScrollDeltaX;
-  const offsetY = hostBounds ? sourcePageY - adjustedHostPageY : sourcePageY - boundsScrollDeltaY;
-  const transform = [{
-    translateY: offsetY
-  }, {
-    translateX: offsetX
-  }];
-  if (position === "absolute") {
-    return {
-      left: 0,
-      position: "absolute",
-      top: 0,
-      transform
-    };
-  }
+
+  // same-screen re-bases the static host frame onto the source scroll snapshot.
+  // Cross-screen hosts are the chosen replacement coordinate space, so their
+  // destination scroll is represented by where the host itself is mounted.
+  const alignHostToBoundsScroll = placement === "same-screen";
+  const hostSnapshotDeltaX = alignHostToBoundsScroll ? (0, _scroll.getClampedScrollAxisDelta)(boundsScrollSnapshot, hostBoundsScrollSnapshot, "horizontal") : 0;
+  const hostSnapshotDeltaY = alignHostToBoundsScroll ? (0, _scroll.getClampedScrollAxisDelta)(boundsScrollSnapshot, hostBoundsScrollSnapshot, "vertical") : 0;
+
+  // Without registered host bounds the host frame is the origin, so the source
+  // page position becomes the offset directly.
+  const adjustedHostPageX = hostBounds ? hostBounds.pageX - hostSnapshotDeltaX : 0;
+  const adjustedHostPageY = hostBounds ? hostBounds.pageY - hostSnapshotDeltaY : 0;
   return {
-    transform
+    transform: [{
+      translateY: bounds.pageY - adjustedHostPageY + (landingShift?.y ?? 0)
+    }, {
+      translateX: bounds.pageX - adjustedHostPageX + (landingShift?.x ?? 0)
+    }]
   };
 };
 exports.resolvePortalOffsetStyle = resolvePortalOffsetStyle;

package/lib/commonjs/shared/components/boundary/portal/utils/offset-style.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_scroll","_hostBounds","resolvePortalOffsetStyle","alignHostToBoundsScroll","bounds","boundsCurrentScroll","compensateSourceScroll","currentScroll","hostCurrentScroll","hostKey","hostProgress","includeScrollOffsets","placement","position","sourceCurrentScroll","trackSourceScroll","hostBounds","getPortalHostBounds","shouldAlignHostToBoundsScroll","shouldCompensateSourceScroll","shouldIncludeHostScrollOffsets","boundsScrollSnapshot","scroll","sourceScrollSnapshot","sourceScrollDeltaX","getClampedScrollAxisDelta","sourceScrollDeltaY","sourcePageX","pageX","sourcePageY","pageY","boundsScroll","hostBoundsScrollSnapshot","hostBoundsScroll","resolvedHostCurrentScroll","hostSnapshotDeltaX","hostSnapshotDeltaY","hostScrollDeltaX","hostScrollDeltaY","adjustedHostPageX","interpolate","adjustedHostPageY","boundsScrollDeltaX","boundsScrollDeltaY","offsetX","offsetY","transform","translateY","translateX","left","top","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/portal/utils/offset-style.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_scroll","require","_hostBounds","resolvePortalOffsetStyle","bounds","hostKey","placement","landingShift","hostBounds","getPortalHostBounds","boundsScrollSnapshot","scroll","hostBoundsScrollSnapshot","alignHostToBoundsScroll","hostSnapshotDeltaX","getClampedScrollAxisDelta","hostSnapshotDeltaY","adjustedHostPageX","pageX","adjustedHostPageY","pageY","transform","translateY","y","translateX","x","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/portal/utils/offset-style.ts"],"mappings":";;;;;;AACA,IAAAA,OAAA,GAAAC,OAAA;AAEA,IAAAC,WAAA,GAAAD,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAgBO,MAAME,wBAAwB,GAAGA,CAAC;EACxCC,MAAM;EACNC,OAAO;EACPC,SAAS;EACTC;AAC+B,CAAC,KAAiB;EACjD,SAAS;;EACT,MAAMC,UAAU,GAAG,IAAAC,+BAAmB,EAACJ,OAAO,CAAC;EAC/C,MAAMK,oBAAoB,GAAGN,MAAM,CAACO,MAAM,IAAI,IAAI;EAClD,MAAMC,wBAAwB,GAAGJ,UAAU,EAAEG,MAAM,IAAI,IAAI;;EAE3D;EACA;EACA;EACA,MAAME,uBAAuB,GAAGP,SAAS,KAAK,aAAa;EAE3D,MAAMQ,kBAAkB,GAAGD,uBAAuB,GAC/C,IAAAE,iCAAyB,EACzBL,oBAAoB,EACpBE,wBAAwB,EACxB,YACD,CAAC,GACA,CAAC;EACJ,MAAMI,kBAAkB,GAAGH,uBAAuB,GAC/C,IAAAE,iCAAyB,EACzBL,oBAAoB,EACpBE,wBAAwB,EACxB,UACD,CAAC,GACA,CAAC;;EAEJ;EACA;EACA,MAAMK,iBAAiB,GAAGT,UAAU,GACjCA,UAAU,CAACU,KAAK,GAAGJ,kBAAkB,GACrC,CAAC;EACJ,MAAMK,iBAAiB,GAAGX,UAAU,GACjCA,UAAU,CAACY,KAAK,GAAGJ,kBAAkB,GACrC,CAAC;EAEJ,OAAO;IACNK,SAAS,EAAE,CACV;MAAEC,UAAU,EAAElB,MAAM,CAACgB,KAAK,GAAGD,iBAAiB,IAAIZ,YAAY,EAAEgB,CAAC,IAAI,CAAC;IAAE,CAAC,EACzE;MAAEC,UAAU,EAAEpB,MAAM,CAACc,KAAK,GAAGD,iBAAiB,IAAIV,YAAY,EAAEkB,CAAC,IAAI,CAAC;IAAE,CAAC;EAE3E,CAAC;AACF,CAAC;AAACC,OAAA,CAAAvB,wBAAA,GAAAA,wBAAA","ignoreList":[]}