fix: strip playback accelerators whenever any text input is focused (#2059)

The command-palette-specific IPC approach didn't cover other modals
with inputs (settings search, playlist creation, etc.). Replace it
with document-level focusin/focusout listeners that signal the main
process whenever any input/textarea/contenteditable gains or loses
focus, so the menu rebuild is triggered automatically for all current
and future input surfaces.

Co-authored-by: muckymucky <muckymucky@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
muckymucky
2026-05-25 21:35:45 +01:00
committed by GitHub
parent 61c6036d41
commit 22d37135ae
4 changed files with 49 additions and 14 deletions
+40
View File
@@ -93,6 +93,7 @@ const AppEffects = () => (
<GlobalShortcutsEffect />
<LanguageEffect />
<NativeMenuSyncEffect />
<InputFocusEffect />
</>
);
@@ -170,3 +171,42 @@ const NativeMenuSyncEffect = () => {
return null;
};
const InputFocusEffect = () => {
useEffect(() => {
if (!isElectron()) return;
const handleFocusIn = (e: FocusEvent) => {
const target = e.target as Element | null;
if (
target instanceof HTMLInputElement ||
target instanceof HTMLTextAreaElement ||
(target instanceof HTMLElement && target.isContentEditable)
) {
window.api?.utils?.setInputFocused?.(true);
}
};
const handleFocusOut = (e: FocusEvent) => {
const related = e.relatedTarget as Element | null;
if (
related instanceof HTMLInputElement ||
related instanceof HTMLTextAreaElement ||
(related instanceof HTMLElement && related.isContentEditable)
) {
return;
}
window.api?.utils?.setInputFocused?.(false);
};
document.addEventListener('focusin', handleFocusIn);
document.addEventListener('focusout', handleFocusOut);
return () => {
document.removeEventListener('focusin', handleFocusIn);
document.removeEventListener('focusout', handleFocusOut);
};
}, []);
return null;
};
-5
View File
@@ -201,22 +201,17 @@ export const useAppStore = createWithEqualityFn<AppSlice>()(
set((state) => {
state.commandPalette.opened = false;
});
window.api?.utils?.setCommandPaletteOpen?.(false);
},
open: () => {
set((state) => {
state.commandPalette.opened = true;
});
window.api?.utils?.setCommandPaletteOpen?.(true);
},
opened: false,
toggle: () => {
let nextOpened = false;
set((state) => {
state.commandPalette.opened = !state.commandPalette.opened;
nextOpened = state.commandPalette.opened;
});
window.api?.utils?.setCommandPaletteOpen?.(nextOpened);
},
},
commandPaletteSearchSectionsExpanded: {},