Merge branch 'main' into nrc-input-arg

Author: nrc

src/routes/Settings.tsx

@@ -1,6 +1,5 @@
 import { Dialog, Transition } from '@headlessui/react'
 import { Fragment, useEffect, useRef } from 'react'
-import { useHotkeys } from 'react-hotkeys-hook'
 import { useLocation, useNavigate, useSearchParams } from 'react-router-dom'
 
 import { CustomIcon } from '@src/components/CustomIcon'
@@ -10,23 +9,26 @@ import { KeybindingsSectionsList } from '@src/components/Settings/KeybindingsSec
 import { SettingsSearchBar } from '@src/components/Settings/SettingsSearchBar'
 import { SettingsSectionsList } from '@src/components/Settings/SettingsSectionsList'
 import { SettingsTabs } from '@src/components/Settings/SettingsTabs'
-import { useDotDotSlash } from '@src/hooks/useDotDotSlash'
 import { PATHS } from '@src/lib/paths'
 import type { SettingsLevel } from '@src/lib/settings/settingsTypes'
 
 export const Settings = () => {
   const navigate = useNavigate()
   const [searchParams, setSearchParams] = useSearchParams()
-  const close = () => navigate(location.pathname.replace(PATHS.SETTINGS, ''))
+  const close = () => {
+    // This makes sure input texts are saved before closing the dialog (eg. default project name).
+    if (document.activeElement instanceof HTMLInputElement) {
+      document.activeElement.blur()
+    }
+    navigate(location.pathname.replace(PATHS.SETTINGS, ''))
+  }
   const location = useLocation()
   const isFileSettings = location.pathname.includes(PATHS.FILE)
   const searchParamTab =
     (searchParams.get('tab') as SettingsLevel | 'keybindings') ??
     (isFileSettings ? 'project' : 'user')
 
   const scrollRef = useRef<HTMLDivElement>(null)
-  const dotDotSlash = useDotDotSlash()
-  useHotkeys('esc', () => navigate(dotDotSlash()))
 
   // Scroll to the hash on load if it exists
   useEffect(() => {