Commit 37f53db5 authored by Jimmy Lai's avatar Jimmy Lai

fix: wrap AppRouterAnnouncer setState calls in startTransition to prevent hydration flicker

parent 633e2749
import { useEffect, useRef, useState } from 'react' import { useEffect, useRef, useState, startTransition } from 'react'
import { createPortal } from 'react-dom' import { createPortal } from 'react-dom'
import type { FlightRouterState } from '../../shared/lib/app-router-types' import type { FlightRouterState } from '../../shared/lib/app-router-types'
...@@ -32,7 +32,9 @@ export function AppRouterAnnouncer({ tree }: { tree: FlightRouterState }) { ...@@ -32,7 +32,9 @@ export function AppRouterAnnouncer({ tree }: { tree: FlightRouterState }) {
useEffect(() => { useEffect(() => {
const announcer = getAnnouncerNode() const announcer = getAnnouncerNode()
setPortalNode(announcer) startTransition(() => {
setPortalNode(announcer)
})
return () => { return () => {
const container = document.getElementsByTagName(ANNOUNCER_TYPE)[0] const container = document.getElementsByTagName(ANNOUNCER_TYPE)[0]
if (container?.isConnected) { if (container?.isConnected) {
...@@ -61,7 +63,9 @@ export function AppRouterAnnouncer({ tree }: { tree: FlightRouterState }) { ...@@ -61,7 +63,9 @@ export function AppRouterAnnouncer({ tree }: { tree: FlightRouterState }) {
previousTitle.current !== undefined && previousTitle.current !== undefined &&
previousTitle.current !== currentTitle previousTitle.current !== currentTitle
) { ) {
setRouteAnnouncement(currentTitle) startTransition(() => {
setRouteAnnouncement(currentTitle)
})
} }
previousTitle.current = currentTitle previousTitle.current = currentTitle
}, [tree]) }, [tree])
......
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