From 6da8a3fd87320edc92e5c9c6bf848e92fc96bc4c Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Sat, 20 Sep 2025 17:53:56 +0200 Subject: [PATCH] Move reader store in sub dir --- src/features/reader/auto-scroll/ReaderAutoScroll.tsx | 2 +- .../settings/quick-setting/ReaderNavBarDesktopAutoScroll.tsx | 2 +- src/features/reader/filters/ReaderRGBAFilter.tsx | 2 +- src/features/reader/hooks/useReaderResetStates.ts | 2 +- src/features/reader/hooks/useReaderSetChaptersState.ts | 4 ++-- src/features/reader/hotkeys/ReaderHotkeys.tsx | 2 +- .../infinite-scroll/useReaderInfiniteScrollUpdateChapter.ts | 2 +- src/features/reader/overlay/components/ReaderPageNumber.tsx | 2 +- .../reader/overlay/hooks/useReaderHideOverlayOnUserScroll.ts | 2 +- .../reader/overlay/mobile/ReaderOverlayHeaderMobile.tsx | 2 +- .../overlay/navigation/components/ReaderLibraryButton.tsx | 2 +- .../overlay/navigation/desktop/ReaderNavBarDesktop.tsx | 2 +- .../desktop/components/ReaderNavBarDesktopActions.tsx | 2 +- .../desktop/components/ReaderNavBarDesktopPageNavigation.tsx | 2 +- .../quick-settings/ReaderNavBarDesktopQuickSettings.tsx | 2 +- .../overlay/navigation/mobile/ReaderBottomBarMobile.tsx | 2 +- .../quick-settings/ReaderBottomBarMobileQuickSettings.tsx | 2 +- .../reader/overlay/progress-bar/ReaderProgressBar.tsx | 2 +- .../progress-bar/desktop/StandardReaderProgressBar.tsx | 2 +- .../overlay/progress-bar/mobile/MobileReaderProgressBar.tsx | 2 +- src/features/reader/screens/Reader.tsx | 2 +- src/features/reader/services/ReaderControls.ts | 2 +- src/features/reader/services/ReaderService.ts | 2 +- .../reader/settings/components/ReaderSettingsTabs.tsx | 2 +- src/features/reader/settings/screens/ReaderSettings.tsx | 2 +- src/features/reader/{ => stores}/ReaderStore.constants.ts | 0 src/features/reader/{ => stores}/ReaderStore.ts | 5 ++++- src/features/reader/tap-zones/TapZoneLayout.tsx | 2 +- src/features/reader/viewer/ReaderChapterViewer.tsx | 2 +- src/features/reader/viewer/ReaderViewer.tsx | 2 +- src/features/reader/viewer/components/ReaderPage.tsx | 2 +- .../reader/viewer/components/ReaderTransitionPage.tsx | 2 +- 32 files changed, 35 insertions(+), 32 deletions(-) rename src/features/reader/{ => stores}/ReaderStore.constants.ts (100%) rename src/features/reader/{ => stores}/ReaderStore.ts (98%) diff --git a/src/features/reader/auto-scroll/ReaderAutoScroll.tsx b/src/features/reader/auto-scroll/ReaderAutoScroll.tsx index ccc8ae6d..7f5189f0 100644 --- a/src/features/reader/auto-scroll/ReaderAutoScroll.tsx +++ b/src/features/reader/auto-scroll/ReaderAutoScroll.tsx @@ -17,7 +17,7 @@ import { useAutomaticScrolling } from '@/base/hooks/useAutomaticScrolling.ts'; import { CONTINUOUS_READING_MODE_TO_SCROLL_DIRECTION } from '@/features/reader/settings/ReaderSettings.constants.tsx'; import { withPropsFrom } from '@/base/hoc/withPropsFrom.tsx'; import { ReaderService } from '@/features/reader/services/ReaderService.ts'; -import { getReaderStore, useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { getReaderStore, useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const BaseReaderAutoScroll = ({ openPage, diff --git a/src/features/reader/auto-scroll/settings/quick-setting/ReaderNavBarDesktopAutoScroll.tsx b/src/features/reader/auto-scroll/settings/quick-setting/ReaderNavBarDesktopAutoScroll.tsx index 65f0d8e9..049d3ca9 100644 --- a/src/features/reader/auto-scroll/settings/quick-setting/ReaderNavBarDesktopAutoScroll.tsx +++ b/src/features/reader/auto-scroll/settings/quick-setting/ReaderNavBarDesktopAutoScroll.tsx @@ -17,7 +17,7 @@ import { useRef } from 'react'; import { IReaderSettings } from '@/features/reader/Reader.types.ts'; import { AUTO_SCROLL_SPEED } from '@/features/reader/settings/ReaderSettings.constants.tsx'; import { coerceIn } from '@/lib/HelperFunctions.ts'; -import { useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; export const ReaderNavBarDesktopAutoScroll = ({ autoScroll, diff --git a/src/features/reader/filters/ReaderRGBAFilter.tsx b/src/features/reader/filters/ReaderRGBAFilter.tsx index f18f5b6d..10d974f0 100644 --- a/src/features/reader/filters/ReaderRGBAFilter.tsx +++ b/src/features/reader/filters/ReaderRGBAFilter.tsx @@ -10,7 +10,7 @@ import Box from '@mui/material/Box'; import { useNavBarContext } from '@/features/navigation-bar/NavbarContext.tsx'; import { NavbarContextType } from '@/features/navigation-bar/NavigationBar.types.ts'; import { withPropsFrom } from '@/base/hoc/withPropsFrom.tsx'; -import { useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const BaseReaderRGBAFilter = ({ readerNavBarWidth }: Pick) => { const { diff --git a/src/features/reader/hooks/useReaderResetStates.ts b/src/features/reader/hooks/useReaderResetStates.ts index 6e8c4067..89270cca 100644 --- a/src/features/reader/hooks/useReaderResetStates.ts +++ b/src/features/reader/hooks/useReaderResetStates.ts @@ -7,7 +7,7 @@ */ import { useEffect } from 'react'; -import { getReaderStore } from '@/features/reader/ReaderStore.ts'; +import { getReaderStore } from '@/features/reader/stores/ReaderStore.ts'; export const useReaderResetStates = () => { useEffect( diff --git a/src/features/reader/hooks/useReaderSetChaptersState.ts b/src/features/reader/hooks/useReaderSetChaptersState.ts index 10bacdd5..89717bd3 100644 --- a/src/features/reader/hooks/useReaderSetChaptersState.ts +++ b/src/features/reader/hooks/useReaderSetChaptersState.ts @@ -20,8 +20,8 @@ import { filterChapters } from '@/features/chapter/utils/ChapterList.util.tsx'; import { ChapterListOptions } from '@/features/chapter/Chapter.types.ts'; import { getReaderChapterFromCache } from '@/features/reader/Reader.utils.ts'; import { DirectionOffset } from '@/base/Base.types.ts'; -import { getReaderStore } from '@/features/reader/ReaderStore.ts'; -import { READER_DEFAULT_CHAPTERS_STATE } from '@/features/reader/ReaderStore.constants.ts'; +import { getReaderStore } from '@/features/reader/stores/ReaderStore.ts'; +import { READER_DEFAULT_CHAPTERS_STATE } from '@/features/reader/stores/ReaderStore.constants.ts'; export const useReaderSetChaptersState = ( chaptersResponse: ReturnType>, diff --git a/src/features/reader/hotkeys/ReaderHotkeys.tsx b/src/features/reader/hotkeys/ReaderHotkeys.tsx index 0e1526e3..d404b451 100644 --- a/src/features/reader/hotkeys/ReaderHotkeys.tsx +++ b/src/features/reader/hotkeys/ReaderHotkeys.tsx @@ -24,7 +24,7 @@ import { HotkeyScope } from '@/features/hotkeys/Hotkeys.types.ts'; import { ReaderControls } from '@/features/reader/services/ReaderControls.ts'; import { ScrollOffset } from '@/base/Base.types.ts'; import { getOptionForDirection } from '@/features/theme/services/ThemeCreator.ts'; -import { getReaderStore, useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { getReaderStore, useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const useHotkeys = (...args: Parameters): ReturnType => { const [keys, callback, options, dependencies] = args; diff --git a/src/features/reader/infinite-scroll/useReaderInfiniteScrollUpdateChapter.ts b/src/features/reader/infinite-scroll/useReaderInfiniteScrollUpdateChapter.ts index 23fad675..a99d5eee 100644 --- a/src/features/reader/infinite-scroll/useReaderInfiniteScrollUpdateChapter.ts +++ b/src/features/reader/infinite-scroll/useReaderInfiniteScrollUpdateChapter.ts @@ -16,7 +16,7 @@ import { import { READING_DIRECTION_TO_THEME_DIRECTION } from '@/features/reader/settings/ReaderSettings.constants.tsx'; import { getOptionForDirection } from '@/features/theme/services/ThemeCreator.ts'; import { useIntersectionObserver } from '@/base/hooks/useIntersectionObserver.tsx'; -import { getReaderStore, useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { getReaderStore, useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; interface ElementIntersection { start: boolean; diff --git a/src/features/reader/overlay/components/ReaderPageNumber.tsx b/src/features/reader/overlay/components/ReaderPageNumber.tsx index 1e1ca86c..b036e774 100644 --- a/src/features/reader/overlay/components/ReaderPageNumber.tsx +++ b/src/features/reader/overlay/components/ReaderPageNumber.tsx @@ -17,7 +17,7 @@ import { useNavBarContext } from '@/features/navigation-bar/NavbarContext.tsx'; import { reverseString } from '@/base/utils/Strings.ts'; import { NavbarContextType } from '@/features/navigation-bar/NavigationBar.types.ts'; import { withPropsFrom } from '@/base/hoc/withPropsFrom.tsx'; -import { useReaderStore, useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStore, useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const BaseReaderPageNumber = ({ isDesktop, diff --git a/src/features/reader/overlay/hooks/useReaderHideOverlayOnUserScroll.ts b/src/features/reader/overlay/hooks/useReaderHideOverlayOnUserScroll.ts index 21ebd328..c776ec4d 100644 --- a/src/features/reader/overlay/hooks/useReaderHideOverlayOnUserScroll.ts +++ b/src/features/reader/overlay/hooks/useReaderHideOverlayOnUserScroll.ts @@ -8,7 +8,7 @@ import { MutableRefObject, useEffect } from 'react'; import { TReaderTapZoneContext } from '@/features/reader/tap-zones/TapZoneLayout.types.ts'; -import { getReaderStore } from '@/features/reader/ReaderStore.ts'; +import { getReaderStore } from '@/features/reader/stores/ReaderStore.ts'; export const useReaderHideOverlayOnUserScroll = ( isOverlayVisible: boolean, diff --git a/src/features/reader/overlay/mobile/ReaderOverlayHeaderMobile.tsx b/src/features/reader/overlay/mobile/ReaderOverlayHeaderMobile.tsx index 9cb4dd18..49ab03b6 100644 --- a/src/features/reader/overlay/mobile/ReaderOverlayHeaderMobile.tsx +++ b/src/features/reader/overlay/mobile/ReaderOverlayHeaderMobile.tsx @@ -30,7 +30,7 @@ import { FALLBACK_CHAPTER } from '@/features/chapter/Chapter.constants.ts'; import { FALLBACK_MANGA } from '@/features/manga/Manga.constants.ts'; import { ReaderExitButton } from '@/features/reader/overlay/navigation/components/ReaderExitButton.tsx'; import { requestManager } from '@/lib/requests/RequestManager.ts'; -import { useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const DEFAULT_MANGA = { ...FALLBACK_MANGA, title: '' }; diff --git a/src/features/reader/overlay/navigation/components/ReaderLibraryButton.tsx b/src/features/reader/overlay/navigation/components/ReaderLibraryButton.tsx index 968cb072..d2b0903c 100644 --- a/src/features/reader/overlay/navigation/components/ReaderLibraryButton.tsx +++ b/src/features/reader/overlay/navigation/components/ReaderLibraryButton.tsx @@ -14,7 +14,7 @@ import { memo } from 'react'; import { CustomTooltip } from '@/base/components/CustomTooltip.tsx'; import { useManageMangaLibraryState } from '@/features/manga/hooks/useManageMangaLibraryState.tsx'; import { FALLBACK_MANGA } from '@/features/manga/Manga.constants.ts'; -import { useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const ACTION_FALLBACK_MANGA = { ...FALLBACK_MANGA, diff --git a/src/features/reader/overlay/navigation/desktop/ReaderNavBarDesktop.tsx b/src/features/reader/overlay/navigation/desktop/ReaderNavBarDesktop.tsx index cee4c92f..bc61285a 100644 --- a/src/features/reader/overlay/navigation/desktop/ReaderNavBarDesktop.tsx +++ b/src/features/reader/overlay/navigation/desktop/ReaderNavBarDesktop.tsx @@ -29,7 +29,7 @@ import { LoadingPlaceholder } from '@/base/components/feedback/LoadingPlaceholde import { NavbarContextType } from '@/features/navigation-bar/NavigationBar.types.ts'; import { withPropsFrom } from '@/base/hoc/withPropsFrom.tsx'; import { ReaderExitButton } from '@/features/reader/overlay/navigation/components/ReaderExitButton.tsx'; -import { useReaderStore, useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStore, useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const useGetPreviousNavBarStaticValue = (isVisible: boolean, isStaticNav: boolean) => { const wasNavBarStaticRef = useRef(isStaticNav); diff --git a/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopActions.tsx b/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopActions.tsx index 2ec08d48..72d29d80 100644 --- a/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopActions.tsx +++ b/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopActions.tsx @@ -22,7 +22,7 @@ import { CHAPTER_ACTION_TO_TRANSLATION, FALLBACK_CHAPTER } from '@/features/chap import { IconBrowser } from '@/assets/icons/IconBrowser.tsx'; import { IconWebView } from '@/assets/icons/IconWebView.tsx'; import { requestManager } from '@/lib/requests/RequestManager.ts'; -import { useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; import { ChapterDownloadInfo, ChapterIdInfo } from '@/features/chapter/Chapter.types.ts'; const DownloadButton = ({ diff --git a/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopPageNavigation.tsx b/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopPageNavigation.tsx index 14004348..f339b7df 100644 --- a/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopPageNavigation.tsx +++ b/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopPageNavigation.tsx @@ -19,7 +19,7 @@ import { useGetOptionForDirection } from '@/features/theme/services/ThemeCreator 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 { withPropsFrom } from '@/base/hoc/withPropsFrom.tsx'; -import { useReaderStore, useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStore, useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const BaseReaderNavBarDesktopPageNavigation = ({ openPage, diff --git a/src/features/reader/overlay/navigation/desktop/quick-settings/ReaderNavBarDesktopQuickSettings.tsx b/src/features/reader/overlay/navigation/desktop/quick-settings/ReaderNavBarDesktopQuickSettings.tsx index e50a4376..f19bd173 100644 --- a/src/features/reader/overlay/navigation/desktop/quick-settings/ReaderNavBarDesktopQuickSettings.tsx +++ b/src/features/reader/overlay/navigation/desktop/quick-settings/ReaderNavBarDesktopQuickSettings.tsx @@ -18,7 +18,7 @@ import { ReaderNavBarDesktopReadingDirection } from '@/features/reader/overlay/n import { ReaderNavBarDesktopProps } from '@/features/reader/overlay/ReaderOverlay.types.ts'; import { ReaderService } from '@/features/reader/services/ReaderService.ts'; import { ReaderNavBarDesktopAutoScroll } from '@/features/reader/auto-scroll/settings/quick-setting/ReaderNavBarDesktopAutoScroll.tsx'; -import { useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const BaseReaderNavBarDesktopQuickSettings = ({ openSettings }: Pick) => { const { t } = useTranslation(); diff --git a/src/features/reader/overlay/navigation/mobile/ReaderBottomBarMobile.tsx b/src/features/reader/overlay/navigation/mobile/ReaderBottomBarMobile.tsx index 8ef4c911..3549891a 100644 --- a/src/features/reader/overlay/navigation/mobile/ReaderBottomBarMobile.tsx +++ b/src/features/reader/overlay/navigation/mobile/ReaderBottomBarMobile.tsx @@ -24,7 +24,7 @@ import { MobileReaderProgressBar } from '@/features/reader/overlay/progress-bar/ import { ReaderChapterList } from '@/features/reader/overlay/navigation/components/ReaderChapterList.tsx'; import { ReaderBottomBarMobileQuickSettings } from '@/features/reader/overlay/navigation/mobile/quick-settings/ReaderBottomBarMobileQuickSettings.tsx'; import { useResizeObserver } from '@/base/hooks/useResizeObserver.tsx'; -import { useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const BaseReaderBottomBarMobile = ({ openSettings, diff --git a/src/features/reader/overlay/navigation/mobile/quick-settings/ReaderBottomBarMobileQuickSettings.tsx b/src/features/reader/overlay/navigation/mobile/quick-settings/ReaderBottomBarMobileQuickSettings.tsx index 8373f7b2..01154d37 100644 --- a/src/features/reader/overlay/navigation/mobile/quick-settings/ReaderBottomBarMobileQuickSettings.tsx +++ b/src/features/reader/overlay/navigation/mobile/quick-settings/ReaderBottomBarMobileQuickSettings.tsx @@ -15,7 +15,7 @@ import { ReaderService } from '@/features/reader/services/ReaderService.ts'; import { DefaultSettingFootnote } from '@/features/reader/settings/components/DefaultSettingFootnote.tsx'; import { ReaderSettingAutoScroll } from '@/features/reader/auto-scroll/settings/ReaderSettingAutoScroll.tsx'; import { CheckboxInput } from '@/base/components/inputs/CheckboxInput.tsx'; -import { useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const BaseReaderBottomBarMobileQuickSettings = () => { const { t } = useTranslation(); diff --git a/src/features/reader/overlay/progress-bar/ReaderProgressBar.tsx b/src/features/reader/overlay/progress-bar/ReaderProgressBar.tsx index 56f2352a..4296d3e5 100644 --- a/src/features/reader/overlay/progress-bar/ReaderProgressBar.tsx +++ b/src/features/reader/overlay/progress-bar/ReaderProgressBar.tsx @@ -32,7 +32,7 @@ import { withPropsFrom } from '@/base/hoc/withPropsFrom.tsx'; import { ReaderProgressBarSlotWrapper } from '@/features/reader/overlay/progress-bar/components/ReaderProgressBarSlotWrapper.tsx'; import { useResizeObserver } from '@/base/hooks/useResizeObserver.tsx'; import { ReadingMode } from '@/features/reader/Reader.types.ts'; -import { useReaderStore, useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStore, useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const BaseReaderProgressBar = ({ slotProps, diff --git a/src/features/reader/overlay/progress-bar/desktop/StandardReaderProgressBar.tsx b/src/features/reader/overlay/progress-bar/desktop/StandardReaderProgressBar.tsx index d91c729f..4d59034e 100644 --- a/src/features/reader/overlay/progress-bar/desktop/StandardReaderProgressBar.tsx +++ b/src/features/reader/overlay/progress-bar/desktop/StandardReaderProgressBar.tsx @@ -20,7 +20,7 @@ import { useNavBarContext } from '@/features/navigation-bar/NavbarContext.tsx'; import { ReaderProgressBarSlotDesktop } from '@/features/reader/overlay/progress-bar/desktop/components/ReaderProgressBarSlotDesktop.tsx'; import { useResizeObserver } from '@/base/hooks/useResizeObserver.tsx'; import { getProgressBarPosition } from '@/features/reader/settings/ReaderSettings.utils.tsx'; -import { useReaderStore, useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStore, useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const BaseStandardReaderProgressBar = ({ readerNavBarWidth, diff --git a/src/features/reader/overlay/progress-bar/mobile/MobileReaderProgressBar.tsx b/src/features/reader/overlay/progress-bar/mobile/MobileReaderProgressBar.tsx index 04b4d763..eb6540b0 100644 --- a/src/features/reader/overlay/progress-bar/mobile/MobileReaderProgressBar.tsx +++ b/src/features/reader/overlay/progress-bar/mobile/MobileReaderProgressBar.tsx @@ -29,7 +29,7 @@ import { applyStyles } from '@/base/utils/ApplyStyles.ts'; import { useResizeObserver } from '@/base/hooks/useResizeObserver.tsx'; import { getProgressBarPosition } from '@/features/reader/settings/ReaderSettings.utils.tsx'; import { ReaderControls } from '@/features/reader/services/ReaderControls.ts'; -import { useReaderStore, useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStore, useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const PROGRESS_BAR_POSITION_TO_SLIDE_DIRECTION: Record = { [ProgressBarPosition.BOTTOM]: 'up', diff --git a/src/features/reader/screens/Reader.tsx b/src/features/reader/screens/Reader.tsx index 4174cf94..b84fdefe 100644 --- a/src/features/reader/screens/Reader.tsx +++ b/src/features/reader/screens/Reader.tsx @@ -35,7 +35,7 @@ import { useReaderSetChaptersState } from '@/features/reader/hooks/useReaderSetC import { useAppTitle } from '@/features/navigation-bar/hooks/useAppTitle.ts'; import { useChapterListOptions } from '@/features/chapter/utils/ChapterList.util.tsx'; import { FALLBACK_MANGA } from '@/features/manga/Manga.constants.ts'; -import { useReaderStore, useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStore, useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; import { ReaderAutoScroll } from '@/features/reader/auto-scroll/ReaderAutoScroll.tsx'; const BaseReader = ({ diff --git a/src/features/reader/services/ReaderControls.ts b/src/features/reader/services/ReaderControls.ts index a310d413..3587cb37 100644 --- a/src/features/reader/services/ReaderControls.ts +++ b/src/features/reader/services/ReaderControls.ts @@ -49,7 +49,7 @@ import { ChapterIdInfo, TChapterReader } from '@/features/chapter/Chapter.types. import { awaitConfirmation } from '@/base/utils/AwaitableDialog.tsx'; import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; import { TReaderProgressCurrentPage } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts'; -import { getReaderStore } from '@/features/reader/ReaderStore.ts'; +import { getReaderStore } from '@/features/reader/stores/ReaderStore.ts'; const getScrollDirectionInvert = ( scrollDirection: ScrollDirection, diff --git a/src/features/reader/services/ReaderService.ts b/src/features/reader/services/ReaderService.ts index b49a8c9e..ac33fcc1 100644 --- a/src/features/reader/services/ReaderService.ts +++ b/src/features/reader/services/ReaderService.ts @@ -46,7 +46,7 @@ import { getErrorMessage } from '@/lib/HelperFunctions.ts'; import { FALLBACK_MANGA } from '@/features/manga/Manga.constants.ts'; import { getMetadataKey } from '@/features/metadata/Metadata.utils.ts'; import { DirectionOffset } from '@/base/Base.types.ts'; -import { getReaderStore, useReaderStore } from '@/features/reader/ReaderStore.ts'; +import { getReaderStore, useReaderStore } from '@/features/reader/stores/ReaderStore.ts'; const DIRECTION_TO_INVERTED: Record = { ltr: 'rtl', diff --git a/src/features/reader/settings/components/ReaderSettingsTabs.tsx b/src/features/reader/settings/components/ReaderSettingsTabs.tsx index 891fbad7..47c68c20 100644 --- a/src/features/reader/settings/components/ReaderSettingsTabs.tsx +++ b/src/features/reader/settings/components/ReaderSettingsTabs.tsx @@ -23,7 +23,7 @@ import { ReaderBehaviourSettings } from '@/features/reader/settings/behaviour/Re import { ReaderDefaultLayoutSettings } from '@/features/reader/settings/layout/ReaderDefaultLayoutSettings.tsx'; import { ReaderHotkeysSettings } from '@/features/reader/hotkeys/settings/ReaderHotkeysSettings.tsx'; import { withPropsFrom } from '@/base/hoc/withPropsFrom.tsx'; -import { useReaderStore } from '@/features/reader/ReaderStore.ts'; +import { useReaderStore } from '@/features/reader/stores/ReaderStore.ts'; const BaseReaderSettingsTabs = ({ activeTab, diff --git a/src/features/reader/settings/screens/ReaderSettings.tsx b/src/features/reader/settings/screens/ReaderSettings.tsx index 18c18c2e..a7bcb5dd 100644 --- a/src/features/reader/settings/screens/ReaderSettings.tsx +++ b/src/features/reader/settings/screens/ReaderSettings.tsx @@ -15,7 +15,7 @@ import { ReaderSettingsTabs } from '@/features/reader/settings/components/Reader import { ReaderSettingTab } from '@/features/reader/settings/ReaderSettings.constants.tsx'; import { useDisableAllHotkeysWhileMounted } from '@/features/hotkeys/Hotkeys.utils.ts'; import { applyStyles } from '@/base/utils/ApplyStyles.ts'; -import { useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; export const ReaderSettings = ({ isOpen, close }: { isOpen: boolean; close: () => void }) => { const settings = useReaderStoreShallow((state) => state.settings); diff --git a/src/features/reader/ReaderStore.constants.ts b/src/features/reader/stores/ReaderStore.constants.ts similarity index 100% rename from src/features/reader/ReaderStore.constants.ts rename to src/features/reader/stores/ReaderStore.constants.ts diff --git a/src/features/reader/ReaderStore.ts b/src/features/reader/stores/ReaderStore.ts similarity index 98% rename from src/features/reader/ReaderStore.ts rename to src/features/reader/stores/ReaderStore.ts index 13bb7ec3..a82b8169 100644 --- a/src/features/reader/ReaderStore.ts +++ b/src/features/reader/stores/ReaderStore.ts @@ -24,7 +24,10 @@ import { ReaderStatePages, } from '@/features/reader/Reader.types.ts'; import { ImmerStateCreator } from '@/lib/zustand/Zustand.types.ts'; -import { READER_DEFAULT_CHAPTERS_STATE, READER_DEFAULT_PAGES_STATE } from '@/features/reader/ReaderStore.constants.ts'; +import { + READER_DEFAULT_CHAPTERS_STATE, + READER_DEFAULT_PAGES_STATE, +} from '@/features/reader/stores/ReaderStore.constants.ts'; import { DEFAULT_READER_SETTINGS_WITH_DEFAULT_FLAG } from '@/features/reader/settings/ReaderSettingsMetadata.ts'; import { createReaderProgressBarStoreSlice, diff --git a/src/features/reader/tap-zones/TapZoneLayout.tsx b/src/features/reader/tap-zones/TapZoneLayout.tsx index b5909e2b..c977217e 100644 --- a/src/features/reader/tap-zones/TapZoneLayout.tsx +++ b/src/features/reader/tap-zones/TapZoneLayout.tsx @@ -15,7 +15,7 @@ import { useResizeObserver } from '@/base/hooks/useResizeObserver.tsx'; import { ReadingDirection } from '@/features/reader/Reader.types.ts'; import { withPropsFrom } from '@/base/hoc/withPropsFrom.tsx'; import { NavbarContextType } from '@/features/navigation-bar/NavigationBar.types.ts'; -import { useReaderStore, useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStore, useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const CANVAS_ID = 'reader-tap-zone-layout-canvas'; diff --git a/src/features/reader/viewer/ReaderChapterViewer.tsx b/src/features/reader/viewer/ReaderChapterViewer.tsx index 23cb8709..9c4a9e5e 100644 --- a/src/features/reader/viewer/ReaderChapterViewer.tsx +++ b/src/features/reader/viewer/ReaderChapterViewer.tsx @@ -43,7 +43,7 @@ import { LoadingPlaceholder } from '@/base/components/feedback/LoadingPlaceholde import { ReaderInfiniteScrollUpdateChapter } from '@/features/reader/infinite-scroll/ReaderInfiniteScrollUpdateChapter.tsx'; import { useResizeObserver } from '@/base/hooks/useResizeObserver.tsx'; import { ChapterIdInfo } from '@/features/chapter/Chapter.types.ts'; -import { READER_DEFAULT_PAGES_STATE } from '@/features/reader/ReaderStore.constants.ts'; +import { READER_DEFAULT_PAGES_STATE } from '@/features/reader/stores/ReaderStore.constants.ts'; const BaseReaderChapterViewer = ({ currentPageIndex, diff --git a/src/features/reader/viewer/ReaderViewer.tsx b/src/features/reader/viewer/ReaderViewer.tsx index eac38085..5bf463ce 100644 --- a/src/features/reader/viewer/ReaderViewer.tsx +++ b/src/features/reader/viewer/ReaderViewer.tsx @@ -56,7 +56,7 @@ import { NavbarContextType } from '@/features/navigation-bar/NavigationBar.types import { useReaderPreserveScrollPosition } from '@/features/reader/viewer/hooks/useReaderPreserveScrollPosition.ts'; import { ChapterIdInfo } from '@/features/chapter/Chapter.types.ts'; -import { getReaderStore, useReaderStore, useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { getReaderStore, useReaderStore, useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const READING_MODE_TO_IN_VIEWPORT_TYPE: Record = { [ReadingMode.SINGLE_PAGE]: PageInViewportType.X, diff --git a/src/features/reader/viewer/components/ReaderPage.tsx b/src/features/reader/viewer/components/ReaderPage.tsx index 27eddb01..2a935647 100644 --- a/src/features/reader/viewer/components/ReaderPage.tsx +++ b/src/features/reader/viewer/components/ReaderPage.tsx @@ -17,7 +17,7 @@ import { import { applyStyles } from '@/base/utils/ApplyStyles.ts'; import { MediaQuery } from '@/base/utils/MediaQuery.tsx'; import { NavbarContextType } from '@/features/navigation-bar/NavigationBar.types.ts'; -import { useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const getCustomFilterString = (customFilter: ReaderCustomFilter): string => Object.keys(customFilter) diff --git a/src/features/reader/viewer/components/ReaderTransitionPage.tsx b/src/features/reader/viewer/components/ReaderTransitionPage.tsx index 34003f0c..c2bc1c4c 100644 --- a/src/features/reader/viewer/components/ReaderTransitionPage.tsx +++ b/src/features/reader/viewer/components/ReaderTransitionPage.tsx @@ -29,7 +29,7 @@ import { getValueFromObject, noOp } from '@/lib/HelperFunctions.ts'; import { READER_BACKGROUND_TO_COLOR } from '@/features/reader/settings/ReaderSettings.constants.tsx'; import { ChapterType } from '@/lib/graphql/generated/graphql.ts'; import { ChapterIdInfo } from '@/features/chapter/Chapter.types.ts'; -import { useReaderStore, useReaderStoreShallow } from '@/features/reader/ReaderStore.ts'; +import { useReaderStore, useReaderStoreShallow } from '@/features/reader/stores/ReaderStore.ts'; const ChapterInfo = ({ title,