From a80e8885fb816165a7f5a79b15b6fbcc010894da Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Sat, 1 Feb 2025 19:48:24 +0100 Subject: [PATCH] Introduce "getReaderOpenChapterLocationState" function --- src/modules/chapter/components/cards/ChapterCard.tsx | 2 +- src/modules/chapter/services/Chapters.ts | 6 ++++++ src/modules/manga/components/ContinueReadingButton.tsx | 2 +- src/modules/manga/components/ResumeFAB.tsx | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/modules/chapter/components/cards/ChapterCard.tsx b/src/modules/chapter/components/cards/ChapterCard.tsx index e70d638f..0a6c01c5 100644 --- a/src/modules/chapter/components/cards/ChapterCard.tsx +++ b/src/modules/chapter/components/cards/ChapterCard.tsx @@ -124,7 +124,7 @@ export const ChapterCard = memo((props: IProps) => { style={{ color: theme.palette.text[chapter.isRead ? 'disabled' : 'primary'], }} - state={{ resumeMode: Chapters.getReaderResumeMode(chapter) }} + state={Chapters.getReaderOpenChapterLocationState(chapter)} replace={mode === 'reader'} onClick={(e) => handleClick(e)} {...longPressBind(popupState.open)} diff --git a/src/modules/chapter/services/Chapters.ts b/src/modules/chapter/services/Chapters.ts index 41b181d7..a7c3a959 100644 --- a/src/modules/chapter/services/Chapters.ts +++ b/src/modules/chapter/services/Chapters.ts @@ -459,4 +459,10 @@ export class Chapters { return ReaderResumeMode.LAST_READ; } + + static getReaderOpenChapterLocationState(chapter: ChapterReadInfo): { resumeMode: ReaderResumeMode } { + return { + resumeMode: Chapters.getReaderResumeMode(chapter), + }; + } } diff --git a/src/modules/manga/components/ContinueReadingButton.tsx b/src/modules/manga/components/ContinueReadingButton.tsx index 56c72ea3..a134ca5d 100644 --- a/src/modules/manga/components/ContinueReadingButton.tsx +++ b/src/modules/manga/components/ContinueReadingButton.tsx @@ -39,7 +39,7 @@ export const ContinueReadingButton = ({ sx={{ minWidth: 'unset', py: 0.5, px: 0.75 }} component={Link} to={`${mangaLinkTo}/chapter/${chapter.sourceOrder}`} - state={{ resumeMode: Chapters.getReaderResumeMode(chapter) }} + state={Chapters.getReaderOpenChapterLocationState(chapter)} onClick={(e) => e.stopPropagation()} onMouseDown={(e) => e.stopPropagation()} > diff --git a/src/modules/manga/components/ResumeFAB.tsx b/src/modules/manga/components/ResumeFAB.tsx index de3477c3..d2b03fef 100644 --- a/src/modules/manga/components/ResumeFAB.tsx +++ b/src/modules/manga/components/ResumeFAB.tsx @@ -27,7 +27,7 @@ export function ResumeFab({ chapter }: { chapter: ChapterMangaInfo & ChapterSour variant="extended" color="primary" to={Chapters.getReaderUrl(chapter)} - state={{ resumeMode: Chapters.getReaderResumeMode(chapter) }} + state={Chapters.getReaderOpenChapterLocationState(chapter)} > {sourceOrder === 1 ? t('global.button.start') : t('global.button.resume')}