Skip to content

Commit fbfa234

Browse files
fix(cli): remove excessive loader in root component in tanstack router / start
1 parent 285f516 commit fbfa234

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

apps/cli/templates/frontend/react/tanstack-router/src/routes/__root.tsx.hbs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import Header from "@/components/header";
2-
import Loader from "@/components/loader";
32
import { ThemeProvider } from "@/components/theme-provider";
43
import { Toaster } from "@/components/ui/sonner";
54
{{#if (eq api "orpc")}}
@@ -20,7 +19,6 @@ import {
2019
HeadContent,
2120
Outlet,
2221
createRootRouteWithContext,
23-
useRouterState,
2422
} from "@tanstack/react-router";
2523
import { TanStackRouterDevtools } from "@tanstack/react-router-devtools";
2624
import "../index.css";
@@ -61,10 +59,6 @@ export const Route = createRootRouteWithContext<RouterAppContext>()({
6159
});
6260

6361
function RootComponent() {
64-
const isFetching = useRouterState({
65-
select: (s) => s.isLoading,
66-
});
67-
6862
{{#if (eq api "orpc")}}
6963
const [client] = useState<AppRouterClient>(() => createORPCClient(link));
7064
const [orpcUtils] = useState(() => createTanstackQueryUtils(client));
@@ -82,7 +76,7 @@ function RootComponent() {
8276
>
8377
<div className="grid grid-rows-[auto_1fr] h-svh">
8478
<Header />
85-
{isFetching ? <Loader /> : <Outlet />}
79+
<Outlet />
8680
</div>
8781
<Toaster richColors />
8882
</ThemeProvider>
@@ -95,7 +89,7 @@ function RootComponent() {
9589
>
9690
<div className="grid grid-rows-[auto_1fr] h-svh">
9791
<Header />
98-
{isFetching ? <Loader /> : <Outlet />}
92+
<Outlet />
9993
</div>
10094
<Toaster richColors />
10195
</ThemeProvider>

apps/cli/templates/frontend/react/tanstack-start/src/routes/__root.tsx.hbs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
Outlet,
88
Scripts,
99
createRootRouteWithContext,
10-
useRouterState,
1110
{{#if (and (eq backend "convex") (or (eq auth "clerk") (eq auth "better-auth")))}}
1211
useRouteContext,
1312
{{/if}}
@@ -24,7 +23,6 @@ import type { ConvexReactClient } from "convex/react";
2423
import type { QueryClient } from "@tanstack/react-query";
2524
{{/if}}
2625
{{/if}}
27-
import Loader from "@/components/loader";
2826

2927
{{#if (and (eq backend "convex") (eq auth "clerk"))}}
3028
import { ClerkProvider, useAuth } from "@clerk/tanstack-react-start";
@@ -125,7 +123,6 @@ export const Route = createRootRouteWithContext<RouterAppContext>()({
125123
});
126124

127125
function RootDocument() {
128-
const isFetching = useRouterState({ select: (s) => s.isLoading });
129126
{{#if (and (eq backend "convex") (eq auth "clerk"))}}
130127
const context = useRouteContext({ from: Route.id });
131128
return (
@@ -138,7 +135,7 @@ function RootDocument() {
138135
<body>
139136
<div className="grid h-svh grid-rows-[auto_1fr]">
140137
<Header />
141-
{isFetching ? <Loader /> : <Outlet />}
138+
<Outlet />
142139
</div>
143140
<Toaster richColors />
144141
<TanStackRouterDevtools position="bottom-left" />
@@ -159,7 +156,7 @@ function RootDocument() {
159156
<body>
160157
<div className="grid h-svh grid-rows-[auto_1fr]">
161158
<Header />
162-
{isFetching ? <Loader /> : <Outlet />}
159+
<Outlet />
163160
</div>
164161
<Toaster richColors />
165162
<TanStackRouterDevtools position="bottom-left" />
@@ -177,7 +174,7 @@ function RootDocument() {
177174
<body>
178175
<div className="grid h-svh grid-rows-[auto_1fr]">
179176
<Header />
180-
{isFetching ? <Loader /> : <Outlet />}
177+
<Outlet />
181178
</div>
182179
<Toaster richColors />
183180
<TanStackRouterDevtools position="bottom-left" />

0 commit comments

Comments
 (0)