From c71aacc257cdf54aeb1079e4e8672ab4fc58020e Mon Sep 17 00:00:00 2001
From: schroda <50052685+schroda@users.noreply.github.com>
Date: Sun, 5 Feb 2023 21:49:32 +0100
Subject: [PATCH] Add chapter page dropdown

Makes it possible to select a specific page of the current chapter
---
 src/components/navbar/ReaderNavBar.tsx | 43 ++++++++++++++++++++++++--
 src/screens/Reader.tsx                 |  6 ++--
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/components/navbar/ReaderNavBar.tsx b/src/components/navbar/ReaderNavBar.tsx
index ed021f339a..d97c11e330 100644
--- a/src/components/navbar/ReaderNavBar.tsx
+++ b/src/components/navbar/ReaderNavBar.tsx
@@ -17,7 +17,7 @@ import { useHistory, Link, useLocation } from 'react-router-dom';
 import Slide from '@mui/material/Slide';
 import Fade from '@mui/material/Fade';
 import Zoom from '@mui/material/Zoom';
-import { Divider } from '@mui/material';
+import { Divider, FormControl, MenuItem, Select } from '@mui/material';
 import ListItem from '@mui/material/ListItem';
 import ListItemText from '@mui/material/ListItemText';
 import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction';
@@ -71,6 +71,14 @@ const Navigation = styled('div')({
     },
 });
 
+const PageNavigation = styled('div')({
+    display: 'flex',
+    flexWrap: 'wrap',
+    alignContent: 'center',
+    alignItems: 'center',
+    justifyContent: 'center',
+});
+
 const ChapterNavigation = styled('div')({
     display: 'grid',
     gridTemplateColumns: '1fr 1fr',
@@ -90,6 +98,8 @@ const ChapterNavigation = styled('div')({
     },
 });
 
+const MenuProps = { PaperProps: { style: { maxHeight: 150 } } };
+
 const OpenDrawerButton = styled(IconButton)(({ theme }) => ({
     position: 'fixed',
     top: 0 + 20,
@@ -109,6 +119,7 @@ interface IProps {
     manga: IManga | IMangaCard;
     chapter: IChapter;
     curPage: number;
+    setCurPage: (page: number) => void;
 }
 
 export default function ReaderNavBar(props: IProps) {
@@ -120,7 +131,7 @@ export default function ReaderNavBar(props: IProps) {
     }>();
     const { prevDrawerOpen, prevSettingsCollapseOpen } = location.state ?? {};
 
-    const { settings, setSettingValue, manga, chapter, curPage } = props;
+    const { settings, setSettingValue, manga, chapter, curPage, setCurPage } = props;
 
     const [drawerOpen, setDrawerOpen] = useState(settings.staticNav || prevDrawerOpen);
     const [updateDrawerOnRender, setUpdateDrawerOnRender] = useState(true);
@@ -262,7 +273,33 @@ export default function ReaderNavBar(props: IProps) {
                     </Collapse>
                     <Divider sx={{ my: 1, mx: 2 }} />
                     <Navigation>
-                        <span>{`Currently on page ${curPage + 1} of ${chapter.pageCount}`}</span>
+                        <PageNavigation>
+                            <span>Currently on page</span>
+                            <FormControl
+                                size="small"
+                                sx={{ margin: '0 5px' }}
+                                disabled={chapter.pageCount === -1}
+                            >
+                                <Select
+                                    MenuProps={MenuProps}
+                                    value={chapter.pageCount > -1 ? curPage : ''}
+                                    displayEmpty
+                                    onChange={({ target: { value: selectedPage } }) => {
+                                        setCurPage(Number(selectedPage));
+                                    }}
+                                >
+                                    {Array(Math.max(0, chapter.pageCount))
+                                        .fill(1)
+                                        .map((ignoreValue, index) => (
+                                            // eslint-disable-next-line react/no-array-index-key
+                                            <MenuItem key={`Page#${index}`} value={index}>
+                                                {index + 1}
+                                            </MenuItem>
+                                        ))}
+                                </Select>
+                            </FormControl>
+                            <span>{`of ${chapter.pageCount}`}</span>
+                        </PageNavigation>
                         <ChapterNavigation>
                             {chapter.index > 1 && (
                                 <Link
diff --git a/src/screens/Reader.tsx b/src/screens/Reader.tsx
index 3a41e0cc02..d9bd9d04a8 100644
--- a/src/screens/Reader.tsx
+++ b/src/screens/Reader.tsx
@@ -115,6 +115,7 @@ export default function Reader() {
                     manga={manga}
                     chapter={chapter as IChapter}
                     curPage={curPage}
+                    setCurPage={setCurPage}
                 />
             ),
         });
@@ -209,9 +210,6 @@ export default function Reader() {
 
     const ReaderComponent = getReaderComponent(settings.readerType);
 
-    // last page, also probably read = true, we will load the first page.
-    const initialPage = chapter.lastPageRead === chapter.pageCount - 1 ? 0 : chapter.lastPageRead;
-
     return (
         <Box sx={{ width: settings.staticNav ? 'calc(100vw - 300px)' : '100vw' }}>
             <PageNumber settings={settings} curPage={curPage} pageCount={chapter.pageCount} />
@@ -219,7 +217,7 @@ export default function Reader() {
                 pages={pages}
                 pageCount={chapter.pageCount}
                 setCurPage={setCurPage}
-                initialPage={initialPage}
+                initialPage={curPage}
                 curPage={curPage}
                 settings={settings}
                 manga={manga}