Skip to content
Source
Sign inSign up
TanStack/router

fix(solid-router): RouteProvider Wrap and Match InnerWrap support propagating context to their children #5033

MergedWoyken(GitHub profile, opens in a new tab)merged 4 commits intomain fromrefs/pull/5033/headmerged by birkskyum(GitHub profile, opens in a new tab)

Showing 4 changed files with 126 additions and 26 deletions (loading 1).

x
0 of 4 viewed, 4 left
18 additions and 16 deletionspackages/solid-router/src/Matches.tsxModified
View file
@@ -38,27 +38,27 @@
export function Matches() {
const router = useRouter()
​
- const pendingElement = router.options.defaultPendingComponent ? (
- <router.options.defaultPendingComponent />
- ) : null
-​
// Do not render a root Suspense during SSR or hydrating from SSR
const ResolvedSuspense =
router.isServer || (typeof document !== 'undefined' && router.ssr)
? SafeFragment
: Solid.Suspense
​
- const inner = (
- <ResolvedSuspense fallback={pendingElement}>
- {!router.isServer && <Transitioner />}
- <MatchesInner />
- </ResolvedSuspense>
- )
+ const OptionalWrapper = router.options.InnerWrap || SafeFragment
​
- return router.options.InnerWrap ? (
- <router.options.InnerWrap>{inner}</router.options.InnerWrap>
- ) : (
- inner