ChoChoX/suwayomi-material-you-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup Random library filter

Browse Source
This commit is contained in:
schroda
2026-07-21 01:04:10 +02:00
parent 9ed178342f
commit 12fe47768e
2 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/base/components/inputs/SortRadioInput.tsx
View File

@@ -8,7 +8,6 @@
import ArrowDownward from '@mui/icons-material/ArrowDownward'; import ArrowDownward from '@mui/icons-material/ArrowDownward';
import ArrowUpward from '@mui/icons-material/ArrowUpward'; import ArrowUpward from '@mui/icons-material/ArrowUpward';
import Replay from '@mui/icons-material/Replay';
import { memo } from 'react'; import { memo } from 'react';
import type { RadioInputProps } from '@/base/components/inputs/RadioInput.tsx'; import type { RadioInputProps } from '@/base/components/inputs/RadioInput.tsx';
import { RadioInput } from '@/base/components/inputs/RadioInput.tsx'; import { RadioInput } from '@/base/components/inputs/RadioInput.tsx';
@@ -23,7 +22,3 @@ export const SortRadioInput = memo(({ sortDescending, ...rest }: IProps) => (
{...rest} {...rest}
/> />
)); ));
export const SortRadioInputRandom = memo(({ sortDescending, ...rest }: IProps) => (
<RadioInput checkedIcon={<Replay color="primary" />} {...rest} />
));

44
src/features/library/components/LibraryOptionsPanel.tsx
View File

@@ -16,7 +16,7 @@ import { useMemo } from 'react';
import uniqBy from 'lodash/fp/uniqBy'; import uniqBy from 'lodash/fp/uniqBy';
import { CheckboxInput } from '@/base/components/inputs/CheckboxInput.tsx'; import { CheckboxInput } from '@/base/components/inputs/CheckboxInput.tsx';
import { RadioInput } from '@/base/components/inputs/RadioInput.tsx'; import { RadioInput } from '@/base/components/inputs/RadioInput.tsx';
import { SortRadioInput, SortRadioInputRandom } from '@/base/components/inputs/SortRadioInput.tsx'; import { SortRadioInput } from '@/base/components/inputs/SortRadioInput.tsx';
import { ThreeStateCheckboxInput } from '@/base/components/inputs/ThreeStateCheckboxInput.tsx'; import { ThreeStateCheckboxInput } from '@/base/components/inputs/ThreeStateCheckboxInput.tsx';
import { OptionsTabs } from '@/base/components/modals/OptionsTabs.tsx'; import { OptionsTabs } from '@/base/components/modals/OptionsTabs.tsx';
import { requestManager } from '@/lib/requests/RequestManager.ts'; import { requestManager } from '@/lib/requests/RequestManager.ts';
@@ -38,6 +38,7 @@ import { MANGA_STATUS_TO_TRANSLATION } from '@/features/manga/Manga.constants.ts
import { GridLayout } from '@/base/Base.types'; import { GridLayout } from '@/base/Base.types';
import { getErrorMessage } from '@/lib/HelperFunctions.ts'; import { getErrorMessage } from '@/lib/HelperFunctions.ts';
import { Collapsable } from '@/base/components/Collapsable.tsx'; import { Collapsable } from '@/base/components/Collapsable.tsx';
import Replay from '@mui/icons-material/Replay';
const TITLES: { [key in 'filter' | 'sort' | 'display']: MessageDescriptor } = { const TITLES: { [key in 'filter' | 'sort' | 'display']: MessageDescriptor } = {
filter: msg`Filter`, filter: msg`Filter`,
@@ -211,33 +212,20 @@ export const LibraryOptionsPanel = ({
); );
} }
if (key === 'sort') { if (key === 'sort') {
return SORT_OPTIONS.map(([mode, label]) => return SORT_OPTIONS.map(([mode, label]) => (
mode === 'random' ? ( <SortRadioInput
<SortRadioInputRandom key={mode}
key={mode} label={t(label)}
label={t(label)} checked={categoryLibraryOptions.sortBy === mode}
checked={categoryLibraryOptions.sortBy === mode} checkedIcon={mode === 'random' ? <Replay /> : undefined}
sortDescending={categoryLibraryOptions.sortDesc} sortDescending={categoryLibraryOptions.sortDesc}
onClick={() => onClick={() =>
mode !== categoryLibraryOptions.sortBy mode !== categoryLibraryOptions.sortBy
? updateCategoryLibraryOptions('sortBy', mode) ? updateCategoryLibraryOptions('sortBy', mode)
: updateCategoryLibraryOptions('sortDesc', !categoryLibraryOptions.sortDesc) : updateCategoryLibraryOptions('sortDesc', !categoryLibraryOptions.sortDesc)
} }
/> />
) : ( ));
<SortRadioInput
key={mode}
label={t(label)}
checked={categoryLibraryOptions.sortBy === mode}
sortDescending={categoryLibraryOptions.sortDesc}
onClick={() =>
mode !== categoryLibraryOptions.sortBy
? updateCategoryLibraryOptions('sortBy', mode)
: updateCategoryLibraryOptions('sortDesc', !categoryLibraryOptions.sortDesc)
}
/>
),
);
} }
if (key === 'display') { if (key === 'display') {
return ( return (