mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00
Code Activity

Merge pull request #18874 from Snuffleupagus/ColorPicker-AbortSignal-any

Browse source 
[Editor] Remove `ColorPicker` event listeners with `AbortSignal.any()` (PR 18586 follow-up)
This commit is contained in:
Tim van der Meij 2024-10-10 19:55:19 +02:00 • committed by GitHub
commit 0543e9e49c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/display/editor/color_picker.js
View file

@ -18,10 +18,6 @@ import { KeyboardManager } from "./tools.js";
import { noContextMenu } from "../display_utils.js";
class ColorPicker {
#boundKeyDown = this.#keyDown.bind(this);
#boundPointerDown = this.#pointerDown.bind(this);
#button = null;
#buttonSwatch = null;
@ -38,6 +34,8 @@ class ColorPicker {
#eventBus;
#openDropdownAC = null;
#uiManager = null;
#type;
@ -101,7 +99,7 @@ class ColorPicker {
button.setAttribute("aria-haspopup", true);
const signal = this.#uiManager._signal;
button.addEventListener("click", this.#openDropdown.bind(this), { signal });
button.addEventListener("keydown", this.#boundKeyDown, { signal });
button.addEventListener("keydown", this.#keyDown.bind(this), { signal });
const swatch = (this.#buttonSwatch = document.createElement("span"));
swatch.className = "swatch";
swatch.setAttribute("aria-hidden", true);
@ -145,7 +143,7 @@ class ColorPicker {
div.append(button);
}
div.addEventListener("keydown", this.#boundKeyDown, { signal });
div.addEventListener("keydown", this.#keyDown.bind(this), { signal });
return div;
}
@ -225,9 +223,14 @@ class ColorPicker {
return;
}
this.#dropdownWasFromKeyboard = event.detail === 0;
window.addEventListener("pointerdown", this.#boundPointerDown, {
signal: this.#uiManager._signal,
});
if (!this.#openDropdownAC) {
this.#openDropdownAC = new AbortController();
window.addEventListener("pointerdown", this.#pointerDown.bind(this), {
signal: this.#uiManager.combinedSignal(this.#openDropdownAC),
});
}
if (this.#dropdown) {
this.#dropdown.classList.remove("hidden");
return;
@ -245,7 +248,8 @@ class ColorPicker {
hideDropdown() {
this.#dropdown?.classList.add("hidden");
window.removeEventListener("pointerdown", this.#boundPointerDown);
this.#openDropdownAC?.abort();
this.#openDropdownAC = null;
}
get #isDropdownVisible() {