Skip to content

Commit

Permalink
Simplify layoutEffect
Browse files Browse the repository at this point in the history
  • Loading branch information
brophdawg11 committed Apr 27, 2023
1 parent 8119c67 commit 7eeb1da
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions packages/react-router/lib/components.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,10 @@ export function RouterProvider({
fallbackElement,
router,
}: RouterProviderProps): React.ReactElement {
let [state, setState] = React.useState(router.state);

// Need to use a layout effect here so we are subscribed early enough to
// pick up on any render-driven redirects/navigations (useEffect/<Navigate>)
React.useLayoutEffect(() => {
return router.subscribe((newState) => {
setState((prevState) => {
if (prevState !== newState) {
return newState;
}
return prevState;
});
});
}, [router]);
let [state, setState] = React.useState(router.state);
React.useLayoutEffect(() => router.subscribe(setState), [router, setState]);

let navigator = React.useMemo((): Navigator => {
return {
Expand Down

0 comments on commit 7eeb1da

Please sign in to comment.