Unverified Commit 60ab8f63 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Fix loading navigation with metadata and prefetch (#66447)

### What & Why

Fixes NEXT-3498

Fixed loading shows up and disappear during client navigation, when you
defined `prefetch` is enabled and slow `generateMetadata` is defined. In
#64532, where in layout-router, we removed the place of infinite
suspense, adding it back so that the app can still remain suspensy
during navigation.

#### Behavior before fix

Prefetch -> Link Navigation -> Show `loading.js` -> RSC payload fetched
(no page content) -> the page content will display later when the
promise is resolved

#### Behavior after the fix

Prefetch -> Link Navigation -> Show `loading.js` -> RSC payload fetched
-> suspensy page content still triggering `loading.js` -> display the
resolved page content when the promise is resolved

---------
Co-authored-by: 's avatarZack Tanner <1939140+ztanner@users.noreply.github.com>
parent b9114854
...@@ -450,10 +450,10 @@ function InnerLayoutRouter({ ...@@ -450,10 +450,10 @@ function InnerLayoutRouter({
// It's important that we mark this as resolved, in case this branch is replayed, we don't want to continously re-apply // It's important that we mark this as resolved, in case this branch is replayed, we don't want to continously re-apply
// the patch to the tree. // the patch to the tree.
childNode.lazyDataResolved = true childNode.lazyDataResolved = true
// Suspend infinitely as `changeByServerResponse` will cause a different part of the tree to be rendered.
use(unresolvedThenable) as never
} }
// Suspend infinitely as `changeByServerResponse` will cause a different part of the tree to be rendered.
// A falsey `resolvedRsc` indicates missing data -- we should not commit that branch, and we need to wait for the data to arrive.
use(unresolvedThenable) as never
} }
// We use `useDeferredValue` to handle switching between the prefetched and // We use `useDeferredValue` to handle switching between the prefetched and
......
'use client'
import { useEffect } from 'react'
export default function Loading() { export default function Loading() {
useEffect(() => {
window.shownLoading = true
}, [])
return <div id="loading">Loading</div> return <div id="loading">Loading</div>
} }
...@@ -864,16 +864,22 @@ describe('app dir - navigation', () => { ...@@ -864,16 +864,22 @@ describe('app dir - navigation', () => {
it('should render the final state of the page with correct metadata', async () => { it('should render the final state of the page with correct metadata', async () => {
const browser = await next.browser('/metadata-await-promise') const browser = await next.browser('/metadata-await-promise')
await browser // dev doesn't trigger the loading boundary as it's not prefetched
.elementByCss("[href='/metadata-await-promise/nested']") if (isNextDev) {
.click() await browser
.elementByCss("[href='/metadata-await-promise/nested']")
.click()
} else {
const loadingText = await browser
.elementByCss("[href='/metadata-await-promise/nested']")
.click()
.waitForElementByCss('#loading')
.text()
await retry(async () => { expect(loadingText).toBe('Loading')
// dev doesn't trigger the loading boundary as it's not prefetched }
if (!isNextDev) {
expect(await browser.eval(`window.shownLoading`)).toBe(true)
}
await retry(async () => {
expect(await browser.elementById('page-content').text()).toBe('Content') expect(await browser.elementById('page-content').text()).toBe('Content')
expect(await browser.elementByCss('title').text()).toBe('Async Title') expect(await browser.elementByCss('title').text()).toBe('Async Title')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment