From f37d7e892ae1173c77f145fcfded1ddc52815fd2 Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Mon, 22 Sep 2025 17:58:28 +0200 Subject: [PATCH] Fix tsc issues --- src/features/reader/services/ReaderService.ts | 4 +-- .../reader/viewer/ReaderChapterViewer.tsx | 10 +++----- src/features/reader/viewer/ReaderViewer.tsx | 25 +++++++------------ .../viewer/hooks/useReaderSetPagesState.ts | 4 +-- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/src/features/reader/services/ReaderService.ts b/src/features/reader/services/ReaderService.ts index e4b3d321..df067d0f 100644 --- a/src/features/reader/services/ReaderService.ts +++ b/src/features/reader/services/ReaderService.ts @@ -17,7 +17,6 @@ import { ReaderExitMode, ReaderOpenChapterLocationState, ReaderOverlayMode, - ReaderStateChapters, ReadingDirection, ReadingMode, } from '@/features/reader/Reader.types.ts'; @@ -53,6 +52,7 @@ import { useReaderSettingsStore, } from '@/features/reader/stores/ReaderStore.ts'; import { ReactRouter } from '@/lib/react-router/ReactRouter.ts'; +import { ReaderChaptersStoreSlice } from '@/features/reader/stores/ReaderChaptersStore.ts'; const DIRECTION_TO_INVERTED: Record = { ltr: 'rtl', @@ -120,7 +120,7 @@ export class ReaderService { chapter: TChapterReader | undefined | null, lastLeadingChapterSourceOrder: number, lastTrailingChapterSourceOrder: number, - setReaderStateChapters: ReaderStateChapters['setReaderStateChapters'], + setReaderStateChapters: ReaderChaptersStoreSlice['chapters']['setReaderStateChapters'], direction: DirectionOffset, ): void { if (!chapter) { diff --git a/src/features/reader/viewer/ReaderChapterViewer.tsx b/src/features/reader/viewer/ReaderChapterViewer.tsx index 82badad8..80de8100 100644 --- a/src/features/reader/viewer/ReaderChapterViewer.tsx +++ b/src/features/reader/viewer/ReaderChapterViewer.tsx @@ -16,7 +16,6 @@ import { ReaderPagerProps, ReaderPageSpreadState, ReaderResumeMode, - ReaderStateChapters, ReaderStatePages, ReaderTransitionPageMode, ReadingDirection, @@ -45,6 +44,7 @@ import { useResizeObserver } from '@/base/hooks/useResizeObserver.tsx'; import { ChapterIdInfo } from '@/features/chapter/Chapter.types.ts'; import { READER_DEFAULT_PAGES_STATE } from '@/features/reader/stores/ReaderPagesStore.ts'; +import { getReaderChaptersStore } from '@/features/reader/stores/ReaderStore.ts'; const BaseReaderChapterViewer = ({ currentPageIndex, @@ -79,7 +79,6 @@ const BaseReaderChapterViewer = ({ isPreloadMode, imageRefs: globalImageRefs, scrollIntoView, - setReaderStateChapters, resumeMode, customFilter, shouldStretchPage, @@ -104,8 +103,7 @@ const BaseReaderChapterViewer = ({ Pick< IReaderSettings, 'readingMode' | 'shouldOffsetDoubleSpreads' | 'readingDirection' | 'readerWidth' | 'pageScaleMode' - > & - Pick & { + > & { updateCurrentPageIndex: ReturnType; chapterId: ChapterIdInfo['id']; previousChapterId?: ChapterIdInfo['id']; @@ -265,7 +263,7 @@ const BaseReaderChapterViewer = ({ pagesToSpreadState, arePagesFetched, setArePagesFetched, - (value) => updateState(value, noOp, setReaderStateChapters), + (value) => updateState(value, noOp, getReaderChaptersStore().setReaderStateChapters), (value) => updateState(value, setTotalPages, setContextTotalPages), (value) => updateState(value, setPages, setContextPages), (value) => updateState(value, setPageUrls, noOp), @@ -275,7 +273,7 @@ const BaseReaderChapterViewer = ({ (value) => { if ((isInitialChapter && !arePagesFetched) || scrollIntoView) { setPageToScrollToIndex(value); - setReaderStateChapters((prevState) => ({ + getReaderChaptersStore().setReaderStateChapters((prevState) => ({ ...prevState, visibleChapters: { ...prevState.visibleChapters, scrollIntoView: false, resumeMode: undefined }, })); diff --git a/src/features/reader/viewer/ReaderViewer.tsx b/src/features/reader/viewer/ReaderViewer.tsx index 83bb17ef..b0173b4d 100644 --- a/src/features/reader/viewer/ReaderViewer.tsx +++ b/src/features/reader/viewer/ReaderViewer.tsx @@ -114,21 +114,15 @@ const BaseReaderViewer = forwardRef( retryFailedPagesKeyPrefix: state.pages.retryFailedPagesKeyPrefix, setTransitionPageMode: state.pages.setTransitionPageMode, })); - const { - initialChapter, - currentChapter, - chapters, - visibleChapters, - setReaderStateChapters, - isCurrentChapterReady, - } = useReaderChaptersStore((state) => ({ - initialChapter: state.chapters.initialChapter, - currentChapter: state.chapters.currentChapter, - chapters: state.chapters.chapters, - visibleChapters: state.chapters.visibleChapters, - setReaderStateChapters: state.chapters.setReaderStateChapters, - isCurrentChapterReady: state.chapters.isCurrentChapterReady, - })); + const { initialChapter, currentChapter, chapters, visibleChapters, isCurrentChapterReady } = + useReaderChaptersStore((state) => ({ + initialChapter: state.chapters.initialChapter, + currentChapter: state.chapters.currentChapter, + chapters: state.chapters.chapters, + visibleChapters: state.chapters.visibleChapters, + setReaderStateChapters: state.chapters.setReaderStateChapters, + isCurrentChapterReady: state.chapters.isCurrentChapterReady, + })); const { readingMode, readingDirection, @@ -419,7 +413,6 @@ const BaseReaderViewer = forwardRef( visibleChapters.resumeMode, resumeMode, )} - setReaderStateChapters={setReaderStateChapters} setTransitionPageMode={setTransitionPageMode} pageGap={pageGap} imagePreLoadAmount={imagePreLoadAmount} diff --git a/src/features/reader/viewer/hooks/useReaderSetPagesState.ts b/src/features/reader/viewer/hooks/useReaderSetPagesState.ts index 8b31d88c..c42b53e1 100644 --- a/src/features/reader/viewer/hooks/useReaderSetPagesState.ts +++ b/src/features/reader/viewer/hooks/useReaderSetPagesState.ts @@ -12,12 +12,12 @@ import { createPagesData } from '@/features/reader/viewer/pager/ReaderPager.util import { ReaderPageSpreadState, ReaderResumeMode, - ReaderStateChapters, ReaderStatePages, ReaderTransitionPageMode, } from '@/features/reader/Reader.types.ts'; import { requestManager } from '@/lib/requests/RequestManager.ts'; import { TChapterReader } from '@/features/chapter/Chapter.types.ts'; +import { ReaderChaptersStoreSlice } from '@/features/reader/stores/ReaderChaptersStore.ts'; export const useReaderSetPagesState = ( isCurrentChapter: boolean, @@ -29,7 +29,7 @@ export const useReaderSetPagesState = ( pagesToSpreadState: ReaderPageSpreadState[], arePagesFetched: boolean, setArePagesFetched: (fetched: boolean) => void, - setReaderStateChapters: ReaderStateChapters['setReaderStateChapters'], + setReaderStateChapters: ReaderChaptersStoreSlice['chapters']['setReaderStateChapters'], setTotalPages: ReaderStatePages['setTotalPages'], setPages: ReaderStatePages['setPages'], setPageUrls: ReaderStatePages['setPageUrls'],