ChoChoX/suwayomi-material-you-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature/improve back navigation button (#636)

Browse Source 
* Improve detection of last page in history

* Use "useBackButton" in reader
This commit is contained in:
schroda
2024-03-04 20:40:14 +01:00
committed by GitHub
parent f0fc31ceac
commit 224df1300f
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/util/useBackButton.ts
View File

@@ -18,14 +18,20 @@ export const useBackButton = () => {
const { defaultBackTo: backToUrl } = useContext(NavBarContext);
return () => {
const isLastPageInHistory = location.key === 'default';
const wasPreviousPageReader = history[history.length - 2]?.match(/\/manga\/[0-9]+\/chapter\/[0-9]+.*/g);
const isHistoryEmpty = !history.length;
const isLastPageInHistoryCurrentPage = history.length === 1 && history[0] === location.pathname;
if (isLastPageInHistory || wasPreviousPageReader) {
navigate(backToUrl ?? '');
const canNavigateBack = !isHistoryEmpty && !isLastPageInHistoryCurrentPage;
if (canNavigateBack) {
navigate(-1);
return;
}
navigate(-1);
if (backToUrl) {
navigate(backToUrl);
return;
}
navigate('/library');
};
};