@tanstack/solid-router 1.114.12 → 1.114.15

package/dist/cjs/ScrollRestoration.cjs

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const routerCore = require("@tanstack/router-core");
 const useRouter = require("./useRouter.cjs");
-const scrollRestoration = require("./scroll-restoration.cjs");
 function useScrollRestoration() {
   const router = useRouter.useRouter();
-  scrollRestoration.setupScrollRestoration(router, true);
+  routerCore.setupScrollRestoration(router, true);
 }
 function ScrollRestoration(_props) {
   useScrollRestoration();
@@ -17,7 +17,7 @@ function useElementScrollRestoration(options) {
   var _a;
   useScrollRestoration();
   const router = useRouter.useRouter();
-  const getKey = options.getKey || scrollRestoration.defaultGetScrollRestorationKey;
+  const getKey = options.getKey || routerCore.defaultGetScrollRestorationKey;
   let elementSelector = "";
   if (options.id) {
     elementSelector = `[data-scroll-restoration-id="${options.id}"]`;
@@ -26,10 +26,10 @@ function useElementScrollRestoration(options) {
     if (!element) {
       return;
     }
-    elementSelector = scrollRestoration.getCssSelector(element);
+    elementSelector = element instanceof Window ? "window" : routerCore.getCssSelector(element);
   }
   const restoreKey = getKey(router.latestLocation);
-  const byKey = scrollRestoration.scrollRestorationCache.state[restoreKey];
+  const byKey = routerCore.scrollRestorationCache.state[restoreKey];
   return byKey == null ? void 0 : byKey[elementSelector];
 }
 exports.ScrollRestoration = ScrollRestoration;

package/dist/cjs/ScrollRestoration.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ScrollRestoration.cjs","sources":["../../src/ScrollRestoration.tsx"],"sourcesContent":["import { useRouter } from './useRouter'\nimport {\n  defaultGetScrollRestorationKey,\n  getCssSelector,\n  scrollRestorationCache,\n  setupScrollRestoration,\n} from './scroll-restoration'\nimport type { ScrollRestorationOptions } from './scroll-restoration'\nimport type { ParsedLocation } from '@tanstack/router-core'\n\nfunction useScrollRestoration() {\n  const router = useRouter()\n  setupScrollRestoration(router, true)\n}\n\n/**\n * @deprecated use createRouter's `scrollRestoration` option instead\n */\nexport function ScrollRestoration(_props: ScrollRestorationOptions) {\n  useScrollRestoration()\n\n  if (process.env.NODE_ENV === 'development') {\n    console.warn(\n      \"The ScrollRestoration component is deprecated. Use createRouter's `scrollRestoration` option instead.\",\n    )\n  }\n\n  return null\n}\n\nexport function useElementScrollRestoration(\n  options: (\n    | {\n        id: string\n        getElement?: () => Element | undefined | null\n      }\n    | {\n        id?: string\n        getElement: () => Element | undefined | null\n      }\n  ) & {\n    getKey?: (location: ParsedLocation) => string\n  },\n) {\n  useScrollRestoration()\n\n  const router = useRouter()\n  const getKey = options.getKey || defaultGetScrollRestorationKey\n\n  let elementSelector = ''\n\n  if (options.id) {\n    elementSelector = `[data-scroll-restoration-id=\"${options.id}\"]`\n  } else {\n    const element = options.getElement?.()\n    if (!element) {\n      return\n    }\n    elementSelector = getCssSelector(element)\n  }\n\n  const restoreKey = getKey(router.latestLocation)\n  const byKey = scrollRestorationCache.state[restoreKey]\n  return byKey?.[elementSelector]\n}\n"],"names":["useScrollRestoration","router","useRouter","setupScrollRestoration","ScrollRestoration","_props","process","env","NODE_ENV","console","warn","useElementScrollRestoration","options","getKey","defaultGetScrollRestorationKey","elementSelector","id","element","getElement","getCssSelector","restoreKey","latestLocation","byKey","scrollRestorationCache","state"],"mappings":";;;;AAUA,SAASA,uBAAuB;AAC9B,QAAMC,SAASC,UAAAA,UAAU;AACzBC,oBAAAA,uBAAuBF,QAAQ,IAAI;AACrC;AAKO,SAASG,kBAAkBC,QAAkC;AAC7C,uBAAA;AAEjBC,MAAAA,QAAQC,IAAIC,aAAa,eAAe;AAC1CC,YAAQC,KACN,uGACF;AAAA,EAAA;AAGK,SAAA;AACT;AAEO,SAASC,4BACdC,SAYA;;AACqB,uBAAA;AAErB,QAAMX,SAASC,UAAAA,UAAU;AACnBW,QAAAA,SAASD,QAAQC,UAAUC,kBAAAA;AAEjC,MAAIC,kBAAkB;AAEtB,MAAIH,QAAQI,IAAI;AACI,sBAAA,gCAAgCJ,QAAQI,EAAE;AAAA,EAAA,OACvD;AACCC,UAAAA,WAAUL,aAAQM,eAARN;AAChB,QAAI,CAACK,SAAS;AACZ;AAAA,IAAA;AAEFF,sBAAkBI,iCAAeF,OAAO;AAAA,EAAA;AAGpCG,QAAAA,aAAaP,OAAOZ,OAAOoB,cAAc;AACzCC,QAAAA,QAAQC,kBAAAA,uBAAuBC,MAAMJ,UAAU;AACrD,SAAOE,+BAAQP;AACjB;;;"}
+{"version":3,"file":"ScrollRestoration.cjs","sources":["../../src/ScrollRestoration.tsx"],"sourcesContent":["import {\n  defaultGetScrollRestorationKey,\n  getCssSelector,\n  scrollRestorationCache,\n  setupScrollRestoration,\n} from '@tanstack/router-core'\nimport { useRouter } from './useRouter'\nimport type {\n  ParsedLocation,\n  ScrollRestorationEntry,\n  ScrollRestorationOptions,\n} from '@tanstack/router-core'\n\nfunction useScrollRestoration() {\n  const router = useRouter()\n  setupScrollRestoration(router, true)\n}\n\n/**\n * @deprecated use createRouter's `scrollRestoration` option instead\n */\nexport function ScrollRestoration(_props: ScrollRestorationOptions) {\n  useScrollRestoration()\n\n  if (process.env.NODE_ENV === 'development') {\n    console.warn(\n      \"The ScrollRestoration component is deprecated. Use createRouter's `scrollRestoration` option instead.\",\n    )\n  }\n\n  return null\n}\n\nexport function useElementScrollRestoration(\n  options: (\n    | {\n        id: string\n        getElement?: () => Window | Element | undefined | null\n      }\n    | {\n        id?: string\n        getElement: () => Window | Element | undefined | null\n      }\n  ) & {\n    getKey?: (location: ParsedLocation) => string\n  },\n): ScrollRestorationEntry | undefined {\n  useScrollRestoration()\n\n  const router = useRouter()\n  const getKey = options.getKey || defaultGetScrollRestorationKey\n\n  let elementSelector = ''\n\n  if (options.id) {\n    elementSelector = `[data-scroll-restoration-id=\"${options.id}\"]`\n  } else {\n    const element = options.getElement?.()\n    if (!element) {\n      return\n    }\n    elementSelector =\n      element instanceof Window ? 'window' : getCssSelector(element)\n  }\n\n  const restoreKey = getKey(router.latestLocation)\n  const byKey = scrollRestorationCache.state[restoreKey]\n  return byKey?.[elementSelector]\n}\n"],"names":["useScrollRestoration","router","useRouter","setupScrollRestoration","ScrollRestoration","_props","process","env","NODE_ENV","console","warn","useElementScrollRestoration","options","getKey","defaultGetScrollRestorationKey","elementSelector","id","element","getElement","Window","getCssSelector","restoreKey","latestLocation","byKey","scrollRestorationCache","state"],"mappings":";;;;AAaA,SAASA,uBAAuB;AAC9B,QAAMC,SAASC,UAAAA,UAAU;AACzBC,aAAAA,uBAAuBF,QAAQ,IAAI;AACrC;AAKO,SAASG,kBAAkBC,QAAkC;AAC7C,uBAAA;AAEjBC,MAAAA,QAAQC,IAAIC,aAAa,eAAe;AAC1CC,YAAQC,KACN,uGACF;AAAA,EAAA;AAGK,SAAA;AACT;AAEO,SAASC,4BACdC,SAYoC;;AACf,uBAAA;AAErB,QAAMX,SAASC,UAAAA,UAAU;AACnBW,QAAAA,SAASD,QAAQC,UAAUC,WAAAA;AAEjC,MAAIC,kBAAkB;AAEtB,MAAIH,QAAQI,IAAI;AACI,sBAAA,gCAAgCJ,QAAQI,EAAE;AAAA,EAAA,OACvD;AACCC,UAAAA,WAAUL,aAAQM,eAARN;AAChB,QAAI,CAACK,SAAS;AACZ;AAAA,IAAA;AAEFF,sBACEE,mBAAmBE,SAAS,WAAWC,WAAAA,eAAeH,OAAO;AAAA,EAAA;AAG3DI,QAAAA,aAAaR,OAAOZ,OAAOqB,cAAc;AACzCC,QAAAA,QAAQC,WAAAA,uBAAuBC,MAAMJ,UAAU;AACrD,SAAOE,+BAAQR;AACjB;;;"}

package/dist/cjs/ScrollRestoration.d.cts

@@ -1,15 +1,14 @@
-import { ScrollRestorationOptions } from './scroll-restoration.cjs';
-import { ParsedLocation } from '@tanstack/router-core';
+import { ParsedLocation, ScrollRestorationEntry, ScrollRestorationOptions } from '@tanstack/router-core';
 /**
  * @deprecated use createRouter's `scrollRestoration` option instead
  */
 export declare function ScrollRestoration(_props: ScrollRestorationOptions): null;
 export declare function useElementScrollRestoration(options: ({
     id: string;
-    getElement?: () => Element | undefined | null;
+    getElement?: () => Window | Element | undefined | null;
 } | {
     id?: string;
-    getElement: () => Element | undefined | null;
+    getElement: () => Window | Element | undefined | null;
 }) & {
     getKey?: (location: ParsedLocation) => string;
-}): import('./scroll-restoration.cjs').ScrollRestorationEntry | undefined;
+}): ScrollRestorationEntry | undefined;

package/dist/cjs/router.cjs

@@ -4,7 +4,6 @@ const history = require("@tanstack/history");
 const solidStore = require("@tanstack/solid-store");
 const invariant = require("tiny-invariant");
 const routerCore = require("@tanstack/router-core");
-const scrollRestoration = require("./scroll-restoration.cjs");
 const componentTypes = [
   "component",
   "errorComponent",
@@ -105,7 +104,7 @@ class Router {
             };
           }
         });
-        scrollRestoration.setupScrollRestoration(this);
+        routerCore.setupScrollRestoration(this);
       }
       if (typeof window !== "undefined" && "CSS" in window && typeof ((_a = window.CSS) == null ? void 0 : _a.supports) === "function") {
         this.isViewTransitionTypesSupported = window.CSS.supports(