mirror/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2024-12-24 00:39:32 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "fix(frontend): 直前のパターンを記録するように"

Browse Source 
This reverts commit 5372b25940.
This commit is contained in:
kakkokari-gtyih 2024-07-10 00:01:24 +09:00
parent bdac34273e
commit a9bb52e799
1 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/frontend/src/scripts/hotkey.ts
View File

@ -45,10 +45,6 @@ const MODIFIER_KEYS = ['ctrl', 'alt', 'shift'];
const IGNORE_ELEMENTS = ['input', 'textarea']; const IGNORE_ELEMENTS = ['input', 'textarea'];
//#endregion //#endregion
//#region store
let latestHotkey: Pattern & { callback: CallbackFunction } | null = null;
//#endregion
//#region impl //#region impl
export const makeHotkey = (keymap: Keymap) => { export const makeHotkey = (keymap: Keymap) => {
const actions = parseKeymap(keymap); const actions = parseKeymap(keymap);
@ -58,12 +54,11 @@ export const makeHotkey = (keymap: Keymap) => {
if (IGNORE_ELEMENTS.includes(document.activeElement.tagName.toLowerCase())) return; if (IGNORE_ELEMENTS.includes(document.activeElement.tagName.toLowerCase())) return;
if (getHTMLElementOrNull(document.activeElement)?.isContentEditable) return; if (getHTMLElementOrNull(document.activeElement)?.isContentEditable) return;
} }
for (const action of actions) { for (const { patterns, callback, options } of actions) {
if (matchPatterns(ev, action)) { if (matchPatterns(ev, patterns, options)) {
ev.preventDefault(); ev.preventDefault();
ev.stopPropagation(); ev.stopPropagation();
action.callback(ev); callback(ev);
storePattern(ev, action.callback);
} }
} }
}; };
@ -108,21 +103,10 @@ const parseOptions = (rawCallback: Keymap[keyof Keymap]) => {
return { ...defaultOptions } as const satisfies Action['options']; return { ...defaultOptions } as const satisfies Action['options'];
}; };
const matchPatterns = (ev: KeyboardEvent, action: Action) => { const matchPatterns = (ev: KeyboardEvent, patterns: Action['patterns'], options: Action['options']) => {
const { patterns, options, callback } = action;
if (ev.repeat && !options.allowRepeat) return false; if (ev.repeat && !options.allowRepeat) return false;
const key = ev.key.toLowerCase(); const key = ev.key.toLowerCase();
return patterns.some(({ which, ctrl, shift, alt }) => { return patterns.some(({ which, ctrl, shift, alt }) => {
if (
latestHotkey != null &&
latestHotkey.which.includes(key) &&
latestHotkey.ctrl === ctrl &&
latestHotkey.alt === alt &&
latestHotkey.shift === shift &&
latestHotkey.callback === callback
) {
return false;
}
if (!which.includes(key)) return false; if (!which.includes(key)) return false;
if (ctrl !== (ev.ctrlKey || ev.metaKey)) return false; if (ctrl !== (ev.ctrlKey || ev.metaKey)) return false;
if (alt !== ev.altKey) return false; if (alt !== ev.altKey) return false;
@ -131,16 +115,6 @@ const matchPatterns = (ev: KeyboardEvent, action: Action) => {
}); });
}; };
const storePattern = (ev: KeyboardEvent, callback: CallbackFunction) => {
latestHotkey = {
which: [ev.key.toLowerCase()],
ctrl: ev.ctrlKey || ev.metaKey,
alt: ev.altKey,
shift: ev.shiftKey,
callback,
};
};
const parseKeyCode = (input?: string | null) => { const parseKeyCode = (input?: string | null) => {
if (input == null) return []; if (input == null) return [];
const raw = getValueByKey(KEY_ALIASES, input); const raw = getValueByKey(KEY_ALIASES, input);