From 3f7f048e0a7cd171dac372d1a4d650806ccbdcbe Mon Sep 17 00:00:00 2001 From: catjoha04-byte Date: Tue, 10 Nov 2026 11:10:41 +0100 Subject: [PATCH 1/4] feat: add ScrollManager to reset or restore scroll --- Frontend/App.tsx | 2 + Frontend/src/components/ScrollManager.tsx | 52 +++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 Frontend/src/components/ScrollManager.tsx diff --git a/Frontend/App.tsx b/Frontend/App.tsx index bd686e5..9d786dc 100644 --- a/Frontend/App.tsx +++ b/Frontend/App.tsx @@ -7,10 +7,12 @@ import SignInPage from './src/pages/SignIn' import WishlistPage from './src/pages/WishlistPage' import ProfilePage from './src/pages/ProfilePage' import FriendsPage from './src/pages/FriendsPage' +import ScrollManager from './src/components/ScrollManager' function App() { return ( + } /> } /> diff --git a/Frontend/src/components/ScrollManager.tsx b/Frontend/src/components/ScrollManager.tsx new file mode 100644 index 0000000..8724063 --- /dev/null +++ b/Frontend/src/components/ScrollManager.tsx @@ -0,0 +1,52 @@ +import { useEffect, useLayoutEffect, useRef } from 'react' +import { useLocation, useNavigationType } from 'react-router-dom' + +const savedPositions = new Map() +const RESTORE_TIMEOUT_MS = 2000 +const USER_SCROLL_EVENTS = ['wheel', 'keydown', 'pointerdown', 'touchstart'] as const + +//Ensures that the scroll position on a page is restored if the user navigates back to it, but resets to the top of the page if +// navigated to from another page (ex. clicking a passive card to access a game page, or clicking a page in the header) +//Ensures consistency accross browsers. +export default function ScrollManager() { + const location = useLocation() + const navigationType = useNavigationType() + const keyRef = useRef(location.key) + + useEffect(() => { + window.history.scrollRestoration = 'manual' + const SavePosition = () => savedPositions.set(keyRef.current, window.scrollY) + window.addEventListener('scroll', SavePosition, { passive: true }) + return () => window.removeEventListener('scroll', SavePosition) + }, []) + + useLayoutEffect(() => { + keyRef.current = location.key + const target = navigationType === 'POP' ? (savedPositions.get(location.key) ?? 0) : 0 + + const start = performance.now() + let frame = 0 + const TryScroll = () => { + window.scrollTo(0, target) + const reached = Math.abs(window.scrollY - target) < 1 + if (!reached && performance.now() - start < RESTORE_TIMEOUT_MS) { + frame = requestAnimationFrame(TryScroll) + } + } + TryScroll() + + //Stops restoring as soon as user scrolls themselves. + const Cancel = () => cancelAnimationFrame(frame) + for (const event of USER_SCROLL_EVENTS) { + window.addEventListener(event, Cancel, { passive: true }) + } + return () => { + Cancel() + for (const event of USER_SCROLL_EVENTS) { + window.removeEventListener(event, Cancel) + } + } + }, [location.key, navigationType]) + + return null +} From 477cc066d7463832608f6559b19fe98460d1cacb Mon Sep 17 00:00:00 2001 From: catjoha04-byte Date: Tue, 10 Nov 2026 11:12:14 +0100 Subject: [PATCH 2/4] fix: apply discount filter to search accessed by see more --- Frontend/src/FrontendLogic/MainPageLogicFrontend.ts | 3 ++- Frontend/src/tests/MainPage.test.tsx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Frontend/src/FrontendLogic/MainPageLogicFrontend.ts b/Frontend/src/FrontendLogic/MainPageLogicFrontend.ts index 9ea4342..ed3c68e 100644 --- a/Frontend/src/FrontendLogic/MainPageLogicFrontend.ts +++ b/Frontend/src/FrontendLogic/MainPageLogicFrontend.ts @@ -53,7 +53,8 @@ export function PrepareDiscountGenreSearch(genre: string) { 'GameStart:filtersSearchpage': genre ? [genre] : [], [DISCOUNT_ONLY_KEY]: true, 'GameStart:querySearchpage': '', - 'GameStart:sortOptionSearchpage': '', + 'GameStart:sortOptionSearchpage': 'discount-desc', + 'GameStart:filterMenuOpenSearchpage': true, 'GameStart:pageSearchpage': 1 } diff --git a/Frontend/src/tests/MainPage.test.tsx b/Frontend/src/tests/MainPage.test.tsx index 3cf3cb0..a96da76 100644 --- a/Frontend/src/tests/MainPage.test.tsx +++ b/Frontend/src/tests/MainPage.test.tsx @@ -328,7 +328,8 @@ describe('MainPage', () => { expect(sessionStorage.getItem('GameStart:filtersSearchpage')).toBe('["Adventure"]') expect(sessionStorage.getItem('GameStart:discountedOnlySearchpage')).toBe('true') expect(sessionStorage.getItem('GameStart:querySearchpage')).toBe('""') - expect(sessionStorage.getItem('GameStart:sortOptionSearchpage')).toBe('""') + expect(sessionStorage.getItem('GameStart:sortOptionSearchpage')).toBe('"discount-desc"') + expect(sessionStorage.getItem('GameStart:filterMenuOpenSearchpage')).toBe('true') expect(sessionStorage.getItem('GameStart:pageSearchpage')).toBe('1') }) From 65ca8b2610fec84481e6d989be86622057e16a0f Mon Sep 17 00:00:00 2001 From: catjoha04-byte Date: Tue, 10 Nov 2026 11:14:10 +0100 Subject: [PATCH 3/4] fix: let reviews list scroll pass to page scroll at edges --- Frontend/src/css/ActiveGameCard.css | 1 - 1 file changed, 1 deletion(-) diff --git a/Frontend/src/css/ActiveGameCard.css b/Frontend/src/css/ActiveGameCard.css index e665284..4c7f5d8 100644 --- a/Frontend/src/css/ActiveGameCard.css +++ b/Frontend/src/css/ActiveGameCard.css @@ -216,7 +216,6 @@ min-height: clamp(6rem, 28vh, 20rem); gap: 0.65rem; overflow-y: auto; - overscroll-behavior: contain; scrollbar-gutter: stable; } From c17a679ec4666a7e824fb229229d89786cc851c9 Mon Sep 17 00:00:00 2001 From: catjoha04-byte Date: Tue, 10 Nov 2026 11:23:34 +0100 Subject: [PATCH 4/4] fix: restore discount see more button Discount by Genre button was switched to become a link, and has now been switched back to being a button. --- Frontend/src/components/GenreGamesSection.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Frontend/src/components/GenreGamesSection.tsx b/Frontend/src/components/GenreGamesSection.tsx index f2d918f..2350ddf 100644 --- a/Frontend/src/components/GenreGamesSection.tsx +++ b/Frontend/src/components/GenreGamesSection.tsx @@ -144,9 +144,14 @@ export function GenreGamesSection({ {showSeeMore && (
- +
)}