From 4e30081ed8841a657abe74e3746b6517b1ea0151 Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Sun, 31 Aug 2025 12:18:40 +0200 Subject: [PATCH] Move reader "pages" state to base reader types --- src/features/reader/Reader.types.ts | 32 +++++++++++++++++- src/features/reader/Reader.utils.ts | 2 +- .../reader/ReaderContext.constants.ts | 3 +- .../state/ReaderStatePagesContext.tsx | 3 +- .../reader/hooks/useReaderResetStates.ts | 2 +- .../overlay/components/ReaderPageNumber.tsx | 6 ++-- .../components/ReaderNavBarDesktopActions.tsx | 3 +- .../ReaderNavBarDesktopPageNavigation.tsx | 3 +- .../progress-bar/ReaderProgressBar.types.ts | 33 +------------------ src/features/reader/screens/Reader.tsx | 2 +- .../reader/viewer/ReaderChapterViewer.tsx | 2 +- src/features/reader/viewer/ReaderViewer.tsx | 2 +- .../components/ReaderTransitionPage.tsx | 2 +- .../useReaderConvertPagesForReadingMode.ts | 3 +- .../hooks/useReaderHandlePageSelection.ts | 3 +- .../hooks/useReaderPreserveScrollPosition.ts | 2 +- .../useReaderScrollToStartOnPageChange.ts | 3 +- .../viewer/hooks/useReaderSetPagesState.ts | 2 +- .../reader/viewer/pager/ReaderPager.utils.tsx | 2 +- .../viewer/pager/components/BasePager.tsx | 2 +- 20 files changed, 51 insertions(+), 61 deletions(-) diff --git a/src/features/reader/Reader.types.ts b/src/features/reader/Reader.types.ts index 5800ccb3..35d74b3c 100644 --- a/src/features/reader/Reader.types.ts +++ b/src/features/reader/Reader.types.ts @@ -10,7 +10,6 @@ import { MutableRefObject } from 'react'; import { TapZoneInvertMode, TapZoneLayouts } from '@/features/reader/tap-zones/TapZoneLayout.types.ts'; import { TChapterReader } from '@/features/chapter/Chapter.types.ts'; import { ReaderService } from '@/features/reader/services/ReaderService.ts'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { TMangaReader } from '@/features/manga/Manga.types.ts'; import { useAutomaticScrolling } from '@/base/hooks/useAutomaticScrolling.ts'; import { NavbarContextType } from '@/features/navigation-bar/NavigationBar.types.ts'; @@ -284,6 +283,37 @@ export enum ReaderHotkey { EXIT_READER, } +interface SinglePageData { + index: number; + alt: string; + url: string; +} + +export interface PageData { + name: string; + primary: SinglePageData; + secondary?: SinglePageData; +} + +export interface ReaderStatePages { + totalPages: number; + setTotalPages: React.Dispatch>; + currentPageIndex: number; + setCurrentPageIndex: React.Dispatch>; + pageToScrollToIndex: number | null; + setPageToScrollToIndex: React.Dispatch>; + pageUrls: string[]; + setPageUrls: React.Dispatch>; + pageLoadStates: { url: string; loaded: boolean; error?: boolean }[]; + setPageLoadStates: React.Dispatch>; + pages: PageData[]; + setPages: React.Dispatch>; + transitionPageMode: ReaderTransitionPageMode; + setTransitionPageMode: React.Dispatch>; + retryFailedPagesKeyPrefix: string; + setRetryFailedPagesKeyPrefix: React.Dispatch>; +} + export interface ReaderPagerProps extends Pick< ReaderStatePages, diff --git a/src/features/reader/Reader.utils.ts b/src/features/reader/Reader.utils.ts index 09da344f..1ef3c9ef 100644 --- a/src/features/reader/Reader.utils.ts +++ b/src/features/reader/Reader.utils.ts @@ -10,6 +10,7 @@ import { ReaderPageSpreadState, ReaderResumeMode, ReaderStateChapters, + ReaderStatePages, ReadingMode, } from '@/features/reader/Reader.types.ts'; import { UpdateChapterPatchInput } from '@/lib/graphql/generated/graphql.ts'; @@ -17,7 +18,6 @@ import { ChapterIdInfo, TChapterReader } from '@/features/chapter/Chapter.types. import { Chapters } from '@/features/chapter/services/Chapters.ts'; import { CHAPTER_READER_FIELDS } from '@/lib/graphql/fragments/ChapterFragments.ts'; import { isPageOfOutdatedPageLoadStates, isSpreadPage } from '@/features/reader/viewer/pager/ReaderPager.utils.tsx'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { coerceIn } from '@/lib/HelperFunctions.ts'; import { DirectionOffset } from '@/base/Base.types.ts'; diff --git a/src/features/reader/ReaderContext.constants.ts b/src/features/reader/ReaderContext.constants.ts index de3f4300..963fe52e 100644 --- a/src/features/reader/ReaderContext.constants.ts +++ b/src/features/reader/ReaderContext.constants.ts @@ -6,8 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; -import { ReaderTransitionPageMode } from '@/features/reader/Reader.types.ts'; +import { ReaderStatePages, ReaderTransitionPageMode } from '@/features/reader/Reader.types.ts'; import { createPageData } from '@/features/reader/viewer/pager/ReaderPager.utils.tsx'; export const READER_STATE_PAGES_DEFAULTS: ReaderStatePages = { diff --git a/src/features/reader/contexts/state/ReaderStatePagesContext.tsx b/src/features/reader/contexts/state/ReaderStatePagesContext.tsx index 2367785c..763a02d5 100644 --- a/src/features/reader/contexts/state/ReaderStatePagesContext.tsx +++ b/src/features/reader/contexts/state/ReaderStatePagesContext.tsx @@ -7,8 +7,7 @@ */ import { createContext, ReactNode, useContext, useMemo, useState } from 'react'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; -import { ReaderTransitionPageMode } from '@/features/reader/Reader.types.ts'; +import { ReaderStatePages, ReaderTransitionPageMode } from '@/features/reader/Reader.types.ts'; import { READER_STATE_PAGES_DEFAULTS } from '@/features/reader/ReaderContext.constants.ts'; export const ReaderStatePagesContext = createContext({ diff --git a/src/features/reader/hooks/useReaderResetStates.ts b/src/features/reader/hooks/useReaderResetStates.ts index f259e28f..e7ba5481 100644 --- a/src/features/reader/hooks/useReaderResetStates.ts +++ b/src/features/reader/hooks/useReaderResetStates.ts @@ -10,13 +10,13 @@ import { useEffect } from 'react'; import { createPageData } from '@/features/reader/viewer/pager/ReaderPager.utils.tsx'; import { ReaderStateChapters, + ReaderStatePages, ReaderTransitionPageMode, TReaderAutoScrollContext, TReaderStateMangaContext, TReaderStateSettingsContext, } from '@/features/reader/Reader.types.ts'; import { DEFAULT_READER_SETTINGS_WITH_DEFAULT_FLAG } from '@/features/reader/settings/ReaderSettingsMetadata.ts'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { TReaderOverlayContext } from '@/features/reader/overlay/ReaderOverlay.types.ts'; import { READER_STATE_CHAPTERS_DEFAULTS } from '@/features/reader/contexts/state/ReaderStateChaptersContext.tsx'; diff --git a/src/features/reader/overlay/components/ReaderPageNumber.tsx b/src/features/reader/overlay/components/ReaderPageNumber.tsx index 00042543..079d0d7f 100644 --- a/src/features/reader/overlay/components/ReaderPageNumber.tsx +++ b/src/features/reader/overlay/components/ReaderPageNumber.tsx @@ -14,6 +14,7 @@ import { ReaderService } from '@/features/reader/services/ReaderService.ts'; import { IReaderSettings, ProgressBarType, + ReaderStatePages, ReadingDirection, TReaderScrollbarContext, } from '@/features/reader/Reader.types.ts'; @@ -24,10 +25,7 @@ import { useReaderProgressBarContext } from '@/features/reader/overlay/progress- import { useReaderScrollbarContext } from '@/features/reader/contexts/ReaderScrollbarContext.tsx'; import { reverseString } from '@/base/utils/Strings.ts'; import { NavbarContextType } from '@/features/navigation-bar/NavigationBar.types.ts'; -import { - ReaderStatePages, - TReaderProgressBarContext, -} from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; +import { TReaderProgressBarContext } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { withPropsFrom } from '@/base/hoc/withPropsFrom.tsx'; const BaseReaderPageNumber = ({ diff --git a/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopActions.tsx b/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopActions.tsx index 7eacbc7e..da331421 100644 --- a/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopActions.tsx +++ b/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopActions.tsx @@ -15,9 +15,8 @@ import { memo, useMemo, useRef } from 'react'; import DeleteIcon from '@mui/icons-material/Delete'; import { CustomTooltip } from '@/base/components/CustomTooltip.tsx'; import { Chapters } from '@/features/chapter/services/Chapters.ts'; -import { ReaderStateChapters } from '@/features/reader/Reader.types.ts'; +import { ReaderStateChapters, ReaderStatePages } from '@/features/reader/Reader.types.ts'; import { DownloadStateIndicator } from '@/base/components/downloads/DownloadStateIndicator.tsx'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { withPropsFrom } from '@/base/hoc/withPropsFrom.tsx'; import { useReaderStateChaptersContext } from '@/features/reader/contexts/state/ReaderStateChaptersContext.tsx'; import { userReaderStatePagesContext } from '@/features/reader/contexts/state/ReaderStatePagesContext.tsx'; diff --git a/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopPageNavigation.tsx b/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopPageNavigation.tsx index 8e802a71..c4da6525 100644 --- a/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopPageNavigation.tsx +++ b/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopPageNavigation.tsx @@ -14,13 +14,12 @@ import FormControl from '@mui/material/FormControl'; import InputLabel from '@mui/material/InputLabel'; import { Select } from '@/base/components/inputs/Select.tsx'; import { getNextIndexFromPage, getPage } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { ReaderControls } from '@/features/reader/services/ReaderControls.ts'; import { useGetOptionForDirection } from '@/features/theme/services/ThemeCreator.ts'; import { ReaderService } from '@/features/reader/services/ReaderService.ts'; import { ReaderNavBarDesktopNextPreviousButton } from '@/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopNextPreviousButton.tsx'; import { READING_DIRECTION_TO_THEME_DIRECTION } from '@/features/reader/settings/ReaderSettings.constants.tsx'; -import { IReaderSettings } from '@/features/reader/Reader.types.ts'; +import { IReaderSettings, ReaderStatePages } from '@/features/reader/Reader.types.ts'; import { withPropsFrom } from '@/base/hoc/withPropsFrom.tsx'; import { userReaderStatePagesContext } from '@/features/reader/contexts/state/ReaderStatePagesContext.tsx'; diff --git a/src/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts b/src/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts index 8d0b31e7..c88b754f 100644 --- a/src/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts +++ b/src/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts @@ -8,38 +8,7 @@ import { BoxProps } from '@mui/material/Box'; import { TooltipProps } from '@mui/material/Tooltip'; -import { IReaderSettings, ReaderTransitionPageMode } from '@/features/reader/Reader.types.ts'; - -interface SinglePageData { - index: number; - alt: string; - url: string; -} - -interface PageData { - name: string; - primary: SinglePageData; - secondary?: SinglePageData; -} - -export interface ReaderStatePages { - totalPages: number; - setTotalPages: React.Dispatch>; - currentPageIndex: number; - setCurrentPageIndex: React.Dispatch>; - pageToScrollToIndex: number | null; - setPageToScrollToIndex: React.Dispatch>; - pageUrls: string[]; - setPageUrls: React.Dispatch>; - pageLoadStates: { url: string; loaded: boolean; error?: boolean }[]; - setPageLoadStates: React.Dispatch>; - pages: PageData[]; - setPages: React.Dispatch>; - transitionPageMode: ReaderTransitionPageMode; - setTransitionPageMode: React.Dispatch>; - retryFailedPagesKeyPrefix: string; - setRetryFailedPagesKeyPrefix: React.Dispatch>; -} +import { IReaderSettings, PageData, ReaderStatePages } from '@/features/reader/Reader.types.ts'; export interface ReaderProgressBarProps extends Pick, diff --git a/src/features/reader/screens/Reader.tsx b/src/features/reader/screens/Reader.tsx index 654a87af..75f87673 100644 --- a/src/features/reader/screens/Reader.tsx +++ b/src/features/reader/screens/Reader.tsx @@ -34,6 +34,7 @@ import { IReaderSettings, IReaderSettingsWithDefaultFlag, ReaderStateChapters, + ReaderStatePages, TReaderAutoScrollContext, TReaderStateMangaContext, TReaderStateSettingsContext, @@ -41,7 +42,6 @@ import { import { getErrorMessage } from '@/lib/HelperFunctions.ts'; import { NavbarContextType } from '@/features/navigation-bar/NavigationBar.types.ts'; import { TReaderOverlayContext } from '@/features/reader/overlay/ReaderOverlay.types.ts'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { withPropsFrom } from '@/base/hoc/withPropsFrom.tsx'; import { useReaderStateChaptersContext } from '@/features/reader/contexts/state/ReaderStateChaptersContext.tsx'; import { useReaderAutoScrollContext } from '@/features/reader/auto-scroll/ReaderAutoScrollContext.tsx'; diff --git a/src/features/reader/viewer/ReaderChapterViewer.tsx b/src/features/reader/viewer/ReaderChapterViewer.tsx index 8058c3da..8f3f4afb 100644 --- a/src/features/reader/viewer/ReaderChapterViewer.tsx +++ b/src/features/reader/viewer/ReaderChapterViewer.tsx @@ -17,6 +17,7 @@ import { ReaderPageSpreadState, ReaderResumeMode, ReaderStateChapters, + ReaderStatePages, ReaderTransitionPageMode, ReadingDirection, ReadingMode, @@ -29,7 +30,6 @@ import { isContinuousVerticalReadingMode, shouldApplyReaderWidth, } from '@/features/reader/settings/ReaderSettings.utils.tsx'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { createHandleReaderPageLoadError, createUpdateReaderPageLoadState } from '@/features/reader/Reader.utils.ts'; import { useReaderConvertPagesForReadingMode } from '@/features/reader/viewer/hooks/useReaderConvertPagesForReadingMode.ts'; import { ReaderTransitionPage } from '@/features/reader/viewer/components/ReaderTransitionPage.tsx'; diff --git a/src/features/reader/viewer/ReaderViewer.tsx b/src/features/reader/viewer/ReaderViewer.tsx index b9ce248c..ebeb34ae 100644 --- a/src/features/reader/viewer/ReaderViewer.tsx +++ b/src/features/reader/viewer/ReaderViewer.tsx @@ -28,6 +28,7 @@ import { ReaderOpenChapterLocationState, ReaderResumeMode, ReaderStateChapters, + ReaderStatePages, ReadingDirection, ReadingMode, TReaderScrollbarContext, @@ -45,7 +46,6 @@ import { useMouseDragScroll } from '@/base/hooks/useMouseDragScroll.tsx'; import { useReaderOverlayContext } from '@/features/reader/overlay/ReaderOverlayContext.tsx'; import { applyStyles } from '@/base/utils/ApplyStyles.ts'; import { TReaderOverlayContext } from '@/features/reader/overlay/ReaderOverlay.types.ts'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { withPropsFrom } from '@/base/hoc/withPropsFrom.tsx'; import { useReaderAutoScrollContext } from '@/features/reader/auto-scroll/ReaderAutoScrollContext.tsx'; import { TReaderTapZoneContext } from '@/features/reader/tap-zones/TapZoneLayout.types.ts'; diff --git a/src/features/reader/viewer/components/ReaderTransitionPage.tsx b/src/features/reader/viewer/components/ReaderTransitionPage.tsx index 173cd02f..5c5b365c 100644 --- a/src/features/reader/viewer/components/ReaderTransitionPage.tsx +++ b/src/features/reader/viewer/components/ReaderTransitionPage.tsx @@ -17,6 +17,7 @@ import { useReaderScrollbarContext } from '@/features/reader/contexts/ReaderScro import { useReaderStateChaptersContext } from '@/features/reader/contexts/state/ReaderStateChaptersContext.tsx'; import { IReaderSettings, + ReaderStatePages, ReaderTransitionPageMode, ReadingMode, TReaderScrollbarContext, @@ -37,7 +38,6 @@ import { useReaderStateMangaContext } from '@/features/reader/contexts/state/Rea import { getValueFromObject, noOp } from '@/lib/HelperFunctions.ts'; import { READER_BACKGROUND_TO_COLOR } from '@/features/reader/settings/ReaderSettings.constants.tsx'; import { ReaderService } from '@/features/reader/services/ReaderService.ts'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { userReaderStatePagesContext } from '@/features/reader/contexts/state/ReaderStatePagesContext.tsx'; import { ChapterType } from '@/lib/graphql/generated/graphql.ts'; import { ChapterIdInfo } from '@/features/chapter/Chapter.types.ts'; diff --git a/src/features/reader/viewer/hooks/useReaderConvertPagesForReadingMode.ts b/src/features/reader/viewer/hooks/useReaderConvertPagesForReadingMode.ts index 5a36e464..1b98ea60 100644 --- a/src/features/reader/viewer/hooks/useReaderConvertPagesForReadingMode.ts +++ b/src/features/reader/viewer/hooks/useReaderConvertPagesForReadingMode.ts @@ -7,10 +7,9 @@ */ import { useLayoutEffect, useState } from 'react'; -import { ReaderPageSpreadState, ReadingMode } from '@/features/reader/Reader.types.ts'; +import { ReaderPageSpreadState, ReaderStatePages, ReadingMode } from '@/features/reader/Reader.types.ts'; import { getNextIndexFromPage, getPage } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx'; import { createPagesData } from '@/features/reader/viewer/pager/ReaderPager.utils.tsx'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { ReaderControls } from '@/features/reader/services/ReaderControls.ts'; export const useReaderConvertPagesForReadingMode = ( diff --git a/src/features/reader/viewer/hooks/useReaderHandlePageSelection.ts b/src/features/reader/viewer/hooks/useReaderHandlePageSelection.ts index 62c96e80..abbbbdf5 100644 --- a/src/features/reader/viewer/hooks/useReaderHandlePageSelection.ts +++ b/src/features/reader/viewer/hooks/useReaderHandlePageSelection.ts @@ -8,10 +8,9 @@ import { MutableRefObject, useLayoutEffect } from 'react'; import { Direction } from '@mui/material/styles'; -import { ReadingDirection } from '@/features/reader/Reader.types.ts'; +import { ReaderStatePages, ReadingDirection } from '@/features/reader/Reader.types.ts'; import { getNextIndexFromPage, getPage } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx'; import { getScrollIntoViewInlineOption } from '@/features/reader/viewer/pager/ReaderPager.utils.tsx'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { ReaderControls } from '@/features/reader/services/ReaderControls.ts'; import { DirectionOffset } from '@/base/Base.types.ts'; diff --git a/src/features/reader/viewer/hooks/useReaderPreserveScrollPosition.ts b/src/features/reader/viewer/hooks/useReaderPreserveScrollPosition.ts index be20eb8b..be47e2a5 100644 --- a/src/features/reader/viewer/hooks/useReaderPreserveScrollPosition.ts +++ b/src/features/reader/viewer/hooks/useReaderPreserveScrollPosition.ts @@ -11,10 +11,10 @@ import { useWindowEvent } from '@mantine/hooks'; import { ReaderPageScaleMode, ReaderStateChapters, + ReaderStatePages, ReadingDirection, ReadingMode, } from '@/features/reader/Reader.types.ts'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { isContinuousReadingMode, isContinuousVerticalReadingMode, diff --git a/src/features/reader/viewer/hooks/useReaderScrollToStartOnPageChange.ts b/src/features/reader/viewer/hooks/useReaderScrollToStartOnPageChange.ts index 2217e186..c048cba8 100644 --- a/src/features/reader/viewer/hooks/useReaderScrollToStartOnPageChange.ts +++ b/src/features/reader/viewer/hooks/useReaderScrollToStartOnPageChange.ts @@ -8,9 +8,8 @@ import { MutableRefObject, useLayoutEffect } from 'react'; import { Direction } from '@mui/material/styles'; -import { ReadingDirection } from '@/features/reader/Reader.types.ts'; +import { ReaderStatePages, ReadingDirection } from '@/features/reader/Reader.types.ts'; import { getScrollToXForReadingDirection } from '@/features/reader/viewer/pager/ReaderPager.utils.tsx'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; export const useReaderScrollToStartOnPageChange = ( currentPageIndex: ReaderStatePages['currentPageIndex'], diff --git a/src/features/reader/viewer/hooks/useReaderSetPagesState.ts b/src/features/reader/viewer/hooks/useReaderSetPagesState.ts index a73eb7b3..8b31d88c 100644 --- a/src/features/reader/viewer/hooks/useReaderSetPagesState.ts +++ b/src/features/reader/viewer/hooks/useReaderSetPagesState.ts @@ -13,10 +13,10 @@ import { ReaderPageSpreadState, ReaderResumeMode, ReaderStateChapters, + ReaderStatePages, ReaderTransitionPageMode, } from '@/features/reader/Reader.types.ts'; import { requestManager } from '@/lib/requests/RequestManager.ts'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { TChapterReader } from '@/features/chapter/Chapter.types.ts'; export const useReaderSetPagesState = ( diff --git a/src/features/reader/viewer/pager/ReaderPager.utils.tsx b/src/features/reader/viewer/pager/ReaderPager.utils.tsx index f60d48dc..c90d101c 100644 --- a/src/features/reader/viewer/pager/ReaderPager.utils.tsx +++ b/src/features/reader/viewer/pager/ReaderPager.utils.tsx @@ -13,6 +13,7 @@ import { PageInViewportType, ReaderPageScaleMode, ReaderPageSpreadState, + ReaderStatePages, ReaderTransitionPageMode, ReadingDirection, ReadingMode, @@ -25,7 +26,6 @@ import { isContinuousVerticalReadingMode, shouldApplyReaderWidth, } from '@/features/reader/settings/ReaderSettings.utils.tsx'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { requestManager } from '@/lib/requests/RequestManager.ts'; import { ReaderPage } from '@/features/reader/viewer/components/ReaderPage.tsx'; import { reverseString } from '@/base/utils/Strings.ts'; diff --git a/src/features/reader/viewer/pager/components/BasePager.tsx b/src/features/reader/viewer/pager/components/BasePager.tsx index 6af3d404..a6e7b6b4 100644 --- a/src/features/reader/viewer/pager/components/BasePager.tsx +++ b/src/features/reader/viewer/pager/components/BasePager.tsx @@ -9,11 +9,11 @@ import { forwardRef, memo, ReactNode, useCallback, useEffect, useMemo, useRef } from 'react'; import Box, { BoxProps } from '@mui/material/Box'; import { getPageIndexesToLoad, isATransitionPageVisible } from '@/features/reader/viewer/pager/ReaderPager.utils.tsx'; -import { ReaderStatePages } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; import { IReaderSettings, ReaderPagerProps, ReaderResumeMode, + ReaderStatePages, ReaderTransitionPageMode, } from '@/features/reader/Reader.types.ts'; import { applyStyles } from '@/base/utils/ApplyStyles.ts';