@fluixi/core 1.0.0-alpha.94 → 1.0.0-alpha.95

package/dist/src/lib/client/index.cjs

@@ -1,4 +1,4 @@
-/*! @fluixi/core v1.0.0-alpha.94 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/core v1.0.0-alpha.95 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 "use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -124,6 +124,68 @@ var init_transition = __esm({
   }
 });
 
+// src/lib/router/scroll.ts
+function keepScroll(initial) {
+  const read2 = () => {
+    try {
+      return JSON.parse(sessionStorage.getItem(STORE) ?? "{}");
+    } catch {
+      return {};
+    }
+  };
+  const positions = read2();
+  const write = () => {
+    const keys = Object.keys(positions);
+    for (const key of keys.slice(0, Math.max(0, keys.length - KEEP))) delete positions[key];
+    try {
+      sessionStorage.setItem(STORE, JSON.stringify(positions));
+    } catch {
+    }
+  };
+  let current = initial.key;
+  const save = () => {
+    if (current === void 0) return;
+    delete positions[current];
+    positions[current] = window.scrollY;
+    write();
+  };
+  const restoration = history.scrollRestoration;
+  history.scrollRestoration = "manual";
+  window.addEventListener("pagehide", save);
+  const to = (top) => window.scrollTo({ top, left: 0, behavior: "instant" });
+  const toHash = (hash) => {
+    if (!hash || hash === "#") return false;
+    const target = document.getElementById(decodeURIComponent(hash.slice(1)));
+    target?.scrollIntoView({ behavior: "instant" });
+    return target !== null;
+  };
+  return {
+    leave: save,
+    arrive(location, from) {
+      current = location.key;
+      if (location.action === "pop" || from === void 0) {
+        const y = location.key === void 0 ? void 0 : positions[location.key];
+        if (y !== void 0) to(y);
+        return;
+      }
+      if (location.action === "replace" && location.pathname === from.pathname) return;
+      if (!toHash(location.hash)) to(0);
+    },
+    dispose() {
+      window.removeEventListener("pagehide", save);
+      history.scrollRestoration = restoration;
+    }
+  };
+}
+var STORE, KEEP;
+var init_scroll = __esm({
+  "src/lib/router/scroll.ts"() {
+    "use strict";
+    STORE = "fx:scroll";
+    KEEP = 100;
+  }
+});
+
 // src/lib/context/context.ts
 function createContext3(defaultValue, name) {
   const context = (0, import_signal7.createContext)(defaultValue, name);
@@ -389,9 +451,20 @@ function renderLayer(m, depth, base) {
       return router ? router.trackLoad(result) : result;
     });
     (0, import_signal10.onCleanup)(onRevalidate(() => void refetch()));
+    let loadedFor = (0, import_signal10.untrack)(() => JSON.stringify(base.matched()[depth]?.params ?? {}));
+    (0, import_signal10.createEffect)(() => {
+      const now = base.matched()[depth];
+      if (now?.route !== m.route) return;
+      const params = JSON.stringify(now.params ?? {});
+      if (params === loadedFor) return;
+      loadedFor = params;
+      (0, import_signal10.untrack)(() => void refetch());
+    });
     data = () => {
       const error = resource.error;
       if (error !== void 0 && error !== null) throw error;
+      const r = resource;
+      if (r.state === "refreshing") return r.latest;
       return resource();
     };
     Object.defineProperty(data, "loading", { get: () => resource.loading });
@@ -495,16 +568,19 @@ function buildDefaultNotFound() {
   return el;
 }
 function Router(props) {
-  const history = props.history ?? (0, import_router.createBrowserHistory)();
+  const history2 = props.history ?? (0, import_router.createBrowserHistory)();
   const router = (0, import_router.createRouter)({
     routes: props.routes,
     base: props.base,
-    history
+    history: history2
   });
   const [state, setState] = (0, import_signal10.createSignal)(router.state());
   const [navigating, setNavigating] = (0, import_signal10.createSignal)(false);
   const [loads, setLoads] = (0, import_signal10.createSignal)(0);
   let navigationId = 0;
+  const scroll = history2.window ? keepScroll(router.state().location) : void 0;
+  let arriving = scroll ? { id: 0, location: router.state().location, from: void 0 } : null;
+  const [arrived, setArrived] = (0, import_signal10.createSignal)(0);
   const takeMode = () => {
     const mode = pendingTransitionMode ?? (props.transition ?? "auto");
     pendingTransitionMode = void 0;
@@ -514,6 +590,10 @@ function Router(props) {
     const id = ++navigationId;
     const mode = takeMode();
     setNavigating(true);
+    if (scroll) {
+      scroll.leave();
+      arriving = { id, location: next.location, from: (0, import_signal10.untrack)(state).location };
+    }
     const prepared = prepareComponents(
       (next.match?.matched ?? []).map((m) => m.component).filter(Boolean)
     );
@@ -521,6 +601,7 @@ function Router(props) {
       setState(next);
       const flushed = (0, import_signal10.flush)();
       if (id === navigationId) setNavigating(false);
+      if (scroll) setArrived(id);
       return flushed;
     };
     if (!prepared) {
@@ -534,6 +615,7 @@ function Router(props) {
   });
   (0, import_signal10.onCleanup)(() => {
     unsub();
+    scroll?.dispose();
     router.destroy();
     navigationId++;
   });
@@ -556,6 +638,19 @@ function Router(props) {
       return result;
     }
   };
+  if (scroll) {
+    const nextFrame = typeof requestAnimationFrame === "function" ? requestAnimationFrame : (fn) => setTimeout(fn, 0);
+    (0, import_signal10.createEffect)(() => {
+      const id = arrived();
+      if (ctx.isRouting()) return;
+      const next = arriving;
+      if (!next || next.id !== id || id !== navigationId) return;
+      arriving = null;
+      nextFrame(() => {
+        if (id === navigationId) scroll.arrive(next.location, next.from);
+      });
+    });
+  }
   const root = {
     depth: -1,
     matched,
@@ -799,6 +894,7 @@ var init_router = __esm({
     import_signal11 = require("@fluixi/reactive/signal");
     import_object = require("@fluixi/utils/object");
     import_compare = require("@fluixi/utils/compare");
+    init_scroll();
     import_router = require("@fluixi/router");
     init_data();
     import_router2 = require("@fluixi/router");
@@ -847,7 +943,7 @@ var import_dom13 = require("@fluixi/dom");
 var import_dom = require("@fluixi/dom");
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.94";
+var VERSION = "1.0.0-alpha.95";
 
 // src/lib/render/versions.ts
 var import_dom2 = require("@fluixi/dom");

package/dist/src/lib/client/index.mjs

@@ -1,5 +1,5 @@
-/*! @fluixi/core v1.0.0-alpha.94 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
-import "./chunk-TSXM2PNY.mjs";
+/*! @fluixi/core v1.0.0-alpha.95 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+import "./chunk-AHNP3IWU.mjs";
 
 // src/lib/client/index.ts
 import {
@@ -15,7 +15,7 @@ import {
 import { registerCoreVersion } from "@fluixi/dom";
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.94";
+var VERSION = "1.0.0-alpha.95";
 
 // src/lib/render/versions.ts
 import { stampVersions, warnOnVersionSkew, versions } from "@fluixi/dom";
@@ -246,7 +246,7 @@ async function startClient(App, options = {}) {
     beginAppHydration();
     try {
       if (options.routes && options.routes.length) {
-        const { preloadRoutes } = await import("./router-BDVPLLYX.mjs");
+        const { preloadRoutes } = await import("./router-5C6FQJQ4.mjs");
         await preloadRoutes(options.routes, window.location.pathname);
       }
       deserializeHydrationData();

package/dist/src/lib/client/{router-BDVPLLYX.mjs → router-5C6FQJQ4.mjs}

@@ -1,7 +1,7 @@
-/*! @fluixi/core v1.0.0-alpha.94 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/core v1.0.0-alpha.95 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 import {
   lazy
-} from "./chunk-TSXM2PNY.mjs";
+} from "./chunk-AHNP3IWU.mjs";
 
 // src/lib/router/index.ts
 import {
@@ -75,6 +75,64 @@ import {
 import { createContext as createContext2, useContext as useContext2 } from "@fluixi/reactive/signal";
 import { get } from "@fluixi/utils/object";
 import { deepEqual } from "@fluixi/utils/compare";
+
+// src/lib/router/scroll.ts
+var STORE = "fx:scroll";
+var KEEP = 100;
+function keepScroll(initial) {
+  const read2 = () => {
+    try {
+      return JSON.parse(sessionStorage.getItem(STORE) ?? "{}");
+    } catch {
+      return {};
+    }
+  };
+  const positions = read2();
+  const write = () => {
+    const keys = Object.keys(positions);
+    for (const key of keys.slice(0, Math.max(0, keys.length - KEEP))) delete positions[key];
+    try {
+      sessionStorage.setItem(STORE, JSON.stringify(positions));
+    } catch {
+    }
+  };
+  let current = initial.key;
+  const save = () => {
+    if (current === void 0) return;
+    delete positions[current];
+    positions[current] = window.scrollY;
+    write();
+  };
+  const restoration = history.scrollRestoration;
+  history.scrollRestoration = "manual";
+  window.addEventListener("pagehide", save);
+  const to = (top) => window.scrollTo({ top, left: 0, behavior: "instant" });
+  const toHash = (hash) => {
+    if (!hash || hash === "#") return false;
+    const target = document.getElementById(decodeURIComponent(hash.slice(1)));
+    target?.scrollIntoView({ behavior: "instant" });
+    return target !== null;
+  };
+  return {
+    leave: save,
+    arrive(location, from) {
+      current = location.key;
+      if (location.action === "pop" || from === void 0) {
+        const y = location.key === void 0 ? void 0 : positions[location.key];
+        if (y !== void 0) to(y);
+        return;
+      }
+      if (location.action === "replace" && location.pathname === from.pathname) return;
+      if (!toHash(location.hash)) to(0);
+    },
+    dispose() {
+      window.removeEventListener("pagehide", save);
+      history.scrollRestoration = restoration;
+    }
+  };
+}
+
+// src/lib/router/index.ts
 import {
   createRouter as createCoreRouter,
   createBrowserHistory,
@@ -316,9 +374,20 @@ function renderLayer(m, depth, base) {
       return router ? router.trackLoad(result) : result;
     });
     onCleanup(onRevalidate(() => void refetch()));
+    let loadedFor = untrack(() => JSON.stringify(base.matched()[depth]?.params ?? {}));
+    createEffect(() => {
+      const now = base.matched()[depth];
+      if (now?.route !== m.route) return;
+      const params = JSON.stringify(now.params ?? {});
+      if (params === loadedFor) return;
+      loadedFor = params;
+      untrack(() => void refetch());
+    });
     data = () => {
       const error = resource.error;
       if (error !== void 0 && error !== null) throw error;
+      const r = resource;
+      if (r.state === "refreshing") return r.latest;
       return resource();
     };
     Object.defineProperty(data, "loading", { get: () => resource.loading });
@@ -423,16 +492,19 @@ function buildDefaultNotFound() {
 }
 var pendingTransitionMode;
 function Router(props) {
-  const history = props.history ?? createBrowserHistory();
+  const history2 = props.history ?? createBrowserHistory();
   const router = createCoreRouter({
     routes: props.routes,
     base: props.base,
-    history
+    history: history2
   });
   const [state, setState] = createSignal2(router.state());
   const [navigating, setNavigating] = createSignal2(false);
   const [loads, setLoads] = createSignal2(0);
   let navigationId = 0;
+  const scroll = history2.window ? keepScroll(router.state().location) : void 0;
+  let arriving = scroll ? { id: 0, location: router.state().location, from: void 0 } : null;
+  const [arrived, setArrived] = createSignal2(0);
   const takeMode = () => {
     const mode = pendingTransitionMode ?? (props.transition ?? "auto");
     pendingTransitionMode = void 0;
@@ -442,6 +514,10 @@ function Router(props) {
     const id = ++navigationId;
     const mode = takeMode();
     setNavigating(true);
+    if (scroll) {
+      scroll.leave();
+      arriving = { id, location: next.location, from: untrack(state).location };
+    }
     const prepared = prepareComponents(
       (next.match?.matched ?? []).map((m) => m.component).filter(Boolean)
     );
@@ -449,6 +525,7 @@ function Router(props) {
       setState(next);
       const flushed = flush();
       if (id === navigationId) setNavigating(false);
+      if (scroll) setArrived(id);
       return flushed;
     };
     if (!prepared) {
@@ -462,6 +539,7 @@ function Router(props) {
   });
   onCleanup(() => {
     unsub();
+    scroll?.dispose();
     router.destroy();
     navigationId++;
   });
@@ -484,6 +562,19 @@ function Router(props) {
       return result;
     }
   };
+  if (scroll) {
+    const nextFrame = typeof requestAnimationFrame === "function" ? requestAnimationFrame : (fn) => setTimeout(fn, 0);
+    createEffect(() => {
+      const id = arrived();
+      if (ctx.isRouting()) return;
+      const next = arriving;
+      if (!next || next.id !== id || id !== navigationId) return;
+      arriving = null;
+      nextFrame(() => {
+        if (id === navigationId) scroll.arrive(next.location, next.from);
+      });
+    });
+  }
   const root = {
     depth: -1,
     matched,

package/dist/src/lib/core.cjs

@@ -152,7 +152,7 @@ var import_signal6 = require("@fluixi/reactive/signal");
 var import_dom = require("@fluixi/dom");
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.94";
+var VERSION = "1.0.0-alpha.95";
 
 // src/lib/render/versions.ts
 var import_dom2 = require("@fluixi/dom");
@@ -1177,6 +1177,64 @@ var import_dom15 = require("@fluixi/dom");
 var import_signal16 = require("@fluixi/reactive/signal");
 var import_object = require("@fluixi/utils/object");
 var import_compare = require("@fluixi/utils/compare");
+
+// src/lib/router/scroll.ts
+var STORE = "fx:scroll";
+var KEEP = 100;
+function keepScroll(initial) {
+  const read3 = () => {
+    try {
+      return JSON.parse(sessionStorage.getItem(STORE) ?? "{}");
+    } catch {
+      return {};
+    }
+  };
+  const positions = read3();
+  const write = () => {
+    const keys = Object.keys(positions);
+    for (const key of keys.slice(0, Math.max(0, keys.length - KEEP))) delete positions[key];
+    try {
+      sessionStorage.setItem(STORE, JSON.stringify(positions));
+    } catch {
+    }
+  };
+  let current = initial.key;
+  const save = () => {
+    if (current === void 0) return;
+    delete positions[current];
+    positions[current] = window.scrollY;
+    write();
+  };
+  const restoration = history.scrollRestoration;
+  history.scrollRestoration = "manual";
+  window.addEventListener("pagehide", save);
+  const to = (top) => window.scrollTo({ top, left: 0, behavior: "instant" });
+  const toHash = (hash) => {
+    if (!hash || hash === "#") return false;
+    const target = document.getElementById(decodeURIComponent(hash.slice(1)));
+    target?.scrollIntoView({ behavior: "instant" });
+    return target !== null;
+  };
+  return {
+    leave: save,
+    arrive(location, from) {
+      current = location.key;
+      if (location.action === "pop" || from === void 0) {
+        const y = location.key === void 0 ? void 0 : positions[location.key];
+        if (y !== void 0) to(y);
+        return;
+      }
+      if (location.action === "replace" && location.pathname === from.pathname) return;
+      if (!toHash(location.hash)) to(0);
+    },
+    dispose() {
+      window.removeEventListener("pagehide", save);
+      history.scrollRestoration = restoration;
+    }
+  };
+}
+
+// src/lib/router/index.ts
 var import_router = require("@fluixi/router");
 
 // src/lib/router/data.ts
@@ -1256,9 +1314,20 @@ function renderLayer(m, depth, base) {
       return router ? router.trackLoad(result) : result;
     });
     (0, import_signal15.onCleanup)(onRevalidate(() => void refetch()));
+    let loadedFor = (0, import_signal15.untrack)(() => JSON.stringify(base.matched()[depth]?.params ?? {}));
+    (0, import_signal15.createEffect)(() => {
+      const now = base.matched()[depth];
+      if (now?.route !== m.route) return;
+      const params = JSON.stringify(now.params ?? {});
+      if (params === loadedFor) return;
+      loadedFor = params;
+      (0, import_signal15.untrack)(() => void refetch());
+    });
     data = () => {
       const error = resource2.error;
       if (error !== void 0 && error !== null) throw error;
+      const r = resource2;
+      if (r.state === "refreshing") return r.latest;
       return resource2();
     };
     Object.defineProperty(data, "loading", { get: () => resource2.loading });
@@ -1363,16 +1432,19 @@ function buildDefaultNotFound() {
 }
 var pendingTransitionMode;
 function Router(props) {
-  const history = props.history ?? (0, import_router.createBrowserHistory)();
+  const history2 = props.history ?? (0, import_router.createBrowserHistory)();
   const router = (0, import_router.createRouter)({
     routes: props.routes,
     base: props.base,
-    history
+    history: history2
   });
   const [state, setState] = (0, import_signal15.createSignal)(router.state());
   const [navigating, setNavigating] = (0, import_signal15.createSignal)(false);
   const [loads, setLoads] = (0, import_signal15.createSignal)(0);
   let navigationId = 0;
+  const scroll = history2.window ? keepScroll(router.state().location) : void 0;
+  let arriving = scroll ? { id: 0, location: router.state().location, from: void 0 } : null;
+  const [arrived, setArrived] = (0, import_signal15.createSignal)(0);
   const takeMode = () => {
     const mode = pendingTransitionMode ?? (props.transition ?? "auto");
     pendingTransitionMode = void 0;
@@ -1382,6 +1454,10 @@ function Router(props) {
     const id = ++navigationId;
     const mode = takeMode();
     setNavigating(true);
+    if (scroll) {
+      scroll.leave();
+      arriving = { id, location: next.location, from: (0, import_signal15.untrack)(state).location };
+    }
     const prepared = prepareComponents(
       (next.match?.matched ?? []).map((m) => m.component).filter(Boolean)
     );
@@ -1389,6 +1465,7 @@ function Router(props) {
       setState(next);
       const flushed = (0, import_signal15.flush)();
       if (id === navigationId) setNavigating(false);
+      if (scroll) setArrived(id);
       return flushed;
     };
     if (!prepared) {
@@ -1402,6 +1479,7 @@ function Router(props) {
   });
   (0, import_signal15.onCleanup)(() => {
     unsub();
+    scroll?.dispose();
     router.destroy();
     navigationId++;
   });
@@ -1424,6 +1502,19 @@ function Router(props) {
       return result;
     }
   };
+  if (scroll) {
+    const nextFrame = typeof requestAnimationFrame === "function" ? requestAnimationFrame : (fn) => setTimeout(fn, 0);
+    (0, import_signal15.createEffect)(() => {
+      const id = arrived();
+      if (ctx.isRouting()) return;
+      const next = arriving;
+      if (!next || next.id !== id || id !== navigationId) return;
+      arriving = null;
+      nextFrame(() => {
+        if (id === navigationId) scroll.arrive(next.location, next.from);
+      });
+    });
+  }
   const root = {
     depth: -1,
     matched,

package/dist/src/lib/core.mjs

@@ -38,7 +38,7 @@ import { createRoot as createRoot2 } from "@fluixi/reactive/signal";
 import { registerCoreVersion } from "@fluixi/dom";
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.94";
+var VERSION = "1.0.0-alpha.95";
 
 // src/lib/render/versions.ts
 import { stampVersions, warnOnVersionSkew, versions } from "@fluixi/dom";
@@ -1126,6 +1126,64 @@ import {
 import { createContext as createContext5, useContext as useContext5 } from "@fluixi/reactive/signal";
 import { get } from "@fluixi/utils/object";
 import { deepEqual } from "@fluixi/utils/compare";
+
+// src/lib/router/scroll.ts
+var STORE = "fx:scroll";
+var KEEP = 100;
+function keepScroll(initial) {
+  const read3 = () => {
+    try {
+      return JSON.parse(sessionStorage.getItem(STORE) ?? "{}");
+    } catch {
+      return {};
+    }
+  };
+  const positions = read3();
+  const write = () => {
+    const keys = Object.keys(positions);
+    for (const key of keys.slice(0, Math.max(0, keys.length - KEEP))) delete positions[key];
+    try {
+      sessionStorage.setItem(STORE, JSON.stringify(positions));
+    } catch {
+    }
+  };
+  let current = initial.key;
+  const save = () => {
+    if (current === void 0) return;
+    delete positions[current];
+    positions[current] = window.scrollY;
+    write();
+  };
+  const restoration = history.scrollRestoration;
+  history.scrollRestoration = "manual";
+  window.addEventListener("pagehide", save);
+  const to = (top) => window.scrollTo({ top, left: 0, behavior: "instant" });
+  const toHash = (hash) => {
+    if (!hash || hash === "#") return false;
+    const target = document.getElementById(decodeURIComponent(hash.slice(1)));
+    target?.scrollIntoView({ behavior: "instant" });
+    return target !== null;
+  };
+  return {
+    leave: save,
+    arrive(location, from) {
+      current = location.key;
+      if (location.action === "pop" || from === void 0) {
+        const y = location.key === void 0 ? void 0 : positions[location.key];
+        if (y !== void 0) to(y);
+        return;
+      }
+      if (location.action === "replace" && location.pathname === from.pathname) return;
+      if (!toHash(location.hash)) to(0);
+    },
+    dispose() {
+      window.removeEventListener("pagehide", save);
+      history.scrollRestoration = restoration;
+    }
+  };
+}
+
+// src/lib/router/index.ts
 import {
   createRouter as createCoreRouter,
   createBrowserHistory,
@@ -1218,9 +1276,20 @@ function renderLayer(m, depth, base) {
       return router ? router.trackLoad(result) : result;
     });
     onCleanup4(onRevalidate(() => void refetch()));
+    let loadedFor = untrack4(() => JSON.stringify(base.matched()[depth]?.params ?? {}));
+    createEffect4(() => {
+      const now = base.matched()[depth];
+      if (now?.route !== m.route) return;
+      const params = JSON.stringify(now.params ?? {});
+      if (params === loadedFor) return;
+      loadedFor = params;
+      untrack4(() => void refetch());
+    });
     data = () => {
       const error = resource2.error;
       if (error !== void 0 && error !== null) throw error;
+      const r = resource2;
+      if (r.state === "refreshing") return r.latest;
       return resource2();
     };
     Object.defineProperty(data, "loading", { get: () => resource2.loading });
@@ -1325,16 +1394,19 @@ function buildDefaultNotFound() {
 }
 var pendingTransitionMode;
 function Router(props) {
-  const history = props.history ?? createBrowserHistory();
+  const history2 = props.history ?? createBrowserHistory();
   const router = createCoreRouter({
     routes: props.routes,
     base: props.base,
-    history
+    history: history2
   });
   const [state, setState] = createSignal8(router.state());
   const [navigating, setNavigating] = createSignal8(false);
   const [loads, setLoads] = createSignal8(0);
   let navigationId = 0;
+  const scroll = history2.window ? keepScroll(router.state().location) : void 0;
+  let arriving = scroll ? { id: 0, location: router.state().location, from: void 0 } : null;
+  const [arrived, setArrived] = createSignal8(0);
   const takeMode = () => {
     const mode = pendingTransitionMode ?? (props.transition ?? "auto");
     pendingTransitionMode = void 0;
@@ -1344,6 +1416,10 @@ function Router(props) {
     const id = ++navigationId;
     const mode = takeMode();
     setNavigating(true);
+    if (scroll) {
+      scroll.leave();
+      arriving = { id, location: next.location, from: untrack4(state).location };
+    }
     const prepared = prepareComponents(
       (next.match?.matched ?? []).map((m) => m.component).filter(Boolean)
     );
@@ -1351,6 +1427,7 @@ function Router(props) {
       setState(next);
       const flushed = flush();
       if (id === navigationId) setNavigating(false);
+      if (scroll) setArrived(id);
       return flushed;
     };
     if (!prepared) {
@@ -1364,6 +1441,7 @@ function Router(props) {
   });
   onCleanup4(() => {
     unsub();
+    scroll?.dispose();
     router.destroy();
     navigationId++;
   });
@@ -1386,6 +1464,19 @@ function Router(props) {
       return result;
     }
   };
+  if (scroll) {
+    const nextFrame = typeof requestAnimationFrame === "function" ? requestAnimationFrame : (fn) => setTimeout(fn, 0);
+    createEffect4(() => {
+      const id = arrived();
+      if (ctx.isRouting()) return;
+      const next = arriving;
+      if (!next || next.id !== id || id !== navigationId) return;
+      arriving = null;
+      nextFrame(() => {
+        if (id === navigationId) scroll.arrive(next.location, next.from);
+      });
+    });
+  }
   const root = {
     depth: -1,
     matched,

package/dist/src/lib/i18n/index.cjs

@@ -1,4 +1,4 @@
-/*! @fluixi/core v1.0.0-alpha.94 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/core v1.0.0-alpha.95 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 "use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;