From 9a8655db2fdc3077396d75c693d8262b595884c6 Mon Sep 17 00:00:00 2001
From: schroda <50052685+schroda@users.noreply.github.com>
Date: Thu, 12 Dec 2024 13:21:29 +0100
Subject: [PATCH] Always use "secondary page index" as "current page index"
 when available

There was an issue where one had to click twice at the end of a chapter in the "double page mode" to get to the chapter transition page.
This was caused due to setting the "primary page index" as the "current page index" and thus, when opening the next page, it got changed to the "secondary page index". However, this page was already visible and therefore, there was no visual change.
---
 .../ReaderNavBarDesktopPageNavigation.tsx     |  4 +--
 .../progress-bar/ReaderProgressBar.tsx        | 33 +++++++++++--------
 .../viewer/pager/ReaderDoublePagedPager.tsx   |  4 +--
 .../reader/utils/ReaderProgressBar.utils.tsx  | 18 +++++-----
 4 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktopPageNavigation.tsx b/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktopPageNavigation.tsx
index c0eac141..8880133c 100644
--- a/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktopPageNavigation.tsx
+++ b/src/modules/reader/components/overlay/navigation/desktop/ReaderNavBarDesktopPageNavigation.tsx
@@ -13,7 +13,7 @@ import { useMemo } from 'react';
 import FormControl from '@mui/material/FormControl';
 import InputLabel from '@mui/material/InputLabel';
 import { Select } from '@/modules/core/components/inputs/Select.tsx';
-import { getPage } from '@/modules/reader/utils/ReaderProgressBar.utils.tsx';
+import { getNextIndexFromPage, getPage } from '@/modules/reader/utils/ReaderProgressBar.utils.tsx';
 import { ReaderStatePages } from '@/modules/reader/types/ReaderProgressBar.types.ts';
 import { ReaderControls } from '@/modules/reader/services/ReaderControls.ts';
 import { useGetOptionForDirection } from '@/modules/theme/services/ThemeCreator.ts';
@@ -50,7 +50,7 @@ export const ReaderNavBarDesktopPageNavigation = ({
                 <Select
                     labelId="reader-nav-bar-desktop-page-select"
                     label={t('reader.page_info.label.page')}
-                    value={currentPage.primary.index}
+                    value={getNextIndexFromPage(currentPage)}
                     onChange={(e) => openPage(e.target.value as number)}
                 >
                     {pages.map(({ primary: { index }, name }) => (
diff --git a/src/modules/reader/components/overlay/progress-bar/ReaderProgressBar.tsx b/src/modules/reader/components/overlay/progress-bar/ReaderProgressBar.tsx
index dd072b3f..53a0d31f 100644
--- a/src/modules/reader/components/overlay/progress-bar/ReaderProgressBar.tsx
+++ b/src/modules/reader/components/overlay/progress-bar/ReaderProgressBar.tsx
@@ -20,6 +20,7 @@ import { ReaderProgressBarSlotsContainer } from '@/modules/reader/components/ove
 import { ProgressBarHighlightReadPages } from '@/modules/reader/components/overlay/progress-bar/ProgressBarHighlightReadPages.tsx';
 import { ReaderProgressBarCurrentPageSlot } from '@/modules/reader/components/overlay/progress-bar/ReaderProgressBarCurrentPageSlot.tsx';
 import {
+    getNextIndexFromPage,
     getPage,
     getPageForMousePos,
     getProgressBarPositionInfo,
@@ -116,13 +117,15 @@ export const ReaderProgressBar = ({
                             }
 
                             openPage(
-                                getPageForMousePos(
-                                    event.touches[0],
-                                    progressBarRef.current.getBoundingClientRect(),
-                                    pages,
-                                    isHorizontalPosition,
-                                    getOptionForDirection,
-                                ).primary.index,
+                                getNextIndexFromPage(
+                                    getPageForMousePos(
+                                        event.touches[0],
+                                        progressBarRef.current.getBoundingClientRect(),
+                                        pages,
+                                        isHorizontalPosition,
+                                        getOptionForDirection,
+                                    ),
+                                ),
                             );
                             setIsDragging(true);
                         }}
@@ -133,13 +136,15 @@ export const ReaderProgressBar = ({
                             }
 
                             openPage(
-                                getPageForMousePos(
-                                    event,
-                                    progressBarRef.current.getBoundingClientRect(),
-                                    pages,
-                                    isHorizontalPosition,
-                                    getOptionForDirection,
-                                ).primary.index,
+                                getNextIndexFromPage(
+                                    getPageForMousePos(
+                                        event,
+                                        progressBarRef.current.getBoundingClientRect(),
+                                        pages,
+                                        isHorizontalPosition,
+                                        getOptionForDirection,
+                                    ),
+                                ),
                             );
                             setIsDragging(true);
                         }}
diff --git a/src/modules/reader/components/viewer/pager/ReaderDoublePagedPager.tsx b/src/modules/reader/components/viewer/pager/ReaderDoublePagedPager.tsx
index d21c7868..f9f0e003 100644
--- a/src/modules/reader/components/viewer/pager/ReaderDoublePagedPager.tsx
+++ b/src/modules/reader/components/viewer/pager/ReaderDoublePagedPager.tsx
@@ -13,7 +13,7 @@ import { ReaderService } from '@/modules/reader/services/ReaderService.ts';
 import { ReaderPagerProps, ReadingDirection } from '@/modules/reader/types/Reader.types.ts';
 import { applyStyles } from '@/modules/core/utils/ApplyStyles.ts';
 import { createReaderPage } from '@/modules/reader/utils/ReaderPager.utils.tsx';
-import { getPage } from '@/modules/reader/utils/ReaderProgressBar.utils.tsx';
+import { getNextIndexFromPage, getPage } from '@/modules/reader/utils/ReaderProgressBar.utils.tsx';
 
 const getPagePosition = (
     pageType: 'first' | 'second',
@@ -58,7 +58,7 @@ export const ReaderDoublePagedPager = ({
             createPage={(page, pagesIndex, shouldLoad, shouldDisplay) => {
                 const { primary, secondary } = page;
 
-                const currentSecondaryPageIndex = currentPage.secondary?.index ?? currentPage.primary.index;
+                const currentSecondaryPageIndex = getNextIndexFromPage(currentPage);
 
                 const hasSecondaryPage = !!secondary;
                 const isPrimaryPage = currentPage.primary.index === primary.index;
diff --git a/src/modules/reader/utils/ReaderProgressBar.utils.tsx b/src/modules/reader/utils/ReaderProgressBar.utils.tsx
index 8a074f47..22fb78a5 100644
--- a/src/modules/reader/utils/ReaderProgressBar.utils.tsx
+++ b/src/modules/reader/utils/ReaderProgressBar.utils.tsx
@@ -110,15 +110,17 @@ export const useHandleProgressDragging = (
                 return;
             }
 
-            const newPageIndex = getPageForMousePos(
-                coordinates,
-                progressBarRef.current.getBoundingClientRect(),
-                pages,
-                isHorizontal,
-                getOptionForDirection,
-            ).primary.index;
+            const newPageIndex = getNextIndexFromPage(
+                getPageForMousePos(
+                    coordinates,
+                    progressBarRef.current.getBoundingClientRect(),
+                    pages,
+                    isHorizontal,
+                    getOptionForDirection,
+                ),
+            );
 
-            const hasCurrentPageIndexChanged = currentPage.primary.index !== newPageIndex;
+            const hasCurrentPageIndexChanged = getNextIndexFromPage(currentPage) !== newPageIndex;
             if (!hasCurrentPageIndexChanged) {
                 return;
             }