fix(react-router,start): ensure document and window is only used when…

… available
TanStack · Aug 12, 2024 · 3ab6098 · 3ab6098
1 parent a6819bf
commit 3ab6098
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/packages/react-router/src/Transitioner.tsx b/packages/react-router/src/Transitioner.tsx
@@ -55,6 +55,9 @@ export function Transitioner() {
 
   // Try to load the initial location
   useLayoutEffect(() => {
+    if (router.isServer) {
+      return
+    }
     if (
       window.__TSR__?.dehydrated ||
       (mountLoadForRouter.current.router === router &&
@@ -111,11 +114,13 @@ export function Transitioner() {
         resolvedLocation: s.location,
       }))
 
-      if ((document as any).querySelector) {
-        if (router.state.location.hash !== '') {
-          const el = document.getElementById(router.state.location.hash)
-          if (el) {
-            el.scrollIntoView()
+      if (!router.isServer) {
+        if ((document as any).querySelector) {
+          if (router.state.location.hash !== '') {
+            const el = document.getElementById(router.state.location.hash)
+            if (el) {
+              el.scrollIntoView()
+            }
           }
         }
       }

diff --git a/packages/start/src/client/Meta.tsx b/packages/start/src/client/Meta.tsx
@@ -173,6 +173,10 @@ export const Meta = ({ children }: { children?: React.ReactNode }) => {
   React[
     typeof document !== 'undefined' ? 'useLayoutEffect' : 'useEffect'
   ](() => {
+    if (router.isServer) {
+      return
+    }
+
     // Remove all meta between the tsr meta tags
     const start = document.head.querySelector('meta[name="tsr-meta"]')
     const end = document.head.querySelector('meta[name="/tsr-meta"]')
@@ -190,7 +194,7 @@ export const Meta = ({ children }: { children?: React.ReactNode }) => {
     end?.remove()
 
     setMounted(true)
-  }, [])
+  }, [router.isServer])
 
   const all = (
     <>