@pyreon/router 0.12.14 → 0.13.0

package/lib/analysis/index.js.html

@@ -5386,7 +5386,7 @@ var drawChart = (function (exports) {
   </script>
   <script>
     /*<!--*/
-    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.js","children":[{"name":"src","children":[{"uid":"d7a354cf-1","name":"loader.ts"},{"uid":"d7a354cf-3","name":"match.ts"},{"uid":"d7a354cf-5","name":"scroll.ts"},{"uid":"d7a354cf-7","name":"types.ts"},{"uid":"d7a354cf-9","name":"router.ts"},{"uid":"d7a354cf-11","name":"components.tsx"},{"uid":"d7a354cf-13","name":"index.ts"}]}]}],"isRoot":true},"nodeParts":{"d7a354cf-1":{"renderedLength":2855,"gzipLength":1243,"brotliLength":0,"metaUid":"d7a354cf-0"},"d7a354cf-3":{"renderedLength":12203,"gzipLength":3691,"brotliLength":0,"metaUid":"d7a354cf-2"},"d7a354cf-5":{"renderedLength":1906,"gzipLength":781,"brotliLength":0,"metaUid":"d7a354cf-4"},"d7a354cf-7":{"renderedLength":385,"gzipLength":246,"brotliLength":0,"metaUid":"d7a354cf-6"},"d7a354cf-9":{"renderedLength":23190,"gzipLength":6358,"brotliLength":0,"metaUid":"d7a354cf-8"},"d7a354cf-11":{"renderedLength":7106,"gzipLength":2622,"brotliLength":0,"metaUid":"d7a354cf-10"},"d7a354cf-13":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"metaUid":"d7a354cf-12"}},"nodeMetas":{"d7a354cf-0":{"id":"/src/loader.ts","moduleParts":{"index.js":"d7a354cf-1"},"imported":[{"uid":"d7a354cf-14"}],"importedBy":[{"uid":"d7a354cf-12"},{"uid":"d7a354cf-10"}]},"d7a354cf-2":{"id":"/src/match.ts","moduleParts":{"index.js":"d7a354cf-3"},"imported":[],"importedBy":[{"uid":"d7a354cf-12"},{"uid":"d7a354cf-8"}]},"d7a354cf-4":{"id":"/src/scroll.ts","moduleParts":{"index.js":"d7a354cf-5"},"imported":[],"importedBy":[{"uid":"d7a354cf-8"}]},"d7a354cf-6":{"id":"/src/types.ts","moduleParts":{"index.js":"d7a354cf-7"},"imported":[],"importedBy":[{"uid":"d7a354cf-12"},{"uid":"d7a354cf-8"}]},"d7a354cf-8":{"id":"/src/router.ts","moduleParts":{"index.js":"d7a354cf-9"},"imported":[{"uid":"d7a354cf-14"},{"uid":"d7a354cf-15"},{"uid":"d7a354cf-2"},{"uid":"d7a354cf-4"},{"uid":"d7a354cf-6"}],"importedBy":[{"uid":"d7a354cf-12"},{"uid":"d7a354cf-10"}]},"d7a354cf-10":{"id":"/src/components.tsx","moduleParts":{"index.js":"d7a354cf-11"},"imported":[{"uid":"d7a354cf-14"},{"uid":"d7a354cf-0"},{"uid":"d7a354cf-8"}],"importedBy":[{"uid":"d7a354cf-12"}]},"d7a354cf-12":{"id":"/src/index.ts","moduleParts":{"index.js":"d7a354cf-13"},"imported":[{"uid":"d7a354cf-10"},{"uid":"d7a354cf-0"},{"uid":"d7a354cf-2"},{"uid":"d7a354cf-8"},{"uid":"d7a354cf-6"}],"importedBy":[],"isEntry":true},"d7a354cf-14":{"id":"@pyreon/core","moduleParts":{},"imported":[],"importedBy":[{"uid":"d7a354cf-10"},{"uid":"d7a354cf-0"},{"uid":"d7a354cf-8"}]},"d7a354cf-15":{"id":"@pyreon/reactivity","moduleParts":{},"imported":[],"importedBy":[{"uid":"d7a354cf-8"}]}},"env":{"rollup":"4.23.0"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
+    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.js","children":[{"name":"src","children":[{"uid":"aa1c31e3-1","name":"loader.ts"},{"uid":"aa1c31e3-3","name":"match.ts"},{"uid":"aa1c31e3-5","name":"scroll.ts"},{"uid":"aa1c31e3-7","name":"types.ts"},{"uid":"aa1c31e3-9","name":"router.ts"},{"uid":"aa1c31e3-11","name":"components.tsx"},{"uid":"aa1c31e3-13","name":"index.ts"}]}]}],"isRoot":true},"nodeParts":{"aa1c31e3-1":{"renderedLength":2824,"gzipLength":1233,"brotliLength":0,"metaUid":"aa1c31e3-0"},"aa1c31e3-3":{"renderedLength":12203,"gzipLength":3691,"brotliLength":0,"metaUid":"aa1c31e3-2"},"aa1c31e3-5":{"renderedLength":2194,"gzipLength":899,"brotliLength":0,"metaUid":"aa1c31e3-4"},"aa1c31e3-7":{"renderedLength":385,"gzipLength":246,"brotliLength":0,"metaUid":"aa1c31e3-6"},"aa1c31e3-9":{"renderedLength":23568,"gzipLength":6469,"brotliLength":0,"metaUid":"aa1c31e3-8"},"aa1c31e3-11":{"renderedLength":7151,"gzipLength":2635,"brotliLength":0,"metaUid":"aa1c31e3-10"},"aa1c31e3-13":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"metaUid":"aa1c31e3-12"}},"nodeMetas":{"aa1c31e3-0":{"id":"/src/loader.ts","moduleParts":{"index.js":"aa1c31e3-1"},"imported":[{"uid":"aa1c31e3-14"}],"importedBy":[{"uid":"aa1c31e3-12"},{"uid":"aa1c31e3-10"}]},"aa1c31e3-2":{"id":"/src/match.ts","moduleParts":{"index.js":"aa1c31e3-3"},"imported":[],"importedBy":[{"uid":"aa1c31e3-12"},{"uid":"aa1c31e3-8"}]},"aa1c31e3-4":{"id":"/src/scroll.ts","moduleParts":{"index.js":"aa1c31e3-5"},"imported":[],"importedBy":[{"uid":"aa1c31e3-8"}]},"aa1c31e3-6":{"id":"/src/types.ts","moduleParts":{"index.js":"aa1c31e3-7"},"imported":[],"importedBy":[{"uid":"aa1c31e3-12"},{"uid":"aa1c31e3-8"}]},"aa1c31e3-8":{"id":"/src/router.ts","moduleParts":{"index.js":"aa1c31e3-9"},"imported":[{"uid":"aa1c31e3-14"},{"uid":"aa1c31e3-15"},{"uid":"aa1c31e3-2"},{"uid":"aa1c31e3-4"},{"uid":"aa1c31e3-6"}],"importedBy":[{"uid":"aa1c31e3-12"},{"uid":"aa1c31e3-10"}]},"aa1c31e3-10":{"id":"/src/components.tsx","moduleParts":{"index.js":"aa1c31e3-11"},"imported":[{"uid":"aa1c31e3-14"},{"uid":"aa1c31e3-0"},{"uid":"aa1c31e3-8"}],"importedBy":[{"uid":"aa1c31e3-12"}]},"aa1c31e3-12":{"id":"/src/index.ts","moduleParts":{"index.js":"aa1c31e3-13"},"imported":[{"uid":"aa1c31e3-10"},{"uid":"aa1c31e3-0"},{"uid":"aa1c31e3-2"},{"uid":"aa1c31e3-8"},{"uid":"aa1c31e3-6"}],"importedBy":[],"isEntry":true},"aa1c31e3-14":{"id":"@pyreon/core","moduleParts":{},"imported":[],"importedBy":[{"uid":"aa1c31e3-10"},{"uid":"aa1c31e3-0"},{"uid":"aa1c31e3-8"}]},"aa1c31e3-15":{"id":"@pyreon/reactivity","moduleParts":{},"imported":[],"importedBy":[{"uid":"aa1c31e3-8"}]}},"env":{"rollup":"4.23.0"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
 
     const run = () => {
       const width = window.innerWidth;

package/lib/index.js

@@ -34,7 +34,6 @@ function useLoaderData() {
 async function prefetchLoaderData(router, path) {
 	const route = router._resolve(path);
 	const ac = new AbortController();
-	router._abortController = ac;
 	await Promise.all(route.matched.filter((r) => r.loader).map(async (r) => {
 		const data = await r.loader?.({
 			params: route.params,
@@ -498,6 +497,7 @@ function buildNameIndex(routes) {
 * Saves scroll position before each navigation and restores it when
 * navigating back to a previously visited path.
 */
+const MAX_SCROLL_POSITIONS = 100;
 var ScrollManager = class {
 	_positions = /* @__PURE__ */ new Map();
 	_behavior;
@@ -507,7 +507,13 @@ var ScrollManager = class {
 	/** Call before navigating away — saves current scroll position for `fromPath` */
 	save(fromPath) {
 		if (typeof window === "undefined") return;
+		if (this._positions.has(fromPath)) this._positions.delete(fromPath);
 		this._positions.set(fromPath, window.scrollY);
+		while (this._positions.size > MAX_SCROLL_POSITIONS) {
+			const oldest = this._positions.keys().next().value;
+			if (oldest === void 0) break;
+			this._positions.delete(oldest);
+		}
 	}
 	/** Call after navigation is committed — applies scroll behavior */
 	restore(to, from) {
@@ -656,17 +662,31 @@ function onBeforeRouteUpdate(guard) {
 * })
 * // later: blocker.remove()
 */
+let _beforeUnloadRefCount = 0;
+const _beforeUnloadHandler = (e) => {
+	e.preventDefault();
+};
+function retainBeforeUnload() {
+	if (!_isBrowser) return;
+	if (_beforeUnloadRefCount === 0) window.addEventListener("beforeunload", _beforeUnloadHandler);
+	_beforeUnloadRefCount++;
+}
+function releaseBeforeUnload() {
+	if (!_isBrowser) return;
+	_beforeUnloadRefCount--;
+	if (_beforeUnloadRefCount <= 0) {
+		_beforeUnloadRefCount = 0;
+		window.removeEventListener("beforeunload", _beforeUnloadHandler);
+	}
+}
 function useBlocker(fn) {
 	const router = useContext(RouterContext) ?? _activeRouter;
 	if (!router) throw new Error("[Pyreon] No router installed. Wrap your app in <RouterProvider router={router}>.");
 	router._blockers.add(fn);
-	const beforeUnloadHandler = _isBrowser ? (e) => {
-		e.preventDefault();
-	} : null;
-	if (beforeUnloadHandler) window.addEventListener("beforeunload", beforeUnloadHandler);
+	retainBeforeUnload();
 	const remove = () => {
 		router._blockers.delete(fn);
-		if (beforeUnloadHandler) window.removeEventListener("beforeunload", beforeUnloadHandler);
+		releaseBeforeUnload();
 	};
 	onUnmount(() => remove());
 	return { remove };
@@ -1152,7 +1172,6 @@ function createRouter(options) {
 				componentCache.set(record, comp);
 			}));
 			const ac = new AbortController();
-			router._abortController = ac;
 			await Promise.all(resolved.matched.filter((r) => r.loader).map(async (r) => {
 				const data = await r.loader?.({
 					params: resolved.params,
@@ -1167,11 +1186,13 @@ function createRouter(options) {
 			if (_hashchangeHandler) window.removeEventListener("hashchange", _hashchangeHandler);
 			guards.length = 0;
 			afterHooks.length = 0;
+			for (let i = router._blockers.size; i > 0; i--) releaseBeforeUnload();
 			router._blockers.clear();
 			componentCache.clear();
 			router._loaderData.clear();
 			router._abortController?.abort();
 			router._abortController = null;
+			if (_activeRouter === router) _activeRouter = null;
 		},
 		_resolve: (rawPath) => resolveRoute(rawPath, routes)
 	};
@@ -1326,6 +1347,7 @@ const RouterLink = (props) => {
 		if (!router) return "";
 		const current = router.currentRoute().path;
 		const target = props.to;
+		if (typeof target !== "string") return "";
 		const isExact = current === target;
 		const isActive = isExact || !props.exact && isSegmentPrefix(current, target);
 		const classes = [];