diff --git a/src/components/navbar/NavBar.tsx b/src/components/navbar/NavBar.tsx index f7737d268d..07cb3b2f62 100644 --- a/src/components/navbar/NavBar.tsx +++ b/src/components/navbar/NavBar.tsx @@ -20,10 +20,12 @@ import ExtensionIcon from '@mui/icons-material/Extension'; import ExploreIcon from '@mui/icons-material/Explore'; import GetAppIcon from '@mui/icons-material/GetApp'; import SettingsIcon from '@mui/icons-material/Settings'; +import ArrowBack from '@mui/icons-material/ArrowBack'; +import { useHistory } from 'react-router-dom'; import NavBarContext from 'context/NavbarContext'; import DarkTheme from 'context/DarkTheme'; -import PermanentSideBar from './PermanentSideBar'; import TemporaryDrawer from './TemporaryDrawer'; +import PermanentSideBar from './PermanentSideBar'; const useStyles = makeStyles((theme) => ({ root: { @@ -72,6 +74,7 @@ export default function NavBar() { const { title, action, override } = useContext(NavBarContext); const theme = useTheme(); const isMobileWidth = useMediaQuery(theme.breakpoints.down('sm')); + const history = useHistory(); const { darkTheme } = useContext(DarkTheme); @@ -83,7 +86,7 @@ export default function NavBar() {
- {isMobileWidth && ( + {isMobileWidth ? ( - )} + ) + : ( + !navbarItems.some(({ path }) => path === history.location.pathname) + && ( + (history.length === 1 ? history.push('/library') : history.goBack())} + size="large" + > + + + ) + )} {title} diff --git a/src/components/navbar/ReaderNavBar.tsx b/src/components/navbar/ReaderNavBar.tsx index d5688547e9..56fea5f2fe 100644 --- a/src/components/navbar/ReaderNavBar.tsx +++ b/src/components/navbar/ReaderNavBar.tsx @@ -228,7 +228,7 @@ export default function ReaderNavBar(props: IProps) { color="inherit" aria-label="menu" disableRipple - onClick={() => history.push(`/manga/${manga.id}`)} + onClick={() => history.goBack()} size="large" > @@ -344,6 +344,7 @@ export default function ReaderNavBar(props: IProps) { {chapter.index > 1 && ( @@ -358,6 +359,7 @@ export default function ReaderNavBar(props: IProps) { {chapter.index < chapter.chapterCount && (