From 75cf18b254ec500f312ec88074614949363d8b19 Mon Sep 17 00:00:00 2001
From: schroda <50052685+schroda@users.noreply.github.com>
Date: Sat, 21 Feb 2026 15:06:09 +0100
Subject: [PATCH] Rename "getNextIndexFromPage" to "getIndexOfPage"

---
 .../components/ReaderNavBarDesktopPageNavigation.tsx   | 10 +++++-----
 .../reader/overlay/progress-bar/ReaderProgressBar.tsx  |  4 ++--
 .../overlay/progress-bar/ReaderProgressBar.utils.tsx   |  5 ++---
 src/features/reader/services/ReaderControls.ts         | 10 +++++-----
 .../hooks/useReaderConvertPagesForReadingMode.ts       |  4 ++--
 .../viewer/hooks/useReaderHandlePageSelection.ts       |  4 ++--
 .../viewer/pager/components/ReaderDoublePagedPager.tsx |  4 ++--
 7 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopPageNavigation.tsx b/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopPageNavigation.tsx
index 81f88500..12dfebc8 100644
--- a/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopPageNavigation.tsx
+++ b/src/features/reader/overlay/navigation/desktop/components/ReaderNavBarDesktopPageNavigation.tsx
@@ -13,7 +13,7 @@ import FormControl from '@mui/material/FormControl';
 import InputLabel from '@mui/material/InputLabel';
 import { useLingui } from '@lingui/react/macro';
 import { Select } from '@/base/components/inputs/Select.tsx';
-import { getNextIndexFromPage, getPage } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx';
+import { getIndexOfPage, getPage } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx';
 import { useGetOptionForDirection } from '@/features/theme/services/ThemeCreator.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';
