From b37ff532f52324e9682d0280ad610ea287022e1b Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Sat, 5 Apr 2025 12:47:44 +0200 Subject: [PATCH] Fix reverted code after merge For some reason github didn't show a merge conflict on the pr --- src/modules/reader/components/viewer/ReaderViewer.tsx | 1 + src/modules/reader/hooks/useReaderPreserveScrollPosition.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/reader/components/viewer/ReaderViewer.tsx b/src/modules/reader/components/viewer/ReaderViewer.tsx index 8c2a5ce2..bdb091b5 100644 --- a/src/modules/reader/components/viewer/ReaderViewer.tsx +++ b/src/modules/reader/components/viewer/ReaderViewer.tsx @@ -284,6 +284,7 @@ const BaseReaderViewer = forwardRef( scrollElementRef, currentPageIndex, readingMode, + readingDirection, isContinuousReadingModeActive, readerNavBarWidth, setPageToScrollToIndex, diff --git a/src/modules/reader/hooks/useReaderPreserveScrollPosition.ts b/src/modules/reader/hooks/useReaderPreserveScrollPosition.ts index bc7cd7cd..ee95e391 100644 --- a/src/modules/reader/hooks/useReaderPreserveScrollPosition.ts +++ b/src/modules/reader/hooks/useReaderPreserveScrollPosition.ts @@ -7,7 +7,7 @@ */ import { RefObject, useCallback, useEffect, useLayoutEffect, useRef } from 'react'; -import { ReaderPageScaleMode, ReadingMode } from '@/modules/reader/types/Reader.types.ts'; +import { ReaderPageScaleMode, ReadingDirection, ReadingMode } from '@/modules/reader/types/Reader.types.ts'; import { ReaderStatePages } from '@/modules/reader/types/ReaderProgressBar.types'; import { isReaderWidthEditable } from '@/modules/reader/utils/ReaderSettings.utils.tsx'; @@ -15,6 +15,7 @@ export const useReaderPreserveScrollPosition = ( scrollElementRef: RefObject, pageIndex: number, readingMode: ReadingMode, + readingDirection: ReadingDirection, isContinuousReadingModeActive: boolean, readerNavBarWidth: number, setPageToScrollToIndex: ReaderStatePages['setPageToScrollToIndex'],