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

package/dist/src/lib/core.cjs

@@ -70,6 +70,7 @@ __export(core_exports, {
   createSignal: () => import_signal18.createSignal,
   createStore: () => import_store.createStore,
   createTheme: () => createTheme,
+  css: () => import_dom17.css,
   default: () => core_default,
   deferred: () => deferred,
   delegate: () => import_dom18.delegate,
@@ -151,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.93";
+var VERSION = "1.0.0-alpha.95";
 
 // src/lib/render/versions.ts
 var import_dom2 = require("@fluixi/dom");
@@ -1176,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
@@ -1255,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 });
@@ -1362,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;
@@ -1381,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)
     );
@@ -1388,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) {
@@ -1401,6 +1479,7 @@ function Router(props) {
   });
   (0, import_signal15.onCleanup)(() => {
     unsub();
+    scroll?.dispose();
     router.destroy();
     navigationId++;
   });
@@ -1423,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.d.ts

@@ -35,8 +35,8 @@ export { createTheme, type Theme, type ThemeOptions } from './theme/index.js';
 export { createColorScheme, type ColorScheme, type ColorSchemeChoice, type ColorSchemeOptions } from './theme/color-scheme.js';
 export { ThemeProvider, ColorSchemeProvider, useTheme, useColorScheme } from './theme/provider.js';
 import { Link, Router, useNavigate, useRouter } from './router/index.js';
-export { html, svg } from '@fluixi/dom';
-export type { TemplateResult, Reactive } from '@fluixi/dom';
+export { html, svg, css } from '@fluixi/dom';
+export type { TemplateResult, Reactive, FluixiStyle } from '@fluixi/dom';
 export { query, queryAll, closest, addClass, removeClass, toggleClass, hasClass, setAttribute, getAttribute, removeAttribute, setStyles, getStyle, createElement as domCreateElement, removeChildren, appendChildren, isVisible, scrollIntoView, getOffset, delegate, waitForElement, observeIntersection, observeResize, } from '@fluixi/dom';
 export { classMap, styleMap, Island, hydrateIslands, type IslandProps, type IslandRegistry, mergeProps, splitProps, type ComponentFn, type ComponentChild, type ComponentOrElement, type FxComponent, type FxC, type FxParentProps, type FxParent, type FxVoidProps, type FxVoid, type FxFlowProps, type FxFlow, } from '@fluixi/dom';
 export * from "./control-flow.js";

package/dist/src/lib/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/lib/core.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/lib/core.ts"],"names":[],"mappings":"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"}

package/dist/src/lib/core.js

@@ -56,7 +56,7 @@ import { Link, Router, useNavigate, useRouter, } from './router/index.js';
 // html`` / svg`` template markers, the no-JSX authoring surface. They live in
 // @fluixi/dom (compiled away by `format: 'lit'`/`both`); re-exported here so
 // `import { html } from '@fluixi/core'` works. Inert typed functions, no lit runtime.
-export { html, svg } from '@fluixi/dom';
+export { html, svg, css } from '@fluixi/dom';
 // createReactiveJSX (a deprecated legacy adapter) lived here but pulled the jsx-runtime
 // `.` entry into the core graph. It's gone: compiled JSX uses the jsx-runtime subpath
 // directly, and nothing in the framework needs the adapter.

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.93";
+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,
@@ -1499,7 +1590,7 @@ function Link(props) {
 }
 
 // src/lib/core.ts
