6
6
} from '@tanstack/router-core'
7
7
import { useRouter } from './useRouter'
8
8
import { useRouterState } from './useRouterState'
9
- import { usePrevious } from './utils'
9
+ import { useLayoutEffect , usePrevious } from './utils'
10
10
11
11
export function Transitioner ( ) {
12
12
const router = useRouter ( )
@@ -65,8 +65,7 @@ export function Transitioner() {
65
65
} )
66
66
67
67
// Try to load the initial location
68
- Solid . createRenderEffect ( ( ) => {
69
- if ( router . isServer ) return
68
+ useLayoutEffect ( ( ) => {
70
69
Solid . untrack ( ( ) => {
71
70
if (
72
71
// if we are hydrating from SSR, loading is triggered in ssr-client
@@ -87,7 +86,7 @@ export function Transitioner() {
87
86
} )
88
87
} )
89
88
90
- Solid . createRenderEffect (
89
+ useLayoutEffect (
91
90
Solid . on (
92
91
[ previousIsLoading , isLoading ] ,
93
92
( [ previousIsLoading , isLoading ] ) => {
@@ -100,7 +99,8 @@ export function Transitioner() {
100
99
} ,
101
100
) ,
102
101
)
103
- Solid . createRenderEffect (
102
+
103
+ useLayoutEffect (
104
104
Solid . on (
105
105
[ isPagePending , previousIsPagePending ] ,
106
106
( [ isPagePending , previousIsPagePending ] ) => {
@@ -115,7 +115,7 @@ export function Transitioner() {
115
115
) ,
116
116
)
117
117
118
- Solid . createRenderEffect (
118
+ useLayoutEffect (
119
119
Solid . on (
120
120
[ isAnyPending , previousIsAnyPending ] ,
121
121
( [ isAnyPending , previousIsAnyPending ] ) => {
0 commit comments