@flemo/core 1.10.0 → 1.10.1

package/dist/history/store.d.ts

@@ -16,6 +16,7 @@ export interface HistoryStore {
     popHistory: (index: number) => void;
     popHistories: (count: number) => void;
     setPendingIndex: (index: number) => void;
+    adoptHistory: (history: History) => void;
     setTransitionName: (index: number, transitionName: TransitionName) => void;
 }
 export type HistoryStoreApi = StoreApi<HistoryStore>;

package/dist/index.mjs

@@ -206,6 +206,7 @@ function o(t = [], n = -1) {
 			});
 		},
 		setPendingIndex: (t) => e({ pendingIndex: t }),
+		adoptHistory: (t) => e((e) => ({ histories: e.histories.slice(0, e.index).concat(t) })),
 		setTransitionName: (t, n) => e((e) => {
 			let r = e.histories[t];
 			if (!r || r.transitionName === n) return {};
@@ -330,20 +331,30 @@ function _() {
 //#endregion
 //#region src/history/createHistorySync.ts
 function v(e) {
-	let { stores: t, driver: n = p(), consume: r = _ } = e;
-	return n.subscribe(async (e) => {
-		if (r()) return;
-		let n = e.state, i = a.generateTaskId();
+	let { stores: t, driver: n = p(), consume: r = _ } = e, i = !1, o = n.subscribe(async (e) => {
+		if (i || r()) return;
+		let n = e.state, o = a.generateTaskId();
 		(await a.addTask(async (r) => {
-			let { setStatus: a, setTransitionTaskId: o } = t.navigate.getState(), { index: s, addHistory: c, popHistory: l, setPendingIndex: u } = t.history.getState(), d = n?.index, f = d !== void 0 && d < s, p = n?.status === "PUSHING" && d !== void 0 && d > s, m = n?.status === "REPLACING" && d !== void 0 && d > s;
-			if (!f && !p && !m) {
+			if (i) {
 				r.abort();
 				return;
 			}
-			if (o(i), f) u(d), a("POPPING");
+			let { setStatus: a, setTransitionTaskId: s } = t.navigate.getState(), { index: c, addHistory: l, popHistory: u, setPendingIndex: d } = t.history.getState(), f = n?.index, p = f !== void 0 && f < c, m = n?.status === "PUSHING" && f !== void 0 && f > c, h = n?.status === "REPLACING" && f !== void 0 && f > c;
+			if (!p && !m && !h) {
+				let i = t.history.getState().histories[c];
+				n?.id && i && n.id !== i.id && t.history.getState().adoptHistory({
+					id: n.id,
+					pathname: e.pathname,
+					params: n.params,
+					transitionName: n.transitionName,
+					layoutId: n.layoutId
+				}), r.abort();
+				return;
+			}
+			if (s(o), p) d(f), a("POPPING");
 			else {
 				let t = n;
-				a(p ? "PUSHING" : "REPLACING"), c({
+				a(m ? "PUSHING" : "REPLACING"), l({
 					id: t.id,
 					pathname: e.pathname,
 					params: t.params,
@@ -352,13 +363,16 @@ function v(e) {
 				});
 			}
 			return async () => {
-				f && d !== void 0 && l(d + 1), a("COMPLETED");
+				p && f !== void 0 && u(f + 1), a("COMPLETED");
 			};
 		}, {
-			id: i,
+			id: o,
 			control: { manual: !0 }
 		})).result?.();
 	});
+	return () => {
+		i = !0, o();
+	};
 }
 //#endregion
 //#region src/history/memoryHistoryDriver.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flemo/core",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "Framework-agnostic primitives for flemo: history, navigation, transitions, task manager.",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",