mirror of
https://github.com/zadam/trilium.git
synced 2025-10-20 23:29:02 +02:00
fix(client): function keys (e.g. help) not working due to change in modifiers
This commit is contained in:
parent
b4c20d9683
commit
e1ef02058d
@ -148,6 +148,15 @@ describe("shortcuts", () => {
|
|||||||
expect(matchesShortcut(event, "a")).toBe(false);
|
expect(matchesShortcut(event, "a")).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should match function keys even with no modifiers", () => {
|
||||||
|
let event = createKeyboardEvent({ key: "F1", code: "F1" });
|
||||||
|
expect(matchesShortcut(event, "F1")).toBeTruthy();
|
||||||
|
expect(matchesShortcut(event, "f1")).toBeTruthy();
|
||||||
|
|
||||||
|
event = createKeyboardEvent({ key: "F1", code: "F1", shiftKey: true });
|
||||||
|
expect(matchesShortcut(event, "Shift+F1")).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
it("should handle alternative modifier names", () => {
|
it("should handle alternative modifier names", () => {
|
||||||
const ctrlEvent = createKeyboardEvent({ key: "a", code: "KeyA", ctrlKey: true });
|
const ctrlEvent = createKeyboardEvent({ key: "a", code: "KeyA", ctrlKey: true });
|
||||||
expect(matchesShortcut(ctrlEvent, "control+a")).toBe(true);
|
expect(matchesShortcut(ctrlEvent, "control+a")).toBe(true);
|
||||||
|
@ -163,7 +163,8 @@ export function matchesShortcut(e: KeyboardEvent, shortcut: string): boolean {
|
|||||||
const expectedMeta = modifiers.includes('meta') || modifiers.includes('cmd') || modifiers.includes('command');
|
const expectedMeta = modifiers.includes('meta') || modifiers.includes('cmd') || modifiers.includes('command');
|
||||||
|
|
||||||
// Refuse key combinations that don't include modifiers because they interfere with the normal usage of the application.
|
// Refuse key combinations that don't include modifiers because they interfere with the normal usage of the application.
|
||||||
if (!(expectedCtrl || expectedAlt || expectedShift || expectedMeta)) {
|
// Function keys are an exception.
|
||||||
|
if (!(expectedCtrl || expectedAlt || expectedShift || expectedMeta) && !/f\d+/.test(key)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user