From ef15788c135ca023d703e9104d3bf7719c14cf09 Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Wed, 25 Dec 2024 17:12:07 +0100 Subject: [PATCH] Pass "transitionPageMode" to "ReaderTransitionPage" Regression d67d6f7d2861ad7ac93f33fd95a5d59cf05cff49 which was never caught due to an error in the "withPropsFrom" HOC typing (fixed with 2e79f3f0dbe13fe9401f245e8abfabaf8f4f3ef7) --- .../reader/components/viewer/ReaderTransitionPage.tsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/modules/reader/components/viewer/ReaderTransitionPage.tsx b/src/modules/reader/components/viewer/ReaderTransitionPage.tsx index 1f35f2e6..2db8329c 100644 --- a/src/modules/reader/components/viewer/ReaderTransitionPage.tsx +++ b/src/modules/reader/components/viewer/ReaderTransitionPage.tsx @@ -41,6 +41,8 @@ import { useReaderStateMangaContext } from '@/modules/reader/contexts/state/Read import { getValueFromObject } from '@/lib/HelperFunctions.ts'; import { READER_BACKGROUND_TO_COLOR } from '@/modules/reader/constants/ReaderSettings.constants.tsx'; import { ReaderService } from '@/modules/reader/services/ReaderService.ts'; +import { userReaderStatePagesContext } from '@/modules/reader/contexts/state/ReaderStatePagesContext.tsx'; +import { ReaderStatePages } from '@/modules/reader/types/ReaderProgressBar.types.ts'; const ChapterInfo = ({ title, @@ -79,7 +81,7 @@ const ChapterInfo = ({ const BaseReaderTransitionPage = ({ type, - mode, + transitionPageMode, readingMode, pageScaleMode, backgroundColor, @@ -94,9 +96,9 @@ const BaseReaderTransitionPage = ({ Pick & Pick & Pick & + Pick & Pick & { type: Exclude; - mode: ReaderTransitionPageMode; }) => { const { t } = useTranslation(); @@ -110,7 +112,7 @@ const BaseReaderTransitionPage = ({ const isFitWidthPageScaleMode = [ReaderPageScaleMode.SCREEN, ReaderPageScaleMode.WIDTH].includes(pageScaleMode); - if (!isTransitionPageVisible(type, mode, readingMode)) { + if (!isTransitionPageVisible(type, transitionPageMode, readingMode)) { return null; } @@ -235,6 +237,7 @@ export const ReaderTransitionPage = withPropsFrom( useReaderStateChaptersContext, useReaderScrollbarContext, useNavBarContext, + userReaderStatePagesContext, ReaderService.useSettingsWithoutDefaultFlag, ], [ @@ -246,7 +249,7 @@ export const ReaderTransitionPage = withPropsFrom( 'scrollbarYSize', 'readerNavBarWidth', 'backgroundColor', - 'mode', + 'transitionPageMode', 'readingMode', 'pageScaleMode', ],