Skip to content

Fix loading photos on paginated #4190

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

Merged
ildyria merged 1 commit into from
Mar 16, 2026
+19 −4
Merged

Fix loading photos on paginated #4190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions resources/js/components/pagination/PaginationInfiniteScroll.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@ let scrollContainer: HTMLElement | null = null;
*/
function handleIntersect(entries: IntersectionObserverEntry[]) {
const entry = entries[0];
console.debug(
`[InfiniteScroll] intersect: isIntersecting=${entry.isIntersecting}, hasMore=${props.hasMore}, loading=${props.loading}, isEmitting=${isEmitting}`,
);
if (LycheeState.is_debug_enabled) {
console.debug(
`[InfiniteScroll] intersect: isIntersecting=${entry.isIntersecting}, hasMore=${props.hasMore}, loading=${props.loading}, isEmitting=${isEmitting}`,
);
}
// Guard against duplicate emissions during rapid intersection callbacks
if (entry.isIntersecting && props.hasMore && !props.loading && !isEmitting) {
// console.log("[InfiniteScroll] => emitting loadMore");
Expand Down
15 changes: 14 additions & 1 deletion resources/js/views/gallery-panels/Album.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,8 @@ watch(

photoStore.setTransition(newPhotoId as string | undefined);

if (newAlbumId !== albumStore.albumId) {
const oldAlbumId = albumId.value;
if (newAlbumId !== oldAlbumId) {
current_page.value = 1; // Reset the page if we change album
}
albumId.value = newAlbumId as string;
Expand All @@ -506,6 +507,18 @@ watch(
togglableStore.rememberScrollThumb(photoId.value);
}

if (oldAlbumId === newAlbumId) {
// If we are navigating between photos of the same album, we don't need to reload the album.
// We just need to load the new photo.
photoStore.load();

// TODO: Consider loading the next page if the photo is getting close to the end of the currently loaded photos.
return;
}

// If we are navigating to a different album, we need to
// 1. load the new album
// 2. set the scroll position to the photo if we have a photoId, or to the top if we don't have a photoId
load().then(() => {
if (photoId.value === undefined) {
setScroll();
Expand Down
Loading