From 4c9d5eede18d32c44ea18373e5f0458ea660a285 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Tue, 2 Dec 2025 17:02:03 +0000 Subject: [PATCH] Revert ScrollToTop component back to class-based --- webclient/src/ScrollToTop.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/webclient/src/ScrollToTop.js b/webclient/src/ScrollToTop.js index 2bf6867..267da92 100644 --- a/webclient/src/ScrollToTop.js +++ b/webclient/src/ScrollToTop.js @@ -1,10 +1,14 @@ -import { useEffect } from 'react'; -import { useLocation } from 'react-router-dom'; +import React from 'react'; +import { withRouter } from 'react-router-dom'; -function ScrollToTop() { - const { pathname } = useLocation(); +class ScrollToTop extends React.Component { + componentDidUpdate(prevProps) { + //console.log(this.props.location.pathname, prevProps.location.pathname); + + if (this.props.location.pathname === prevProps.location.pathname) { + return; + } - useEffect(() => { if (localStorage.getItem('scrollLock') === 'True') { localStorage.setItem('scrollLock', 'False'); return; @@ -12,9 +16,11 @@ function ScrollToTop() { window.scrollTo(0, 0); document.body.scrollTop = 0; - }, [pathname]); + } - return null; + render() { + return null; + } } -export default ScrollToTop; +export default withRouter(ScrollToTop);