From 4a83723dbf51e4f7dc4ed9f6f524636fef24909e Mon Sep 17 00:00:00 2001
From: soxa <6390896+Soxasora@users.noreply.github.com>
Date: Sat, 16 Aug 2025 00:59:51 +0200
Subject: [PATCH] fix: don't use route changes to clear the navigator,
 misclearing favicon (#2423)

---
 components/use-comments-navigator.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/components/use-comments-navigator.js b/components/use-comments-navigator.js
index 2eb46016..cb5aeba9 100644
--- a/components/use-comments-navigator.js
+++ b/components/use-comments-navigator.js
@@ -1,6 +1,5 @@
 import { useCallback, useEffect, useRef, useState, startTransition, createContext, useContext } from 'react'
 import styles from './comment.module.css'
-import { useRouter } from 'next/router'
 import LongPressable from './long-pressable'
 import { useFavicon } from './favicon'
 
@@ -28,7 +27,6 @@ export function useCommentsNavigatorContext () {
 }
 
 export function useCommentsNavigator () {
-  const router = useRouter()
   const { setHasNewComments } = useFavicon()
   const [commentCount, setCommentCount] = useState(0)
   // refs in ref to not re-render on tracking
@@ -161,11 +159,10 @@ export function useCommentsNavigator () {
     navigatorRef.current = { trackNewComment, untrackNewComment, scrollToComment, clearCommentRefs }
   }
 
-  // clear the navigator on route changes
+  // clear the navigator on unmount
   useEffect(() => {
-    router.events.on('routeChangeStart', clearCommentRefs)
-    return () => router.events.off('routeChangeStart', clearCommentRefs)
-  }, [clearCommentRefs, router.events])
+    return () => clearCommentRefs()
+  }, [clearCommentRefs])
 
   return { navigator: navigatorRef.current, commentCount }
 }