Skip to content
Merged
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
10 changes: 8 additions & 2 deletions packages/react-router/src/Transitioner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export function Transitioner() {
select: ({ isLoading }) => isLoading,
})

const [isTransitioning, startReactTransition_] = React.useTransition()
const [isTransitioning, setIsTransitioning] = React.useState(false)
// Track pending state changes
const hasPendingMatches = useRouterState({
select: (s) => s.matches.some((d) => d.status === 'pending'),
Expand All @@ -27,7 +27,13 @@ export function Transitioner() {
const previousIsPagePending = usePrevious(isPagePending)

if (!router.isServer) {
router.startReactTransition = startReactTransition_
router.startReactTransition = (fn: () => void) => {
setIsTransitioning(true)
React.startTransition(() => {
fn()
setIsTransitioning(false)
})
}
}

// Subscribe to location changes
Expand Down
Loading