mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-22 14:35:41 +00:00
778c9e00fd
* fix(artists): attach infinite-scroll observer when sentinel mounts The Artists page only renders the bottom sentinel after getArtists finishes. The hook subscribed in an effect keyed on loadMore; unlike Albums, that callback does not depend on loading, so the observer never attached after the first paint. Use a callback ref and observe against the main scroll viewport (#app-main-scroll-viewport). * docs: changelog for Artists infinite scroll fix (PR #709)
82 lines
2.7 KiB
TypeScript
82 lines
2.7 KiB
TypeScript
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
|
import { APP_MAIN_SCROLL_VIEWPORT_ID } from '../constants/appScroll';
|
|
|
|
interface UseArtistsInfiniteScrollArgs {
|
|
pageSize: number;
|
|
resetDeps: ReadonlyArray<unknown>;
|
|
}
|
|
|
|
interface UseArtistsInfiniteScrollResult {
|
|
visibleCount: number;
|
|
loadingMore: boolean;
|
|
/** Callback ref — attaches IntersectionObserver when the sentinel mounts (fixes first paint behind `loading`). */
|
|
observerTarget: React.RefCallback<HTMLDivElement | null>;
|
|
loadMore: () => void;
|
|
}
|
|
|
|
/**
|
|
* Page through the artists list with a sentinel-driven
|
|
* IntersectionObserver. `pageSize` is dynamic because artist-images
|
|
* mode wants smaller batches to keep disk I/O sane on big libraries
|
|
* (5000+ artists).
|
|
*
|
|
* `resetDeps` is the list of values that should snap `visibleCount`
|
|
* back to one page — filter text, letter pick, starred-only,
|
|
* view-mode, page-size itself.
|
|
*
|
|
* The observer doesn't take a `hasMore` flag — the page only renders
|
|
* the sentinel `<div ref={observerTarget}>` while there is more data,
|
|
* so the observer naturally disconnects when the last page is reached
|
|
* (callback ref runs with `node === null` as the sentinel unmounts).
|
|
*/
|
|
export function useArtistsInfiniteScroll({
|
|
pageSize,
|
|
resetDeps,
|
|
}: UseArtistsInfiniteScrollArgs): UseArtistsInfiniteScrollResult {
|
|
const [visibleCount, setVisibleCount] = useState(pageSize);
|
|
const [loadingMore, setLoadingMore] = useState(false);
|
|
const loadMoreRef = useRef<() => void>(() => {});
|
|
const observerInst = useRef<IntersectionObserver | null>(null);
|
|
|
|
const loadMore = useCallback(() => {
|
|
if (loadingMore) return;
|
|
setLoadingMore(true);
|
|
setVisibleCount(prev => prev + pageSize);
|
|
setTimeout(() => setLoadingMore(false), 100);
|
|
}, [loadingMore, pageSize]);
|
|
|
|
loadMoreRef.current = loadMore;
|
|
|
|
useEffect(() => {
|
|
setVisibleCount(pageSize);
|
|
// resetDeps is intentionally spread into the dep array.
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, [pageSize, ...resetDeps]);
|
|
|
|
const observerTarget = useCallback((node: HTMLDivElement | null) => {
|
|
observerInst.current?.disconnect();
|
|
observerInst.current = null;
|
|
if (!node) return;
|
|
|
|
const rootEl = document.getElementById(APP_MAIN_SCROLL_VIEWPORT_ID);
|
|
const observer = new IntersectionObserver(
|
|
entries => {
|
|
if (entries[0]?.isIntersecting) loadMoreRef.current();
|
|
},
|
|
{
|
|
root: rootEl instanceof HTMLElement ? rootEl : null,
|
|
rootMargin: '200px',
|
|
},
|
|
);
|
|
observer.observe(node);
|
|
observerInst.current = observer;
|
|
}, []);
|
|
|
|
useEffect(() => () => {
|
|
observerInst.current?.disconnect();
|
|
observerInst.current = null;
|
|
}, []);
|
|
|
|
return { visibleCount, loadingMore, observerTarget, loadMore };
|
|
}
|