fix: back to last location

Signed-off-by: Innei <i@innei.in>
RSSNext · Jul 24, 2024 · 15f7022 · 15f7022
1 parent 51db2dc
commit 15f7022
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/renderer/src/pages/(main)/(layer)/(subview)/layout.tsx b/src/renderer/src/pages/(main)/(layer)/(subview)/layout.tsx
@@ -1,12 +1,24 @@
+import { getReadonlyRoute } from "@renderer/atoms/route"
+import {
+  getSidebarActiveView,
+  setSidebarActiveView,
+} from "@renderer/atoms/sidebar"
 import { MotionButtonBase } from "@renderer/components/ui/button"
+import { useRef } from "react"
 import { Outlet, useNavigate } from "react-router-dom"
 
 export function Component() {
   const navigate = useNavigate()
+  const prevLocation = useRef(getReadonlyRoute().location).current
+  const prevView = useRef(getSidebarActiveView()).current
   return (
     <div className="relative flex size-full">
       <MotionButtonBase
-        onClick={() => navigate("/")}
+        onClick={() => {
+          navigate(prevLocation)
+
+          setSidebarActiveView(prevView)
+        }}
         className="absolute left-10 top-11 flex items-center gap-1"
       >
         <i className="i-mgc-left-cute-fi" />

diff --git a/src/renderer/src/providers/stable-router-provider.tsx b/src/renderer/src/providers/stable-router-provider.tsx
@@ -64,5 +64,6 @@ export const StableRouterProvider = () => {
       })
     }
   }, [location, searchParams])
+
   return null
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,5 +64,6 @@ export const StableRouterProvider = () => { @@
           })
         }
       }, [location, searchParams])
       return null
     }