Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/olive-walls-rule.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"react-router": patch
---

Ensure `HydrateFallback` renders during SPA initialization for routes that have `middleware` but do not have a `loader`
39 changes: 39 additions & 0 deletions packages/react-router/__tests__/dom/data-browser-router-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,45 @@ function testDomRouter(
`);
});

it("renders hydrateFallbackElement while first data fetch happens when it is only middleware", async () => {
let middlewareDfd = createDeferred();
let router = createTestRouter(
[
{
path: "/",
Component: Outlet,
HydrateFallback: () => "Loading...",
children: [
{
path: "foo",
middleware: [() => middlewareDfd.promise],
Component: () => "Foo",
},
],
},
],
{
window: getWindow("/foo"),
},
);

let { container } = render(<RouterProvider router={router} />);

expect(getHtml(container)).toMatchInlineSnapshot(`
"<div>
Loading...
</div>"
`);

middlewareDfd.resolve();
await waitFor(() => screen.getByText("Foo"));
expect(getHtml(container)).toMatchInlineSnapshot(`
"<div>
Foo
</div>"
`);
});

it("does not render hydrateFallback if no data fetch or lazy loading is required", async () => {
let fooDefer = createDeferred();
let router = createTestRouter(
Expand Down
8 changes: 6 additions & 2 deletions packages/react-router/lib/hooks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,7 @@ export function _renderMatches(
// a given HydrateFallback while we load the rest of the hydration data
let renderFallback = false;
let fallbackIndex = -1;
if (dataRouterState) {
if (dataRouterState && !dataRouterState.initialized) {
for (let i = 0; i < renderedMatches.length; i++) {
let match = renderedMatches[i];
// Track the deepest fallback up until the first route without data
Expand All @@ -1169,11 +1169,15 @@ export function _renderMatches(

if (match.route.id) {
let { loaderData, errors } = dataRouterState;
let needsToRunSpaMiddleware =
match.route.middleware &&
match.route.middleware.length > 0 &&
!match.route.loader;
let needsToRunLoader =
match.route.loader &&
!loaderData.hasOwnProperty(match.route.id) &&
(!errors || errors[match.route.id] === undefined);
if (match.route.lazy || needsToRunLoader) {
if (match.route.lazy || needsToRunSpaMiddleware || needsToRunLoader) {
// We found the first route that's not ready to render (waiting on
// lazy, or has a loader that hasn't run yet). Flag that we need to
// render a fallback and render up until the appropriate fallback
Expand Down
Loading