Skip to content

fix(Library): filter watched sort results #1293

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

Open
Cesarsk wants to merge 1 commit into
base: development
Choose a base branch
from
+24 −5
Open

fix(Library): filter watched sort results #1293

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
29 changes: 24 additions & 5 deletions src/routes/Library/Library.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,33 @@ const Library = ({ model, urlParams, queryParams }) => {
const [library, loadNextPage] = useLibrary(model, urlParams, queryParams);
const [typeSelect, sortChips, hasNextPage] = useSelectableInputs(library);
const scrollContainerRef = React.useRef(null);
const watchedFilter = React.useMemo(() => {
switch (library.selected?.request.sort) {
case 'watched':
case 'timeswatched':
return true;
case 'notwatched':
return false;
default:
return null;
}
}, [library.selected]);
const catalog = React.useMemo(() => {
return watchedFilter === null ?
library.catalog
:
library.catalog.filter(({ watched }) => watched === watchedFilter);
}, [library.catalog, watchedFilter]);
const hasHiddenWatchedFilterItems = watchedFilter !== null && library.catalog.some(({ watched }) => watched !== watchedFilter);
const hasFilteredNextPage = hasNextPage && !hasHiddenWatchedFilterItems;
const onScrollToBottom = React.useCallback(() => {
if (hasNextPage) {
if (hasFilteredNextPage) {
loadNextPage();
}
}, [hasNextPage, loadNextPage]);
}, [hasFilteredNextPage, loadNextPage]);
const onScroll = useOnScrollToBottom(onScrollToBottom, SCROLL_TO_BOTTOM_TRESHOLD);
React.useLayoutEffect(() => {
if (scrollContainerRef.current !== null && library.selected && library.selected.request.page === 1 && library.catalog.length !== 0) {
if (scrollContainerRef.current !== null && library.selected && library.selected.request.page === 1 && catalog.length !== 0) {
scrollContainerRef.current.scrollTop = 0;
}
}, [profile.auth, library.selected]);
Expand Down Expand Up @@ -92,7 +111,7 @@ const Library = ({ model, urlParams, queryParams }) => {
</div>
</DelayedRenderer>
:
library.catalog.length === 0 ?
catalog.length === 0 ?
<div className={styles['message-container']}>
<Image
className={styles['image']}
Expand All @@ -104,7 +123,7 @@ const Library = ({ model, urlParams, queryParams }) => {
:
<div ref={scrollContainerRef} className={classnames(styles['meta-items-container'], 'animation-fade-in')} onScroll={onScroll}>
{
library.catalog.map((libItem, index) => (
catalog.map((libItem, index) => (
<LibItem {...libItem} notifications={notifications} removable={model === 'library'} key={index} />
))
}
Expand Down