Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/hotkey.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export function registerHotkey(
const once = (options as HotkeyEventListenerOptions)?.once;

const native_options = options && typeof options === "object"
? { capture: options.capture, passive: options.passive }
? { capture: options.capture, passive: options.passive, signal: options.signal }
: options;

const unregister = listen(target, eventName, function (this: EventTarget, e: KeyboardEvent) {
Expand Down
38 changes: 38 additions & 0 deletions tests/hotkey.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -429,3 +429,41 @@ test("should trigger when Alt+0 is pressed", async ({ page }) => {
const triggered = await page.evaluate(() => window.hotkeyTriggered);
expect(triggered).toBe(true);
});

test("should not trigger after AbortSignal is aborted", async ({ page }) => {
await page.evaluate(() => {
window.hotkeyCount = 0;
window.controller = new AbortController();

window.registerHotkey(document, "Ctrl+K", () => {
window.hotkeyCount++;
}, "keydown", { signal: window.controller.signal });
});

await page.keyboard.press("Control+k");

await page.evaluate(() => window.controller.abort());

await page.keyboard.press("Control+k");

const count = await page.evaluate(() => window.hotkeyCount);
expect(count).toBe(1);
});

test("should not trigger when AbortSignal is already aborted", async ({ page }) => {
await page.evaluate(() => {
window.hotkeyCount = 0;

const controller = new AbortController();
controller.abort();

window.registerHotkey(document, "Ctrl+K", () => {
window.hotkeyCount++;
}, "keydown", { signal: controller.signal });
});

await page.keyboard.press("Control+k");

const count = await page.evaluate(() => window.hotkeyCount);
expect(count).toBe(0);
});
Loading