diff --git a/next.config.js b/next.config.js index 3bd71dbc..07e914ab 100644 --- a/next.config.js +++ b/next.config.js @@ -9,9 +9,6 @@ module.exports = removeImports({ typescript: { ignoreBuildErrors: true, }, - experimental: { - scrollRestoration: true, - }, webpack: (config) => { config.experiments = { ...config.experiments, topLevelAwait: true }; return config; diff --git a/src/components/note/index.tsx b/src/components/note/index.tsx index 5d5909cb..ac10e4ca 100644 --- a/src/components/note/index.tsx +++ b/src/components/note/index.tsx @@ -2,9 +2,11 @@ import { Content } from '@components/note/content'; import { RootNote } from '@components/note/root'; import destr from 'destr'; +import { useRouter } from 'next/router'; import { memo, useMemo } from 'react'; export const Note = memo(function Note({ event }: { event: any }) { + const router = useRouter(); const tags = destr(event.tags); const fetchRootEvent = useMemo(() => { @@ -24,8 +26,15 @@ export const Note = memo(function Note({ event }: { event: any }) { } }, [tags]); + const openThread = () => { + router.push(`/newsfeed/${event.id}`); + }; + return ( -
+
openThread()} + className="relative z-10 flex h-min min-h-min w-full cursor-pointer select-text flex-col border-b border-zinc-800 py-5 px-3 hover:bg-black/20" + > <>{fetchRootEvent}
diff --git a/src/pages/newsfeed/thread/index.tsx b/src/pages/newsfeed/[id].tsx similarity index 97% rename from src/pages/newsfeed/thread/index.tsx rename to src/pages/newsfeed/[id].tsx index 8f0e5ea1..753282fd 100644 --- a/src/pages/newsfeed/thread/index.tsx +++ b/src/pages/newsfeed/[id].tsx @@ -18,13 +18,12 @@ import { } from 'react'; export default function Page() { + const router = useRouter(); const { db }: any = useContext(DatabaseContext); + const id = router.query.id; const [root, setRoot] = useState(null); - const router = useRouter(); - const { id }: any = router.query; - const fetchRoot = useCallback(async () => { const result = await db.select(`SELECT * FROM cache_notes WHERE id = "${id}"`); setRoot(result[0]);