* sorting

add menu
add sort by left to Read
add sort alphabetical
add sort by ID
add Asc/Desc

* woops

* woops

* Camel case
This commit is contained in:
robo
2022-02-24 06:16:21 +00:00
committed by GitHub
parent 55a3f8ed23
commit d4221044cc
3 changed files with 93 additions and 3 deletions

View File

@@ -48,6 +48,32 @@ function filterManga(mangas: IMangaCard[]): IMangaCard[] {
&& queryFilter(query, manga));
}
function toReadSort(a: IMangaCard, b: IMangaCard): number {
if (!a.unreadCount) return -1;
if (!b.unreadCount) return 1;
return a.unreadCount > b.unreadCount ? 1 : -1;
}
function toSortAlph(a: IMangaCard, b: IMangaCard): number {
return a.title < b.title ? 1 : -1;
}
function toSortID(a: IMangaCard, b: IMangaCard): number {
return a.id > b.id ? 1 : -1;
}
function sortManga(mangas: IMangaCard[]): IMangaCard[] {
const { sorts, sortDesc } = useLibraryOptions();
return (sorts === 'sortID' || sorts === undefined) && !sortDesc ? mangas : mangas.sort((a, b) => {
const c = sortDesc === true ? b : a;
const d = sortDesc === true ? a : b;
if (sorts === 'sortToRead') { return toReadSort(c, d); }
if (sorts === 'sortAlph') { return toSortAlph(c, d); }
if (sorts === 'sortID' || sorts === undefined) { return toSortID(c, d); }
return 1;
});
}
export default function LibraryMangaGrid(props: IMangaGridProps) {
const {
mangas, isLoading, hasNextPage, lastPageNum, setLastPageNum, message,
@@ -55,12 +81,13 @@ export default function LibraryMangaGrid(props: IMangaGridProps) {
const { active, query } = useLibraryOptions();
const filteredManga = filterManga(mangas);
const sortedManga = sortManga(filteredManga);
const showFilteredOutMessage = (active || query)
&& filteredManga.length === 0 && mangas.length > 0;
return (
<MangaGrid
mangas={filteredManga}
mangas={sortedManga}
isLoading={isLoading}
hasNextPage={hasNextPage}
lastPageNum={lastPageNum}

View File

@@ -8,9 +8,12 @@
import React from 'react';
import FilterListIcon from '@mui/icons-material/FilterList';
import SortIcon from '@mui/icons-material/Sort';
import { Drawer, FormControlLabel, IconButton } from '@mui/material';
import useLibraryOptions from 'util/useLibraryOptions';
import ThreeStateCheckbox from 'components/util/ThreeStateCheckbox';
import Switch from '@mui/material/Switch';
import Radio from '@mui/material/Radio';
import { Box } from '@mui/system';
function Options() {
@@ -25,8 +28,32 @@ function Options() {
);
}
function SortOptions() {
const {
sorts, setSorts, sortDesc, setSortDesc,
} = useLibraryOptions();
const handleSortChange = (name: string) => (event: { target: { checked: boolean; }; }) => {
setSorts(event.target.checked ? name : undefined);
};
const handleOrderChange = () => (event: { target: { checked: boolean; }; }) => {
setSortDesc(event.target.checked);
};
return (
<Box sx={{ display: 'flex', flexDirection: 'column' }}>
<FormControlLabel control={<Switch name="sortDesc" checked={sortDesc === true} onChange={handleOrderChange()} color="default" />} label="Asc/Desc" />
<FormControlLabel control={<Radio name="sortToRead" checked={sorts === 'sortToRead'} onChange={handleSortChange('sortToRead')} />} label="Sort by left to read" />
<FormControlLabel control={<Radio name="sortAlph" checked={sorts === 'sortAlph'} onChange={handleSortChange('sortAlph')} />} label="Sort alphbetical" />
<FormControlLabel control={<Radio name="sortID" checked={sorts === 'sortID' || sorts === undefined} onChange={handleSortChange('sortID')} />} label="Sort by ID" />
</Box>
);
}
export default function LibraryOptions() {
const [filtersOpen, setFiltersOpen] = React.useState(false);
const [sortsOpen, setSortsOpen] = React.useState(false);
const { active } = useLibraryOptions();
return (
<>
@@ -50,6 +77,26 @@ export default function LibraryOptions() {
<Options />
</Drawer>
<IconButton
onClick={() => setSortsOpen(!filtersOpen)}
color={active ? 'warning' : 'default'}
>
<SortIcon />
</IconButton>
<Drawer
anchor="bottom"
open={sortsOpen}
onClose={() => setSortsOpen(false)}
PaperProps={{
style: {
maxWidth: 600, padding: '1em', marginLeft: 'auto', marginRight: 'auto',
},
}}
>
<SortOptions />
</Drawer>
</>
);
}