From ea102eceb6bb1b72364d705740195baabf9dbbef Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Sun, 30 Jun 2024 14:10:49 +0200 Subject: [PATCH] Make chapter sort options typing more strict --- src/components/chapter/ChapterOptions.tsx | 4 ++-- src/components/chapter/util.tsx | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/chapter/ChapterOptions.tsx b/src/components/chapter/ChapterOptions.tsx index 494587fd..2b631c08 100644 --- a/src/components/chapter/ChapterOptions.tsx +++ b/src/components/chapter/ChapterOptions.tsx @@ -80,7 +80,7 @@ export const ChapterOptions: React.FC = ({ open, onClose, options, optio ); } if (key === 'sort') { - return SORT_OPTIONS.map(([mode, label]) => ( + return Object.entries(SORT_OPTIONS).map(([mode, label]) => ( = ({ open, onClose, options, optio sortDescending={options.reverse} onClick={() => mode !== options.sortBy - ? optionsDispatch({ type: 'sortBy', sortBy: mode }) + ? optionsDispatch({ type: 'sortBy', sortBy: mode as keyof typeof SORT_OPTIONS }) : optionsDispatch({ type: 'sortReverse' }) } /> diff --git a/src/components/chapter/util.tsx b/src/components/chapter/util.tsx index 01fd4477..34e420fd 100644 --- a/src/components/chapter/util.tsx +++ b/src/components/chapter/util.tsx @@ -129,12 +129,12 @@ export const useChapterOptions = (mangaId: number) => defaultChapterOptions, ); -export const SORT_OPTIONS: [ChapterSortMode, TranslationKey][] = [ - ['source', 'global.sort.label.by_source'], - ['chapterNumber', 'global.sort.label.by_chapter_number'], - ['uploadedAt', 'global.sort.label.by_upload_date'], - ['fetchedAt', 'global.sort.label.by_fetch_date'], -]; +export const SORT_OPTIONS: Record = { + source: 'global.sort.label.by_source', + chapterNumber: 'global.sort.label.by_chapter_number', + uploadedAt: 'global.sort.label.by_upload_date', + fetchedAt: 'global.sort.label.by_fetch_date', +}; export const isFilterActive = (options: ChapterListOptions) => { const { unread, downloaded, bookmarked } = options;