From 21b326ee691ed7b8752ebf49e58bea28b62dc63c Mon Sep 17 00:00:00 2001
From: xiaotianxt <tianyp@pku.edu.cn>
Date: Thu, 27 Feb 2025 15:03:40 +0800
Subject: [PATCH] feat: Improve settings navigation hotkey behavior

- Add location check to prevent navigating to settings when already on settings page
- Enable hotkey on content editable and form elements
- Use useLocation to track current route
---
 src/renderer/src/handler/NavigationHandler.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/handler/NavigationHandler.tsx b/src/renderer/src/handler/NavigationHandler.tsx
index c780e467c3..f3b6a0a226 100644
--- a/src/renderer/src/handler/NavigationHandler.tsx
+++ b/src/renderer/src/handler/NavigationHandler.tsx
@@ -1,14 +1,19 @@
 import { useHotkeys } from 'react-hotkeys-hook'
-import { useNavigate } from 'react-router-dom'
+import { useLocation, useNavigate } from 'react-router-dom'
 
 const NavigationHandler: React.FC = () => {
+  const location = useLocation()
   const navigate = useNavigate()
+
   useHotkeys(
     'meta+, ! ctrl+,',
     function () {
+      if (location.pathname.startsWith('/settings')) {
+        return
+      }
       navigate('/settings/provider')
     },
-    { splitKey: '!' }
+    { splitKey: '!', enableOnContentEditable: true, enableOnFormTags: true }
   )
 
   return null