From 36e943214c7861eadc4681ae72f908d4deb803c3 Mon Sep 17 00:00:00 2001
From: schroda <50052685+schroda@users.noreply.github.com>
Date: Fri, 14 Jun 2024 13:43:15 +0200
Subject: [PATCH] Remove "default back to" functionality

Caused an infinite loop, because in case the Reader was the initial opened page, got closed and the back button was pressed, the Reader just got opened again.

This happened because in case it was the initial opened page, closing the Reader did not use the browser back navigation and instead opened the Manga page, resulting in it to be pushed in the history stack with the Reader being the previous page
---
 src/components/context/NavbarContext.tsx        | 17 +----------------
 src/components/navbar/NavBarContextProvider.tsx |  5 +----
 src/components/navbar/ReaderNavBar.tsx          |  2 --
 src/util/useBackButton.ts                       |  7 +------
 4 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/src/components/context/NavbarContext.tsx b/src/components/context/NavbarContext.tsx
index de65ebf6..6d83cf09 100644
--- a/src/components/context/NavbarContext.tsx
+++ b/src/components/context/NavbarContext.tsx
@@ -6,16 +6,12 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import React, { useContext, useEffect } from 'react';
+import React, { useContext } from 'react';
 import { INavbarOverride } from '@/typings';
 
 type ContextType = {
     history: string[];
 
-    // Default back button url
-    defaultBackTo: string | undefined;
-    setDefaultBackTo: React.Dispatch<React.SetStateAction<string | undefined>>;
-
     // AppBar title
     title: string | React.ReactNode;
     setTitle: (title: ContextType['title'], browserTitle?: string) => void;
@@ -31,8 +27,6 @@ type ContextType = {
 
 export const NavBarContext = React.createContext<ContextType>({
     history: [],
-    defaultBackTo: undefined,
-    setDefaultBackTo: (): void => {},
     title: 'Suwayomi',
     setTitle: (): void => {},
     action: <div />,
@@ -42,12 +36,3 @@ export const NavBarContext = React.createContext<ContextType>({
 });
 
 export const useNavBarContext = () => useContext(NavBarContext);
-
-export const useSetDefaultBackTo = (value: string) => {
-    const { setDefaultBackTo } = useNavBarContext();
-
-    useEffect(() => {
-        setDefaultBackTo(value);
-        return () => setDefaultBackTo(undefined);
-    }, [value]);
-};
diff --git a/src/components/navbar/NavBarContextProvider.tsx b/src/components/navbar/NavBarContextProvider.tsx
index 650ce310..a07b2ac6 100644
--- a/src/components/navbar/NavBarContextProvider.tsx
+++ b/src/components/navbar/NavBarContextProvider.tsx
@@ -16,7 +16,6 @@ interface IProps {
 }
 
 export function NavBarContextProvider({ children }: IProps) {
-    const [defaultBackTo, setDefaultBackTo] = useState<string | undefined>();
     const [title, setTitle] = useState<string | React.ReactNode>('Suwayomi');
     const [action, setAction] = useState<any>(<div />);
     const [override, setOverride] = useState<INavbarOverride>({
@@ -37,8 +36,6 @@ export function NavBarContextProvider({ children }: IProps) {
     const value = useMemo(
         () => ({
             history,
-            defaultBackTo,
-            setDefaultBackTo,
             title,
             setTitle: updateTitle,
             action,
@@ -46,7 +43,7 @@ export function NavBarContextProvider({ children }: IProps) {
             override,
             setOverride,
         }),
-        [history, defaultBackTo, setDefaultBackTo, title, updateTitle, action, setAction, override, setOverride],
+        [history, title, updateTitle, action, setAction, override, setOverride],
     );
     return <NavBarContext.Provider value={value}>{children}</NavBarContext.Provider>;
 }
diff --git a/src/components/navbar/ReaderNavBar.tsx b/src/components/navbar/ReaderNavBar.tsx
index bd84c5c5..46a5a6b3 100644
--- a/src/components/navbar/ReaderNavBar.tsx
+++ b/src/components/navbar/ReaderNavBar.tsx
@@ -30,7 +30,6 @@ import { useTranslation } from 'react-i18next';
 import { AllowedMetadataValueTypes, ChapterOffset, IReaderSettings, TChapter, TManga } from '@/typings';
 import { ReaderSettingsOptions } from '@/components/reader/ReaderSettingsOptions';
 import { useBackButton } from '@/util/useBackButton.ts';
-import { useSetDefaultBackTo } from '@/components/context/NavbarContext.tsx';
 import { Select } from '@/components/atoms/Select.tsx';
 import { getOptionForDirection } from '@/theme.ts';
 
@@ -155,7 +154,6 @@ export function ReaderNavBar(props: IProps) {
     } = props;
 
     const handleBack = useBackButton();
-    useSetDefaultBackTo(`/manga/${manga.id}`);
 
     const hasMultipleScanlators = useMemo(() => !!new Set(chapters.map(({ scanlator }) => scanlator)).size, [chapters]);
 
diff --git a/src/util/useBackButton.ts b/src/util/useBackButton.ts
index 4641d179..c0ca59b1 100644
--- a/src/util/useBackButton.ts
+++ b/src/util/useBackButton.ts
@@ -13,7 +13,7 @@ import { NavBarContext } from '@/components/context/NavbarContext.tsx';
 export const useBackButton = () => {
     const navigate = useNavigate();
     const location = useLocation();
-    const { history, defaultBackTo: backToUrl } = useContext(NavBarContext);
+    const { history } = useContext(NavBarContext);
 
     return () => {
         const isHistoryEmpty = !history.length;
@@ -25,11 +25,6 @@ export const useBackButton = () => {
             return;
         }
 
-        if (backToUrl) {
-            navigate(backToUrl);
-            return;
-        }
-
         navigate('/library');
     };
 };