From ac6029120854c0f52a82f186427d9b5d8d7a36f5 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Sun, 27 Oct 2024 19:27:19 +0100 Subject: [PATCH] feat(react-router): allow to opt-out of default pending component --- packages/react-router/src/Match.tsx | 5 ++++- packages/react-router/src/route.ts | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/react-router/src/Match.tsx b/packages/react-router/src/Match.tsx index 57c8754c56..c75a6f999a 100644 --- a/packages/react-router/src/Match.tsx +++ b/packages/react-router/src/Match.tsx @@ -36,7 +36,10 @@ export const Match = React.memo(function MatchImpl({ const PendingComponent = route.options.pendingComponent ?? router.options.defaultPendingComponent - const pendingElement = PendingComponent ? : null + const pendingElement = + PendingComponent && PendingComponent !== 'never' ? ( + + ) : null const routeErrorComponent = route.options.errorComponent ?? router.options.defaultErrorComponent diff --git a/packages/react-router/src/route.ts b/packages/react-router/src/route.ts index 1bc5c88908..b7b2cb2043 100644 --- a/packages/react-router/src/route.ts +++ b/packages/react-router/src/route.ts @@ -330,7 +330,7 @@ export interface UpdatableRouteOptions< component?: RouteComponent errorComponent?: false | null | ErrorRouteComponent notFoundComponent?: NotFoundRouteComponent - pendingComponent?: RouteComponent + pendingComponent?: RouteComponent | 'never' pendingMs?: number pendingMinMs?: number staleTime?: number