diff --git a/src/components/LinksDropdown.tsx b/src/components/LinksDropdown.tsx index 0fb0957e..661cc51f 100644 --- a/src/components/LinksDropdown.tsx +++ b/src/components/LinksDropdown.tsx @@ -1,7 +1,7 @@ import classNames from "classnames"; import { useCallback, useEffect, useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; -import { useNavigate } from "react-router-dom"; +import { To, useNavigate } from "react-router-dom"; import { base64ToBuffer, decryptData } from "@/backend/accounts/crypto"; import { UserAvatar } from "@/components/Avatar"; @@ -24,8 +24,12 @@ function GoToLink(props: { const navigate = useNavigate(); const goTo = (href: string) => { - if (href.startsWith("http")) window.open(href, "_blank"); - else navigate(href); + if (href.startsWith("http")) { + window.open(href, "_blank"); + } else { + window.scrollTo(0, 0); + navigate(href); + } }; return ( diff --git a/src/components/layout/Navigation.tsx b/src/components/layout/Navigation.tsx index b3022d0b..90e91e59 100644 --- a/src/components/layout/Navigation.tsx +++ b/src/components/layout/Navigation.tsx @@ -1,5 +1,5 @@ import classNames from "classnames"; -import { Link, useNavigate } from "react-router-dom"; +import { Link, To, useNavigate } from "react-router-dom"; import { NoUserAvatar, UserAvatar } from "@/components/Avatar"; import { IconPatch } from "@/components/buttons/IconPatch"; @@ -24,6 +24,11 @@ export function Navigation(props: NavigationProps) { const navigate = useNavigate(); const { loggedIn } = useAuth(); + const handleClick = (path: To) => { + window.scrollTo(0, 0); + navigate(path); + }; + return ( <> {/* lightbar */} @@ -84,6 +89,7 @@ export function Navigation(props: NavigationProps) { window.scrollTo(0, 0)} > @@ -104,7 +110,7 @@ export function Navigation(props: NavigationProps) { navigate("/discover")} + onClick={() => handleClick("/discover")} rel="noreferrer" className="text-xl text-white tabbable rounded-full" > diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx index e6f5c4b5..26bc30c9 100644 --- a/src/pages/HomePage.tsx +++ b/src/pages/HomePage.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from "react"; import { Helmet } from "react-helmet-async"; import { useTranslation } from "react-i18next"; -import { useNavigate } from "react-router-dom"; +import { To, useNavigate } from "react-router-dom"; import { WideContainer } from "@/components/layout/WideContainer"; import { useDebounce } from "@/hooks/useDebounce"; @@ -48,6 +48,11 @@ export function HomePage() { const [showBookmarks, setShowBookmarks] = useState(false); const [showWatching, setShowWatching] = useState(false); + const handleClick = (path: To) => { + window.scrollTo(0, 0); + navigate(path); + }; + return (
@@ -77,7 +82,7 @@ export function HomePage() {

{emptyText}