fix: register event listener only for client

oedotme · oedotme · commit 4a76e7dd8973 · 2024-04-15T17:06:19.000+02:00
diff --git a/.changeset/lucky-dingos-happen.md b/.changeset/lucky-dingos-happen.md
@@ -0,0 +1,5 @@
+---
+"@solidjs/router": patch
+---
+
+Fix state updates detection on history back/forward
diff --git a/src/routing.ts b/src/routing.ts
@@ -7,7 +7,6 @@ import {
   createSignal,
   on,
   onCleanup,
-  onMount,
   untrack,
   useContext,
   startTransition,
@@ -327,9 +326,11 @@ export function createRouterContext(
     }
   };
 
-  const handlePopState = () => setState(window.history.state);
-  onMount(() => window.addEventListener("popstate", handlePopState));
-  onCleanup(() => window.removeEventListener("popstate", handlePopState));
+  if (!isServer) {
+    const syncState = () => setState(window.history.state);
+    window.addEventListener("popstate", syncState);
+    onCleanup(() => window.removeEventListener("popstate", syncState));
+  }
 
   createRenderEffect(() => {
     const { value, state } = source();

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@solidjs/router": patch
 +---
++
 +Fix state updates detection on history back/forward