Skip to content

Commit 701a527

Browse files
committed
Fixes
1 parent a2b9e03 commit 701a527

File tree

5 files changed

+39
-41
lines changed

5 files changed

+39
-41
lines changed

src/routes/$libraryId/$version.docs.$.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ import {
77
notFound,
88
createFileRoute,
99
useLocation,
10-
getRouteApi,
10+
useMatch,
1111
isNotFound,
1212
} from '@tanstack/react-router'
1313

14-
const docsRouteApi = getRouteApi('/$libraryId/$version/docs')
15-
1614
export const Route = createFileRoute('/$libraryId/$version/docs/$')({
1715
staleTime: 1000 * 60 * 5,
1816
loader: async (ctx) => {
@@ -87,7 +85,8 @@ export const Route = createFileRoute('/$libraryId/$version/docs/$')({
8785
function Docs() {
8886
const { version, libraryId, _splat } = Route.useParams()
8987
const { title, content, filePath } = Route.useLoaderData()
90-
const { config } = docsRouteApi.useLoaderData()
88+
const versionMatch = useMatch({ from: '/$libraryId/$version' })
89+
const { config } = versionMatch.loaderData
9190
const library = getLibrary(libraryId)
9291
const branch = getBranch(library, version)
9392
const location = useLocation()

src/routes/$libraryId/$version.docs.framework.$framework.$.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
isNotFound,
44
redirect,
55
useLocation,
6-
getRouteApi,
6+
useMatch,
77
} from '@tanstack/react-router'
88
import { seo } from '~/utils/seo'
99
import { Doc } from '~/components/Doc'
@@ -12,8 +12,6 @@ import { getBranch, getLibrary } from '~/libraries'
1212
import { capitalize } from '~/utils/utils'
1313
import { DocContainer } from '~/components/DocContainer'
1414

15-
const docsRouteApi = getRouteApi('/$libraryId/$version/docs')
16-
1715
export const Route = createFileRoute(
1816
'/$libraryId/$version/docs/framework/$framework/$',
1917
)({
@@ -66,7 +64,8 @@ export const Route = createFileRoute(
6664

6765
function Docs() {
6866
const { title, content, filePath } = Route.useLoaderData()
69-
const { config } = docsRouteApi.useLoaderData()
67+
const versionMatch = useMatch({ from: '/$libraryId/$version' })
68+
const { config } = versionMatch.loaderData
7069
const { version, libraryId, framework } = Route.useParams()
7170
const library = getLibrary(libraryId)
7271
const branch = getBranch(library, version)

src/routes/$libraryId/$version.docs.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import { Outlet, createFileRoute, getRouteApi } from '@tanstack/react-router'
1+
import { Outlet, createFileRoute, useMatch } from '@tanstack/react-router'
22
import { DocsLayout } from '~/components/DocsLayout'
33
import { getLibrary } from '~/libraries'
44
import { seo } from '~/utils/seo'
55

6-
const versionRouteApi = getRouteApi('/$libraryId/$version')
7-
86
export const Route = createFileRoute('/$libraryId/$version/docs')({
97
head: (ctx) => {
108
const { libraryId } = ctx.params
@@ -29,7 +27,8 @@ export const Route = createFileRoute('/$libraryId/$version/docs')({
2927
function DocsRoute() {
3028
const { libraryId, version } = Route.useParams()
3129
const library = getLibrary(libraryId)
32-
const { config } = versionRouteApi.useLoaderData()
30+
const versionMatch = useMatch({ from: '/$libraryId/$version' })
31+
const { config } = versionMatch.loaderData
3332

3433
return (
3534
<DocsLayout

src/routes/$libraryId/$version.index.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react'
22
import {
33
createFileRoute,
4-
getRouteApi,
4+
useMatch,
55
redirect,
66
Link,
77
} from '@tanstack/react-router'
@@ -12,8 +12,6 @@ import { seo } from '~/utils/seo'
1212
import { ossStatsQuery } from '~/queries/stats'
1313
import { Button } from '~/components/Button'
1414

15-
const versionRouteApi = getRouteApi('/$libraryId/$version')
16-
1715
// Lazy-loaded landing components for each library
1816
const landingComponents: Partial<
1917
Record<LibraryId, React.LazyExoticComponent<React.ComponentType>>
@@ -68,7 +66,8 @@ export const Route = createFileRoute('/$libraryId/$version/')({
6866
function LibraryVersionIndex() {
6967
const { libraryId, version } = Route.useParams()
7068
const library = getLibrary(libraryId)
71-
const { config } = versionRouteApi.useLoaderData()
69+
const versionMatch = useMatch({ from: '/$libraryId/$version' })
70+
const { config } = versionMatch.loaderData
7271

7372
const LandingComponent = landingComponents[libraryId as LibraryId]
7473

src/routes/index.tsx

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { createFileRoute, Link } from '@tanstack/react-router'
1+
import { ClientOnly, createFileRoute, Link } from '@tanstack/react-router'
22

33
import { Footer } from '~/components/Footer'
44
import { LazySponsorSection } from '~/components/LazySponsorSection'
@@ -133,30 +133,32 @@ function Index() {
133133
xl:[--ship-x:80px] xl:[--ship-y:2.5rem]
134134
2xl:[--ship-x:90px] 2xl:[--ship-y:3rem]"
135135
>
136-
{/* Ship behind splash */}
137-
<div className="absolute left-1/3 bottom-[25%] z-0 animate-ship-peek">
138-
<NetlifyImage
139-
src="/images/ship.png"
140-
alt=""
141-
width={80}
142-
height={80}
143-
className="w-16 xl:w-20"
144-
/>
145-
</div>
146-
{/* Invisible clickable ship in front */}
147-
<Link
148-
to="/explore"
149-
className="absolute left-1/3 bottom-[25%] z-20 animate-ship-peek-clickable"
150-
title="Explore TanStack"
151-
>
152-
<NetlifyImage
153-
src="/images/ship.png"
154-
alt="Explore TanStack"
155-
width={80}
156-
height={80}
157-
className="w-16 xl:w-20 opacity-0"
158-
/>
159-
</Link>
136+
<ClientOnly>
137+
{/* Ship behind splash */}
138+
<div className="absolute left-1/3 bottom-[25%] z-0 animate-ship-peek">
139+
<NetlifyImage
140+
src="/images/ship.png"
141+
alt=""
142+
width={80}
143+
height={80}
144+
className="w-16 xl:w-20"
145+
/>
146+
</div>
147+
{/* Invisible clickable ship in front */}
148+
<Link
149+
to="/explore"
150+
className="absolute left-1/3 bottom-[25%] z-20 animate-ship-peek-clickable"
151+
title="Explore TanStack"
152+
>
153+
<NetlifyImage
154+
src="/images/ship.png"
155+
alt="Explore TanStack"
156+
width={80}
157+
height={80}
158+
className="w-16 xl:w-20 opacity-0"
159+
/>
160+
</Link>
161+
</ClientOnly>
160162
<BrandContextMenu className="cursor-pointer relative z-10">
161163
<NetlifyImage
162164
src="/images/logos/splash-light.png"

0 commit comments

Comments
 (0)