Handle esc key in settings (#4702)

deltachat · Feb 25, 2025 · f979e9f · f979e9f
1 parent eb3c18e
commit f979e9f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@
 - constrain size of webxdc window by available screen-workarea-space #4683
 - fix that in html email view links without schema didn't open in browser #4690
 - fix clicking on the same anchor multiple timed disn't work in html email view #4690
+- close second level settings form with Escape key #4128
 
 <a id="1_54_1"></a>
 

diff --git a/packages/frontend/src/components/Settings/Settings.tsx b/packages/frontend/src/components/Settings/Settings.tsx
@@ -34,6 +34,21 @@ export default function Settings({ onClose }: DialogProps) {
   const tx = useTranslationFunction()
   const [settingsMode, setSettingsMode] = useState<SettingsView>('main')
 
+  useEffect(() => {
+    const handler = (evt: KeyboardEvent) => {
+      if (
+        settingsMode !== 'main' &&
+        window.__settingsOpened &&
+        evt.key === 'Escape'
+      ) {
+        evt.preventDefault()
+        setSettingsMode('main')
+      }
+    }
+    document.addEventListener('keydown', handler)
+    return () => document.removeEventListener('keydown', handler)
+  }, [settingsMode])
+
   useEffect(() => {
     if (window.__settingsOpened) {
       throw new Error(