techhub/mastodon
2
0
Fork 0
Code Activity

Fix g + h keyboard shortcut not working when a post is focused (#36935)

Browse Source
This commit is contained in:
diondiondion
2025-11-19 11:58:07 +01:00
committed by Claire
parent c6ccacdf7b
commit 1dbf10198d
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/javascript/mastodon/components/hotkeys/index.tsx
View File

@@ -180,15 +180,15 @@ export function useHotkeys<T extends HTMLElement>(handlers: HandlerMap) {
if (shouldHandleEvent) { if (shouldHandleEvent) {
const matchCandidates: { const matchCandidates: {
handler: (event: KeyboardEvent) => void; // A candidate will be have an undefined handler if it's matched,
// but handled in a parent component rather than this one.
handler: ((event: KeyboardEvent) => void) | undefined;
priority: number; priority: number;
}[] = []; }[] = [];
(Object.keys(hotkeyMatcherMap) as HotkeyName[]).forEach( (Object.keys(hotkeyMatcherMap) as HotkeyName[]).forEach(
(handlerName) => { (handlerName) => {
const handler = handlersRef.current[handlerName]; const handler = handlersRef.current[handlerName];
if (handler) {
const hotkeyMatcher = hotkeyMatcherMap[handlerName]; const hotkeyMatcher = hotkeyMatcherMap[handlerName];
const { isMatch, priority } = hotkeyMatcher( const { isMatch, priority } = hotkeyMatcher(
@@ -199,7 +199,6 @@ export function useHotkeys<T extends HTMLElement>(handlers: HandlerMap) {
if (isMatch) { if (isMatch) {
matchCandidates.push({ handler, priority }); matchCandidates.push({ handler, priority });
} }
}
}, },
); );