@@ -39,7 +39,7 @@ const BaseReaderNavBarDesktopPageNavigation = () => {
                 title={getOptionForDirection(t`Previous page`, t`Next page`, direction)}
                 disabled={getOptionForDirection(
                     !currentPage.primary.index,
-                    getNextIndexFromPage(currentPage) === getNextIndexFromPage(pages.slice(-1)[0]),
+                    getIndexOfPage(currentPage) === getIndexOfPage(pages.slice(-1)[0]),
                     direction,
                 )}
                 onClick={() => ReaderControls.openPage('previous', undefined, false)}
@@ -49,11 +49,11 @@ const BaseReaderNavBarDesktopPageNavigation = () => {
                 <Select
                     labelId="reader-nav-bar-desktop-page-select"
                     label={t`Page`}
-                    value={getNextIndexFromPage(currentPage)}
+                    value={getIndexOfPage(currentPage)}
                     onChange={(e) => ReaderControls.openPage(e.target.value as number, undefined, false)}
                 >
                     {pages.map((page) => (
-                        <MenuItem key={getNextIndexFromPage(page)} value={getNextIndexFromPage(page)}>
+                        <MenuItem key={getIndexOfPage(page)} value={getIndexOfPage(page)}>
                             {page.name}
                         </MenuItem>
                     ))}
@@ -63,7 +63,7 @@ const BaseReaderNavBarDesktopPageNavigation = () => {
                 type="next"
                 title={getOptionForDirection(t`Next page`, t`Previous page`, direction)}
                 disabled={getOptionForDirection(
-                    getNextIndexFromPage(currentPage) === getNextIndexFromPage(pages.slice(-1)[0]),
+                    getIndexOfPage(currentPage) === getIndexOfPage(pages.slice(-1)[0]),
                     !currentPage.primary.index,
                     direction,
                 )}
diff --git a/src/features/reader/overlay/progress-bar/ReaderProgressBar.tsx b/src/features/reader/overlay/progress-bar/ReaderProgressBar.tsx
index 78be02e1..eb56c6a1 100644
--- a/src/features/reader/overlay/progress-bar/ReaderProgressBar.tsx
+++ b/src/features/reader/overlay/progress-bar/ReaderProgressBar.tsx
@@ -19,7 +19,7 @@ import { ReaderProgressBarSlotsContainer } from '@/features/reader/overlay/progr
 import { ProgressBarHighlightReadPages } from '@/features/reader/overlay/progress-bar/components/ProgressBarHighlightReadPages.tsx';
 import { ReaderProgressBarCurrentPageSlot } from '@/features/reader/overlay/progress-bar/components/ReaderProgressBarCurrentPageSlot.tsx';
 import {
-    getNextIndexFromPage,
+    getIndexOfPage,
     getPage,
     getPageForMousePos,
     getProgressBarPositionInfo,
@@ -132,7 +132,7 @@ const BaseReaderProgressBar = ({
         const isTouchEvent = 'touches' in e;
 
         ReaderControls.openPage(
-            getNextIndexFromPage(
+            getIndexOfPage(
                 getPageForMousePos(
                     isTouchEvent ? e.touches[0] : e,
                     progressBarRef.current,
diff --git a/src/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx b/src/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx
index c7717486..0e224abf 100644
--- a/src/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx
+++ b/src/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx
@@ -27,8 +27,7 @@ export const getPage = (pageIndex: number, pages: ReaderStatePages['pages']): TR
  * for the double page mode the secondary page index has to be used to be able to correctly detect if the last page is visible
  *
  */
-export const getNextIndexFromPage = (page: ReaderStatePages['pages'][number]) =>
-    page.secondary?.index ?? page.primary.index;
+export const getIndexOfPage = (page: ReaderStatePages['pages'][number]) => page.secondary?.index ?? page.primary.index;
 
 export const getNextPageIndex = (
     offset: 'previous' | 'next',
@@ -37,7 +36,7 @@ export const getNextPageIndex = (
 ): number => {
     const offsetNumber = offset === 'previous' ? DirectionOffset.PREVIOUS : DirectionOffset.NEXT;
 
-    return getNextIndexFromPage(pages[coerceIn(pagesIndex + offsetNumber, 0, pages.length - 1)]);
+    return getIndexOfPage(pages[coerceIn(pagesIndex + offsetNumber, 0, pages.length - 1)]);
 };
 
 export const getPageForMousePos = (
diff --git a/src/features/reader/services/ReaderControls.ts b/src/features/reader/services/ReaderControls.ts
index 76191da4..816fca5d 100644
--- a/src/features/reader/services/ReaderControls.ts
+++ b/src/features/reader/services/ReaderControls.ts
@@ -12,7 +12,7 @@ import { Direction } from '@mui/material/styles';
 import { d } from 'koration';
 import { msg, t } from '@lingui/core/macro';
 import {
-    getNextIndexFromPage,
+    getIndexOfPage,
     getNextPageIndex,
     getPage,
     getPageForMousePos,
@@ -343,8 +343,8 @@ export class ReaderControls {
         const currentPage = getPage(currentPageIndex, pages);
         const previousPageIndex = getNextPageIndex('previous', currentPage.pagesIndex, pages);
         const nextPageIndex = getNextPageIndex('next', currentPage.pagesIndex, pages);
-        const indexOfFirstPage = getNextIndexFromPage(pages[0]);
-        const indexOfLastPage = getNextIndexFromPage(pages[pages.length - 1]);
+        const indexOfFirstPage = getIndexOfPage(pages[0]);
+        const indexOfLastPage = getIndexOfPage(pages[pages.length - 1]);
 
         const isFirstPage = currentPage.primary.index === 0;
         const isLastPage = currentPageIndex === indexOfLastPage;
@@ -614,7 +614,7 @@ export class ReaderControls {
                     return;
                 }
 
-                const newPageIndex = getNextIndexFromPage(
+                const newPageIndex = getIndexOfPage(
                     getPageForMousePos(
                         coordinates,
                         progressBarRef.current,
@@ -625,7 +625,7 @@ export class ReaderControls {
                     ),
                 );
 
-                const hasCurrentPageIndexChanged = getNextIndexFromPage(currentPage) !== newPageIndex;
+                const hasCurrentPageIndexChanged = getIndexOfPage(currentPage) !== newPageIndex;
                 if (!hasCurrentPageIndexChanged) {
                     return;
                 }
diff --git a/src/features/reader/viewer/hooks/useReaderConvertPagesForReadingMode.ts b/src/features/reader/viewer/hooks/useReaderConvertPagesForReadingMode.ts
index 1b98ea60..a6c38391 100644
--- a/src/features/reader/viewer/hooks/useReaderConvertPagesForReadingMode.ts
+++ b/src/features/reader/viewer/hooks/useReaderConvertPagesForReadingMode.ts
@@ -8,7 +8,7 @@
 
 import { useLayoutEffect, useState } from 'react';
 import { ReaderPageSpreadState, ReaderStatePages, ReadingMode } from '@/features/reader/Reader.types.ts';
-import { getNextIndexFromPage, getPage } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx';
+import { getIndexOfPage, getPage } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx';
 import { createPagesData } from '@/features/reader/viewer/pager/ReaderPager.utils.tsx';
 import { ReaderControls } from '@/features/reader/services/ReaderControls.ts';
 
@@ -37,7 +37,7 @@ export const useReaderConvertPagesForReadingMode = (
         const convertPagesToDoublePageMode = readingMode === ReadingMode.DOUBLE_PAGE;
         if (convertPagesToDoublePageMode) {
             if (!wasDoublePageMode) {
-                updateCurrentPageIndex(getNextIndexFromPage(getPage(currentPageIndex, actualPages)));
+                updateCurrentPageIndex(getIndexOfPage(getPage(currentPageIndex, actualPages)));
             }
             setPages(actualPages);
             setWasDoublePageMode(readingMode === ReadingMode.DOUBLE_PAGE);
diff --git a/src/features/reader/viewer/hooks/useReaderHandlePageSelection.ts b/src/features/reader/viewer/hooks/useReaderHandlePageSelection.ts
index 87dc4ad8..f2ad6b9a 100644
--- a/src/features/reader/viewer/hooks/useReaderHandlePageSelection.ts
+++ b/src/features/reader/viewer/hooks/useReaderHandlePageSelection.ts
@@ -9,7 +9,7 @@
 import { MutableRefObject, useLayoutEffect } from 'react';
 import { Direction } from '@mui/material/styles';
 import { ReaderStatePages, ReadingDirection } from '@/features/reader/Reader.types.ts';
-import { getNextIndexFromPage, getPage } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx';
+import { getIndexOfPage, getPage } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx';
 import { getScrollIntoViewInlineOption } from '@/features/reader/viewer/pager/ReaderPager.utils.tsx';
 import { ReaderControls } from '@/features/reader/services/ReaderControls.ts';
 
@@ -40,7 +40,7 @@ export const useReaderHandlePageSelection = (
             });
         }
 
-        const newPageIndex = getNextIndexFromPage(pageToScrollTo);
+        const newPageIndex = getIndexOfPage(pageToScrollTo);
         const isLastPage = newPageIndex === totalPages - 1;
 
         setPageToScrollToIndex(null);
diff --git a/src/features/reader/viewer/pager/components/ReaderDoublePagedPager.tsx b/src/features/reader/viewer/pager/components/ReaderDoublePagedPager.tsx
index 97beb1dd..4a23a519 100644
--- a/src/features/reader/viewer/pager/components/ReaderDoublePagedPager.tsx
+++ b/src/features/reader/viewer/pager/components/ReaderDoublePagedPager.tsx
@@ -17,7 +17,7 @@ import {
 } from '@/features/reader/Reader.types.ts';
 import { applyStyles } from '@/base/utils/ApplyStyles.ts';
 import { createReaderPage } from '@/features/reader/viewer/pager/ReaderPager.utils.tsx';
-import { getNextIndexFromPage, getPage } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx';
+import { getIndexOfPage, getPage } from '@/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx';
 
 const getPagePosition = (
     pageType: 'first' | 'second',
@@ -62,7 +62,7 @@ const BaseReaderDoublePagedPager = ({
             createPage={(page, pagesIndex, shouldLoad, shouldDisplay, _setRef, ...baseProps) => {
                 const { primary, secondary } = page;
 
-                const currentSecondaryPageIndex = getNextIndexFromPage(currentPage);
+                const currentSecondaryPageIndex = getIndexOfPage(currentPage);
 
                 const hasSecondaryPage = !!secondary;
                 const isPrimaryPage = currentPage.primary.index === primary.index;