@@ -137,17 +137,28 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
137137
138138 useEffect ( ( ) => {
139139 const handleKeyDown = ( event : globalThis . KeyboardEvent ) => {
140- if ( event . key !== "/" || event . metaKey || event . ctrlKey || event . altKey ) return ;
140+ if ( event . defaultPrevented || event . isComposing ) return ;
141+ const isFindShortcut =
142+ event . key . toLowerCase ( ) === "f" &&
143+ ( event . metaKey || event . ctrlKey ) &&
144+ ! event . altKey &&
145+ ! event . shiftKey ;
146+ const isSlashShortcut =
147+ event . key === "/" && ! event . metaKey && ! event . ctrlKey && ! event . altKey ;
148+ if ( ! isFindShortcut && ! isSlashShortcut ) return ;
141149
142150 const target = event . target ;
143151 if (
144152 target instanceof HTMLElement &&
145- ( target . tagName === "INPUT" ||
146- target . tagName === "TEXTAREA" ||
147- target . isContentEditable ||
148- // Keep focus inside open dialogs and popups instead of escaping
149- // their focus trap into the sidebar search.
150- target . closest ( '[role="dialog"], [aria-modal="true"], [data-slot$="popup"]' ) !== null )
153+ ( ( isSlashShortcut &&
154+ ( target . tagName === "INPUT" ||
155+ target . tagName === "TEXTAREA" ||
156+ target . isContentEditable ) ) ||
157+ // Preserve dialog and popup focus traps, and let shortcut recorders
158+ // capture the keypress without moving focus into the sidebar search.
159+ target . closest (
160+ '[role="dialog"], [aria-modal="true"], [data-slot$="popup"], [data-keybinding-capture]' ,
161+ ) !== null )
151162 ) {
152163 return ;
153164 }
0 commit comments