-import { html, svg } from "@fluixi/dom";
+import { html, svg, css } from "@fluixi/dom";
 import {
   query,
   queryAll,
@@ -1647,6 +1738,7 @@ export {
   createSignal9 as createSignal,
   createStore,
   createTheme,
+  css,
   core_default as default,
   deferred,
   delegate,

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

@@ -1,4 +1,4 @@
-/*! @fluixi/core v1.0.0-alpha.93 | (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;

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

@@ -1,4 +1,4 @@
-/*! @fluixi/core v1.0.0-alpha.93 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/core v1.0.0-alpha.95 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 
 // src/lib/i18n/index.ts
 import { createSignal } from "@fluixi/reactive/signal";

package/dist/src/lib/index.cjs

@@ -114,7 +114,7 @@ var import_signal6 = require("@fluixi/reactive/signal");
 var import_dom = require("@fluixi/dom");
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.93";
+var VERSION = "1.0.0-alpha.95";
 
 // src/lib/render/versions.ts
 var import_dom2 = require("@fluixi/dom");

package/dist/src/lib/index.mjs

@@ -44,7 +44,7 @@ import { createRoot as createRoot2 } from "@fluixi/reactive/signal";
 import { registerCoreVersion } from "@fluixi/dom";
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.93";
+var VERSION = "1.0.0-alpha.95";
 
 // src/lib/render/versions.ts
 import { stampVersions, warnOnVersionSkew, versions } from "@fluixi/dom";

package/dist/src/lib/jsx-runtime/index.cjs

@@ -1,4 +1,4 @@
-/*! @fluixi/core v1.0.0-alpha.93 | (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;

package/dist/src/lib/jsx-runtime/index.mjs

@@ -1,4 +1,4 @@
-/*! @fluixi/core v1.0.0-alpha.93 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/core v1.0.0-alpha.95 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 
 // src/lib/jsx-runtime/index.ts
 export * from "@fluixi/jsx/jsx-runtime";

package/dist/src/lib/jsx-runtime/jsx-dev-runtime.cjs

@@ -1,4 +1,4 @@
-/*! @fluixi/core v1.0.0-alpha.93 | (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;

package/dist/src/lib/jsx-runtime/jsx-dev-runtime.mjs

@@ -1,4 +1,4 @@
-/*! @fluixi/core v1.0.0-alpha.93 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/core v1.0.0-alpha.95 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 
 // src/lib/jsx-runtime/jsx-dev-runtime.ts
 export * from "@fluixi/jsx/jsx-dev-runtime";

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

@@ -1,4 +1,4 @@
-/*! @fluixi/core v1.0.0-alpha.93 | (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 __create = Object.create;
 var __defProp = Object.defineProperty;

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

@@ -1,4 +1,4 @@
-/*! @fluixi/core v1.0.0-alpha.93 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/core v1.0.0-alpha.95 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 
 // src/lib/plugins/vite.ts
 import { fluixi, createVitePlugin } from "@fluixi/vite-plugin";

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

@@ -63,7 +63,7 @@ var import_signal6 = require("@fluixi/reactive/signal");
 var import_dom = require("@fluixi/dom");
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.93";
+var VERSION = "1.0.0-alpha.95";
 
 // src/lib/render/versions.ts
 var import_dom2 = require("@fluixi/dom");

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

@@ -6,7 +6,7 @@ import { createRoot as createRoot2 } from "@fluixi/reactive/signal";
 import { registerCoreVersion } from "@fluixi/dom";
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.93";
+var VERSION = "1.0.0-alpha.95";
 
 // src/lib/render/versions.ts
 import { stampVersions, warnOnVersionSkew, versions } from "@fluixi/dom";

package/dist/src/lib/render/versions.cjs

@@ -28,7 +28,7 @@ module.exports = __toCommonJS(versions_exports);
 var import_dom = require("@fluixi/dom");
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.93";
+var VERSION = "1.0.0-alpha.95";
 
 // src/lib/render/versions.ts
 var import_dom2 = require("@fluixi/dom");

package/dist/src/lib/render/versions.mjs

@@ -2,7 +2,7 @@
 import { registerCoreVersion } from "@fluixi/dom";
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.93";
+var VERSION = "1.0.0-alpha.95";
 
 // src/lib/render/versions.ts
 import { stampVersions, warnOnVersionSkew, versions } from "@fluixi/dom";

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

@@ -1,4 +1,4 @@
-/*! @fluixi/core v1.0.0-alpha.93 | (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;
@@ -113,6 +113,64 @@ var import_dom3 = require("@fluixi/dom");
 var import_signal6 = 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 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
 var import_router = require("@fluixi/router");
 
 // src/lib/router/data.ts
@@ -383,9 +441,20 @@ function renderLayer(m, depth, base) {
       return router ? router.trackLoad(result) : result;
     });
     (0, import_signal5.onCleanup)(onRevalidate(() => void refetch()));
+    let loadedFor = (0, import_signal5.untrack)(() => JSON.stringify(base.matched()[depth]?.params ?? {}));
+    (0, import_signal5.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_signal5.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 });
@@ -490,16 +559,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_signal5.createSignal)(router.state());
   const [navigating, setNavigating] = (0, import_signal5.createSignal)(false);
   const [loads, setLoads] = (0, import_signal5.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_signal5.createSignal)(0);
   const takeMode = () => {
     const mode = pendingTransitionMode ?? (props.transition ?? "auto");
     pendingTransitionMode = void 0;
@@ -509,6 +581,10 @@ function Router(props) {
     const id = ++navigationId;
     const mode = takeMode();
     setNavigating(true);
+    if (scroll) {
+      scroll.leave();
+      arriving = { id, location: next.location, from: (0, import_signal5.untrack)(state).location };
+    }
     const prepared = prepareComponents(
       (next.match?.matched ?? []).map((m) => m.component).filter(Boolean)
     );
@@ -516,6 +592,7 @@ function Router(props) {
       setState(next);
       const flushed = (0, import_signal5.flush)();
       if (id === navigationId) setNavigating(false);
+      if (scroll) setArrived(id);
       return flushed;
     };
     if (!prepared) {
@@ -529,6 +606,7 @@ function Router(props) {
   });
   (0, import_signal5.onCleanup)(() => {
     unsub();
+    scroll?.dispose();
     router.destroy();
     navigationId++;
   });
@@ -551,6 +629,19 @@ function Router(props) {
       return result;
     }
   };
+  if (scroll) {
+    const nextFrame = typeof requestAnimationFrame === "function" ? requestAnimationFrame : (fn) => setTimeout(fn, 0);
+    (0, import_signal5.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,