Skip to content

feat(desktop): close settings with Escape key #3466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kitenite merged 1 commit into from
Apr 15, 2026
Merged

feat(desktop): close settings with Escape key #3466

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions apps/desktop/src/renderer/routes/_authenticated/settings/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ import {
useNavigate,
} from "@tanstack/react-router";
import { useEffect } from "react";
import { useHotkeys } from "react-hotkeys-hook";
import { electronTrpc } from "renderer/lib/electron-trpc";
import {
type SettingsSection,
useSetSettingsSearchQuery,
useSettingsOriginRoute,
useSettingsSearchQuery,
} from "renderer/stores/settings-state";
import { SearchResultsBanner } from "./components/SearchResultsBanner";
Expand Down Expand Up @@ -88,6 +90,7 @@ function SettingsLayout() {
const isMac = platform === undefined || platform === "darwin";
const searchQuery = useSettingsSearchQuery();
const setSearchQuery = useSetSettingsSearchQuery();
const originRoute = useSettingsOriginRoute();
const location = useLocation();
const navigate = useNavigate();
const normalizedSearchQuery = searchQuery.trim();
Expand Down Expand Up @@ -117,6 +120,17 @@ function SettingsLayout() {
}
}, [isSearchActive, location.pathname, navigate, normalizedSearchQuery]);

useHotkeys(
"escape",
(event) => {
if (document.querySelector('[data-state="open"]')) return;
event.preventDefault();
navigate({ to: originRoute });
},
{ enableOnFormTags: false, enableOnContentEditable: false },
[navigate, originRoute],
);

return (
<div className="flex flex-col h-screen w-screen bg-tertiary">
<div
Expand Down
Loading