@tanstack/solid-router 1.121.40 → 1.122.0

package/src/Match.tsx

@@ -18,7 +18,7 @@ import { matchContext } from './matchContext'
 import { SafeFragment } from './SafeFragment'
 import { renderRouteNotFound } from './renderRouteNotFound'
 import { ScrollRestoration } from './scroll-restoration'
-import type { AnyRoute } from '@tanstack/router-core'
+import type { AnyRoute, RootRouteOptions } from '@tanstack/router-core'
 
 export const Match = (props: { matchId: string }) => {
   const router = useRouter()
@@ -77,8 +77,12 @@ export const Match = (props: { matchId: string }) => {
     },
   })
 
+  const ShellComponent = route().isRoot
+    ? ((route().options as RootRouteOptions).shellComponent ?? SafeFragment)
+    : SafeFragment
+
   return (
-    <>
+    <ShellComponent>
       <matchContext.Provider value={() => props.matchId}>
         <Dynamic
           component={ResolvedSuspenseBoundary()}
@@ -124,7 +128,7 @@ export const Match = (props: { matchId: string }) => {
           <ScrollRestoration />
         </>
       ) : null}
-    </>
+    </ShellComponent>
   )
 }
 

package/src/link.tsx

@@ -112,6 +112,7 @@ export function useLinkProps<
     'state',
     'mask',
     'reloadDocument',
+    'unsafeRelative',
   ])
 
   // If this link simply reloads the current route,

package/src/route.tsx

@@ -54,6 +54,14 @@ declare module '@tanstack/router-core' {
     pendingComponent?: RouteComponent
   }
 
+  export interface RootRouteOptionsExtensions {
+    shellComponent?: ({
+      children,
+    }: {
+      children: Solid.JSX.Element
+    }) => Solid.JSX.Element
+  }
+
   export interface RouteExtensions<
     in out TId extends string,
     in out TFullPath extends string,