Skip to content
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

Jump to bottom

Scrolls to previous location when opening library #1954

Merged
merged 6 commits into from
Nov 3, 2022
Merged

Scrolls to previous location when opening library #1954

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f305ce4
Scrolls to previous location when opening library
Snoodelz Oct 29, 2022
a6fe44c
Fixed typo
Snoodelz Oct 29, 2022
2308e8a
Changed to useLayoutEffect and using ref to access listing
Snoodelz Oct 30, 2022
d9942d3
Cleaner code, no event listener needed anymore
Snoodelz Oct 30, 2022
6424d09
Merge branch 'beta' into feat/RememberScrollPositionInLib
flavioislima Nov 3, 2022
1a9469e
fix: lint
flavioislima Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/frontend/components/UI/Sidebar/components/SidebarLinks/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,11 @@ export default function SidebarLinks() {
classNames('Sidebar__item', { active: isActive })
}
to={'/'}
onClick={async () =>
onClick={() => {
localStorage.setItem('scrollPosition', '0')
refreshLibrary({ runInBackground: false, fullRefresh: true })
}
}}

>
<>
<div className="Sidebar__itemIcon">
Expand Down
20 changes: 18 additions & 2 deletions src/frontend/screens/Library/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import React, {
useEffect,
useMemo,
useRef,
useState
useState,
useLayoutEffect
} from 'react'

import ArrowDropUp from '@mui/icons-material/ArrowDropUp'
Expand Down Expand Up @@ -81,6 +82,21 @@ export default function Library(): JSX.Element {
)
const { t } = useTranslation()
const backToTopElement = useRef(null)
const listing = useRef<HTMLDivElement>(null)

//Remember scroll position
useLayoutEffect(() => {
const scrollPosition = parseInt(storage?.getItem('scrollPosition') || '0')

if (listing.current !== null && scrollPosition > 0) {
listing.current.scrollTo(0, scrollPosition)
}
return () => {
if (listing.current !== null) {
storage?.setItem('scrollPosition', listing.current.scrollTop.toString())
}
}
}, [listing])

// bind back to top button
useEffect(() => {
Expand Down Expand Up @@ -291,7 +307,7 @@ export default function Library(): JSX.Element {
return (
<>
<Header />
<div className="listing">
<div className="listing" ref={listing}>
<span id="top" />
{showRecentGames && (
<RecentlyPlayed
Expand Down