@tanstack/solid-router 1.132.0-alpha.8 → 1.132.2

package/src/link.tsx

@@ -15,7 +15,6 @@ import { useRouter } from './useRouter'
 
 import { useIntersectionObserver } from './utils'
 
-import { useActiveLocation } from './useActiveLocation'
 import type {
   AnyRouter,
   Constrain,
@@ -115,43 +114,60 @@ export function useLinkProps<
     'unsafeRelative',
   ])
 
-  // If this link simply reloads the current route,
-  // make sure it has a new key so it will trigger a data refresh
-
-  // If this `to` is a valid external URL, return
-  // null for LinkUtils
-
-  const type: Solid.Accessor<'internal' | 'external'> = () => {
-    try {
-      new URL(`${local.to}`)
-      return 'external'
-    } catch {}
-    return 'internal'
-  }
-
   const currentSearch = useRouterState({
     select: (s) => s.location.searchStr,
   })
 
-  const { getFromPath, activeLocation } = useActiveLocation()
-
-  const from = getFromPath(options.from)
+  const from = options.from
 
   const _options = () => {
     return {
       ...options,
-      from: from(),
+      from,
     }
   }
 
   const next = Solid.createMemo(() => {
     currentSearch()
-    activeLocation()
     return router.buildLocation(_options() as any)
   })
 
