From b5108b4f97b632f7c9fadd5dedeb59dd7a73a854 Mon Sep 17 00:00:00 2001
From: MuLingQwQ <105187600+CharyeahOwO@users.noreply.github.com>
Date: Mon, 9 Feb 2026 20:40:12 +0800
Subject: [PATCH] fix(web): calendar navigation should use current page path
 (#5605)

---
 web/src/hooks/useDateFilterNavigation.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/web/src/hooks/useDateFilterNavigation.ts b/web/src/hooks/useDateFilterNavigation.ts
index ce0a167b6..d04724da9 100644
--- a/web/src/hooks/useDateFilterNavigation.ts
+++ b/web/src/hooks/useDateFilterNavigation.ts
@@ -1,16 +1,18 @@
 import { useCallback } from "react";
-import { useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
 import { stringifyFilters } from "@/contexts/MemoFilterContext";
 
-export const useDateFilterNavigation = () => {
+export const useDateFilterNavigation = (targetPath?: string) => {
   const navigate = useNavigate();
+  const location = useLocation();
 
   const navigateToDateFilter = useCallback(
     (date: string) => {
       const filterQuery = stringifyFilters([{ factor: "displayTime", value: date }]);
-      navigate(`/?filter=${filterQuery}`);
+      const basePath = targetPath ?? location.pathname;
+      navigate(`${basePath}?filter=${filterQuery}`);
     },
-    [navigate],
+    [navigate, location.pathname, targetPath],
   );
 
   return navigateToDateFilter;