@mittwald/react-tunnel 1.2.0-next.9 → 2.0.0-next.0

package/dist/index.js

@@ -28,28 +28,38 @@ var p = "default", m = "default", h = class e {
 		let e = a(this.instanceId), t = a(null);
 		return (t.current === null || e.current !== this.instanceId) && (e.current = this.instanceId, t.current = this.nextIndex++), t.current;
 	}
-	setChildren(e = p, t, n, r) {
-		let i = {
+	buildEntryState(e, t, n, r, i) {
+		let a = new Set(e?.owners);
+		return a.add(n), {
 			id: t,
-			index: n,
-			children: r
-		}, a = this.committedChildren.get(e) ?? u.map({}, { deep: !1 });
-		a.set(t, i), this.renderPhaseChildren.get(e)?.delete(t), this.committedChildren.set(e, a);
+			index: r,
+			children: i,
+			owners: a
+		};
 	}
-	setRenderPhaseChildren(e = p, t, n, r) {
-		let i = {
-			id: t,
-			index: n,
-			children: r
-		}, a = this.renderPhaseChildren.get(e) ?? /* @__PURE__ */ new Map();
-		a.set(t, i), this.renderPhaseChildren.set(e, a);
+	setChildren(e = p, t, n, r, i) {
+		let a = this.committedChildren.get(e) ?? u.map({}, { deep: !1 });
+		a.set(t, this.buildEntryState(a.get(t), t, n, r, i)), this.deleteOwnerFromMap(this.renderPhaseChildren, e, t, n), this.committedChildren.set(e, a);
+	}
+	setRenderPhaseChildren(e = p, t, n, r, i) {
+		let a = this.renderPhaseChildren.get(e) ?? /* @__PURE__ */ new Map();
+		a.set(t, this.buildEntryState(a.get(t), t, n, r, i)), this.renderPhaseChildren.set(e, a);
 	}
-	deleteChildrenFromMap(e, t, n) {
-		let r = e.get(t);
-		r?.delete(n), r?.size === 0 && e.delete(t);
+	deleteOwnerFromMap(e, t, n, r) {
+		let i = e.get(t), a = i?.get(n);
+		if (!i || !a) return;
+		let o = new Set(a.owners);
+		if (o.delete(r), o.size > 0) {
+			i.set(n, {
+				...a,
+				owners: o
+			});
+			return;
+		}
+		i.delete(n), i.size === 0 && e.delete(t);
 	}
-	deleteChildren(e = p, t) {
-		this.deleteChildrenFromMap(this.committedChildren, e, t), this.deleteChildrenFromMap(this.renderPhaseChildren, e, t);
+	deleteChildren(e = p, t, n) {
+		this.deleteOwnerFromMap(this.committedChildren, e, t, n), this.deleteOwnerFromMap(this.renderPhaseChildren, e, t, n);
 	}
 	getEntries(e = p, t = !1) {
 		let n = this.committedChildren.get(e)?.values(), r = t ? this.renderPhaseChildren.get(e)?.values() : void 0, i = n ?? r;
@@ -76,27 +86,33 @@ var p = "default", m = "default", h = class e {
 	});
 }, y = (e) => {
 	let { children: t, id: o, staticEntryId: s, providerId: c } = e, l = _(c), u = r(), d = s ?? u, f = l.useEntryIndex(), p = a(!1);
-	return p.current || l.setRenderPhaseChildren(o, d, f, t), i(() => {
-		p.current = !0, l.setChildren(o, d, f, t);
+	return p.current || l.setRenderPhaseChildren(o, d, u, f, t), i(() => {
+		p.current = !0, l.setChildren(o, d, u, f, t);
 	}, [
 		t,
 		o,
 		d,
+		u,
 		f,
 		c
 	]), n(() => () => {
-		l.deleteChildren(o, d);
+		l.deleteChildren(o, d, u);
 	}, [
 		o,
 		d,
+		u,
 		c
 	]), null;
 }, b = (e) => {
 	let { children: t } = e;
 	return typeof t == "function" ? t() : t;
 }, x = f((e) => {
-	let { children: t, id: n, providerId: r } = e, i = s(() => () => null, () => !1, () => !0), a = _(r).getEntries(n, i)?.entries.map((e) => /* @__PURE__ */ d(b, { children: e.children }, e.id));
-	return typeof t == "function" ? t(a) : a ?? t;
+	let { children: t, id: n, providerId: r } = e, o = s(() => () => null, () => !1, () => !0), c = a(!0);
+	i(() => {
+		c.current = !1;
+	}, []);
+	let l = _(r).getEntries(n, o || c.current)?.entries.map((e) => /* @__PURE__ */ d(b, { children: e.children }, e.id));
+	return typeof t == "function" ? t(l) : l ?? t;
 });
 //#endregion
 export { y as TunnelEntry, x as TunnelExit, v as TunnelProvider };

package/dist/types/TunnelState.d.ts

@@ -6,6 +6,15 @@ interface TunnelEntryState {
     index: number;
     id: string;
     children: TunnelChildren;
+    /**
+     * The `TunnelEntry` instances currently registered under this entry id.
+     * Usually exactly one, but a `staticEntryId` is shared on purpose: react-aria
+     * renders collection children twice (once into its hidden collection
+     * document, once for real), and both renders register the same entry. The
+     * entry is only removed once the last of them unmounts — deleting it when the
+     * first one goes would drop content that is still being rendered.
+     */
+    owners: Set<string>;
 }
 interface TunnelEntries {
     committed: boolean;
@@ -21,11 +30,11 @@ export declare class TunnelState {
     static useNew(id?: string): TunnelState;
     resetIndex(): void;
     useEntryIndex(): number;
-    setChildren(tunnelId: string | undefined, entryId: string, index: number, children: TunnelChildren): void;
-    setRenderPhaseChildren(tunnelId: string | undefined, entryId: string, index: number, children: TunnelChildren): void;
-    private deleteChildrenFromMap;
-    deleteChildren(tunnelId: string | undefined, entryId: string): void;
+    private buildEntryState;
+    setChildren(tunnelId: string | undefined, entryId: string, ownerId: string, index: number, children: TunnelChildren): void;
+    setRenderPhaseChildren(tunnelId: string | undefined, entryId: string, ownerId: string, index: number, children: TunnelChildren): void;
+    private deleteOwnerFromMap;
+    deleteChildren(tunnelId: string | undefined, entryId: string, ownerId: string): void;
     getEntries(tunnelId?: string, useRenderPhaseFallback?: boolean): TunnelEntries | undefined;
 }
 export {};
-//# sourceMappingURL=TunnelState.d.ts.map

package/dist/types/components/TunnelEntry.d.ts

@@ -3,11 +3,23 @@ export type TunnelEntryChildren = ReactNode | undefined | (() => ReactNode | und
 export interface TunnelEntryProps {
     id?: string;
     children?: TunnelEntryChildren;
-    /** Static entry ID instead of generated ID by `useId` */
+    /**
+     * Static entry ID instead of generated ID by `useId`.
+     *
+     * Needed wherever one logical element is rendered by more than one component
+     * instance — react-aria, for example, renders the children of a collection
+     * twice: once into its hidden collection document, once for real. Each
+     * instance generates its own `useId`, so with a generated entry id the exit
+     * renders the element once per instance. A static id derived from the element
+     * itself collapses them into one entry; the entry is kept until the last of
+     * the instances unmounts.
+     *
+     * Must be unique among the siblings of one tunnel — two unrelated entries
+     * sharing an id overwrite each other.
+     */
     staticEntryId?: string;
     /** Select a dedicated tunnel provider by ID. */
     providerId?: string;
 }
 export declare const TunnelEntry: FC<TunnelEntryProps>;
 export default TunnelEntry;
-//# sourceMappingURL=TunnelEntry.d.ts.map

package/dist/types/components/TunnelExit.d.ts

@@ -9,4 +9,3 @@ export interface TunnelExitProps {
 }
 export declare const TunnelExit: FC<TunnelExitProps>;
 export default TunnelExit;
-//# sourceMappingURL=TunnelExit.d.ts.map

package/dist/types/components/TunnelProvider.d.ts

@@ -8,4 +8,3 @@ export interface TunnelProviderProps extends PropsWithChildren {
 }
 export declare const TunnelProvider: FC<TunnelProviderProps>;
 export default TunnelProvider;
-//# sourceMappingURL=TunnelProvider.d.ts.map

package/dist/types/context.d.ts

@@ -6,4 +6,3 @@ interface TunnelContext {
 export declare const tunnelContext: import('react').Context<TunnelContext>;
 export default tunnelContext;
 export declare const useTunnelState: (id?: string) => TunnelState;
-//# sourceMappingURL=context.d.ts.map

package/dist/types/index.d.ts

@@ -1,4 +1,3 @@
 export * from './components/TunnelProvider';
 export * from './components/TunnelEntry';
 export * from './components/TunnelExit';
-//# sourceMappingURL=index.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mittwald/react-tunnel",
-  "version": "1.2.0-next.9",
+  "version": "2.0.0-next.0",
   "type": "module",
   "description": "It's like a Portal – but with React components",
   "keywords": [
@@ -12,6 +12,7 @@
   ],
   "homepage": "https://github.com/mittwald/flow/tree/main/packages/react-tunnel",
   "repository": "https://github.com/mittwald/flow",
+  "license": "MIT",
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",
@@ -37,8 +38,8 @@
     "mobx-react-lite": "^4.1.1"
   },
   "devDependencies": {
-    "@mittwald/flow-core": "1.2.0-next.9",
-    "@mittwald/typescript-config": "1.2.0-next.9",
+    "@mittwald/flow-core": "2.0.0-next.0",
+    "@mittwald/typescript-config": "2.0.0-next.0",
     "@types/node": "^25.9.3",
     "@types/react": "^19.2",
     "@types/react-dom": "^19.2",
@@ -60,5 +61,5 @@
     "react": "^19.2.0",
     "react-dom": "^19.2.0"
   },
-  "gitHead": "f63082035b7e221f573463c84fea6b7b4a89f56d"
+  "gitHead": "08f1ba9b272fb8a4857a78f1b4dc034f2cbb441f"
 }

package/dist/types/Tunnel.browser.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=Tunnel.browser.test.d.ts.map

package/dist/types/Tunnel.browser.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Tunnel.browser.test.d.ts","sourceRoot":"","sources":["../../src/Tunnel.browser.test.tsx"],"names":[],"mappings":""}

package/dist/types/TunnelState.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TunnelState.d.ts","sourceRoot":"","sources":["../../src/TunnelState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAA2B,MAAM,OAAO,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAI1C,eAAO,MAAM,uBAAuB,YAAY,CAAC;AAEjD,MAAM,MAAM,cAAc,GACtB,SAAS,GACT,SAAS,GACT,CAAC,CAAC,cAAc,CAAC,EAAE,SAAS,GAAG,SAAS,KAAK,SAAS,GAAG,SAAS,CAAC,CAAC;AAExE,UAAU,gBAAgB;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,cAAc,CAAC;CAC1B;AAED,UAAU,aAAa;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,gBAAgB,EAAE,CAAC;CAC7B;AAED,qBAAa,WAAW;IACtB,SAAgB,EAAE,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,UAAU,CAAS;IAE3B,SAAgB,iBAAiB,iEAQ/B;IAEF,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAGhC;IAEJ,OAAO,CAAC,SAAS,CAAK;gBAGpB,EAAE,SAA0B,EAC5B,UAAU,SAA0B;WAWxB,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,WAAW;IAOvC,UAAU;IAIV,aAAa;IAUb,WAAW,CAChB,QAAQ,EAAE,MAAM,YAAY,EAC5B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,GACvB,IAAI;IAiBA,sBAAsB,CAC3B,QAAQ,EAAE,MAAM,YAAY,EAC5B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,GACvB,IAAI;IAgBP,OAAO,CAAC,qBAAqB;IAYtB,cAAc,CAAC,QAAQ,EAAE,MAAM,YAAY,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAcnE,UAAU,CACf,QAAQ,SAAY,EACpB,sBAAsB,UAAQ,GAC7B,aAAa,GAAG,SAAS;CAmB7B"}

package/dist/types/components/TunnelEntry.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TunnelEntry.d.ts","sourceRoot":"","sources":["../../../src/components/TunnelEntry.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAI3C,MAAM,MAAM,mBAAmB,GAC7B,SAAS,GAAG,SAAS,GAAG,CAAC,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC;AAExD,MAAM,WAAW,gBAAgB;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAC/B,yDAAyD;IACzD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gDAAgD;IAChD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,WAAW,EAAE,EAAE,CAAC,gBAAgB,CA+B5C,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/dist/types/components/TunnelExit.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TunnelExit.d.ts","sourceRoot":"","sources":["../../../src/components/TunnelExit.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAwB,MAAM,OAAO,CAAC;AAGtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,MAAM,MAAM,kBAAkB,GAAG,cAAc,CAAC;AAEhD,MAAM,WAAW,eAAe;IAC9B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,gDAAgD;IAChD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CAC/B;AAOD,eAAO,MAAM,UAAU,EAAE,EAAE,CAAC,eAAe,CAmBzC,CAAC;AAEH,eAAe,UAAU,CAAC"}

package/dist/types/components/TunnelProvider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TunnelProvider.d.ts","sourceRoot":"","sources":["../../../src/components/TunnelProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,EAAE,EAAE,KAAK,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAIpE,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC5D;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,CAgBlD,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/dist/types/context.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,WAAW,EAAE,MAAM,eAAe,CAAC;AAErE,UAAU,aAAa;IACrB,KAAK,EAAE,WAAW,CAAC;IACnB,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AAED,eAAO,MAAM,aAAa,wCAExB,CAAC;AAEH,eAAe,aAAa,CAAC;AAE7B,eAAO,MAAM,cAAc,GAAI,WAA4B,gBAa1D,CAAC"}

package/dist/types/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC"}