+  const hrefOption = Solid.createMemo(() => {
+    if (_options().disabled) {
+      return undefined
+    }
+    let href
+    const maskedLocation = next().maskedLocation
+    if (maskedLocation) {
+      href = maskedLocation.url
+    } else {
+      href = next().url
+    }
+    let external = false
+    if (router.origin) {
+      if (href.startsWith(router.origin)) {
+        href = href.replace(router.origin, '')
+      } else {
+        external = true
+      }
+    }
+    return { href, external }
+  })
+
+  const externalLink = Solid.createMemo(() => {
+    const _href = hrefOption()
+    if (_href?.external) {
+      return _href.href
+    }
+    try {
+      new URL(_options().to as any)
+      return _options().to
+    } catch {}
+    return undefined
+  })
+
   const preload = Solid.createMemo(() => {
-    if (_options().reloadDocument) {
+    if (_options().reloadDocument || externalLink()) {
       return false
     }
     return local.preload ?? router.options.defaultPreload
@@ -161,6 +177,7 @@ export function useLinkProps<
 
   const isActive = useRouterState({
     select: (s) => {
+      if (externalLink()) return false
       if (local.activeOptions?.exact) {
         const testExact = exactPathTest(
           s.location.pathname,
@@ -238,17 +255,12 @@ export function useLinkProps<
     }
   })
 
-  if (type() === 'external') {
+  if (externalLink()) {
     return Solid.mergeProps(
       propsSafeToSpread,
       {
         ref,
-        get type() {
-          return type()
-        },
-        get href() {
-          return local.to
-        },
+        href: externalLink,
       },
       Solid.splitProps(local, [
         'target',
@@ -268,11 +280,16 @@ export function useLinkProps<
 
   // The click handler
   const handleClick = (e: MouseEvent) => {
+    // Check actual element's target attribute as fallback
+    const elementTarget = (e.currentTarget as HTMLAnchorElement).target
+    const effectiveTarget =
+      local.target !== undefined ? local.target : elementTarget
+
     if (
       !local.disabled &&
       !isCtrlEvent(e) &&
       !e.defaultPrevented &&
-      (!local.target || local.target === '_self') &&
+      (!effectiveTarget || effectiveTarget === '_self') &&
       e.button === 0
     ) {
       e.preventDefault()
@@ -384,24 +401,13 @@ export function useLinkProps<
     ...resolvedInactiveProps().style,
   })
 
-  const href = Solid.createMemo(() => {
-    const nextLocation = next()
-    const maskedLocation = nextLocation?.maskedLocation
-
-    return _options().disabled
-      ? undefined
-      : maskedLocation
-        ? router.history.createHref(maskedLocation.href)
-        : router.history.createHref(nextLocation?.href)
-  })
-
   return Solid.mergeProps(
     propsSafeToSpread,
     resolvedActiveProps,
     resolvedInactiveProps,
     () => {
       return {
-        href: href(),
+        href: hrefOption()?.href,
         ref: mergeRefs(setRef, _options().ref),
         onClick: composeEventHandlers([local.onClick, handleClick]),
         onFocus: composeEventHandlers([local.onFocus, handleFocus]),

package/src/route.tsx

@@ -153,7 +153,7 @@ export class RouteApi<
 }
 
 export class Route<
-    in out TRegister extends Register = Register,
+    in out TRegister = unknown,
     in out TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute,
     in out TPath extends RouteConstraints['TPath'] = '/',
     in out TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<
@@ -176,6 +176,8 @@ export class Route<
     in out TChildren = unknown,
     in out TFileRouteTypes = unknown,
     in out TSSR = unknown,
+    in out TMiddlewares = unknown,
+    in out THandlers = undefined,
   >
   extends BaseRoute<
     TRegister,
@@ -193,7 +195,9 @@ export class Route<
     TLoaderFn,
     TChildren,
     TFileRouteTypes,
-    TSSR
+    TSSR,
+    TMiddlewares,
+    THandlers
   >
   implements
     RouteCore<
@@ -212,7 +216,9 @@ export class Route<
       TLoaderFn,
       TChildren,
       TFileRouteTypes,
-      TSSR
+      TSSR,
+      TMiddlewares,
+      THandlers
     >
 {
   /**
@@ -233,7 +239,9 @@ export class Route<
       TRouterContext,
       TRouteContextFn,
       TBeforeLoadFn,
-      TSSR
+      TSSR,
+      TMiddlewares,
+      THandlers
     >,
   ) {
     super(options)
@@ -286,7 +294,7 @@ export class Route<
 }
 
 export function createRoute<
-  TRegister extends Register = Register,
+  TRegister = unknown,
   TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute,
   TPath extends RouteConstraints['TPath'] = '/',
   TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<
@@ -307,6 +315,7 @@ export function createRoute<
   TLoaderFn = undefined,
   TChildren = unknown,
   TSSR = unknown,
+  THandlers = undefined,
 >(
   options: RouteOptions<
     TRegister,
@@ -322,7 +331,8 @@ export function createRoute<
     AnyContext,
     TRouteContextFn,
     TBeforeLoadFn,
-    TSSR
+    TSSR,
+    THandlers
   >,
 ): Route<
   TRegister,
@@ -340,7 +350,8 @@ export function createRoute<
   TLoaderFn,
   TChildren,
   unknown,
-  TSSR
+  TSSR,
+  THandlers
 > {
   return new Route<
     TRegister,
@@ -358,7 +369,8 @@ export function createRoute<
     TLoaderFn,
     TChildren,
     unknown,
-    TSSR
+    TSSR,
+    THandlers
   >(options)
 }
 
@@ -377,13 +389,14 @@ export type AnyRootRoute = RootRoute<
 
 export function createRootRouteWithContext<TRouterContext extends {}>() {
   return <
-    TRegister extends Register = Register,
+    TRegister = Register,
     TRouteContextFn = AnyContext,
     TBeforeLoadFn = AnyContext,
     TSearchValidator = undefined,
     TLoaderDeps extends Record<string, any> = {},
     TLoaderFn = undefined,
     TSSR = unknown,
+    THandlers = undefined,
   >(
     options?: RootRouteOptions<
       TRegister,
@@ -393,7 +406,8 @@ export function createRootRouteWithContext<TRouterContext extends {}>() {
       TBeforeLoadFn,
       TLoaderDeps,
       TLoaderFn,
-      TSSR
+      TSSR,
+      THandlers
     >,
   ) => {
     return createRootRoute<
@@ -404,7 +418,8 @@ export function createRootRouteWithContext<TRouterContext extends {}>() {
       TBeforeLoadFn,
       TLoaderDeps,
       TLoaderFn,
-      TSSR
+      TSSR,
+      THandlers
     >(options as any)
   }
 }
@@ -415,7 +430,7 @@ export function createRootRouteWithContext<TRouterContext extends {}>() {
 export const rootRouteWithContext = createRootRouteWithContext
 
 export class RootRoute<
-    in out TRegister extends Register = Register,
+    in out TRegister = Register,
     in out TSearchValidator = undefined,
     in out TRouterContext = {},
     in out TRouteContextFn = AnyContext,
@@ -425,6 +440,7 @@ export class RootRoute<
     in out TChildren = unknown,
     in out TFileRouteTypes = unknown,
     in out TSSR = unknown,
+    in out THandlers = undefined,
   >
   extends BaseRootRoute<
     TRegister,
@@ -436,7 +452,8 @@ export class RootRoute<
     TLoaderFn,
     TChildren,
     TFileRouteTypes,
-    TSSR
+    TSSR,
+    THandlers
   >
   implements
     RootRouteCore<
@@ -449,7 +466,8 @@ export class RootRoute<
       TLoaderFn,
       TChildren,
       TFileRouteTypes,
-      TSSR
+      TSSR,
+      THandlers
     >
 {
   /**
@@ -464,7 +482,8 @@ export class RootRoute<
       TBeforeLoadFn,
       TLoaderDeps,
       TLoaderFn,
-      TSSR
+      TSSR,
+      THandlers
     >,
   ) {
     super(options)
@@ -546,7 +565,7 @@ export type ErrorRouteComponent = AsyncRouteComponent<ErrorComponentProps>
 export type NotFoundRouteComponent = RouteTypes<NotFoundRouteProps>['component']
 
 export class NotFoundRoute<
-  TRegister extends Register,
+  TRegister,
   TParentRoute extends AnyRootRoute,
   TRouterContext = AnyContext,
   TRouteContextFn = AnyContext,
@@ -556,6 +575,7 @@ export class NotFoundRoute<
   TLoaderFn = undefined,
   TChildren = unknown,
   TSSR = unknown,
+  THandlers = undefined,
 > extends Route<
   TRegister,
   TParentRoute,
@@ -571,7 +591,8 @@ export class NotFoundRoute<
   TLoaderDeps,
   TLoaderFn,
   TChildren,
-  TSSR
+  TSSR,
+  THandlers
 > {
   constructor(
     options: Omit<
@@ -589,7 +610,8 @@ export class NotFoundRoute<
         TRouterContext,
         TRouteContextFn,
         TBeforeLoadFn,
-        TSSR
+        TSSR,
+        THandlers
       >,
       | 'caseSensitive'
       | 'parseParams'
@@ -607,7 +629,7 @@ export class NotFoundRoute<
 }
 
 export function createRootRoute<
-  TRegister extends Register = Register,
+  TRegister = Register,
   TSearchValidator = undefined,
   TRouterContext = {},
   TRouteContextFn = AnyContext,
@@ -615,6 +637,7 @@ export function createRootRoute<
   TLoaderDeps extends Record<string, any> = {},
   TLoaderFn = undefined,
   TSSR = unknown,
+  THandlers = undefined,
 >(
   options?: RootRouteOptions<
     TRegister,
@@ -624,7 +647,8 @@ export function createRootRoute<
     TBeforeLoadFn,
     TLoaderDeps,
     TLoaderFn,
-    TSSR
+    TSSR,
+    THandlers
   >,
 ): RootRoute<
   TRegister,
@@ -636,7 +660,8 @@ export function createRootRoute<
   TLoaderFn,
   unknown,
   unknown,
-  TSSR
+  TSSR,
+  THandlers
 > {
   return new RootRoute<
     TRegister,
@@ -648,6 +673,7 @@ export function createRootRoute<
     TLoaderFn,
     unknown,
     unknown,
-    TSSR
+    TSSR,
+    THandlers
   >(options)
 }

package/src/ssr/renderRouterToString.tsx

@@ -13,6 +13,7 @@ export const renderRouterToString = async ({
 }) => {
   try {
     let html = Solid.renderToString(children)
+    router.serverSsr!.setRenderFinished()
     const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(
       (htmls) => htmls.join(''),
     )

package/src/useNavigate.tsx

@@ -1,6 +1,5 @@
 import * as Solid from 'solid-js'
 import { useRouter } from './useRouter'
-import { useActiveLocation } from './useActiveLocation'
 import type {
   AnyRouter,
   FromPathOption,
@@ -17,17 +16,10 @@ export function useNavigate<
 }): UseNavigateResult<TDefaultFrom> {
   const router = useRouter()
 
-  const { getFromPath, setActiveLocation } = useActiveLocation(
-    router.latestLocation,
-  )
-
   return ((options: NavigateOptions) => {
-    setActiveLocation(router.latestLocation)
-    const from = getFromPath(options.from ?? _defaultOpts?.from)
-
     return router.navigate({
       ...options,
-      from: from(),
+      from: options.from ?? _defaultOpts?.from,
     })
   }) as UseNavigateResult<TDefaultFrom>
 }

package/src/useParams.tsx

@@ -62,10 +62,12 @@ export function useParams<
 > {
   return useMatch({
     from: opts.from!,
-    strict: opts.strict,
     shouldThrow: opts.shouldThrow,
-    select: (match: any) => {
-      return opts.select ? opts.select(match.params) : match.params
+    strict: opts.strict,
+    select: (match) => {
+      const params = opts.strict === false ? match.params : match._strictParams
+
+      return opts.select ? opts.select(params) : params
     },
-  } as any) as any
+  }) as Accessor<any>
 }

package/dist/cjs/useActiveLocation.cjs

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const routerCore = require("@tanstack/router-core");
-const Solid = require("solid-js");
-const useMatch = require("./useMatch.cjs");
-const useRouter = require("./useRouter.cjs");
-const useRouterState = require("./useRouterState.cjs");
-function useActiveLocation(location) {
-  const router = useRouter.useRouter();
-  const [activeLocation, setActiveLocation] = Solid.createSignal(
-    location ?? useRouterState.useRouterState({ select: (s) => s.location })()
-  );
-  const [customActiveLocation, setCustomActiveLocation] = Solid.createSignal(location);
-  Solid.createEffect(() => {
-    setActiveLocation(
-      customActiveLocation() ?? useRouterState.useRouterState({ select: (s) => s.location })()
-    );
-  });
-  const matchIndex = useMatch.useMatch({
-    strict: false,
-    select: (match) => match.index
-  });
-  const getFromPath = (from) => Solid.createMemo(() => {
-    const activeLocationMatches = router.matchRoutes(
-      customActiveLocation() ?? activeLocation(),
-      {
-        _buildLocation: false
-      }
-    );
-    const activeLocationMatch = routerCore.last(activeLocationMatches);
-    return from ?? activeLocationMatch?.fullPath ?? router.state.matches[matchIndex()].fullPath;
-  });
-  return {
-    activeLocation,
-    getFromPath,
-    setActiveLocation: setCustomActiveLocation
-  };
-}
-exports.useActiveLocation = useActiveLocation;
-//# sourceMappingURL=useActiveLocation.cjs.map

package/dist/cjs/useActiveLocation.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"useActiveLocation.cjs","sources":["../../src/useActiveLocation.ts"],"sourcesContent":["import { last } from '@tanstack/router-core'\nimport { createEffect, createMemo, createSignal } from 'solid-js'\nimport { useMatch } from './useMatch'\nimport { useRouter } from './useRouter'\nimport { useRouterState } from './useRouterState'\nimport type { Accessor } from 'solid-js'\nimport type { ParsedLocation } from '@tanstack/router-core'\n\nexport type UseLocationResult = {\n  activeLocation: Accessor<ParsedLocation>\n  getFromPath: (from?: string) => Accessor<string>\n  setActiveLocation: (location?: ParsedLocation) => void\n}\n\nexport function useActiveLocation(\n  location?: ParsedLocation,\n): UseLocationResult {\n  const router = useRouter()\n  // we are not using a variable here for router state location since we need to only calculate that if the location is not passed in. It can result in unnecessary history actions if we do that.\n  const [activeLocation, setActiveLocation] = createSignal<ParsedLocation>(\n    location ?? useRouterState({ select: (s) => s.location })(),\n  )\n  const [customActiveLocation, setCustomActiveLocation] = createSignal<\n    ParsedLocation | undefined\n  >(location)\n\n  createEffect(() => {\n    setActiveLocation(\n      customActiveLocation() ?? useRouterState({ select: (s) => s.location })(),\n    )\n  })\n\n  const matchIndex = useMatch({\n    strict: false,\n    select: (match) => match.index,\n  })\n\n  const getFromPath = (from?: string) =>\n    createMemo(() => {\n      const activeLocationMatches = router.matchRoutes(\n        customActiveLocation() ?? activeLocation(),\n        {\n          _buildLocation: false,\n        },\n      )\n\n      const activeLocationMatch = last(activeLocationMatches)\n\n      return (\n        from ??\n        activeLocationMatch?.fullPath ??\n        router.state.matches[matchIndex()]!.fullPath\n      )\n    })\n\n  return {\n    activeLocation,\n    getFromPath,\n    setActiveLocation: setCustomActiveLocation,\n  }\n}\n"],"names":["useRouter","createSignal","useRouterState","createEffect","useMatch","createMemo","last"],"mappings":";;;;;;;AAcO,SAAS,kBACd,UACmB;AACnB,QAAM,SAASA,UAAAA,UAAA;AAEf,QAAM,CAAC,gBAAgB,iBAAiB,IAAIC,MAAAA;AAAAA,IAC1C,YAAYC,eAAAA,eAAe,EAAE,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAA;AAAA,EAAE;AAE5D,QAAM,CAAC,sBAAsB,uBAAuB,IAAID,MAAAA,aAEtD,QAAQ;AAEVE,QAAAA,aAAa,MAAM;AACjB;AAAA,MACE,qBAAA,KAA0BD,eAAAA,eAAe,EAAE,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAA;AAAA,IAAE;AAAA,EAE5E,CAAC;AAED,QAAM,aAAaE,SAAAA,SAAS;AAAA,IAC1B,QAAQ;AAAA,IACR,QAAQ,CAAC,UAAU,MAAM;AAAA,EAAA,CAC1B;AAED,QAAM,cAAc,CAAC,SACnBC,MAAAA,WAAW,MAAM;AACf,UAAM,wBAAwB,OAAO;AAAA,MACnC,qBAAA,KAA0B,eAAA;AAAA,MAC1B;AAAA,QACE,gBAAgB;AAAA,MAAA;AAAA,IAClB;AAGF,UAAM,sBAAsBC,WAAAA,KAAK,qBAAqB;AAEtD,WACE,QACA,qBAAqB,YACrB,OAAO,MAAM,QAAQ,WAAA,CAAY,EAAG;AAAA,EAExC,CAAC;AAEH,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA,mBAAmB;AAAA,EAAA;AAEvB;;"}

package/dist/cjs/useActiveLocation.d.cts

@@ -1,8 +0,0 @@
-import { Accessor } from 'solid-js';
-import { ParsedLocation } from '@tanstack/router-core';
-export type UseLocationResult = {
-    activeLocation: Accessor<ParsedLocation>;
-    getFromPath: (from?: string) => Accessor<string>;
-    setActiveLocation: (location?: ParsedLocation) => void;
-};
-export declare function useActiveLocation(location?: ParsedLocation): UseLocationResult;

package/dist/esm/useActiveLocation.d.ts

@@ -1,8 +0,0 @@
-import { Accessor } from 'solid-js';
-import { ParsedLocation } from '@tanstack/router-core';
-export type UseLocationResult = {
-    activeLocation: Accessor<ParsedLocation>;
-    getFromPath: (from?: string) => Accessor<string>;
-    setActiveLocation: (location?: ParsedLocation) => void;
-};
-export declare function useActiveLocation(location?: ParsedLocation): UseLocationResult;

package/dist/esm/useActiveLocation.js

@@ -1,40 +0,0 @@
-import { last } from "@tanstack/router-core";
-import { createSignal, createEffect, createMemo } from "solid-js";
-import { useMatch } from "./useMatch.js";
-import { useRouter } from "./useRouter.js";
-import { useRouterState } from "./useRouterState.js";
-function useActiveLocation(location) {
-  const router = useRouter();
-  const [activeLocation, setActiveLocation] = createSignal(
-    location ?? useRouterState({ select: (s) => s.location })()
-  );
-  const [customActiveLocation, setCustomActiveLocation] = createSignal(location);
-  createEffect(() => {
-    setActiveLocation(
-      customActiveLocation() ?? useRouterState({ select: (s) => s.location })()
-    );
-  });
-  const matchIndex = useMatch({
-    strict: false,
-    select: (match) => match.index
-  });
-  const getFromPath = (from) => createMemo(() => {
-    const activeLocationMatches = router.matchRoutes(
-      customActiveLocation() ?? activeLocation(),
-      {
-        _buildLocation: false
-      }
-    );
-    const activeLocationMatch = last(activeLocationMatches);
-    return from ?? activeLocationMatch?.fullPath ?? router.state.matches[matchIndex()].fullPath;
-  });
-  return {
-    activeLocation,
-    getFromPath,
-    setActiveLocation: setCustomActiveLocation
-  };
-}
-export {
-  useActiveLocation
-};
-//# sourceMappingURL=useActiveLocation.js.map

package/dist/esm/useActiveLocation.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useActiveLocation.js","sources":["../../src/useActiveLocation.ts"],"sourcesContent":["import { last } from '@tanstack/router-core'\nimport { createEffect, createMemo, createSignal } from 'solid-js'\nimport { useMatch } from './useMatch'\nimport { useRouter } from './useRouter'\nimport { useRouterState } from './useRouterState'\nimport type { Accessor } from 'solid-js'\nimport type { ParsedLocation } from '@tanstack/router-core'\n\nexport type UseLocationResult = {\n  activeLocation: Accessor<ParsedLocation>\n  getFromPath: (from?: string) => Accessor<string>\n  setActiveLocation: (location?: ParsedLocation) => void\n}\n\nexport function useActiveLocation(\n  location?: ParsedLocation,\n): UseLocationResult {\n  const router = useRouter()\n  // we are not using a variable here for router state location since we need to only calculate that if the location is not passed in. It can result in unnecessary history actions if we do that.\n  const [activeLocation, setActiveLocation] = createSignal<ParsedLocation>(\n    location ?? useRouterState({ select: (s) => s.location })(),\n  )\n  const [customActiveLocation, setCustomActiveLocation] = createSignal<\n    ParsedLocation | undefined\n  >(location)\n\n  createEffect(() => {\n    setActiveLocation(\n      customActiveLocation() ?? useRouterState({ select: (s) => s.location })(),\n    )\n  })\n\n  const matchIndex = useMatch({\n    strict: false,\n    select: (match) => match.index,\n  })\n\n  const getFromPath = (from?: string) =>\n    createMemo(() => {\n      const activeLocationMatches = router.matchRoutes(\n        customActiveLocation() ?? activeLocation(),\n        {\n          _buildLocation: false,\n        },\n      )\n\n      const activeLocationMatch = last(activeLocationMatches)\n\n      return (\n        from ??\n        activeLocationMatch?.fullPath ??\n        router.state.matches[matchIndex()]!.fullPath\n      )\n    })\n\n  return {\n    activeLocation,\n    getFromPath,\n    setActiveLocation: setCustomActiveLocation,\n  }\n}\n"],"names":[],"mappings":";;;;;AAcO,SAAS,kBACd,UACmB;AACnB,QAAM,SAAS,UAAA;AAEf,QAAM,CAAC,gBAAgB,iBAAiB,IAAI;AAAA,IAC1C,YAAY,eAAe,EAAE,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAA;AAAA,EAAE;AAE5D,QAAM,CAAC,sBAAsB,uBAAuB,IAAI,aAEtD,QAAQ;AAEV,eAAa,MAAM;AACjB;AAAA,MACE,qBAAA,KAA0B,eAAe,EAAE,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAA;AAAA,IAAE;AAAA,EAE5E,CAAC;AAED,QAAM,aAAa,SAAS;AAAA,IAC1B,QAAQ;AAAA,IACR,QAAQ,CAAC,UAAU,MAAM;AAAA,EAAA,CAC1B;AAED,QAAM,cAAc,CAAC,SACnB,WAAW,MAAM;AACf,UAAM,wBAAwB,OAAO;AAAA,MACnC,qBAAA,KAA0B,eAAA;AAAA,MAC1B;AAAA,QACE,gBAAgB;AAAA,MAAA;AAAA,IAClB;AAGF,UAAM,sBAAsB,KAAK,qBAAqB;AAEtD,WACE,QACA,qBAAqB,YACrB,OAAO,MAAM,QAAQ,WAAA,CAAY,EAAG;AAAA,EAExC,CAAC;AAEH,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA,mBAAmB;AAAA,EAAA;AAEvB;"}

package/dist/source/useActiveLocation.d.ts

@@ -1,8 +0,0 @@
-import type { Accessor } from 'solid-js';
-import type { ParsedLocation } from '@tanstack/router-core';
-export type UseLocationResult = {
-    activeLocation: Accessor<ParsedLocation>;
-    getFromPath: (from?: string) => Accessor<string>;
-    setActiveLocation: (location?: ParsedLocation) => void;
-};
-export declare function useActiveLocation(location?: ParsedLocation): UseLocationResult;

package/dist/source/useActiveLocation.js

@@ -1,33 +0,0 @@
-import { last } from '@tanstack/router-core';
-import { createEffect, createMemo, createSignal } from 'solid-js';
-import { useMatch } from './useMatch';
-import { useRouter } from './useRouter';
-import { useRouterState } from './useRouterState';
-export function useActiveLocation(location) {
-    const router = useRouter();
-    // we are not using a variable here for router state location since we need to only calculate that if the location is not passed in. It can result in unnecessary history actions if we do that.
-    const [activeLocation, setActiveLocation] = createSignal(location ?? useRouterState({ select: (s) => s.location })());
-    const [customActiveLocation, setCustomActiveLocation] = createSignal(location);
-    createEffect(() => {
-        setActiveLocation(customActiveLocation() ?? useRouterState({ select: (s) => s.location })());
-    });
-    const matchIndex = useMatch({
-        strict: false,
-        select: (match) => match.index,
-    });
-    const getFromPath = (from) => createMemo(() => {
-        const activeLocationMatches = router.matchRoutes(customActiveLocation() ?? activeLocation(), {
-            _buildLocation: false,
-        });
-        const activeLocationMatch = last(activeLocationMatches);
-        return (from ??
-            activeLocationMatch?.fullPath ??
-            router.state.matches[matchIndex()].fullPath);
-    });
-    return {
-        activeLocation,
-        getFromPath,
-        setActiveLocation: setCustomActiveLocation,
-    };
-}
-//# sourceMappingURL=useActiveLocation.js.map

package/dist/source/useActiveLocation.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useActiveLocation.js","sourceRoot":"","sources":["../../src/useActiveLocation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAUjD,MAAM,UAAU,iBAAiB,CAC/B,QAAyB;IAEzB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,gMAAgM;IAChM,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,YAAY,CACtD,QAAQ,IAAI,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,CAC5D,CAAA;IACD,MAAM,CAAC,oBAAoB,EAAE,uBAAuB,CAAC,GAAG,YAAY,CAElE,QAAQ,CAAC,CAAA;IAEX,YAAY,CAAC,GAAG,EAAE;QAChB,iBAAiB,CACf,oBAAoB,EAAE,IAAI,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,CAC1E,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,MAAM,UAAU,GAAG,QAAQ,CAAC;QAC1B,MAAM,EAAE,KAAK;QACb,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK;KAC/B,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,CAAC,IAAa,EAAE,EAAE,CACpC,UAAU,CAAC,GAAG,EAAE;QACd,MAAM,qBAAqB,GAAG,MAAM,CAAC,WAAW,CAC9C,oBAAoB,EAAE,IAAI,cAAc,EAAE,EAC1C;YACE,cAAc,EAAE,KAAK;SACtB,CACF,CAAA;QAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAA;QAEvD,OAAO,CACL,IAAI;YACJ,mBAAmB,EAAE,QAAQ;YAC7B,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,CAAE,CAAC,QAAQ,CAC7C,CAAA;IACH,CAAC,CAAC,CAAA;IAEJ,OAAO;QACL,cAAc;QACd,WAAW;QACX,iBAAiB,EAAE,uBAAuB;KAC3C,CAAA;AACH,CAAC"}