#155

frontend/src/components/TopNav.tsx

@@ -26,7 +26,7 @@ export const menuOutline = ({ tag, wikiId, user, pathName }: {
     pathName: string }): Menu => {
   const postCount = tag?.postCount ?? 0
 
-  const wikiPageFlg = Boolean (/^\/wiki\/(?!new|changes)[^\/]+/.test (pathName) && wikiId)
+  const wikiPageFlg = Boolean (/^\/wiki\/(?!new|changes)[^/]+/.test (pathName) && wikiId)
   const wikiTitle = pathName.split ('/')[2] ?? ''
 
   const tagFlg = /^\/tags\/\d+/.test (pathName)
@@ -80,7 +80,7 @@ export const menuOutline = ({ tag, wikiId, user, pathName }: {
 }
 
 
-export default (({ user }: Props) => {
+const TopNav: FC<Props> = ({ user }) => {
   const location = useLocation ()
 
   const dirRef = useRef<(-1) | 1> (1)
@@ -159,12 +159,12 @@ export default (({ user }: Props) => {
   useEffect (() => {
     const unsubscribe = WikiIdBus.subscribe (setWikiId)
     return () => unsubscribe ()
-  }, [activeIdx])
+  }, [])
 
   useEffect (() => {
     setMenuOpen (false)
     setOpenItemIdx (activeIdx)
-  }, [location])
+  }, [activeIdx, location])
 
   return (
       <>
@@ -433,4 +433,6 @@ export default (({ user }: Props) => {
 	      </motion.div>)}
 	</AnimatePresence>
       </>)
-}) satisfies FC<Props>
+}
+
+export default TopNav