replicate changes to Solid

Author: nlynzaad

packages/solid-router/src/link.tsx

@@ -135,15 +135,30 @@ export function useLinkProps<
 
   // when `from` is not supplied, use the route of the current match as the `from` location
   // so relative routing works as expected
-  const from = useMatch({
+  // const from = useMatch({
+  //   strict: false,
+  //   select: (match) => options.from ?? match.fullPath,
+  // })
+
+  const matchIndex = useMatch({
     strict: false,
-    select: (match) => options.from ?? match.fullPath,
+    select: (match) => match.index,
   })
 
-  const _options = () => ({
-    ...options,
-    from: from(),
-  })
+  const _options = () => {
+    const currentRouteMatches= router.matchRoutes(router.latestLocation, {
+      _buildLocation: false,
+    })
+
+    const from = options.from ??
+      currentRouteMatches.slice(-1)[0]?.fullPath ??
+      router.state.matches[matchIndex()]!.fullPath
+
+    return ({
+      ...options,
+      from
+    })
+  }
 
   const next = Solid.createMemo(() => {
     currentSearch()

packages/solid-router/src/useNavigate.tsx

@@ -15,20 +15,25 @@ export function useNavigate<
 >(_defaultOpts?: {
   from?: FromPathOption<TRouter, TDefaultFrom>
 }): UseNavigateResult<TDefaultFrom> {
-  const { navigate, state } = useRouter()
+  const router = useRouter()
 
   const matchIndex = useMatch({
     strict: false,
     select: (match) => match.index,
   })
 
   return ((options: NavigateOptions) => {
-    return navigate({
+    const currentRouteMatches= router.matchRoutes(router.latestLocation, {
+      _buildLocation: false,
+    })
+
+    return router.navigate({
       ...options,
       from:
         options.from ??
         _defaultOpts?.from ??
-        state.matches[matchIndex()]!.fullPath,
+        currentRouteMatches.slice(-1)[0]?.fullPath ??
+        router.state.matches[matchIndex()]!.fullPath
     })
   }) as UseNavigateResult<TDefaultFrom>
 }