Skip to content

fix(scroll): hide when scroll-to-top is clicked (@AzureNightlock) #7999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AzureNightlock wants to merge 2 commits into
base: master
Choose a base branch
from
+19 −7
Open

fix(scroll): hide when scroll-to-top is clicked (@AzureNightlock) #7999

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be7c2f6
add timeout
AzureNightlock Jun 3, 2026
91c0714
Merge branch 'monkeytypegame:master' into fix/scroll-to-top-visibility
AzureNightlock Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions frontend/src/ts/components/layout/footer/ScrollToTop.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,27 @@ import { Fa } from "../../common/Fa";

export function ScrollToTop(): JSXElement {
const [visible, setVisible] = createSignal(false);
const [scrolling, setScrolling] = createSignal(false);

const handleScroll = (): void => {
if (getActivePage() === "test") return;

if (getActivePage() === "test" || scrolling()) return;
const scroll = window.scrollY;
setVisible(scroll > 100);
};

const scrollUp = async (): Promise<void> => {
const scrollEnded = new Promise<void>((resolve) => {
setTimeout(resolve, 1000);
if (window.scrollY === 0) {
resolve();
return;
}
window.addEventListener("scrollend", () => resolve(), { once: true });
});
window.scrollTo({ top: 0, behavior: "smooth" });
await scrollEnded;
};
Comment on lines +16 to +27

onMount(() => {
window.addEventListener("scroll", handleScroll, { passive: true });
handleScroll();
Expand All @@ -35,12 +48,11 @@ export function ScrollToTop(): JSXElement {
"opacity-0": getActivePage() === "test" || !visible(),
"pointer-events-none": getActivePage() === "test" || !visible(),
}}
onClick={() => {
onClick={async () => {
setVisible(false);
window.scrollTo({
top: 0,
behavior: "smooth",
});
setScrolling(true);
await scrollUp();
setScrolling(false);
Comment on lines +51 to +55
}}
>
<Fa icon="fa-angle-double-up" />
Expand Down
Loading