@tanstack/vue-router 1.168.4 → 1.168.6

package/dist/esm/Match.js

@@ -76,7 +76,7 @@ var Match = Vue.defineComponent({
 					},
 					children: content
 				});
-				const withScrollRestoration = [content, isChildOfRoot && router.options.scrollRestoration ? Vue.h(Vue.Fragment, null, [Vue.h(OnRendered), Vue.h(ScrollRestoration)]) : null].filter(Boolean);
+				const withScrollRestoration = [content, isChildOfRoot ? Vue.h(Vue.Fragment, null, [Vue.h(OnRendered), router.options.scrollRestoration && (isServer ?? router.isServer) ? Vue.h(ScrollRestoration) : null]) : null].filter(Boolean);
 				if (withScrollRestoration.length === 1) return withScrollRestoration[0];
 				return Vue.h(Vue.Fragment, null, withScrollRestoration);
 			};

package/dist/esm/Match.js.map

@@ -1 +1 @@
-{"version":3,"file":"Match.js","names":["Vue","createControlledPromise","getLocationChangeInfo","invariant","isNotFound","isRedirect","rootRouteId","isServer","useStore","CatchBoundary","ErrorComponent","ClientOnly","useRouter","CatchNotFound","matchContext","pendingMatchContext","routeIdContext","renderRouteNotFound","ScrollRestoration","Match","defineComponent","name","props","matchId","type","String","required","setup","router","routeId","stores","activeMatchStoresById","get","process","env","NODE_ENV","Error","isChildOfRoot","routesById","parentRoute","id","activeMatch","getMatchStoreByRouteId","value","isPendingMatchRef","pendingRouteIds","Boolean","equal","Object","is","loadedAt","matchData","computed","match","ssr","_displayPending","route","PendingComponent","options","pendingComponent","defaultPendingComponent","pendingElement","h","undefined","routeErrorComponent","errorComponent","defaultErrorComponent","routeOnCatch","onCatch","defaultOnCatch","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","hasShellComponent","shellComponent","ShellComponent","provide","matchIdRef","actualMatchId","resolvedNoSsr","shouldClientOnly","renderMatchContent","matchInner","MatchInner","content","fallback","default","error","children","getResetKey","console","warn","withScrollRestoration","scrollRestoration","Fragment","OnRendered","filter","length","location","resolvedLocation","state","__TSR_key","prevHref","watch","currentHref","latestLocation","href","emit","immediate","inject","combinedState","matchRouteId","remountFn","remountDeps","defaultRemountDeps","remountKey","loaderDeps","params","_strictParams","search","_strictSearch","JSON","stringify","status","_forcePending","getMatch","_nonReactive","loadPromise","RouteErrorComponent","reset","invalidate","info","componentStack","pendingMinMs","defaultPendingMinMs","routerMatch","minPendingPromise","setTimeout","resolve","Comp","defaultComponent","key","Outlet","parentRouteId","parentMatch","v","parentGlobalNotFound","globalNotFound","childMatchIdMap","childMatchIdByRouteId","childMatchData","childId","child","paramsKey","nextMatch"],"sources":["../../src/Match.tsx"],"sourcesContent":["import * as Vue from 'vue'\nimport {\n  createControlledPromise,\n  getLocationChangeInfo,\n  invariant,\n  isNotFound,\n  isRedirect,\n  rootRouteId,\n} from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { useStore } from '@tanstack/vue-store'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { ClientOnly } from './ClientOnly'\nimport { useRouter } from './useRouter'\nimport { CatchNotFound } from './not-found'\nimport {\n  matchContext,\n  pendingMatchContext,\n  routeIdContext,\n} from './matchContext'\nimport { renderRouteNotFound } from './renderRouteNotFound'\nimport { ScrollRestoration } from './scroll-restoration'\nimport type { VNode } from 'vue'\nimport type { AnyRoute, RootRouteOptions } from '@tanstack/router-core'\n\nexport const Match = Vue.defineComponent({\n  name: 'Match',\n  props: {\n    matchId: {\n      type: String,\n      required: true,\n    },\n  },\n  setup(props) {\n    const router = useRouter()\n\n    // Derive routeId from initial props.matchId — stable for this component's\n    // lifetime. The routeId never changes for a given route position in the\n    // tree, even when matchId changes (loaderDepsHash, etc).\n    const routeId = router.stores.activeMatchStoresById.get(\n      props.matchId,\n    )?.routeId\n\n    if (!routeId) {\n      if (process.env.NODE_ENV !== 'production') {\n        throw new Error(\n          `Invariant failed: Could not find routeId for matchId \"${props.matchId}\". Please file an issue!`,\n        )\n      }\n\n      invariant()\n    }\n\n    // Static route-tree check: is this route a direct child of the root?\n    // parentRoute is set at build time, so no reactive tracking needed.\n    const isChildOfRoot =\n      (router.routesById[routeId] as AnyRoute)?.parentRoute?.id === rootRouteId\n\n    // Single stable store subscription — getMatchStoreByRouteId returns a\n    // cached computed store that resolves routeId → current match state\n    // through the signal graph. No bridge needed.\n    const activeMatch = useStore(\n      router.stores.getMatchStoreByRouteId(routeId),\n      (value) => value,\n    )\n    const isPendingMatchRef = useStore(\n      router.stores.pendingRouteIds,\n      (pendingRouteIds) => Boolean(pendingRouteIds[routeId]),\n      { equal: Object.is },\n    )\n    const loadedAt = useStore(router.stores.loadedAt, (value) => value)\n\n    const matchData = Vue.computed(() => {\n      const match = activeMatch.value\n      if (!match) {\n        return null\n      }\n\n      return {\n        matchId: match.id,\n        routeId,\n        loadedAt: loadedAt.value,\n        ssr: match.ssr,\n        _displayPending: match._displayPending,\n      }\n    })\n\n    const route = Vue.computed(() =>\n      matchData.value ? router.routesById[matchData.value.routeId] : null,\n    )\n\n    const PendingComponent = Vue.computed(\n      () =>\n        route.value?.options?.pendingComponent ??\n        router?.options?.defaultPendingComponent,\n    )\n\n    const pendingElement = Vue.computed(() =>\n      PendingComponent.value ? Vue.h(PendingComponent.value) : undefined,\n    )\n\n    const routeErrorComponent = Vue.computed(\n      () =>\n        route.value?.options?.errorComponent ??\n        router?.options?.defaultErrorComponent,\n    )\n\n    const routeOnCatch = Vue.computed(\n      () => route.value?.options?.onCatch ?? router?.options?.defaultOnCatch,\n    )\n\n    const routeNotFoundComponent = Vue.computed(() =>\n      route.value?.isRoot\n        ? // If it's the root route, use the globalNotFound option, with fallback to the notFoundRoute's component\n          (route.value?.options?.notFoundComponent ??\n          router?.options?.notFoundRoute?.options?.component)\n        : route.value?.options?.notFoundComponent,\n    )\n\n    const hasShellComponent = Vue.computed(() => {\n      if (!route.value?.isRoot) return false\n      return !!(route.value.options as RootRouteOptions).shellComponent\n    })\n\n    const ShellComponent = Vue.computed(() =>\n      hasShellComponent.value\n        ? ((route.value!.options as RootRouteOptions).shellComponent as any)\n        : null,\n    )\n\n    // Provide routeId context (stable string) for children.\n    // MatchInner, Outlet, and useMatch all consume this.\n    Vue.provide(routeIdContext, routeId)\n\n    // Provide reactive nearest-match context for hooks that slice the active\n    // matches array relative to the current match.\n    const matchIdRef = Vue.computed(\n      () => activeMatch.value?.id ?? props.matchId,\n    )\n    Vue.provide(matchContext, matchIdRef)\n\n    Vue.provide(pendingMatchContext, isPendingMatchRef)\n\n    return (): VNode => {\n      const actualMatchId = matchData.value?.matchId ?? props.matchId\n\n      const resolvedNoSsr =\n        matchData.value?.ssr === false || matchData.value?.ssr === 'data-only'\n      const shouldClientOnly =\n        resolvedNoSsr || !!matchData.value?._displayPending\n\n      const renderMatchContent = (): VNode => {\n        const matchInner = Vue.h(MatchInner, { matchId: actualMatchId })\n\n        let content: VNode = shouldClientOnly\n          ? Vue.h(\n              ClientOnly,\n              {\n                fallback: pendingElement.value,\n              },\n              {\n                default: () => matchInner,\n              },\n            )\n          : matchInner\n\n        // Wrap in NotFound boundary if needed\n        if (routeNotFoundComponent.value) {\n          content = Vue.h(CatchNotFound, {\n            fallback: (error: any) => {\n              // If the current not found handler doesn't exist or it has a\n              // route ID which doesn't match the current route, rethrow the error\n              if (\n                !routeNotFoundComponent.value ||\n                (error.routeId && error.routeId !== matchData.value?.routeId) ||\n                (!error.routeId && route.value && !route.value.isRoot)\n              )\n                throw error\n\n              return Vue.h(routeNotFoundComponent.value, error)\n            },\n            children: content,\n          })\n        }\n\n        // Wrap in error boundary if needed\n        if (routeErrorComponent.value) {\n          content = CatchBoundary({\n            getResetKey: () => matchData.value?.loadedAt ?? 0,\n            errorComponent: routeErrorComponent.value || ErrorComponent,\n            onCatch: (error: Error) => {\n              // Forward not found errors (we don't want to show the error component for these)\n              if (isNotFound(error)) throw error\n              if (process.env.NODE_ENV !== 'production') {\n                console.warn(`Warning: Error in route match: ${actualMatchId}`)\n              }\n              routeOnCatch.value?.(error)\n            },\n            children: content,\n          })\n        }\n\n        // Add scroll restoration if needed\n        const withScrollRestoration: Array<VNode> = [\n          content,\n          isChildOfRoot && router.options.scrollRestoration\n            ? Vue.h(Vue.Fragment, null, [\n                Vue.h(OnRendered),\n                Vue.h(ScrollRestoration),\n              ])\n            : null,\n        ].filter(Boolean) as Array<VNode>\n\n        // Return single child directly to avoid Fragment wrapper that causes hydration mismatch\n        if (withScrollRestoration.length === 1) {\n          return withScrollRestoration[0]!\n        }\n\n        return Vue.h(Vue.Fragment, null, withScrollRestoration)\n      }\n\n      if (!hasShellComponent.value) {\n        return renderMatchContent()\n      }\n\n      return Vue.h(ShellComponent.value, null, {\n        // Important: return a fresh VNode on each slot invocation so that shell\n        // components can re-render without reusing a cached VNode instance.\n        default: () => renderMatchContent(),\n      })\n    }\n  },\n})\n\n// On Rendered can't happen above the root layout because it actually\n// renders a dummy dom element to track the rendered state of the app.\n// We render a script tag with a key that changes based on the current\n// location state.__TSR_key. Also, because it's below the root layout, it\n// allows us to fire onRendered events even after a hydration mismatch\n// error that occurred above the root layout (like bad head/link tags,\n// which is common).\nconst OnRendered = Vue.defineComponent({\n  name: 'OnRendered',\n  setup() {\n    const router = useRouter()\n\n    const location = useStore(\n      router.stores.resolvedLocation,\n      (resolvedLocation) => resolvedLocation?.state.__TSR_key,\n    )\n\n    let prevHref: string | undefined\n\n    Vue.watch(\n      location,\n      () => {\n        if (location.value) {\n          const currentHref = router.latestLocation.href\n          if (prevHref === undefined || prevHref !== currentHref) {\n            router.emit({\n              type: 'onRendered',\n              ...getLocationChangeInfo(\n                router.stores.location.state,\n                router.stores.resolvedLocation.state,\n              ),\n            })\n            prevHref = currentHref\n          }\n        }\n      },\n      { immediate: true },\n    )\n\n    return () => null\n  },\n})\n\nexport const MatchInner = Vue.defineComponent({\n  name: 'MatchInner',\n  props: {\n    matchId: {\n      type: String,\n      required: true,\n    },\n  },\n  setup(props) {\n    const router = useRouter()\n\n    // Use routeId from context (provided by parent Match) — stable string.\n    const routeId = Vue.inject(routeIdContext)!\n    const activeMatch = useStore(\n      router.stores.getMatchStoreByRouteId(routeId),\n      (value) => value,\n    )\n\n    // Combined selector for match state AND remount key\n    // This ensures both are computed in the same selector call with consistent data\n    const combinedState = Vue.computed(() => {\n      const match = activeMatch.value\n      if (!match) {\n        // Route no longer exists - truly navigating away\n        return null\n      }\n\n      const matchRouteId = match.routeId as string\n\n      // Compute remount key\n      const remountFn =\n        (router.routesById[matchRouteId] as AnyRoute).options.remountDeps ??\n        router.options.defaultRemountDeps\n\n      let remountKey: string | undefined\n      if (remountFn) {\n        const remountDeps = remountFn({\n          routeId: matchRouteId,\n          loaderDeps: match.loaderDeps,\n          params: match._strictParams,\n          search: match._strictSearch,\n        })\n        remountKey = remountDeps ? JSON.stringify(remountDeps) : undefined\n      }\n\n      return {\n        routeId: matchRouteId,\n        match: {\n          id: match.id,\n          status: match.status,\n          error: match.error,\n          ssr: match.ssr,\n          _forcePending: match._forcePending,\n          _displayPending: match._displayPending,\n        },\n        remountKey,\n      }\n    })\n\n    const route = Vue.computed(() => {\n      if (!combinedState.value) return null\n      return router.routesById[combinedState.value.routeId]!\n    })\n\n    const match = Vue.computed(() => combinedState.value?.match)\n    const remountKey = Vue.computed(() => combinedState.value?.remountKey)\n\n    return (): VNode | null => {\n      // If match doesn't exist, return null (component is being unmounted or not ready)\n      if (!combinedState.value || !match.value || !route.value) return null\n\n      // Handle different match statuses\n      if (match.value._displayPending) {\n        const PendingComponent =\n          route.value.options.pendingComponent ??\n          router.options.defaultPendingComponent\n\n        return PendingComponent ? Vue.h(PendingComponent) : null\n      }\n\n      if (match.value._forcePending) {\n        const PendingComponent =\n          route.value.options.pendingComponent ??\n          router.options.defaultPendingComponent\n\n        return PendingComponent ? Vue.h(PendingComponent) : null\n      }\n\n      if (match.value.status === 'notFound') {\n        if (!isNotFound(match.value.error)) {\n          if (process.env.NODE_ENV !== 'production') {\n            throw new Error('Invariant failed: Expected a notFound error')\n          }\n\n          invariant()\n        }\n        return renderRouteNotFound(router, route.value, match.value.error)\n      }\n\n      if (match.value.status === 'redirected') {\n        if (!isRedirect(match.value.error)) {\n          if (process.env.NODE_ENV !== 'production') {\n            throw new Error('Invariant failed: Expected a redirect error')\n          }\n\n          invariant()\n        }\n        throw router.getMatch(match.value.id)?._nonReactive.loadPromise\n      }\n\n      if (match.value.status === 'error') {\n        // Check if this route or any parent has an error component\n        const RouteErrorComponent =\n          route.value.options.errorComponent ??\n          router.options.defaultErrorComponent\n\n        // If this route has an error component, render it directly\n        // This is more reliable than relying on Vue's error boundary\n        if (RouteErrorComponent) {\n          return Vue.h(RouteErrorComponent, {\n            error: match.value.error,\n            reset: () => {\n              router.invalidate()\n            },\n            info: {\n              componentStack: '',\n            },\n          })\n        }\n\n        // If there's no error component for this route, throw the error\n        // so it can bubble up to the nearest parent with an error component\n        throw match.value.error\n      }\n\n      if (match.value.status === 'pending') {\n        const pendingMinMs =\n          route.value.options.pendingMinMs ?? router.options.defaultPendingMinMs\n\n        const routerMatch = router.getMatch(match.value.id)\n        if (\n          pendingMinMs &&\n          routerMatch &&\n          !routerMatch._nonReactive.minPendingPromise\n        ) {\n          // Create a promise that will resolve after the minPendingMs\n          if (!(isServer ?? router.isServer)) {\n            const minPendingPromise = createControlledPromise<void>()\n\n            routerMatch._nonReactive.minPendingPromise = minPendingPromise\n\n            setTimeout(() => {\n              minPendingPromise.resolve()\n              // We've handled the minPendingPromise, so we can delete it\n              routerMatch._nonReactive.minPendingPromise = undefined\n            }, pendingMinMs)\n          }\n        }\n\n        // In Vue, we render the pending component directly instead of throwing a promise\n        // because Vue's Suspense doesn't catch thrown promises like React does\n        const PendingComponent =\n          route.value.options.pendingComponent ??\n          router.options.defaultPendingComponent\n\n        if (PendingComponent) {\n          return Vue.h(PendingComponent)\n        }\n\n        // If no pending component, return null while loading\n        return null\n      }\n\n      // Success status - render the component with remount key\n      const Comp =\n        route.value.options.component ?? router.options.defaultComponent\n      const key = remountKey.value\n\n      if (Comp) {\n        // Pass key as a prop - Vue.h properly handles 'key' as a special prop\n        return Vue.h(Comp, key !== undefined ? { key } : undefined)\n      }\n\n      return Vue.h(Outlet, key !== undefined ? { key } : undefined)\n    }\n  },\n})\n\nexport const Outlet = Vue.defineComponent({\n  name: 'Outlet',\n  setup() {\n    const router = useRouter()\n    const parentRouteId = Vue.inject(routeIdContext)\n\n    if (!parentRouteId) {\n      return (): VNode | null => null\n    }\n\n    // Parent state via stable routeId store — single subscription\n    const parentMatch = useStore(\n      router.stores.getMatchStoreByRouteId(parentRouteId),\n      (v) => v,\n    )\n\n    const route = Vue.computed(() =>\n      parentMatch.value\n        ? router.routesById[parentMatch.value.routeId as string]!\n        : undefined,\n    )\n\n    const parentGlobalNotFound = Vue.computed(\n      () => parentMatch.value?.globalNotFound ?? false,\n    )\n\n    // Child match lookup: read the child matchId from the shared derived\n    // map (one reactive node for the whole tree), then grab match state\n    // directly from the pool.\n    const childMatchIdMap = useStore(\n      router.stores.childMatchIdByRouteId,\n      (v) => v,\n    )\n\n    const childMatchData = Vue.computed(() => {\n      const childId = childMatchIdMap.value[parentRouteId]\n      if (!childId) return null\n      const child = router.stores.activeMatchStoresById.get(childId)?.state\n      if (!child) return null\n\n      return {\n        id: child.id,\n        // Key based on routeId + params only (not loaderDeps)\n        // This ensures component recreates when params change,\n        // but NOT when only loaderDeps change\n        paramsKey: child.routeId + JSON.stringify(child._strictParams),\n      }\n    })\n\n    return (): VNode | null => {\n      if (parentGlobalNotFound.value) {\n        if (!route.value) {\n          return null\n        }\n        return renderRouteNotFound(router, route.value, undefined)\n      }\n\n      if (!childMatchData.value) {\n        return null\n      }\n\n      const nextMatch = Vue.h(Match, {\n        matchId: childMatchData.value.id,\n        key: childMatchData.value.paramsKey,\n      })\n\n      // Note: We intentionally do NOT wrap in Suspense here.\n      // The top-level Suspense in Matches already covers the root.\n      // The old code compared matchId (e.g. \"__root__/\") with rootRouteId (\"__root__\")\n      // which never matched, so this Suspense was effectively dead code.\n      // With routeId-based lookup, parentRouteId === rootRouteId would match,\n      // causing a double-Suspense that corrupts Vue's DOM during updates.\n      return nextMatch\n    }\n  },\n})\n"],"mappings":"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"}
+{"version":3,"file":"Match.js","names":["Vue","createControlledPromise","getLocationChangeInfo","invariant","isNotFound","isRedirect","rootRouteId","isServer","useStore","CatchBoundary","ErrorComponent","ClientOnly","useRouter","CatchNotFound","matchContext","pendingMatchContext","routeIdContext","renderRouteNotFound","ScrollRestoration","Match","defineComponent","name","props","matchId","type","String","required","setup","router","routeId","stores","activeMatchStoresById","get","process","env","NODE_ENV","Error","isChildOfRoot","routesById","parentRoute","id","activeMatch","getMatchStoreByRouteId","value","isPendingMatchRef","pendingRouteIds","Boolean","equal","Object","is","loadedAt","matchData","computed","match","ssr","_displayPending","route","PendingComponent","options","pendingComponent","defaultPendingComponent","pendingElement","h","undefined","routeErrorComponent","errorComponent","defaultErrorComponent","routeOnCatch","onCatch","defaultOnCatch","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","hasShellComponent","shellComponent","ShellComponent","provide","matchIdRef","actualMatchId","resolvedNoSsr","shouldClientOnly","renderMatchContent","matchInner","MatchInner","content","fallback","default","error","children","getResetKey","console","warn","withScrollRestoration","Fragment","OnRendered","scrollRestoration","filter","length","location","resolvedLocation","state","__TSR_key","prevHref","watch","currentHref","latestLocation","href","emit","immediate","inject","combinedState","matchRouteId","remountFn","remountDeps","defaultRemountDeps","remountKey","loaderDeps","params","_strictParams","search","_strictSearch","JSON","stringify","status","_forcePending","getMatch","_nonReactive","loadPromise","RouteErrorComponent","reset","invalidate","info","componentStack","pendingMinMs","defaultPendingMinMs","routerMatch","minPendingPromise","setTimeout","resolve","Comp","defaultComponent","key","Outlet","parentRouteId","parentMatch","v","parentGlobalNotFound","globalNotFound","childMatchIdMap","childMatchIdByRouteId","childMatchData","childId","child","paramsKey","nextMatch"],"sources":["../../src/Match.tsx"],"sourcesContent":["import * as Vue from 'vue'\nimport {\n  createControlledPromise,\n  getLocationChangeInfo,\n  invariant,\n  isNotFound,\n  isRedirect,\n  rootRouteId,\n} from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { useStore } from '@tanstack/vue-store'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { ClientOnly } from './ClientOnly'\nimport { useRouter } from './useRouter'\nimport { CatchNotFound } from './not-found'\nimport {\n  matchContext,\n  pendingMatchContext,\n  routeIdContext,\n} from './matchContext'\nimport { renderRouteNotFound } from './renderRouteNotFound'\nimport { ScrollRestoration } from './scroll-restoration'\nimport type { VNode } from 'vue'\nimport type { AnyRoute, RootRouteOptions } from '@tanstack/router-core'\n\nexport const Match = Vue.defineComponent({\n  name: 'Match',\n  props: {\n    matchId: {\n      type: String,\n      required: true,\n    },\n  },\n  setup(props) {\n    const router = useRouter()\n\n    // Derive routeId from initial props.matchId — stable for this component's\n    // lifetime. The routeId never changes for a given route position in the\n    // tree, even when matchId changes (loaderDepsHash, etc).\n    const routeId = router.stores.activeMatchStoresById.get(\n      props.matchId,\n    )?.routeId\n\n    if (!routeId) {\n      if (process.env.NODE_ENV !== 'production') {\n        throw new Error(\n          `Invariant failed: Could not find routeId for matchId \"${props.matchId}\". Please file an issue!`,\n        )\n      }\n\n      invariant()\n    }\n\n    // Static route-tree check: is this route a direct child of the root?\n    // parentRoute is set at build time, so no reactive tracking needed.\n    const isChildOfRoot =\n      (router.routesById[routeId] as AnyRoute)?.parentRoute?.id === rootRouteId\n\n    // Single stable store subscription — getMatchStoreByRouteId returns a\n    // cached computed store that resolves routeId → current match state\n    // through the signal graph. No bridge needed.\n    const activeMatch = useStore(\n      router.stores.getMatchStoreByRouteId(routeId),\n      (value) => value,\n    )\n    const isPendingMatchRef = useStore(\n      router.stores.pendingRouteIds,\n      (pendingRouteIds) => Boolean(pendingRouteIds[routeId]),\n      { equal: Object.is },\n    )\n    const loadedAt = useStore(router.stores.loadedAt, (value) => value)\n\n    const matchData = Vue.computed(() => {\n      const match = activeMatch.value\n      if (!match) {\n        return null\n      }\n\n      return {\n        matchId: match.id,\n        routeId,\n        loadedAt: loadedAt.value,\n        ssr: match.ssr,\n        _displayPending: match._displayPending,\n      }\n    })\n\n    const route = Vue.computed(() =>\n      matchData.value ? router.routesById[matchData.value.routeId] : null,\n    )\n\n    const PendingComponent = Vue.computed(\n      () =>\n        route.value?.options?.pendingComponent ??\n        router?.options?.defaultPendingComponent,\n    )\n\n    const pendingElement = Vue.computed(() =>\n      PendingComponent.value ? Vue.h(PendingComponent.value) : undefined,\n    )\n\n    const routeErrorComponent = Vue.computed(\n      () =>\n        route.value?.options?.errorComponent ??\n        router?.options?.defaultErrorComponent,\n    )\n\n    const routeOnCatch = Vue.computed(\n      () => route.value?.options?.onCatch ?? router?.options?.defaultOnCatch,\n    )\n\n    const routeNotFoundComponent = Vue.computed(() =>\n      route.value?.isRoot\n        ? // If it's the root route, use the globalNotFound option, with fallback to the notFoundRoute's component\n          (route.value?.options?.notFoundComponent ??\n          router?.options?.notFoundRoute?.options?.component)\n        : route.value?.options?.notFoundComponent,\n    )\n\n    const hasShellComponent = Vue.computed(() => {\n      if (!route.value?.isRoot) return false\n      return !!(route.value.options as RootRouteOptions).shellComponent\n    })\n\n    const ShellComponent = Vue.computed(() =>\n      hasShellComponent.value\n        ? ((route.value!.options as RootRouteOptions).shellComponent as any)\n        : null,\n    )\n\n    // Provide routeId context (stable string) for children.\n    // MatchInner, Outlet, and useMatch all consume this.\n    Vue.provide(routeIdContext, routeId)\n\n    // Provide reactive nearest-match context for hooks that slice the active\n    // matches array relative to the current match.\n    const matchIdRef = Vue.computed(\n      () => activeMatch.value?.id ?? props.matchId,\n    )\n    Vue.provide(matchContext, matchIdRef)\n\n    Vue.provide(pendingMatchContext, isPendingMatchRef)\n\n    return (): VNode => {\n      const actualMatchId = matchData.value?.matchId ?? props.matchId\n\n      const resolvedNoSsr =\n        matchData.value?.ssr === false || matchData.value?.ssr === 'data-only'\n      const shouldClientOnly =\n        resolvedNoSsr || !!matchData.value?._displayPending\n\n      const renderMatchContent = (): VNode => {\n        const matchInner = Vue.h(MatchInner, { matchId: actualMatchId })\n\n        let content: VNode = shouldClientOnly\n          ? Vue.h(\n              ClientOnly,\n              {\n                fallback: pendingElement.value,\n              },\n              {\n                default: () => matchInner,\n              },\n            )\n          : matchInner\n\n        // Wrap in NotFound boundary if needed\n        if (routeNotFoundComponent.value) {\n          content = Vue.h(CatchNotFound, {\n            fallback: (error: any) => {\n              // If the current not found handler doesn't exist or it has a\n              // route ID which doesn't match the current route, rethrow the error\n              if (\n                !routeNotFoundComponent.value ||\n                (error.routeId && error.routeId !== matchData.value?.routeId) ||\n                (!error.routeId && route.value && !route.value.isRoot)\n              )\n                throw error\n\n              return Vue.h(routeNotFoundComponent.value, error)\n            },\n            children: content,\n          })\n        }\n\n        // Wrap in error boundary if needed\n        if (routeErrorComponent.value) {\n          content = CatchBoundary({\n            getResetKey: () => matchData.value?.loadedAt ?? 0,\n            errorComponent: routeErrorComponent.value || ErrorComponent,\n            onCatch: (error: Error) => {\n              // Forward not found errors (we don't want to show the error component for these)\n              if (isNotFound(error)) throw error\n              if (process.env.NODE_ENV !== 'production') {\n                console.warn(`Warning: Error in route match: ${actualMatchId}`)\n              }\n              routeOnCatch.value?.(error)\n            },\n            children: content,\n          })\n        }\n\n        // Add scroll restoration if needed\n        const withScrollRestoration: Array<VNode> = [\n          content,\n          isChildOfRoot\n            ? Vue.h(Vue.Fragment, null, [\n                Vue.h(OnRendered),\n                router.options.scrollRestoration &&\n                (isServer ?? router.isServer)\n                  ? Vue.h(ScrollRestoration)\n                  : null,\n              ])\n            : null,\n        ].filter(Boolean) as Array<VNode>\n\n        // Return single child directly to avoid Fragment wrapper that causes hydration mismatch\n        if (withScrollRestoration.length === 1) {\n          return withScrollRestoration[0]!\n        }\n\n        return Vue.h(Vue.Fragment, null, withScrollRestoration)\n      }\n\n      if (!hasShellComponent.value) {\n        return renderMatchContent()\n      }\n\n      return Vue.h(ShellComponent.value, null, {\n        // Important: return a fresh VNode on each slot invocation so that shell\n        // components can re-render without reusing a cached VNode instance.\n        default: () => renderMatchContent(),\n      })\n    }\n  },\n})\n\n// On Rendered can't happen above the root layout because it actually\n// renders a dummy dom element to track the rendered state of the app.\n// We render a script tag with a key that changes based on the current\n// location state.__TSR_key. Also, because it's below the root layout, it\n// allows us to fire onRendered events even after a hydration mismatch\n// error that occurred above the root layout (like bad head/link tags,\n// which is common).\nconst OnRendered = Vue.defineComponent({\n  name: 'OnRendered',\n  setup() {\n    const router = useRouter()\n\n    const location = useStore(\n      router.stores.resolvedLocation,\n      (resolvedLocation) => resolvedLocation?.state.__TSR_key,\n    )\n\n    let prevHref: string | undefined\n\n    Vue.watch(\n      location,\n      () => {\n        if (location.value) {\n          const currentHref = router.latestLocation.href\n          if (prevHref === undefined || prevHref !== currentHref) {\n            router.emit({\n              type: 'onRendered',\n              ...getLocationChangeInfo(\n                router.stores.location.state,\n                router.stores.resolvedLocation.state,\n              ),\n            })\n            prevHref = currentHref\n          }\n        }\n      },\n      { immediate: true },\n    )\n\n    return () => null\n  },\n})\n\nexport const MatchInner = Vue.defineComponent({\n  name: 'MatchInner',\n  props: {\n    matchId: {\n      type: String,\n      required: true,\n    },\n  },\n  setup(props) {\n    const router = useRouter()\n\n    // Use routeId from context (provided by parent Match) — stable string.\n    const routeId = Vue.inject(routeIdContext)!\n    const activeMatch = useStore(\n      router.stores.getMatchStoreByRouteId(routeId),\n      (value) => value,\n    )\n\n    // Combined selector for match state AND remount key\n    // This ensures both are computed in the same selector call with consistent data\n    const combinedState = Vue.computed(() => {\n      const match = activeMatch.value\n      if (!match) {\n        // Route no longer exists - truly navigating away\n        return null\n      }\n\n      const matchRouteId = match.routeId as string\n\n      // Compute remount key\n      const remountFn =\n        (router.routesById[matchRouteId] as AnyRoute).options.remountDeps ??\n        router.options.defaultRemountDeps\n\n      let remountKey: string | undefined\n      if (remountFn) {\n        const remountDeps = remountFn({\n          routeId: matchRouteId,\n          loaderDeps: match.loaderDeps,\n          params: match._strictParams,\n          search: match._strictSearch,\n        })\n        remountKey = remountDeps ? JSON.stringify(remountDeps) : undefined\n      }\n\n      return {\n        routeId: matchRouteId,\n        match: {\n          id: match.id,\n          status: match.status,\n          error: match.error,\n          ssr: match.ssr,\n          _forcePending: match._forcePending,\n          _displayPending: match._displayPending,\n        },\n        remountKey,\n      }\n    })\n\n    const route = Vue.computed(() => {\n      if (!combinedState.value) return null\n      return router.routesById[combinedState.value.routeId]!\n    })\n\n    const match = Vue.computed(() => combinedState.value?.match)\n    const remountKey = Vue.computed(() => combinedState.value?.remountKey)\n\n    return (): VNode | null => {\n      // If match doesn't exist, return null (component is being unmounted or not ready)\n      if (!combinedState.value || !match.value || !route.value) return null\n\n      // Handle different match statuses\n      if (match.value._displayPending) {\n        const PendingComponent =\n          route.value.options.pendingComponent ??\n          router.options.defaultPendingComponent\n\n        return PendingComponent ? Vue.h(PendingComponent) : null\n      }\n\n      if (match.value._forcePending) {\n        const PendingComponent =\n          route.value.options.pendingComponent ??\n          router.options.defaultPendingComponent\n\n        return PendingComponent ? Vue.h(PendingComponent) : null\n      }\n\n      if (match.value.status === 'notFound') {\n        if (!isNotFound(match.value.error)) {\n          if (process.env.NODE_ENV !== 'production') {\n            throw new Error('Invariant failed: Expected a notFound error')\n          }\n\n          invariant()\n        }\n        return renderRouteNotFound(router, route.value, match.value.error)\n      }\n\n      if (match.value.status === 'redirected') {\n        if (!isRedirect(match.value.error)) {\n          if (process.env.NODE_ENV !== 'production') {\n            throw new Error('Invariant failed: Expected a redirect error')\n          }\n\n          invariant()\n        }\n        throw router.getMatch(match.value.id)?._nonReactive.loadPromise\n      }\n\n      if (match.value.status === 'error') {\n        // Check if this route or any parent has an error component\n        const RouteErrorComponent =\n          route.value.options.errorComponent ??\n          router.options.defaultErrorComponent\n\n        // If this route has an error component, render it directly\n        // This is more reliable than relying on Vue's error boundary\n        if (RouteErrorComponent) {\n          return Vue.h(RouteErrorComponent, {\n            error: match.value.error,\n            reset: () => {\n              router.invalidate()\n            },\n            info: {\n              componentStack: '',\n            },\n          })\n        }\n\n        // If there's no error component for this route, throw the error\n        // so it can bubble up to the nearest parent with an error component\n        throw match.value.error\n      }\n\n      if (match.value.status === 'pending') {\n        const pendingMinMs =\n          route.value.options.pendingMinMs ?? router.options.defaultPendingMinMs\n\n        const routerMatch = router.getMatch(match.value.id)\n        if (\n          pendingMinMs &&\n          routerMatch &&\n          !routerMatch._nonReactive.minPendingPromise\n        ) {\n          // Create a promise that will resolve after the minPendingMs\n          if (!(isServer ?? router.isServer)) {\n            const minPendingPromise = createControlledPromise<void>()\n\n            routerMatch._nonReactive.minPendingPromise = minPendingPromise\n\n            setTimeout(() => {\n              minPendingPromise.resolve()\n              // We've handled the minPendingPromise, so we can delete it\n              routerMatch._nonReactive.minPendingPromise = undefined\n            }, pendingMinMs)\n          }\n        }\n\n        // In Vue, we render the pending component directly instead of throwing a promise\n        // because Vue's Suspense doesn't catch thrown promises like React does\n        const PendingComponent =\n          route.value.options.pendingComponent ??\n          router.options.defaultPendingComponent\n\n        if (PendingComponent) {\n          return Vue.h(PendingComponent)\n        }\n\n        // If no pending component, return null while loading\n        return null\n      }\n\n      // Success status - render the component with remount key\n      const Comp =\n        route.value.options.component ?? router.options.defaultComponent\n      const key = remountKey.value\n\n      if (Comp) {\n        // Pass key as a prop - Vue.h properly handles 'key' as a special prop\n        return Vue.h(Comp, key !== undefined ? { key } : undefined)\n      }\n\n      return Vue.h(Outlet, key !== undefined ? { key } : undefined)\n    }\n  },\n})\n\nexport const Outlet = Vue.defineComponent({\n  name: 'Outlet',\n  setup() {\n    const router = useRouter()\n    const parentRouteId = Vue.inject(routeIdContext)\n\n    if (!parentRouteId) {\n      return (): VNode | null => null\n    }\n\n    // Parent state via stable routeId store — single subscription\n    const parentMatch = useStore(\n      router.stores.getMatchStoreByRouteId(parentRouteId),\n      (v) => v,\n    )\n\n    const route = Vue.computed(() =>\n      parentMatch.value\n        ? router.routesById[parentMatch.value.routeId as string]!\n        : undefined,\n    )\n\n    const parentGlobalNotFound = Vue.computed(\n      () => parentMatch.value?.globalNotFound ?? false,\n    )\n\n    // Child match lookup: read the child matchId from the shared derived\n    // map (one reactive node for the whole tree), then grab match state\n    // directly from the pool.\n    const childMatchIdMap = useStore(\n      router.stores.childMatchIdByRouteId,\n      (v) => v,\n    )\n\n    const childMatchData = Vue.computed(() => {\n      const childId = childMatchIdMap.value[parentRouteId]\n      if (!childId) return null\n      const child = router.stores.activeMatchStoresById.get(childId)?.state\n      if (!child) return null\n\n      return {\n        id: child.id,\n        // Key based on routeId + params only (not loaderDeps)\n        // This ensures component recreates when params change,\n        // but NOT when only loaderDeps change\n        paramsKey: child.routeId + JSON.stringify(child._strictParams),\n      }\n    })\n\n    return (): VNode | null => {\n      if (parentGlobalNotFound.value) {\n        if (!route.value) {\n          return null\n        }\n        return renderRouteNotFound(router, route.value, undefined)\n      }\n\n      if (!childMatchData.value) {\n        return null\n      }\n\n      const nextMatch = Vue.h(Match, {\n        matchId: childMatchData.value.id,\n        key: childMatchData.value.paramsKey,\n      })\n\n      // Note: We intentionally do NOT wrap in Suspense here.\n      // The top-level Suspense in Matches already covers the root.\n      // The old code compared matchId (e.g. \"__root__/\") with rootRouteId (\"__root__\")\n      // which never matched, so this Suspense was effectively dead code.\n      // With routeId-based lookup, parentRouteId === rootRouteId would match,\n      // causing a double-Suspense that corrupts Vue's DOM during updates.\n      return nextMatch\n    }\n  },\n})\n"],"mappings":";;;;;;;;;;;;AAyBA,IAAamB,QAAQnB,IAAIoB,gBAAgB;CACvCC,MAAM;CACNC,OAAO,EACLC,SAAS;EACPC,MAAMC;EACNC,UAAU;EACZ,EACD;CACDC,MAAML,OAAO;EACX,MAAMM,SAAShB,WAAW;EAK1B,MAAMiB,UAAUD,OAAOE,OAAOC,sBAAsBC,IAClDV,MAAMC,QACP,EAAEM;AAEH,MAAI,CAACA,SAAS;AACZ,OAAA,QAAA,IAAA,aAA6B,aAC3B,OAAM,IAAIO,MACR,yDAAyDd,MAAMC,QAAO,0BACvE;AAGHpB,cAAW;;EAKb,MAAMkC,gBACHT,OAAOU,WAAWT,UAAuBU,aAAaC,OAAOlC;EAKhE,MAAMmC,cAAcjC,SAClBoB,OAAOE,OAAOY,uBAAuBb,QAAQ,GAC5Cc,UAAUA,MACZ;EACD,MAAMC,oBAAoBpC,SACxBoB,OAAOE,OAAOe,kBACbA,oBAAoBC,QAAQD,gBAAgBhB,SAAS,EACtD,EAAEkB,OAAOC,OAAOC,IAClB,CAAC;EACD,MAAMC,WAAW1C,SAASoB,OAAOE,OAAOoB,WAAWP,UAAUA,MAAM;EAEnE,MAAMQ,YAAYnD,IAAIoD,eAAe;GACnC,MAAMC,QAAQZ,YAAYE;AAC1B,OAAI,CAACU,MACH,QAAO;AAGT,UAAO;IACL9B,SAAS8B,MAAMb;IACfX;IACAqB,UAAUA,SAASP;IACnBW,KAAKD,MAAMC;IACXC,iBAAiBF,MAAME;IACxB;IACD;EAEF,MAAMC,QAAQxD,IAAIoD,eAChBD,UAAUR,QAAQf,OAAOU,WAAWa,UAAUR,MAAMd,WAAW,KAChE;EAED,MAAM4B,mBAAmBzD,IAAIoD,eAEzBI,MAAMb,OAAOe,SAASC,oBACtB/B,QAAQ8B,SAASE,wBACpB;EAED,MAAMC,iBAAiB7D,IAAIoD,eACzBK,iBAAiBd,QAAQ3C,IAAI8D,EAAEL,iBAAiBd,MAAM,GAAGoB,KAAAA,EAC1D;EAED,MAAMC,sBAAsBhE,IAAIoD,eAE5BI,MAAMb,OAAOe,SAASO,kBACtBrC,QAAQ8B,SAASQ,sBACpB;EAED,MAAMC,eAAenE,IAAIoD,eACjBI,MAAMb,OAAOe,SAASU,WAAWxC,QAAQ8B,SAASW,eACzD;EAED,MAAMC,yBAAyBtE,IAAIoD,eACjCI,MAAMb,OAAO4B,SAERf,MAAMb,OAAOe,SAASc,qBACvB5C,QAAQ8B,SAASe,eAAef,SAASgB,YACzClB,MAAMb,OAAOe,SAASc,kBAC3B;EAED,MAAMG,oBAAoB3E,IAAIoD,eAAe;AAC3C,OAAI,CAACI,MAAMb,OAAO4B,OAAQ,QAAO;AACjC,UAAO,CAAC,CAAEf,MAAMb,MAAMe,QAA6BkB;IACnD;EAEF,MAAMC,iBAAiB7E,IAAIoD,eACzBuB,kBAAkBhC,QACZa,MAAMb,MAAOe,QAA6BkB,iBAC5C,KACL;AAID5E,MAAI8E,QAAQ9D,gBAAgBa,QAAQ;EAIpC,MAAMkD,aAAa/E,IAAIoD,eACfX,YAAYE,OAAOH,MAAMlB,MAAMC,QACtC;AACDvB,MAAI8E,QAAQhE,cAAciE,WAAW;AAErC/E,MAAI8E,QAAQ/D,qBAAqB6B,kBAAkB;AAEnD,eAAoB;GAClB,MAAMoC,gBAAgB7B,UAAUR,OAAOpB,WAAWD,MAAMC;GAIxD,MAAM2D,mBADJ/B,UAAUR,OAAOW,QAAQ,SAASH,UAAUR,OAAOW,QAAQ,eAE1C,CAAC,CAACH,UAAUR,OAAOY;GAEtC,MAAM4B,2BAAkC;IACtC,MAAMC,aAAapF,IAAI8D,EAAEuB,YAAY,EAAE9D,SAASyD,eAAe,CAAC;IAEhE,IAAIM,UAAiBJ,mBACjBlF,IAAI8D,EACFnD,YACA,EACE4E,UAAU1B,eAAelB,OAC1B,EACD,EACE6C,eAAeJ,YAEnB,CAAC,GACDA;AAGJ,QAAId,uBAAuB3B,MACzB2C,WAAUtF,IAAI8D,EAAEjD,eAAe;KAC7B0E,WAAWE,UAAe;AAGxB,UACE,CAACnB,uBAAuB3B,SACvB8C,MAAM5D,WAAW4D,MAAM5D,YAAYsB,UAAUR,OAAOd,WACpD,CAAC4D,MAAM5D,WAAW2B,MAAMb,SAAS,CAACa,MAAMb,MAAM4B,OAE/C,OAAMkB;AAER,aAAOzF,IAAI8D,EAAEQ,uBAAuB3B,OAAO8C,MAAM;;KAEnDC,UAAUJ;KACX,CAAC;AAIJ,QAAItB,oBAAoBrB,MACtB2C,WAAU7E,cAAc;KACtBkF,mBAAmBxC,UAAUR,OAAOO,YAAY;KAChDe,gBAAgBD,oBAAoBrB,SAASjC;KAC7C0D,UAAUqB,UAAiB;AAEzB,UAAIrF,WAAWqF,MAAM,CAAE,OAAMA;AAC7B,UAAA,QAAA,IAAA,aAA6B,aAC3BG,SAAQC,KAAK,kCAAkCb,gBAAgB;AAEjEb,mBAAaxB,QAAQ8C,MAAM;;KAE7BC,UAAUJ;KACX,CAAC;IAIJ,MAAMQ,wBAAsC,CAC1CR,SACAjD,gBACIrC,IAAI8D,EAAE9D,IAAI+F,UAAU,MAAM,CACxB/F,IAAI8D,EAAEkC,WAAW,EACjBpE,OAAO8B,QAAQuC,sBACd1F,YAAYqB,OAAOrB,YAChBP,IAAI8D,EAAE5C,kBAAkB,GACxB,KACL,CAAC,GACF,KACL,CAACgF,OAAOpD,QAAwB;AAGjC,QAAIgD,sBAAsBK,WAAW,EACnC,QAAOL,sBAAsB;AAG/B,WAAO9F,IAAI8D,EAAE9D,IAAI+F,UAAU,MAAMD,sBAAsB;;AAGzD,OAAI,CAACnB,kBAAkBhC,MACrB,QAAOwC,oBAAoB;AAG7B,UAAOnF,IAAI8D,EAAEe,eAAelC,OAAO,MAAM,EAGvC6C,eAAeL,oBAAmB,EACnC,CAAC;;;CAGP,CAAC;AASF,IAAMa,aAAahG,IAAIoB,gBAAgB;CACrCC,MAAM;CACNM,QAAQ;EACN,MAAMC,SAAShB,WAAW;EAE1B,MAAMwF,WAAW5F,SACfoB,OAAOE,OAAOuE,mBACbA,qBAAqBA,kBAAkBC,MAAMC,UAC/C;EAED,IAAIC;AAEJxG,MAAIyG,MACFL,gBACM;AACJ,OAAIA,SAASzD,OAAO;IAClB,MAAM+D,cAAc9E,OAAO+E,eAAeC;AAC1C,QAAIJ,aAAazC,KAAAA,KAAayC,aAAaE,aAAa;AACtD9E,YAAOiF,KAAK;MACVrF,MAAM;MACN,GAAGtB,sBACD0B,OAAOE,OAAOsE,SAASE,OACvB1E,OAAOE,OAAOuE,iBAAiBC,MACjC;MACD,CAAC;AACFE,gBAAWE;;;KAIjB,EAAEI,WAAW,MACf,CAAC;AAED,eAAa;;CAEhB,CAAC;AAEF,IAAazB,aAAarF,IAAIoB,gBAAgB;CAC5CC,MAAM;CACNC,OAAO,EACLC,SAAS;EACPC,MAAMC;EACNC,UAAU;EACZ,EACD;CACDC,MAAML,OAAO;EACX,MAAMM,SAAShB,WAAW;EAG1B,MAAMiB,UAAU7B,IAAI+G,OAAO/F,eAAgB;EAC3C,MAAMyB,cAAcjC,SAClBoB,OAAOE,OAAOY,uBAAuBb,QAAQ,GAC5Cc,UAAUA,MACZ;EAID,MAAMqE,gBAAgBhH,IAAIoD,eAAe;GACvC,MAAMC,QAAQZ,YAAYE;AAC1B,OAAI,CAACU,MAEH,QAAO;GAGT,MAAM4D,eAAe5D,MAAMxB;GAG3B,MAAMqF,YACHtF,OAAOU,WAAW2E,cAA2BvD,QAAQyD,eACtDvF,OAAO8B,QAAQ0D;GAEjB,IAAIC;AACJ,OAAIH,WAAW;IACb,MAAMC,cAAcD,UAAU;KAC5BrF,SAASoF;KACTK,YAAYjE,MAAMiE;KAClBC,QAAQlE,MAAMmE;KACdC,QAAQpE,MAAMqE;KACf,CAAC;AACFL,iBAAaF,cAAcQ,KAAKC,UAAUT,YAAY,GAAGpD,KAAAA;;AAG3D,UAAO;IACLlC,SAASoF;IACT5D,OAAO;KACLb,IAAIa,MAAMb;KACVqF,QAAQxE,MAAMwE;KACdpC,OAAOpC,MAAMoC;KACbnC,KAAKD,MAAMC;KACXwE,eAAezE,MAAMyE;KACrBvE,iBAAiBF,MAAME;KACxB;IACD8D;IACD;IACD;EAEF,MAAM7D,QAAQxD,IAAIoD,eAAe;AAC/B,OAAI,CAAC4D,cAAcrE,MAAO,QAAO;AACjC,UAAOf,OAAOU,WAAW0E,cAAcrE,MAAMd;IAC7C;EAEF,MAAMwB,QAAQrD,IAAIoD,eAAe4D,cAAcrE,OAAOU,MAAM;EAC5D,MAAMgE,aAAarH,IAAIoD,eAAe4D,cAAcrE,OAAO0E,WAAW;AAEtE,eAA2B;AAEzB,OAAI,CAACL,cAAcrE,SAAS,CAACU,MAAMV,SAAS,CAACa,MAAMb,MAAO,QAAO;AAGjE,OAAIU,MAAMV,MAAMY,iBAAiB;IAC/B,MAAME,mBACJD,MAAMb,MAAMe,QAAQC,oBACpB/B,OAAO8B,QAAQE;AAEjB,WAAOH,mBAAmBzD,IAAI8D,EAAEL,iBAAiB,GAAG;;AAGtD,OAAIJ,MAAMV,MAAMmF,eAAe;IAC7B,MAAMrE,mBACJD,MAAMb,MAAMe,QAAQC,oBACpB/B,OAAO8B,QAAQE;AAEjB,WAAOH,mBAAmBzD,IAAI8D,EAAEL,iBAAiB,GAAG;;AAGtD,OAAIJ,MAAMV,MAAMkF,WAAW,YAAY;AACrC,QAAI,CAACzH,WAAWiD,MAAMV,MAAM8C,MAAM,EAAE;AAClC,SAAA,QAAA,IAAA,aAA6B,aAC3B,OAAM,IAAIrD,MAAM,8CAA8C;AAGhEjC,gBAAW;;AAEb,WAAOc,oBAAoBW,QAAQ4B,MAAMb,OAAOU,MAAMV,MAAM8C,MAAM;;AAGpE,OAAIpC,MAAMV,MAAMkF,WAAW,cAAc;AACvC,QAAI,CAACxH,WAAWgD,MAAMV,MAAM8C,MAAM,EAAE;AAClC,SAAA,QAAA,IAAA,aAA6B,aAC3B,OAAM,IAAIrD,MAAM,8CAA8C;AAGhEjC,gBAAW;;AAEb,UAAMyB,OAAOmG,SAAS1E,MAAMV,MAAMH,GAAG,EAAEwF,aAAaC;;AAGtD,OAAI5E,MAAMV,MAAMkF,WAAW,SAAS;IAElC,MAAMK,sBACJ1E,MAAMb,MAAMe,QAAQO,kBACpBrC,OAAO8B,QAAQQ;AAIjB,QAAIgE,oBACF,QAAOlI,IAAI8D,EAAEoE,qBAAqB;KAChCzC,OAAOpC,MAAMV,MAAM8C;KACnB0C,aAAa;AACXvG,aAAOwG,YAAY;;KAErBC,MAAM,EACJC,gBAAgB,IAClB;KACD,CAAC;AAKJ,UAAMjF,MAAMV,MAAM8C;;AAGpB,OAAIpC,MAAMV,MAAMkF,WAAW,WAAW;IACpC,MAAMU,eACJ/E,MAAMb,MAAMe,QAAQ6E,gBAAgB3G,OAAO8B,QAAQ8E;IAErD,MAAMC,cAAc7G,OAAOmG,SAAS1E,MAAMV,MAAMH,GAAG;AACnD,QACE+F,gBACAE,eACA,CAACA,YAAYT,aAAaU;SAGtB,EAAEnI,YAAYqB,OAAOrB,WAAW;MAClC,MAAMmI,oBAAoBzI,yBAA+B;AAEzDwI,kBAAYT,aAAaU,oBAAoBA;AAE7CC,uBAAiB;AACfD,yBAAkBE,SAAS;AAE3BH,mBAAYT,aAAaU,oBAAoB3E,KAAAA;SAC5CwE,aAAa;;;IAMpB,MAAM9E,mBACJD,MAAMb,MAAMe,QAAQC,oBACpB/B,OAAO8B,QAAQE;AAEjB,QAAIH,iBACF,QAAOzD,IAAI8D,EAAEL,iBAAiB;AAIhC,WAAO;;GAIT,MAAMoF,OACJrF,MAAMb,MAAMe,QAAQgB,aAAa9C,OAAO8B,QAAQoF;GAClD,MAAMC,MAAM1B,WAAW1E;AAEvB,OAAIkG,KAEF,QAAO7I,IAAI8D,EAAE+E,MAAME,QAAQhF,KAAAA,IAAY,EAAEgF,KAAK,GAAGhF,KAAAA,EAAU;AAG7D,UAAO/D,IAAI8D,EAAEkF,QAAQD,QAAQhF,KAAAA,IAAY,EAAEgF,KAAK,GAAGhF,KAAAA,EAAU;;;CAGlE,CAAC;AAEF,IAAaiF,SAAShJ,IAAIoB,gBAAgB;CACxCC,MAAM;CACNM,QAAQ;EACN,MAAMC,SAAShB,WAAW;EAC1B,MAAMqI,gBAAgBjJ,IAAI+G,OAAO/F,eAAe;AAEhD,MAAI,CAACiI,cACH,cAA2B;EAI7B,MAAMC,cAAc1I,SAClBoB,OAAOE,OAAOY,uBAAuBuG,cAAc,GAClDE,MAAMA,EACR;EAED,MAAM3F,QAAQxD,IAAIoD,eAChB8F,YAAYvG,QACRf,OAAOU,WAAW4G,YAAYvG,MAAMd,WACpCkC,KAAAA,EACL;EAED,MAAMqF,uBAAuBpJ,IAAIoD,eACzB8F,YAAYvG,OAAO0G,kBAAkB,MAC5C;EAKD,MAAMC,kBAAkB9I,SACtBoB,OAAOE,OAAOyH,wBACbJ,MAAMA,EACR;EAED,MAAMK,iBAAiBxJ,IAAIoD,eAAe;GACxC,MAAMqG,UAAUH,gBAAgB3G,MAAMsG;AACtC,OAAI,CAACQ,QAAS,QAAO;GACrB,MAAMC,QAAQ9H,OAAOE,OAAOC,sBAAsBC,IAAIyH,QAAQ,EAAEnD;AAChE,OAAI,CAACoD,MAAO,QAAO;AAEnB,UAAO;IACLlH,IAAIkH,MAAMlH;IAIVmH,WAAWD,MAAM7H,UAAU8F,KAAKC,UAAU8B,MAAMlC,cAAa;IAC9D;IACD;AAEF,eAA2B;AACzB,OAAI4B,qBAAqBzG,OAAO;AAC9B,QAAI,CAACa,MAAMb,MACT,QAAO;AAET,WAAO1B,oBAAoBW,QAAQ4B,MAAMb,OAAOoB,KAAAA,EAAU;;AAG5D,OAAI,CAACyF,eAAe7G,MAClB,QAAO;AAcT,UAXkB3C,IAAI8D,EAAE3C,OAAO;IAC7BI,SAASiI,eAAe7G,MAAMH;IAC9BuG,KAAKS,eAAe7G,MAAMgH;IAC3B,CAAC;;;CAWP,CAAC"}

