File tree Expand file tree Collapse file tree 1 file changed +1
-12
lines changed Expand file tree Collapse file tree 1 file changed +1
-12
lines changed Original file line number Diff line number Diff line change @@ -424,14 +424,8 @@ const InnerRouter = ({ routerData }: { routerData: RouterData }) => {
424
424
} ;
425
425
} , [ changeRoute ] ) ;
426
426
427
- const [ routeFromServer , setRouteFromServer ] = useState <
428
- { path : string ; query : string } | undefined
429
- > ( ) ;
430
427
useEffect ( ( ) => {
431
- if ( routeFromServer ) {
432
- // FIXME This feels too late to update the route from the server
433
- // Ideally, we should call `changeRoute` without useEffect.
434
- const { path, query } = routeFromServer ;
428
+ const callback = ( path : string , query : string ) => {
435
429
const url = new URL ( window . location . href ) ;
436
430
url . pathname = path ;
437
431
url . search = query ;
@@ -447,11 +441,6 @@ const InnerRouter = ({ routerData }: { routerData: RouterData }) => {
447
441
) ;
448
442
}
449
443
changeRoute ( parseRoute ( url ) , { skipRefetch : true } ) ;
450
- }
451
- } , [ routeFromServer , changeRoute ] ) ;
452
- useEffect ( ( ) => {
453
- const callback = ( path : string , query : string ) => {
454
- setRouteFromServer ( { path, query } ) ;
455
444
} ;
456
445
const listeners = ( routerData [ 1 ] ||= new Set ( ) ) ;
457
446
listeners . add ( callback ) ;
You can’t perform that action at this time.
0 commit comments