Fix tsc issues

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<Direction, Direction> = {
     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) {

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<ReaderStateChapters, 'setReaderStateChapters'> & {
         updateCurrentPageIndex: ReturnType<typeof ReaderControls.useUpdateCurrentPageIndex>;
         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 },
                 }));

src/features/reader/viewer/ReaderViewer.tsx

@@ -114,21 +114,15 @@ const BaseReaderViewer = forwardRef(
             retryFailedPagesKeyPrefix: state.pages.retryFailedPagesKeyPrefix,
             setTransitionPageMode: state.pages.setTransitionPageMode,
         }));
-        const {
+        const { initialChapter, currentChapter, chapters, visibleChapters, isCurrentChapterReady } =
-            initialChapter,
+            useReaderChaptersStore((state) => ({
-            currentChapter,
+                initialChapter: state.chapters.initialChapter,
-            chapters,
+                currentChapter: state.chapters.currentChapter,
-            visibleChapters,
+                chapters: state.chapters.chapters,
-            setReaderStateChapters,
+                visibleChapters: state.chapters.visibleChapters,
-            isCurrentChapterReady,
+                setReaderStateChapters: state.chapters.setReaderStateChapters,
-        } = useReaderChaptersStore((state) => ({
+                isCurrentChapterReady: state.chapters.isCurrentChapterReady,
-            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}

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'],