package/dist/esm/ScrollRestoration.js

@@ -1,5 +1,5 @@
 import { useRouter } from "./useRouter.js";
-import { defaultGetScrollRestorationKey, getCssSelector, scrollRestorationCache, setupScrollRestoration } from "@tanstack/router-core";
+import { getElementScrollRestorationEntry, setupScrollRestoration } from "@tanstack/router-core";
 //#region src/ScrollRestoration.tsx
 function useScrollRestoration() {
 	setupScrollRestoration(useRouter(), true);
@@ -14,17 +14,7 @@ function ScrollRestoration(_props) {
 }
 function useElementScrollRestoration(options) {
 	useScrollRestoration();
-	const router = useRouter();
-	const getKey = options.getKey || defaultGetScrollRestorationKey;
-	let elementSelector = "";
-	if (options.id) elementSelector = `[data-scroll-restoration-id="${options.id}"]`;
-	else {
-		const element = options.getElement?.();
-		if (!element) return;
-		elementSelector = element instanceof Window ? "window" : getCssSelector(element);
-	}
-	const restoreKey = getKey(router.latestLocation);
-	return (scrollRestorationCache?.state[restoreKey])?.[elementSelector];
+	return getElementScrollRestorationEntry(useRouter(), options);
 }
 //#endregion
 export { ScrollRestoration, useElementScrollRestoration };

package/dist/esm/ScrollRestoration.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScrollRestoration.js","names":["defaultGetScrollRestorationKey","getCssSelector","scrollRestorationCache","setupScrollRestoration","useRouter","useScrollRestoration","router","ScrollRestoration","_props","process","env","NODE_ENV","console","warn","useElementScrollRestoration","options","getKey","elementSelector","id","element","getElement","Window","restoreKey","latestLocation","byKey","state"],"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"],"mappings":";;;AAaA,SAASK,uBAAuB;AAE9BF,wBADeC,WAAW,EACK,KAAK;;;;;AAMtC,SAAgBG,kBAAkBC,QAAkC;AAClEH,uBAAsB;AAEtB,KAAA,QAAA,IAAA,aAA6B,cAC3BO,SAAQC,KACN,wGACD;AAGH,QAAO;;AAGT,SAAgBC,4BACdC,SAYoC;AACpCV,uBAAsB;CAEtB,MAAMC,SAASF,WAAW;CAC1B,MAAMY,SAASD,QAAQC,UAAUhB;CAEjC,IAAIiB,kBAAkB;AAEtB,KAAIF,QAAQG,GACVD,mBAAkB,gCAAgCF,QAAQG,GAAE;MACvD;EACL,MAAMC,UAAUJ,QAAQK,cAAc;AACtC,MAAI,CAACD,QACH;AAEFF,oBACEE,mBAAmBE,SAAS,WAAWpB,eAAekB,QAAQ;;CAGlE,MAAMG,aAAaN,OAAOV,OAAOiB,eAAe;AAEhD,SADcrB,wBAAwBuB,MAAMH,eAC7BL"}
+{"version":3,"file":"ScrollRestoration.js","names":["getElementScrollRestorationEntry","setupScrollRestoration","useRouter","useScrollRestoration","router","ScrollRestoration","_props","process","env","NODE_ENV","console","warn","useElementScrollRestoration","options"],"sources":["../../src/ScrollRestoration.tsx"],"sourcesContent":["import {\n  getElementScrollRestorationEntry,\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  return getElementScrollRestorationEntry(useRouter(), options)\n}\n"],"mappings":";;;AAWA,SAASG,uBAAuB;AAE9BF,wBADeC,WAAW,EACK,KAAK;;;;;AAMtC,SAAgBG,kBAAkBC,QAAkC;AAClEH,uBAAsB;AAEtB,KAAA,QAAA,IAAA,aAA6B,cAC3BO,SAAQC,KACN,wGACD;AAGH,QAAO;;AAGT,SAAgBC,4BACdC,SAYoC;AACpCV,uBAAsB;AAEtB,QAAOH,iCAAiCE,WAAW,EAAEW,QAAQ"}

package/dist/esm/scroll-restoration.d.ts

@@ -1,8 +1,2 @@
 import * as Vue from 'vue';
-/**
- * ScrollRestoration component for Vue.
- * On server: renders a ScriptOnce with scroll restoration logic.
- * On client during hydration: renders a matching ScriptOnce to avoid mismatch.
- * After mount: renders nothing.
- */
 export declare const ScrollRestoration: Vue.DefineComponent<{}, () => import("vue/jsx-runtime").JSX.Element | null, {}, {}, {}, Vue.ComponentOptionsMixin, Vue.ComponentOptionsMixin, {}, string, Vue.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, Vue.ComponentProvideOptions, true, {}, any>;

package/dist/esm/scroll-restoration.js

@@ -1,39 +1,17 @@
 import { useRouter } from "./useRouter.js";
 import { ScriptOnce } from "./ScriptOnce.js";
-import { defaultGetScrollRestorationKey, escapeHtml, restoreScroll, storageKey } from "@tanstack/router-core";
 import * as Vue from "vue";
 import { createVNode } from "vue";
-import { isServer } from "@tanstack/router-core/isServer";
+import { getScrollRestorationScriptForRouter } from "@tanstack/router-core/scroll-restoration-script";
 //#region src/scroll-restoration.tsx
-/**
-* ScrollRestoration component for Vue.
-* On server: renders a ScriptOnce with scroll restoration logic.
-* On client during hydration: renders a matching ScriptOnce to avoid mismatch.
-* After mount: renders nothing.
-*/
 var ScrollRestoration = Vue.defineComponent({
 	name: "ScrollRestoration",
 	setup() {
 		const router = useRouter();
-		const mounted = Vue.ref(false);
-		Vue.onMounted(() => {
-			mounted.value = true;
-		});
 		return () => {
-			if (mounted.value) return null;
-			if (!router.isScrollRestoring) return null;
-			if (typeof router.options.scrollRestoration === "function") {
-				if (!router.options.scrollRestoration({ location: router.latestLocation })) return null;
-			}
-			const userKey = (router.options.getScrollRestorationKey || defaultGetScrollRestorationKey)(router.latestLocation);
-			const resolvedKey = userKey !== defaultGetScrollRestorationKey(router.latestLocation) ? userKey : void 0;
-			const restoreScrollOptions = {
-				storageKey,
-				shouldScrollRestoration: true
-			};
-			if (resolvedKey) restoreScrollOptions.key = resolvedKey;
-			if (isServer ?? router.isServer) return createVNode(ScriptOnce, { "children": `(${restoreScroll.toString()})(${escapeHtml(JSON.stringify(restoreScrollOptions))})` }, null);
-			return createVNode(ScriptOnce, { "children": "" }, null);
+			const script = getScrollRestorationScriptForRouter(router);
+			if (script) return createVNode(ScriptOnce, { "children": script }, null);
+			return null;
 		};
 	}
 });

package/dist/esm/scroll-restoration.js.map

@@ -1 +1 @@
-{"version":3,"file":"scroll-restoration.js","names":["Vue","defaultGetScrollRestorationKey","escapeHtml","restoreScroll","storageKey","isServer","useRouter","ScriptOnce","ScrollRestoration","defineComponent","name","setup","router","mounted","ref","onMounted","value","isScrollRestoring","options","scrollRestoration","shouldRestore","location","latestLocation","getKey","getScrollRestorationKey","userKey","resolvedKey","undefined","restoreScrollOptions","shouldScrollRestoration","key","_createVNode","toString","JSON","stringify"],"sources":["../../src/scroll-restoration.tsx"],"sourcesContent":["import * as Vue from 'vue'\nimport {\n  defaultGetScrollRestorationKey,\n  escapeHtml,\n  restoreScroll,\n  storageKey,\n} from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { useRouter } from './useRouter'\nimport { ScriptOnce } from './ScriptOnce'\n\n/**\n * ScrollRestoration component for Vue.\n * On server: renders a ScriptOnce with scroll restoration logic.\n * On client during hydration: renders a matching ScriptOnce to avoid mismatch.\n * After mount: renders nothing.\n */\nexport const ScrollRestoration = Vue.defineComponent({\n  name: 'ScrollRestoration',\n  setup() {\n    const router = useRouter()\n\n    // Track mounted state for hydration handling\n    const mounted = Vue.ref(false)\n    Vue.onMounted(() => {\n      mounted.value = true\n    })\n\n    return () => {\n      // After mount, render nothing\n      if (mounted.value) {\n        return null\n      }\n\n      // Check if scroll restoration is enabled\n      if (!router.isScrollRestoring) {\n        return null\n      }\n\n      // Check custom scroll restoration function\n      if (typeof router.options.scrollRestoration === 'function') {\n        const shouldRestore = router.options.scrollRestoration({\n          location: router.latestLocation,\n        })\n        if (!shouldRestore) {\n          return null\n        }\n      }\n\n      const getKey =\n        router.options.getScrollRestorationKey || defaultGetScrollRestorationKey\n      const userKey = getKey(router.latestLocation)\n      const resolvedKey =\n        userKey !== defaultGetScrollRestorationKey(router.latestLocation)\n          ? userKey\n          : undefined\n\n      const restoreScrollOptions: Parameters<typeof restoreScroll>[0] = {\n        storageKey,\n        shouldScrollRestoration: true,\n      }\n      if (resolvedKey) {\n        restoreScrollOptions.key = resolvedKey\n      }\n\n      // Server-side: render the actual scroll restoration script\n      if (isServer ?? router.isServer) {\n        return (\n          <ScriptOnce\n            children={`(${restoreScroll.toString()})(${escapeHtml(JSON.stringify(restoreScrollOptions))})`}\n          />\n        )\n      }\n\n      // Client-side during hydration: render empty ScriptOnce to match server structure\n      return <ScriptOnce children=\"\" />\n    }\n  },\n})\n"],"mappings":";;;;;;;;;;;;;AAiBA,IAAaQ,oBAAoBR,IAAIS,gBAAgB;CACnDC,MAAM;CACNC,QAAQ;EACN,MAAMC,SAASN,WAAW;EAG1B,MAAMO,UAAUb,IAAIc,IAAI,MAAM;AAC9Bd,MAAIe,gBAAgB;AAClBF,WAAQG,QAAQ;IAChB;AAEF,eAAa;AAEX,OAAIH,QAAQG,MACV,QAAO;AAIT,OAAI,CAACJ,OAAOK,kBACV,QAAO;AAIT,OAAI,OAAOL,OAAOM,QAAQC,sBAAsB;QAI1C,CAHkBP,OAAOM,QAAQC,kBAAkB,EACrDE,UAAUT,OAAOU,gBAClB,CAAC,CAEA,QAAO;;GAMX,MAAMG,WADJb,OAAOM,QAAQM,2BAA2BvB,gCACrBW,OAAOU,eAAe;GAC7C,MAAMI,cACJD,YAAYxB,+BAA+BW,OAAOU,eAAe,GAC7DG,UACAE,KAAAA;GAEN,MAAMC,uBAA4D;IAChExB;IACAyB,yBAAyB;IAC1B;AACD,OAAIH,YACFE,sBAAqBE,MAAMJ;AAI7B,OAAIrB,YAAYO,OAAOP,SACrB,QAAA0B,YAAAxB,YAAA,EAAA,YAEc,IAAIJ,cAAc6B,UAAU,CAAA,IAAK9B,WAAW+B,KAAKC,UAAUN,qBAAqB,CAAC,CAAA,IAAG,EAAA,KAAA;AAMpG,UAAAG,YAAAxB,YAAA,EAAA,YAAA,IAAA,EAAA,KAAA;;;CAGL,CAAC"}
+{"version":3,"file":"scroll-restoration.js","names":["Vue","getScrollRestorationScriptForRouter","useRouter","ScriptOnce","ScrollRestoration","defineComponent","name","setup","router","script","_createVNode"],"sources":["../../src/scroll-restoration.tsx"],"sourcesContent":["import * as Vue from 'vue'\nimport { getScrollRestorationScriptForRouter } from '@tanstack/router-core/scroll-restoration-script'\nimport { useRouter } from './useRouter'\nimport { ScriptOnce } from './ScriptOnce'\n\nexport const ScrollRestoration = Vue.defineComponent({\n  name: 'ScrollRestoration',\n  setup() {\n    const router = useRouter()\n\n    return () => {\n      const script = getScrollRestorationScriptForRouter(router)\n\n      if (script) {\n        return <ScriptOnce children={script} />\n      }\n\n      return null\n    }\n  },\n})\n"],"mappings":";;;;;;AAKA,IAAaI,oBAAoBJ,IAAIK,gBAAgB;CACnDC,MAAM;CACNC,QAAQ;EACN,MAAMC,SAASN,WAAW;AAE1B,eAAa;GACX,MAAMO,SAASR,oCAAoCO,OAAO;AAE1D,OAAIC,OACF,QAAAC,YAAAP,YAAA,EAAA,YAA6BM,QAAM,EAAA,KAAA;AAGrC,UAAO;;;CAGZ,CAAC"}

package/dist/esm/useBlocker.d.ts

@@ -1,13 +1,13 @@
 import { HistoryAction } from '@tanstack/history';
 import { AnyRoute, AnyRouter, ParseRoute, RegisteredRouter } from '@tanstack/router-core';
 import * as Vue from 'vue';
-interface ShouldBlockFnLocation<out TRouteId, out TFullPath, out TAllParams, out TFullSearchSchema> {
+type ShouldBlockFnLocation<out TRouteId, out TFullPath, out TAllParams, out TFullSearchSchema> = {
     routeId: TRouteId;
     fullPath: TFullPath;
     pathname: string;
     params: TAllParams;
     search: TFullSearchSchema;
-}
+};
 type MakeShouldBlockFnLocationUnion<TRouter extends AnyRouter = RegisteredRouter, TRoute extends AnyRoute = ParseRoute<TRouter['routeTree']>> = TRoute extends any ? ShouldBlockFnLocation<TRoute['id'], TRoute['fullPath'], TRoute['types']['allParams'], TRoute['types']['fullSearchSchema']> : never;
 type BlockerResolver<TRouter extends AnyRouter = RegisteredRouter> = {
     status: 'blocked';

package/dist/esm/useBlocker.js.map

@@ -1 +1 @@
-{"version":3,"file":"useBlocker.js","names":["Vue","useRouter","_resolveBlockerOpts","opts","condition","undefined","shouldBlockFn","withResolver","shouldBlock","Boolean","_customBlockerFn","enableBeforeUnload","fn","blockerFn","useBlocker","disabled","router","history","resolver","ref","status","current","next","action","proceed","reset","watchEffect","onCleanup","blockerFnComposed","blockerFnArgs","getLocation","location","parsedLocation","parseLocation","matchedRoutes","getMatchedRoutes","pathname","foundRoute","routeId","fullPath","params","routeParams","search","id","currentLocation","nextLocation","promise","Promise","resolve","value","canNavigateAsync","unsubscribe","block","_resolvePromptBlockerArgs","props","BlockImpl","defineComponent","name","type","Function","required","default","Object","setup","slots","blockerArgs","computed","args","defaultSlot","h","Fragment","slotContent","Block","children","rest"],"sources":["../../src/useBlocker.tsx"],"sourcesContent":["import * as Vue from 'vue'\nimport { useRouter } from './useRouter'\nimport type {\n  BlockerFnArgs,\n  HistoryAction,\n  HistoryLocation,\n} from '@tanstack/history'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  ParseRoute,\n  RegisteredRouter,\n} from '@tanstack/router-core'\n\ninterface ShouldBlockFnLocation<\n  out TRouteId,\n  out TFullPath,\n  out TAllParams,\n  out TFullSearchSchema,\n> {\n  routeId: TRouteId\n  fullPath: TFullPath\n  pathname: string\n  params: TAllParams\n  search: TFullSearchSchema\n}\n\ntype AnyShouldBlockFnLocation = ShouldBlockFnLocation<any, any, any, any>\ntype MakeShouldBlockFnLocationUnion<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TRoute extends AnyRoute = ParseRoute<TRouter['routeTree']>,\n> = TRoute extends any\n  ? ShouldBlockFnLocation<\n      TRoute['id'],\n      TRoute['fullPath'],\n      TRoute['types']['allParams'],\n      TRoute['types']['fullSearchSchema']\n    >\n  : never\n\ntype BlockerResolver<TRouter extends AnyRouter = RegisteredRouter> =\n  | {\n      status: 'blocked'\n      current: MakeShouldBlockFnLocationUnion<TRouter>\n      next: MakeShouldBlockFnLocationUnion<TRouter>\n      action: HistoryAction\n      proceed: () => void\n      reset: () => void\n    }\n  | {\n      status: 'idle'\n      current: undefined\n      next: undefined\n      action: undefined\n      proceed: undefined\n      reset: undefined\n    }\n\ntype ShouldBlockFnArgs<TRouter extends AnyRouter = RegisteredRouter> = {\n  current: MakeShouldBlockFnLocationUnion<TRouter>\n  next: MakeShouldBlockFnLocationUnion<TRouter>\n  action: HistoryAction\n}\n\nexport type ShouldBlockFn<TRouter extends AnyRouter = RegisteredRouter> = (\n  args: ShouldBlockFnArgs<TRouter>,\n) => boolean | Promise<boolean>\nexport type UseBlockerOpts<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TWithResolver extends boolean = boolean,\n> = {\n  shouldBlockFn: ShouldBlockFn<TRouter>\n  enableBeforeUnload?: boolean | (() => boolean)\n  disabled?: boolean\n  withResolver?: TWithResolver\n}\n\ntype LegacyBlockerFn = () => Promise<any> | any\ntype LegacyBlockerOpts = {\n  blockerFn?: LegacyBlockerFn\n  condition?: boolean | any\n}\n\nfunction _resolveBlockerOpts(\n  opts?: UseBlockerOpts | LegacyBlockerOpts | LegacyBlockerFn,\n  condition?: boolean | any,\n): UseBlockerOpts {\n  if (opts === undefined) {\n    return {\n      shouldBlockFn: () => true,\n      withResolver: false,\n    }\n  }\n\n  if ('shouldBlockFn' in opts) {\n    return opts\n  }\n\n  if (typeof opts === 'function') {\n    const shouldBlock = Boolean(condition ?? true)\n\n    const _customBlockerFn = async () => {\n      if (shouldBlock) return await opts()\n      return false\n    }\n\n    return {\n      shouldBlockFn: _customBlockerFn,\n      enableBeforeUnload: shouldBlock,\n      withResolver: false,\n    }\n  }\n\n  const shouldBlock = Boolean(opts.condition ?? true)\n  const fn = opts.blockerFn\n\n  const _customBlockerFn = async () => {\n    if (shouldBlock && fn !== undefined) {\n      return await fn()\n    }\n    return shouldBlock\n  }\n\n  return {\n    shouldBlockFn: _customBlockerFn,\n    enableBeforeUnload: shouldBlock,\n    withResolver: fn === undefined,\n  }\n}\n\nexport function useBlocker<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TWithResolver extends boolean = false,\n>(\n  opts: UseBlockerOpts<TRouter, TWithResolver>,\n): TWithResolver extends true ? Vue.Ref<BlockerResolver<TRouter>> : void\n\n/**\n * @deprecated Use the shouldBlockFn property instead\n */\nexport function useBlocker(\n  blockerFnOrOpts?: LegacyBlockerOpts,\n): Vue.Ref<BlockerResolver>\n\n/**\n * @deprecated Use the UseBlockerOpts object syntax instead\n */\nexport function useBlocker(\n  blockerFn?: LegacyBlockerFn,\n  condition?: boolean | any,\n): Vue.Ref<BlockerResolver>\n\nexport function useBlocker(\n  opts?: UseBlockerOpts | LegacyBlockerOpts | LegacyBlockerFn,\n  condition?: boolean | any,\n): Vue.Ref<BlockerResolver> | void {\n  const {\n    shouldBlockFn,\n    enableBeforeUnload = true,\n    disabled = false,\n    withResolver = false,\n  } = _resolveBlockerOpts(opts, condition)\n\n  const router = useRouter()\n  const { history } = router\n\n  const resolver = Vue.ref<BlockerResolver>({\n    status: 'idle',\n    current: undefined,\n    next: undefined,\n    action: undefined,\n    proceed: undefined,\n    reset: undefined,\n  })\n\n  Vue.watchEffect((onCleanup) => {\n    const blockerFnComposed = async (blockerFnArgs: BlockerFnArgs) => {\n      function getLocation(\n        location: HistoryLocation,\n      ): AnyShouldBlockFnLocation {\n        const parsedLocation = router.parseLocation(location)\n        const matchedRoutes = router.getMatchedRoutes(parsedLocation.pathname)\n        if (matchedRoutes.foundRoute === undefined) {\n          return {\n            routeId: '__notFound__',\n            fullPath: parsedLocation.pathname,\n            pathname: parsedLocation.pathname,\n            params: matchedRoutes.routeParams,\n            search: parsedLocation.search,\n          }\n        }\n        return {\n          routeId: matchedRoutes.foundRoute.id,\n          fullPath: matchedRoutes.foundRoute.fullPath,\n          pathname: parsedLocation.pathname,\n          params: matchedRoutes.routeParams,\n          search: parsedLocation.search,\n        }\n      }\n\n      const current = getLocation(blockerFnArgs.currentLocation)\n      const next = getLocation(blockerFnArgs.nextLocation)\n\n      // Allow navigation away from 404 pages to valid routes\n      if (\n        current.routeId === '__notFound__' &&\n        next.routeId !== '__notFound__'\n      ) {\n        return false\n      }\n\n      const shouldBlock = await shouldBlockFn({\n        action: blockerFnArgs.action,\n        current,\n        next,\n      })\n      if (!withResolver) {\n        return shouldBlock\n      }\n\n      if (!shouldBlock) {\n        return false\n      }\n\n      const promise = new Promise<boolean>((resolve) => {\n        resolver.value = {\n          status: 'blocked',\n          current,\n          next,\n          action: blockerFnArgs.action,\n          proceed: () => resolve(false),\n          reset: () => resolve(true),\n        }\n      })\n\n      const canNavigateAsync = await promise\n      resolver.value = {\n        status: 'idle',\n        current: undefined,\n        next: undefined,\n        action: undefined,\n        proceed: undefined,\n        reset: undefined,\n      }\n\n      return canNavigateAsync\n    }\n\n    if (disabled) {\n      return\n    }\n\n    const unsubscribe = history.block({\n      blockerFn: blockerFnComposed,\n      enableBeforeUnload,\n    })\n\n    onCleanup(() => {\n      if (unsubscribe) unsubscribe()\n    })\n  })\n\n  return withResolver ? resolver : undefined\n}\n\nconst _resolvePromptBlockerArgs = (\n  props: PromptProps | LegacyPromptProps,\n): UseBlockerOpts => {\n  if ('shouldBlockFn' in props) {\n    return { ...props }\n  }\n\n  const shouldBlock = Boolean(props.condition ?? true)\n  const fn = props.blockerFn\n\n  const _customBlockerFn = async () => {\n    if (shouldBlock && fn !== undefined) {\n      return await fn()\n    }\n    return shouldBlock\n  }\n\n  return {\n    shouldBlockFn: _customBlockerFn,\n    enableBeforeUnload: shouldBlock,\n    withResolver: fn === undefined,\n  }\n}\n\n// Internal Block implementation as a proper Vue component for reactivity\nconst BlockImpl = Vue.defineComponent({\n  name: 'Block',\n  props: {\n    shouldBlockFn: {\n      type: Function as Vue.PropType<ShouldBlockFn<any>>,\n      required: false,\n    },\n    enableBeforeUnload: {\n      type: [Boolean, Function] as Vue.PropType<boolean | (() => boolean)>,\n      default: true,\n    },\n    disabled: {\n      type: Boolean,\n      default: false,\n    },\n    withResolver: {\n      type: Boolean,\n      default: false,\n    },\n    // Legacy props\n    blockerFn: {\n      type: Function as Vue.PropType<LegacyBlockerFn>,\n      required: false,\n    },\n    condition: {\n      type: [Boolean, Object] as Vue.PropType<boolean | any>,\n      required: false,\n    },\n  },\n  setup(props, { slots }) {\n    // Create a computed that resolves the blocker args reactively\n    const blockerArgs = Vue.computed<UseBlockerOpts>(() => {\n      if (props.shouldBlockFn) {\n        return {\n          shouldBlockFn: props.shouldBlockFn,\n          enableBeforeUnload: props.enableBeforeUnload,\n          disabled: props.disabled,\n          withResolver: props.withResolver,\n        }\n      }\n\n      // Legacy handling\n      const shouldBlock = Boolean(props.condition ?? true)\n      const fn = props.blockerFn\n\n      const _customBlockerFn = async () => {\n        if (shouldBlock && fn !== undefined) {\n          return await fn()\n        }\n        return shouldBlock\n      }\n\n      return {\n        shouldBlockFn: _customBlockerFn,\n        enableBeforeUnload: shouldBlock,\n        disabled: props.disabled,\n        withResolver: fn === undefined,\n      }\n    })\n\n    // Use a reactive useBlocker that re-subscribes when args change\n    const router = useRouter()\n    const { history } = router\n\n    const resolver = Vue.ref<BlockerResolver>({\n      status: 'idle',\n      current: undefined,\n      next: undefined,\n      action: undefined,\n      proceed: undefined,\n      reset: undefined,\n    })\n\n    Vue.watchEffect((onCleanup) => {\n      const args = blockerArgs.value\n\n      if (args.disabled) {\n        return\n      }\n\n      const blockerFnComposed = async (blockerFnArgs: BlockerFnArgs) => {\n        function getLocation(\n          location: HistoryLocation,\n        ): AnyShouldBlockFnLocation {\n          const parsedLocation = router.parseLocation(location)\n          const matchedRoutes = router.getMatchedRoutes(parsedLocation.pathname)\n          if (matchedRoutes.foundRoute === undefined) {\n            return {\n              routeId: '__notFound__',\n              fullPath: parsedLocation.pathname,\n              pathname: parsedLocation.pathname,\n              params: matchedRoutes.routeParams,\n              search: parsedLocation.search,\n            }\n          }\n          return {\n            routeId: matchedRoutes.foundRoute.id,\n            fullPath: matchedRoutes.foundRoute.fullPath,\n            pathname: parsedLocation.pathname,\n            params: matchedRoutes.routeParams,\n            search: parsedLocation.search,\n          }\n        }\n\n        const current = getLocation(blockerFnArgs.currentLocation)\n        const next = getLocation(blockerFnArgs.nextLocation)\n\n        // Allow navigation away from 404 pages to valid routes\n        if (\n          current.routeId === '__notFound__' &&\n          next.routeId !== '__notFound__'\n        ) {\n          return false\n        }\n\n        const shouldBlock = await args.shouldBlockFn({\n          action: blockerFnArgs.action,\n          current,\n          next,\n        })\n        if (!args.withResolver) {\n          return shouldBlock\n        }\n\n        if (!shouldBlock) {\n          return false\n        }\n\n        const promise = new Promise<boolean>((resolve) => {\n          resolver.value = {\n            status: 'blocked',\n            current,\n            next,\n            action: blockerFnArgs.action,\n            proceed: () => resolve(false),\n            reset: () => resolve(true),\n          }\n        })\n\n        const canNavigateAsync = await promise\n        resolver.value = {\n          status: 'idle',\n          current: undefined,\n          next: undefined,\n          action: undefined,\n          proceed: undefined,\n          reset: undefined,\n        }\n\n        return canNavigateAsync\n      }\n\n      const unsubscribe = history.block({\n        blockerFn: blockerFnComposed,\n        enableBeforeUnload: args.enableBeforeUnload,\n      })\n\n      onCleanup(() => {\n        if (unsubscribe) unsubscribe()\n      })\n    })\n\n    return () => {\n      const defaultSlot = slots.default\n      if (!defaultSlot) {\n        return Vue.h(Vue.Fragment, null)\n      }\n\n      // If slot is a function that takes resolver, call it with the resolver\n      const slotContent = defaultSlot(resolver.value as any)\n      return Vue.h(Vue.Fragment, null, slotContent)\n    }\n  },\n})\n\nexport function Block<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TWithResolver extends boolean = boolean,\n>(opts: PromptProps<TRouter, TWithResolver>): Vue.VNode\n\n/**\n *  @deprecated Use the UseBlockerOpts property instead\n */\nexport function Block(opts: LegacyPromptProps): Vue.VNode\n\nexport function Block(opts: PromptProps | LegacyPromptProps): Vue.VNode {\n  const { children, ...rest } = opts\n\n  // Convert children to slot format for the component\n  const slots = children\n    ? typeof children === 'function'\n      ? { default: children }\n      : { default: () => children }\n    : undefined\n\n  return Vue.h(BlockImpl, rest as any, slots)\n}\n\ntype LegacyPromptProps = {\n  blockerFn?: LegacyBlockerFn\n  condition?: boolean | any\n  children?: Vue.VNode | ((params: BlockerResolver) => Vue.VNode)\n}\n\ntype PromptProps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TWithResolver extends boolean = boolean,\n  TParams = TWithResolver extends true ? BlockerResolver<TRouter> : void,\n> = UseBlockerOpts<TRouter, TWithResolver> & {\n  children?: Vue.VNode | ((params: TParams) => Vue.VNode)\n}\n"],"mappings":"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"}
+{"version":3,"file":"useBlocker.js","names":["Vue","useRouter","_resolveBlockerOpts","opts","condition","undefined","shouldBlockFn","withResolver","shouldBlock","Boolean","_customBlockerFn","enableBeforeUnload","fn","blockerFn","useBlocker","disabled","router","history","resolver","ref","status","current","next","action","proceed","reset","watchEffect","onCleanup","blockerFnComposed","blockerFnArgs","getLocation","location","parsedLocation","parseLocation","matchedRoutes","getMatchedRoutes","pathname","foundRoute","routeId","fullPath","params","routeParams","search","id","currentLocation","nextLocation","promise","Promise","resolve","value","canNavigateAsync","unsubscribe","block","_resolvePromptBlockerArgs","props","BlockImpl","defineComponent","name","type","Function","required","default","Object","setup","slots","blockerArgs","computed","args","defaultSlot","h","Fragment","slotContent","Block","children","rest"],"sources":["../../src/useBlocker.tsx"],"sourcesContent":["import * as Vue from 'vue'\nimport { useRouter } from './useRouter'\nimport type {\n  BlockerFnArgs,\n  HistoryAction,\n  HistoryLocation,\n} from '@tanstack/history'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  ParseRoute,\n  RegisteredRouter,\n} from '@tanstack/router-core'\n\ntype ShouldBlockFnLocation<\n  out TRouteId,\n  out TFullPath,\n  out TAllParams,\n  out TFullSearchSchema,\n> = {\n  routeId: TRouteId\n  fullPath: TFullPath\n  pathname: string\n  params: TAllParams\n  search: TFullSearchSchema\n}\n\ntype AnyShouldBlockFnLocation = ShouldBlockFnLocation<any, any, any, any>\ntype MakeShouldBlockFnLocationUnion<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TRoute extends AnyRoute = ParseRoute<TRouter['routeTree']>,\n> = TRoute extends any\n  ? ShouldBlockFnLocation<\n      TRoute['id'],\n      TRoute['fullPath'],\n      TRoute['types']['allParams'],\n      TRoute['types']['fullSearchSchema']\n    >\n  : never\n\ntype BlockerResolver<TRouter extends AnyRouter = RegisteredRouter> =\n  | {\n      status: 'blocked'\n      current: MakeShouldBlockFnLocationUnion<TRouter>\n      next: MakeShouldBlockFnLocationUnion<TRouter>\n      action: HistoryAction\n      proceed: () => void\n      reset: () => void\n    }\n  | {\n      status: 'idle'\n      current: undefined\n      next: undefined\n      action: undefined\n      proceed: undefined\n      reset: undefined\n    }\n\ntype ShouldBlockFnArgs<TRouter extends AnyRouter = RegisteredRouter> = {\n  current: MakeShouldBlockFnLocationUnion<TRouter>\n  next: MakeShouldBlockFnLocationUnion<TRouter>\n  action: HistoryAction\n}\n\nexport type ShouldBlockFn<TRouter extends AnyRouter = RegisteredRouter> = (\n  args: ShouldBlockFnArgs<TRouter>,\n) => boolean | Promise<boolean>\nexport type UseBlockerOpts<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TWithResolver extends boolean = boolean,\n> = {\n  shouldBlockFn: ShouldBlockFn<TRouter>\n  enableBeforeUnload?: boolean | (() => boolean)\n  disabled?: boolean\n  withResolver?: TWithResolver\n}\n\ntype LegacyBlockerFn = () => Promise<any> | any\ntype LegacyBlockerOpts = {\n  blockerFn?: LegacyBlockerFn\n  condition?: boolean | any\n}\n\nfunction _resolveBlockerOpts(\n  opts?: UseBlockerOpts | LegacyBlockerOpts | LegacyBlockerFn,\n  condition?: boolean | any,\n): UseBlockerOpts {\n  if (opts === undefined) {\n    return {\n      shouldBlockFn: () => true,\n      withResolver: false,\n    }\n  }\n\n  if ('shouldBlockFn' in opts) {\n    return opts\n  }\n\n  if (typeof opts === 'function') {\n    const shouldBlock = Boolean(condition ?? true)\n\n    const _customBlockerFn = async () => {\n      if (shouldBlock) return await opts()\n      return false\n    }\n\n    return {\n      shouldBlockFn: _customBlockerFn,\n      enableBeforeUnload: shouldBlock,\n      withResolver: false,\n    }\n  }\n\n  const shouldBlock = Boolean(opts.condition ?? true)\n  const fn = opts.blockerFn\n\n  const _customBlockerFn = async () => {\n    if (shouldBlock && fn !== undefined) {\n      return await fn()\n    }\n    return shouldBlock\n  }\n\n  return {\n    shouldBlockFn: _customBlockerFn,\n    enableBeforeUnload: shouldBlock,\n    withResolver: fn === undefined,\n  }\n}\n\nexport function useBlocker<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TWithResolver extends boolean = false,\n>(\n  opts: UseBlockerOpts<TRouter, TWithResolver>,\n): TWithResolver extends true ? Vue.Ref<BlockerResolver<TRouter>> : void\n\n/**\n * @deprecated Use the shouldBlockFn property instead\n */\nexport function useBlocker(\n  blockerFnOrOpts?: LegacyBlockerOpts,\n): Vue.Ref<BlockerResolver>\n\n/**\n * @deprecated Use the UseBlockerOpts object syntax instead\n */\nexport function useBlocker(\n  blockerFn?: LegacyBlockerFn,\n  condition?: boolean | any,\n): Vue.Ref<BlockerResolver>\n\nexport function useBlocker(\n  opts?: UseBlockerOpts | LegacyBlockerOpts | LegacyBlockerFn,\n  condition?: boolean | any,\n): Vue.Ref<BlockerResolver> | void {\n  const {\n    shouldBlockFn,\n    enableBeforeUnload = true,\n    disabled = false,\n    withResolver = false,\n  } = _resolveBlockerOpts(opts, condition)\n\n  const router = useRouter()\n  const { history } = router\n\n  const resolver = Vue.ref<BlockerResolver>({\n    status: 'idle',\n    current: undefined,\n    next: undefined,\n    action: undefined,\n    proceed: undefined,\n    reset: undefined,\n  })\n\n  Vue.watchEffect((onCleanup) => {\n    const blockerFnComposed = async (blockerFnArgs: BlockerFnArgs) => {\n      function getLocation(\n        location: HistoryLocation,\n      ): AnyShouldBlockFnLocation {\n        const parsedLocation = router.parseLocation(location)\n        const matchedRoutes = router.getMatchedRoutes(parsedLocation.pathname)\n        if (matchedRoutes.foundRoute === undefined) {\n          return {\n            routeId: '__notFound__',\n            fullPath: parsedLocation.pathname,\n            pathname: parsedLocation.pathname,\n            params: matchedRoutes.routeParams,\n            search: parsedLocation.search,\n          }\n        }\n        return {\n          routeId: matchedRoutes.foundRoute.id,\n          fullPath: matchedRoutes.foundRoute.fullPath,\n          pathname: parsedLocation.pathname,\n          params: matchedRoutes.routeParams,\n          search: parsedLocation.search,\n        }\n      }\n\n      const current = getLocation(blockerFnArgs.currentLocation)\n      const next = getLocation(blockerFnArgs.nextLocation)\n\n      // Allow navigation away from 404 pages to valid routes\n      if (\n        current.routeId === '__notFound__' &&\n        next.routeId !== '__notFound__'\n      ) {\n        return false\n      }\n\n      const shouldBlock = await shouldBlockFn({\n        action: blockerFnArgs.action,\n        current,\n        next,\n      })\n      if (!withResolver) {\n        return shouldBlock\n      }\n\n      if (!shouldBlock) {\n        return false\n      }\n\n      const promise = new Promise<boolean>((resolve) => {\n        resolver.value = {\n          status: 'blocked',\n          current,\n          next,\n          action: blockerFnArgs.action,\n          proceed: () => resolve(false),\n          reset: () => resolve(true),\n        }\n      })\n\n      const canNavigateAsync = await promise\n      resolver.value = {\n        status: 'idle',\n        current: undefined,\n        next: undefined,\n        action: undefined,\n        proceed: undefined,\n        reset: undefined,\n      }\n\n      return canNavigateAsync\n    }\n\n    if (disabled) {\n      return\n    }\n\n    const unsubscribe = history.block({\n      blockerFn: blockerFnComposed,\n      enableBeforeUnload,\n    })\n\n    onCleanup(() => {\n      if (unsubscribe) unsubscribe()\n    })\n  })\n\n  return withResolver ? resolver : undefined\n}\n\nconst _resolvePromptBlockerArgs = (\n  props: PromptProps | LegacyPromptProps,\n): UseBlockerOpts => {\n  if ('shouldBlockFn' in props) {\n    return { ...props }\n  }\n\n  const shouldBlock = Boolean(props.condition ?? true)\n  const fn = props.blockerFn\n\n  const _customBlockerFn = async () => {\n    if (shouldBlock && fn !== undefined) {\n      return await fn()\n    }\n    return shouldBlock\n  }\n\n  return {\n    shouldBlockFn: _customBlockerFn,\n    enableBeforeUnload: shouldBlock,\n    withResolver: fn === undefined,\n  }\n}\n\n// Internal Block implementation as a proper Vue component for reactivity\nconst BlockImpl = Vue.defineComponent({\n  name: 'Block',\n  props: {\n    shouldBlockFn: {\n      type: Function as Vue.PropType<ShouldBlockFn<any>>,\n      required: false,\n    },\n    enableBeforeUnload: {\n      type: [Boolean, Function] as Vue.PropType<boolean | (() => boolean)>,\n      default: true,\n    },\n    disabled: {\n      type: Boolean,\n      default: false,\n    },\n    withResolver: {\n      type: Boolean,\n      default: false,\n    },\n    // Legacy props\n    blockerFn: {\n      type: Function as Vue.PropType<LegacyBlockerFn>,\n      required: false,\n    },\n    condition: {\n      type: [Boolean, Object] as Vue.PropType<boolean | any>,\n      required: false,\n    },\n  },\n  setup(props, { slots }) {\n    // Create a computed that resolves the blocker args reactively\n    const blockerArgs = Vue.computed<UseBlockerOpts>(() => {\n      if (props.shouldBlockFn) {\n        return {\n          shouldBlockFn: props.shouldBlockFn,\n          enableBeforeUnload: props.enableBeforeUnload,\n          disabled: props.disabled,\n          withResolver: props.withResolver,\n        }\n      }\n\n      // Legacy handling\n      const shouldBlock = Boolean(props.condition ?? true)\n      const fn = props.blockerFn\n\n      const _customBlockerFn = async () => {\n        if (shouldBlock && fn !== undefined) {\n          return await fn()\n        }\n        return shouldBlock\n      }\n\n      return {\n        shouldBlockFn: _customBlockerFn,\n        enableBeforeUnload: shouldBlock,\n        disabled: props.disabled,\n        withResolver: fn === undefined,\n      }\n    })\n\n    // Use a reactive useBlocker that re-subscribes when args change\n    const router = useRouter()\n    const { history } = router\n\n    const resolver = Vue.ref<BlockerResolver>({\n      status: 'idle',\n      current: undefined,\n      next: undefined,\n      action: undefined,\n      proceed: undefined,\n      reset: undefined,\n    })\n\n    Vue.watchEffect((onCleanup) => {\n      const args = blockerArgs.value\n\n      if (args.disabled) {\n        return\n      }\n\n      const blockerFnComposed = async (blockerFnArgs: BlockerFnArgs) => {\n        function getLocation(\n          location: HistoryLocation,\n        ): AnyShouldBlockFnLocation {\n          const parsedLocation = router.parseLocation(location)\n          const matchedRoutes = router.getMatchedRoutes(parsedLocation.pathname)\n          if (matchedRoutes.foundRoute === undefined) {\n            return {\n              routeId: '__notFound__',\n              fullPath: parsedLocation.pathname,\n              pathname: parsedLocation.pathname,\n              params: matchedRoutes.routeParams,\n              search: parsedLocation.search,\n            }\n          }\n          return {\n            routeId: matchedRoutes.foundRoute.id,\n            fullPath: matchedRoutes.foundRoute.fullPath,\n            pathname: parsedLocation.pathname,\n            params: matchedRoutes.routeParams,\n            search: parsedLocation.search,\n          }\n        }\n\n        const current = getLocation(blockerFnArgs.currentLocation)\n        const next = getLocation(blockerFnArgs.nextLocation)\n\n        // Allow navigation away from 404 pages to valid routes\n        if (\n          current.routeId === '__notFound__' &&\n          next.routeId !== '__notFound__'\n        ) {\n          return false\n        }\n\n        const shouldBlock = await args.shouldBlockFn({\n          action: blockerFnArgs.action,\n          current,\n          next,\n        })\n        if (!args.withResolver) {\n          return shouldBlock\n        }\n\n        if (!shouldBlock) {\n          return false\n        }\n\n        const promise = new Promise<boolean>((resolve) => {\n          resolver.value = {\n            status: 'blocked',\n            current,\n            next,\n            action: blockerFnArgs.action,\n            proceed: () => resolve(false),\n            reset: () => resolve(true),\n          }\n        })\n\n        const canNavigateAsync = await promise\n        resolver.value = {\n          status: 'idle',\n          current: undefined,\n          next: undefined,\n          action: undefined,\n          proceed: undefined,\n          reset: undefined,\n        }\n\n        return canNavigateAsync\n      }\n\n      const unsubscribe = history.block({\n        blockerFn: blockerFnComposed,\n        enableBeforeUnload: args.enableBeforeUnload,\n      })\n\n      onCleanup(() => {\n        if (unsubscribe) unsubscribe()\n      })\n    })\n\n    return () => {\n      const defaultSlot = slots.default\n      if (!defaultSlot) {\n        return Vue.h(Vue.Fragment, null)\n      }\n\n      // If slot is a function that takes resolver, call it with the resolver\n      const slotContent = defaultSlot(resolver.value as any)\n      return Vue.h(Vue.Fragment, null, slotContent)\n    }\n  },\n})\n\nexport function Block<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TWithResolver extends boolean = boolean,\n>(opts: PromptProps<TRouter, TWithResolver>): Vue.VNode\n\n/**\n *  @deprecated Use the UseBlockerOpts property instead\n */\nexport function Block(opts: LegacyPromptProps): Vue.VNode\n\nexport function Block(opts: PromptProps | LegacyPromptProps): Vue.VNode {\n  const { children, ...rest } = opts\n\n  // Convert children to slot format for the component\n  const slots = children\n    ? typeof children === 'function'\n      ? { default: children }\n      : { default: () => children }\n    : undefined\n\n  return Vue.h(BlockImpl, rest as any, slots)\n}\n\ntype LegacyPromptProps = {\n  blockerFn?: LegacyBlockerFn\n  condition?: boolean | any\n  children?: Vue.VNode | ((params: BlockerResolver) => Vue.VNode)\n}\n\ntype PromptProps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TWithResolver extends boolean = boolean,\n  TParams = TWithResolver extends true ? BlockerResolver<TRouter> : void,\n> = UseBlockerOpts<TRouter, TWithResolver> & {\n  children?: Vue.VNode | ((params: TParams) => Vue.VNode)\n}\n"],"mappings":";;;AAmFA,SAASE,oBACPC,MACAC,WACgB;AAChB,KAAID,SAASE,KAAAA,EACX,QAAO;EACLC,qBAAqB;EACrBC,cAAc;EACf;AAGH,KAAI,mBAAmBJ,KACrB,QAAOA;AAGT,KAAI,OAAOA,SAAS,YAAY;EAC9B,MAAMK,cAAcC,QAAQL,aAAa,KAAK;EAE9C,MAAMM,mBAAmB,YAAY;AACnC,OAAIF,YAAa,QAAO,MAAML,MAAM;AACpC,UAAO;;AAGT,SAAO;GACLG,eAAeI;GACfC,oBAAoBH;GACpBD,cAAc;GACf;;CAGH,MAAMC,cAAcC,QAAQN,KAAKC,aAAa,KAAK;CACnD,MAAMQ,KAAKT,KAAKU;CAEhB,MAAMH,mBAAmB,YAAY;AACnC,MAAIF,eAAeI,OAAOP,KAAAA,EACxB,QAAO,MAAMO,IAAI;AAEnB,SAAOJ;;AAGT,QAAO;EACLF,eAAeI;EACfC,oBAAoBH;EACpBD,cAAcK,OAAOP,KAAAA;EACtB;;;;;;;;AAyBH,SAAgBS,WACdX,MACAC,WACiC;CACjC,MAAM,EACJE,eACAK,qBAAqB,MACrBI,WAAW,OACXR,eAAe,UACbL,oBAAoBC,MAAMC,UAAU;CAExC,MAAMY,SAASf,WAAW;CAC1B,MAAM,EAAEgB,YAAYD;CAEpB,MAAME,WAAWlB,IAAImB,IAAqB;EACxCC,QAAQ;EACRC,SAAShB,KAAAA;EACTiB,MAAMjB,KAAAA;EACNkB,QAAQlB,KAAAA;EACRmB,SAASnB,KAAAA;EACToB,OAAOpB,KAAAA;EACR,CAAC;AAEFL,KAAI0B,aAAaC,cAAc;EAC7B,MAAMC,oBAAoB,OAAOC,kBAAiC;GAChE,SAASC,YACPC,UAC0B;IAC1B,MAAMC,iBAAiBhB,OAAOiB,cAAcF,SAAS;IACrD,MAAMG,gBAAgBlB,OAAOmB,iBAAiBH,eAAeI,SAAS;AACtE,QAAIF,cAAcG,eAAehC,KAAAA,EAC/B,QAAO;KACLiC,SAAS;KACTC,UAAUP,eAAeI;KACzBA,UAAUJ,eAAeI;KACzBI,QAAQN,cAAcO;KACtBC,QAAQV,eAAeU;KACxB;AAEH,WAAO;KACLJ,SAASJ,cAAcG,WAAWM;KAClCJ,UAAUL,cAAcG,WAAWE;KACnCH,UAAUJ,eAAeI;KACzBI,QAAQN,cAAcO;KACtBC,QAAQV,eAAeU;KACxB;;GAGH,MAAMrB,UAAUS,YAAYD,cAAce,gBAAgB;GAC1D,MAAMtB,OAAOQ,YAAYD,cAAcgB,aAAa;AAGpD,OACExB,QAAQiB,YAAY,kBACpBhB,KAAKgB,YAAY,eAEjB,QAAO;GAGT,MAAM9B,cAAc,MAAMF,cAAc;IACtCiB,QAAQM,cAAcN;IACtBF;IACAC;IACD,CAAC;AACF,OAAI,CAACf,aACH,QAAOC;AAGT,OAAI,CAACA,YACH,QAAO;GAcT,MAAM0C,mBAAmB,MAXT,IAAIH,SAAkBC,YAAY;AAChD9B,aAAS+B,QAAQ;KACf7B,QAAQ;KACRC;KACAC;KACAC,QAAQM,cAAcN;KACtBC,eAAewB,QAAQ,MAAM;KAC7BvB,aAAauB,QAAQ,KAAI;KAC1B;KACD;AAGF9B,YAAS+B,QAAQ;IACf7B,QAAQ;IACRC,SAAShB,KAAAA;IACTiB,MAAMjB,KAAAA;IACNkB,QAAQlB,KAAAA;IACRmB,SAASnB,KAAAA;IACToB,OAAOpB,KAAAA;IACR;AAED,UAAO6C;;AAGT,MAAInC,SACF;EAGF,MAAMoC,cAAclC,QAAQmC,MAAM;GAChCvC,WAAWe;GACXjB;GACD,CAAC;AAEFgB,kBAAgB;AACd,OAAIwB,YAAaA,cAAa;IAC9B;GACF;AAEF,QAAO5C,eAAeW,WAAWb,KAAAA;;AA4BnC,IAAMkD,YAAYvD,IAAIwD,gBAAgB;CACpCC,MAAM;CACNH,OAAO;EACLhD,eAAe;GACboD,MAAMC;GACNC,UAAU;GACX;EACDjD,oBAAoB;GAClB+C,MAAM,CAACjD,SAASkD,SAAoD;GACpEE,SAAS;GACV;EACD9C,UAAU;GACR2C,MAAMjD;GACNoD,SAAS;GACV;EACDtD,cAAc;GACZmD,MAAMjD;GACNoD,SAAS;GACV;EAEDhD,WAAW;GACT6C,MAAMC;GACNC,UAAU;GACX;EACDxD,WAAW;GACTsD,MAAM,CAACjD,SAASqD,OAAsC;GACtDF,UAAU;GACZ;EACD;CACDG,MAAMT,OAAO,EAAEU,SAAS;EAEtB,MAAMC,cAAcjE,IAAIkE,eAA+B;AACrD,OAAIZ,MAAMhD,cACR,QAAO;IACLA,eAAegD,MAAMhD;IACrBK,oBAAoB2C,MAAM3C;IAC1BI,UAAUuC,MAAMvC;IAChBR,cAAc+C,MAAM/C;IACrB;GAIH,MAAMC,cAAcC,QAAQ6C,MAAMlD,aAAa,KAAK;GACpD,MAAMQ,KAAK0C,MAAMzC;GAEjB,MAAMH,mBAAmB,YAAY;AACnC,QAAIF,eAAeI,OAAOP,KAAAA,EACxB,QAAO,MAAMO,IAAI;AAEnB,WAAOJ;;AAGT,UAAO;IACLF,eAAeI;IACfC,oBAAoBH;IACpBO,UAAUuC,MAAMvC;IAChBR,cAAcK,OAAOP,KAAAA;IACtB;IACD;EAGF,MAAMW,SAASf,WAAW;EAC1B,MAAM,EAAEgB,YAAYD;EAEpB,MAAME,WAAWlB,IAAImB,IAAqB;GACxCC,QAAQ;GACRC,SAAShB,KAAAA;GACTiB,MAAMjB,KAAAA;GACNkB,QAAQlB,KAAAA;GACRmB,SAASnB,KAAAA;GACToB,OAAOpB,KAAAA;GACR,CAAC;AAEFL,MAAI0B,aAAaC,cAAc;GAC7B,MAAMwC,OAAOF,YAAYhB;AAEzB,OAAIkB,KAAKpD,SACP;GAGF,MAAMa,oBAAoB,OAAOC,kBAAiC;IAChE,SAASC,YACPC,UAC0B;KAC1B,MAAMC,iBAAiBhB,OAAOiB,cAAcF,SAAS;KACrD,MAAMG,gBAAgBlB,OAAOmB,iBAAiBH,eAAeI,SAAS;AACtE,SAAIF,cAAcG,eAAehC,KAAAA,EAC/B,QAAO;MACLiC,SAAS;MACTC,UAAUP,eAAeI;MACzBA,UAAUJ,eAAeI;MACzBI,QAAQN,cAAcO;MACtBC,QAAQV,eAAeU;MACxB;AAEH,YAAO;MACLJ,SAASJ,cAAcG,WAAWM;MAClCJ,UAAUL,cAAcG,WAAWE;MACnCH,UAAUJ,eAAeI;MACzBI,QAAQN,cAAcO;MACtBC,QAAQV,eAAeU;MACxB;;IAGH,MAAMrB,UAAUS,YAAYD,cAAce,gBAAgB;IAC1D,MAAMtB,OAAOQ,YAAYD,cAAcgB,aAAa;AAGpD,QACExB,QAAQiB,YAAY,kBACpBhB,KAAKgB,YAAY,eAEjB,QAAO;IAGT,MAAM9B,cAAc,MAAM2D,KAAK7D,cAAc;KAC3CiB,QAAQM,cAAcN;KACtBF;KACAC;KACD,CAAC;AACF,QAAI,CAAC6C,KAAK5D,aACR,QAAOC;AAGT,QAAI,CAACA,YACH,QAAO;IAcT,MAAM0C,mBAAmB,MAXT,IAAIH,SAAkBC,YAAY;AAChD9B,cAAS+B,QAAQ;MACf7B,QAAQ;MACRC;MACAC;MACAC,QAAQM,cAAcN;MACtBC,eAAewB,QAAQ,MAAM;MAC7BvB,aAAauB,QAAQ,KAAI;MAC1B;MACD;AAGF9B,aAAS+B,QAAQ;KACf7B,QAAQ;KACRC,SAAShB,KAAAA;KACTiB,MAAMjB,KAAAA;KACNkB,QAAQlB,KAAAA;KACRmB,SAASnB,KAAAA;KACToB,OAAOpB,KAAAA;KACR;AAED,WAAO6C;;GAGT,MAAMC,cAAclC,QAAQmC,MAAM;IAChCvC,WAAWe;IACXjB,oBAAoBwD,KAAKxD;IAC1B,CAAC;AAEFgB,mBAAgB;AACd,QAAIwB,YAAaA,cAAa;KAC9B;IACF;AAEF,eAAa;GACX,MAAMiB,cAAcJ,MAAMH;AAC1B,OAAI,CAACO,YACH,QAAOpE,IAAIqE,EAAErE,IAAIsE,UAAU,KAAK;GAIlC,MAAMC,cAAcH,YAAYlD,SAAS+B,MAAa;AACtD,UAAOjD,IAAIqE,EAAErE,IAAIsE,UAAU,MAAMC,YAAY;;;CAGlD,CAAC;;;;AAYF,SAAgBC,MAAMrE,MAAkD;CACtE,MAAM,EAAEsE,UAAU,GAAGC,SAASvE;CAG9B,MAAM6D,QAAQS,WACV,OAAOA,aAAa,aAClB,EAAEZ,SAASY,UAAU,GACrB,EAAEZ,eAAeY,UAAU,GAC7BpE,KAAAA;AAEJ,QAAOL,IAAIqE,EAAEd,WAAWmB,MAAaV,MAAM"}

package/dist/source/Match.jsx

@@ -127,10 +127,13 @@ export const Match = Vue.defineComponent({
                 // Add scroll restoration if needed
                 const withScrollRestoration = [
                     content,
-                    isChildOfRoot && router.options.scrollRestoration
+                    isChildOfRoot
                         ? Vue.h(Vue.Fragment, null, [
                             Vue.h(OnRendered),
-                            Vue.h(ScrollRestoration),
+                            router.options.scrollRestoration &&
+                                (isServer ?? router.isServer)
+                                ? Vue.h(ScrollRestoration)
+                                : null,
                         ])
                         : null,
                 ].filter(Boolean);

package/dist/source/Match.jsx.map

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

package/dist/source/ScrollRestoration.jsx

@@ -1,4 +1,4 @@
-import { defaultGetScrollRestorationKey, getCssSelector, scrollRestorationCache, setupScrollRestoration, } from '@tanstack/router-core';
+import { getElementScrollRestorationEntry, setupScrollRestoration, } from '@tanstack/router-core';
 import { useRouter } from './useRouter';
 function useScrollRestoration() {
     const router = useRouter();
@@ -16,22 +16,6 @@ export function ScrollRestoration(_props) {
 }
 export function useElementScrollRestoration(options) {
     useScrollRestoration();
-    const router = useRouter();
-    const getKey = options.getKey || defaultGetScrollRestorationKey;
-    let elementSelector = '';
-    if (options.id) {
-        elementSelector = `[data-scroll-restoration-id="${options.id}"]`;
-    }
-    else {
-        const element = options.getElement?.();
-        if (!element) {
-            return;
-        }
-        elementSelector =
-            element instanceof Window ? 'window' : getCssSelector(element);
-    }
-    const restoreKey = getKey(router.latestLocation);
-    const byKey = scrollRestorationCache?.state[restoreKey];
-    return byKey?.[elementSelector];
+    return getElementScrollRestorationEntry(useRouter(), options);
 }
 //# sourceMappingURL=ScrollRestoration.jsx.map

package/dist/source/ScrollRestoration.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"ScrollRestoration.jsx","sourceRoot":"","sources":["../../src/ScrollRestoration.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,EAC9B,cAAc,EACd,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAOvC,SAAS,oBAAoB;IAC3B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,sBAAsB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AACtC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAgC;IAChE,oBAAoB,EAAE,CAAA;IAEtB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;QAC3C,OAAO,CAAC,IAAI,CACV,uGAAuG,CACxG,CAAA;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,OAWC;IAED,oBAAoB,EAAE,CAAA;IAEtB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,8BAA8B,CAAA;IAE/D,IAAI,eAAe,GAAG,EAAE,CAAA;IAExB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;QACf,eAAe,GAAG,gCAAgC,OAAO,CAAC,EAAE,IAAI,CAAA;IAClE,CAAC;SAAM,CAAC;QACN,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,EAAE,CAAA;QACtC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAM;QACR,CAAC;QACD,eAAe;YACb,OAAO,YAAY,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;IAClE,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAChD,MAAM,KAAK,GAAG,sBAAsB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;IACvD,OAAO,KAAK,EAAE,CAAC,eAAe,CAAC,CAAA;AACjC,CAAC"}
+{"version":3,"file":"ScrollRestoration.jsx","sourceRoot":"","sources":["../../src/ScrollRestoration.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,gCAAgC,EAChC,sBAAsB,GACvB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAOvC,SAAS,oBAAoB;IAC3B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,sBAAsB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AACtC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAgC;IAChE,oBAAoB,EAAE,CAAA;IAEtB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;QAC3C,OAAO,CAAC,IAAI,CACV,uGAAuG,CACxG,CAAA;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,OAWC;IAED,oBAAoB,EAAE,CAAA;IAEtB,OAAO,gCAAgC,CAAC,SAAS,EAAE,EAAE,OAAO,CAAC,CAAA;AAC/D,CAAC"}

package/dist/source/scroll-restoration.d.ts

@@ -1,8 +1,2 @@
 import * as Vue from 'vue';
-/**
- * ScrollRestoration component for Vue.
- * On server: renders a ScriptOnce with scroll restoration logic.
- * On client during hydration: renders a matching ScriptOnce to avoid mismatch.
- * After mount: renders nothing.
- */
 export declare const ScrollRestoration: Vue.DefineComponent<{}, () => import("vue/jsx-runtime").JSX.Element | null, {}, {}, {}, Vue.ComponentOptionsMixin, Vue.ComponentOptionsMixin, {}, string, Vue.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, Vue.ComponentProvideOptions, true, {}, any>;

package/dist/source/scroll-restoration.jsx

@@ -1,59 +1,17 @@
 import * as Vue from 'vue';
-import { defaultGetScrollRestorationKey, escapeHtml, restoreScroll, storageKey, } from '@tanstack/router-core';
-import { isServer } from '@tanstack/router-core/isServer';
+import { getScrollRestorationScriptForRouter } from '@tanstack/router-core/scroll-restoration-script';
 import { useRouter } from './useRouter';
 import { ScriptOnce } from './ScriptOnce';
-/**
- * ScrollRestoration component for Vue.
- * On server: renders a ScriptOnce with scroll restoration logic.
- * On client during hydration: renders a matching ScriptOnce to avoid mismatch.
- * After mount: renders nothing.
- */
 export const ScrollRestoration = Vue.defineComponent({
     name: 'ScrollRestoration',
     setup() {
         const router = useRouter();
-        // Track mounted state for hydration handling
-        const mounted = Vue.ref(false);
-        Vue.onMounted(() => {
-            mounted.value = true;
-        });
         return () => {
-            // After mount, render nothing
-            if (mounted.value) {
-                return null;
+            const script = getScrollRestorationScriptForRouter(router);
+            if (script) {
+                return <ScriptOnce children={script}/>;
             }
-            // Check if scroll restoration is enabled
-            if (!router.isScrollRestoring) {
-                return null;
-            }
-            // Check custom scroll restoration function
-            if (typeof router.options.scrollRestoration === 'function') {
-                const shouldRestore = router.options.scrollRestoration({
-                    location: router.latestLocation,
-                });
-                if (!shouldRestore) {
-                    return null;
-                }
-            }
-            const getKey = router.options.getScrollRestorationKey || defaultGetScrollRestorationKey;
-            const userKey = getKey(router.latestLocation);
-            const resolvedKey = userKey !== defaultGetScrollRestorationKey(router.latestLocation)
-                ? userKey
-                : undefined;
-            const restoreScrollOptions = {
-                storageKey,
-                shouldScrollRestoration: true,
-            };
-            if (resolvedKey) {
-                restoreScrollOptions.key = resolvedKey;
-            }
-            // Server-side: render the actual scroll restoration script
-            if (isServer ?? router.isServer) {
-                return (<ScriptOnce children={`(${restoreScroll.toString()})(${escapeHtml(JSON.stringify(restoreScrollOptions))})`}/>);
-            }
-            // Client-side during hydration: render empty ScriptOnce to match server structure
-            return <ScriptOnce children=""/>;
+            return null;
         };
     },
 });

package/dist/source/scroll-restoration.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"scroll-restoration.jsx","sourceRoot":"","sources":["../../src/scroll-restoration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAC1B,OAAO,EACL,8BAA8B,EAC9B,UAAU,EACV,aAAa,EACb,UAAU,GACX,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAC,eAAe,CAAC;IACnD,IAAI,EAAE,mBAAmB;IACzB,KAAK;QACH,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;QAE1B,6CAA6C;QAC7C,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAC9B,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;YACjB,OAAO,CAAC,KAAK,GAAG,IAAI,CAAA;QACtB,CAAC,CAAC,CAAA;QAEF,OAAO,GAAG,EAAE;YACV,8BAA8B;YAC9B,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBAClB,OAAO,IAAI,CAAA;YACb,CAAC;YAED,yCAAyC;YACzC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;gBAC9B,OAAO,IAAI,CAAA;YACb,CAAC;YAED,2CAA2C;YAC3C,IAAI,OAAO,MAAM,CAAC,OAAO,CAAC,iBAAiB,KAAK,UAAU,EAAE,CAAC;gBAC3D,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC;oBACrD,QAAQ,EAAE,MAAM,CAAC,cAAc;iBAChC,CAAC,CAAA;gBACF,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,OAAO,IAAI,CAAA;gBACb,CAAC;YACH,CAAC;YAED,MAAM,MAAM,GACV,MAAM,CAAC,OAAO,CAAC,uBAAuB,IAAI,8BAA8B,CAAA;YAC1E,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;YAC7C,MAAM,WAAW,GACf,OAAO,KAAK,8BAA8B,CAAC,MAAM,CAAC,cAAc,CAAC;gBAC/D,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,SAAS,CAAA;YAEf,MAAM,oBAAoB,GAAwC;gBAChE,UAAU;gBACV,uBAAuB,EAAE,IAAI;aAC9B,CAAA;YACD,IAAI,WAAW,EAAE,CAAC;gBAChB,oBAAoB,CAAC,GAAG,GAAG,WAAW,CAAA;YACxC,CAAC;YAED,2DAA2D;YAC3D,IAAI,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAChC,OAAO,CACL,CAAC,UAAU,CACT,QAAQ,CAAC,CAAC,IAAI,aAAa,CAAC,QAAQ,EAAE,KAAK,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,EAC/F,CACH,CAAA;YACH,CAAC;YAED,kFAAkF;YAClF,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAG,CAAA;QACnC,CAAC,CAAA;IACH,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"scroll-restoration.jsx","sourceRoot":"","sources":["../../src/scroll-restoration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAC1B,OAAO,EAAE,mCAAmC,EAAE,MAAM,iDAAiD,CAAA;AACrG,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAC,eAAe,CAAC;IACnD,IAAI,EAAE,mBAAmB;IACzB,KAAK;QACH,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;QAE1B,OAAO,GAAG,EAAE;YACV,MAAM,MAAM,GAAG,mCAAmC,CAAC,MAAM,CAAC,CAAA;YAE1D,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAG,CAAA;YACzC,CAAC;YAED,OAAO,IAAI,CAAA;QACb,CAAC,CAAA;IACH,CAAC;CACF,CAAC,CAAA"}

package/dist/source/useBlocker.d.ts

@@ -1,13 +1,13 @@
 import * as Vue from 'vue';
 import type { HistoryAction } from '@tanstack/history';
 import type { AnyRoute, AnyRouter, ParseRoute, RegisteredRouter } from '@tanstack/router-core';
-interface ShouldBlockFnLocation<out TRouteId, out TFullPath, out TAllParams, out TFullSearchSchema> {
+type ShouldBlockFnLocation<out TRouteId, out TFullPath, out TAllParams, out TFullSearchSchema> = {
     routeId: TRouteId;
     fullPath: TFullPath;
     pathname: string;
     params: TAllParams;
     search: TFullSearchSchema;
-}
+};
 type MakeShouldBlockFnLocationUnion<TRouter extends AnyRouter = RegisteredRouter, TRoute extends AnyRoute = ParseRoute<TRouter['routeTree']>> = TRoute extends any ? ShouldBlockFnLocation<TRoute['id'], TRoute['fullPath'], TRoute['types']['allParams'], TRoute['types']['fullSearchSchema']> : never;
 type BlockerResolver<TRouter extends AnyRouter = RegisteredRouter> = {
     status: 'blocked';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/vue-router",
-  "version": "1.168.4",
+  "version": "1.168.6",
   "description": "Modern and scalable routing for Vue applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -65,7 +65,7 @@
     "isbot": "^5.1.22",
     "jsesc": "^3.0.2",
     "@tanstack/history": "1.161.6",
-    "@tanstack/router-core": "1.168.4"
+    "@tanstack/router-core": "1.168.6"
   },
   "devDependencies": {
     "@tanstack/intent": "^0.0.14",

package/src/Match.tsx

@@ -203,10 +203,13 @@ export const Match = Vue.defineComponent({
         // Add scroll restoration if needed
         const withScrollRestoration: Array<VNode> = [
           content,
-          isChildOfRoot && router.options.scrollRestoration
+          isChildOfRoot
             ? Vue.h(Vue.Fragment, null, [
                 Vue.h(OnRendered),
-                Vue.h(ScrollRestoration),
+                router.options.scrollRestoration &&
+                (isServer ?? router.isServer)
+                  ? Vue.h(ScrollRestoration)
+                  : null,
               ])
             : null,
         ].filter(Boolean) as Array<VNode>

package/src/ScrollRestoration.tsx

@@ -1,7 +1,5 @@
 import {
-  defaultGetScrollRestorationKey,
-  getCssSelector,
-  scrollRestorationCache,
+  getElementScrollRestorationEntry,
   setupScrollRestoration,
 } from '@tanstack/router-core'
 import { useRouter } from './useRouter'
@@ -47,23 +45,5 @@ export function useElementScrollRestoration(
 ): ScrollRestorationEntry | undefined {
   useScrollRestoration()
 
-  const router = useRouter()
-  const getKey = options.getKey || defaultGetScrollRestorationKey
-
-  let elementSelector = ''
-
-  if (options.id) {
-    elementSelector = `[data-scroll-restoration-id="${options.id}"]`
-  } else {
-    const element = options.getElement?.()
-    if (!element) {
-      return
-    }
-    elementSelector =
-      element instanceof Window ? 'window' : getCssSelector(element)
-  }
-
-  const restoreKey = getKey(router.latestLocation)
-  const byKey = scrollRestorationCache?.state[restoreKey]
-  return byKey?.[elementSelector]
+  return getElementScrollRestorationEntry(useRouter(), options)
 }

package/src/scroll-restoration.tsx

@@ -1,79 +1,21 @@
 import * as Vue from 'vue'
-import {
-  defaultGetScrollRestorationKey,
-  escapeHtml,
-  restoreScroll,
-  storageKey,
-} from '@tanstack/router-core'
-import { isServer } from '@tanstack/router-core/isServer'
+import { getScrollRestorationScriptForRouter } from '@tanstack/router-core/scroll-restoration-script'
 import { useRouter } from './useRouter'
 import { ScriptOnce } from './ScriptOnce'
 
-/**
- * ScrollRestoration component for Vue.
- * On server: renders a ScriptOnce with scroll restoration logic.
- * On client during hydration: renders a matching ScriptOnce to avoid mismatch.
- * After mount: renders nothing.
- */
 export const ScrollRestoration = Vue.defineComponent({
   name: 'ScrollRestoration',
   setup() {
     const router = useRouter()
 
-    // Track mounted state for hydration handling
-    const mounted = Vue.ref(false)
-    Vue.onMounted(() => {
-      mounted.value = true
-    })
-
     return () => {
-      // After mount, render nothing
-      if (mounted.value) {
-        return null
-      }
-
-      // Check if scroll restoration is enabled
-      if (!router.isScrollRestoring) {
-        return null
-      }
-
-      // Check custom scroll restoration function
-      if (typeof router.options.scrollRestoration === 'function') {
-        const shouldRestore = router.options.scrollRestoration({
-          location: router.latestLocation,
-        })
-        if (!shouldRestore) {
-          return null
-        }
-      }
-
-      const getKey =
-        router.options.getScrollRestorationKey || defaultGetScrollRestorationKey
-      const userKey = getKey(router.latestLocation)
-      const resolvedKey =
-        userKey !== defaultGetScrollRestorationKey(router.latestLocation)
-          ? userKey
-          : undefined
-
-      const restoreScrollOptions: Parameters<typeof restoreScroll>[0] = {
-        storageKey,
-        shouldScrollRestoration: true,
-      }
-      if (resolvedKey) {
-        restoreScrollOptions.key = resolvedKey
-      }
+      const script = getScrollRestorationScriptForRouter(router)
 
-      // Server-side: render the actual scroll restoration script
-      if (isServer ?? router.isServer) {
-        return (
-          <ScriptOnce
-            children={`(${restoreScroll.toString()})(${escapeHtml(JSON.stringify(restoreScrollOptions))})`}
-          />
-        )
+      if (script) {
+        return <ScriptOnce children={script} />
       }
 
-      // Client-side during hydration: render empty ScriptOnce to match server structure
-      return <ScriptOnce children="" />
+      return null
     }
   },
 })

package/src/useBlocker.tsx

@@ -12,12 +12,12 @@ import type {
   RegisteredRouter,
 } from '@tanstack/router-core'
 
-interface ShouldBlockFnLocation<
+type ShouldBlockFnLocation<
   out TRouteId,
   out TFullPath,
   out TAllParams,
   out TFullSearchSchema,
-> {
+> = {
   routeId: TRouteId
   fullPath: TFullPath
   pathname: string