Fix/back button not working without browser history (#389)

* Introduce local history stack

To be able to know if the browser back navigation should be used, it is sometimes necessary to know which the previous page was.
E.g. it should not be used in case the current page is the manga page and the previous one is the reader.

* Handle cases where there is no previous page in the history stack

* Always use a button for the navigation back button

* Navigate from base route to library by replacing the current location

The base route should not be included in the history
This commit is contained in:
schroda
2023-06-26 20:40:35 +02:00
committed by GitHub
parent 1d76e990ae
commit 09b10cd5ab
11 changed files with 83 additions and 12 deletions

View File

@@ -24,13 +24,14 @@ import GetAppIcon from '@mui/icons-material/GetApp';
import GetAppOutlinedIcon from '@mui/icons-material/GetAppOutlined';
import SettingsIcon from '@mui/icons-material/Settings';
import ArrowBack from '@mui/icons-material/ArrowBack';
import { Link, useLocation, useNavigate } from 'react-router-dom';
import { useLocation, useNavigate } from 'react-router-dom';
import { createPortal } from 'react-dom';
import { NavbarItem } from '@/typings';
import NavBarContext from '@/components/context/NavbarContext';
import ExtensionOutlinedIcon from '@/components/util/CustomExtensionOutlinedIcon';
import DesktopSideBar from '@/components/navbar/navigation/DesktopSideBar';
import MobileBottomBar from '@/components/navbar/navigation/MobileBottomBar';
import { useHistory } from '@/util/useHistory';
const navbarItems: Array<NavbarItem> = [
{
@@ -89,7 +90,8 @@ export default function DefaultNavBar() {
const theme = useTheme();
const navigate = useNavigate();
const { pathname } = useLocation();
const { pathname, ...location } = useLocation();
const history = useHistory();
const isMobileWidth = useMediaQuery(theme.breakpoints.down('sm'));
const isMainRoute = navbarItems.some(({ path }) => path === pathname);
@@ -107,7 +109,14 @@ export default function DefaultNavBar() {
}
const handleBack = () => {
if (backToUrl != null) return;
const isLastPageInHistory = location.key === 'default';
const wasPreviousPageReader = history[history.length - 2]?.match(/\/manga\/[0-9]+\/chapter\/[0-9]+.*/g);
if (isLastPageInHistory || wasPreviousPageReader) {
navigate(backToUrl ?? '');
return;
}
navigate(-1);
};
@@ -117,8 +126,7 @@ export default function DefaultNavBar() {
<Toolbar>
{!isMainRoute && (
<IconButton
component={backToUrl ? Link : 'button'}
to={backToUrl}
component="button"
edge="start"
sx={{ marginRight: theme.spacing(2) }}
color="inherit"

View File

@@ -186,6 +186,13 @@ export default function ReaderNavBar(props: IProps) {
}, [handleScroll]); // handleScroll changes on every render
const handleClose = () => {
const isLastPageInHistory = location.key === 'default';
if (isLastPageInHistory) {
navigate(`/manga/${manga.id}`);
return;
}
// this works because opening previous/next chapter will replace the current history element.
// in case this gets changed this has to be updated
navigate(-1);