Beanz/pdf.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18842 from Snuffleupagus/annotationEditorMode-AbortSignal-any

Browse Source 
Remove the `PDFViewer.annotationEditorMode` setter event listeners with `AbortSignal.any()`
This commit is contained in:
Jonas Jenwald 2024-10-03 19:38:49 +02:00 committed by GitHub
commit ebbd019d7d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
web/pdf_viewer.js
View File

@ -227,7 +227,7 @@ class PDFViewer {
#mlManager = null;
#onPageRenderedCallback = null;
#switchAnnotationEditorModeAC = null;
#switchAnnotationEditorModeTimeoutId = null;
@ -2280,10 +2280,9 @@ class PDFViewer {
}
#cleanupSwitchAnnotationEditorMode() {
if (this.#onPageRenderedCallback) {
this.eventBus._off("pagerendered", this.#onPageRenderedCallback);
this.#onPageRenderedCallback = null;
}
this.#switchAnnotationEditorModeAC?.abort();
this.#switchAnnotationEditorModeAC = null;
if (this.#switchAnnotationEditorModeTimeoutId !== null) {
clearTimeout(this.#switchAnnotationEditorModeTimeoutId);
this.#switchAnnotationEditorModeTimeoutId = null;
@ -2353,14 +2352,25 @@ class PDFViewer {
// We're editing so we must switch to editing mode when the rendering is
// done.
this.#cleanupSwitchAnnotationEditorMode();
this.#onPageRenderedCallback = ({ pageNumber }) => {
idsToRefresh.delete(pageNumber);
if (idsToRefresh.size === 0) {
this.#switchAnnotationEditorModeTimeoutId = setTimeout(updater, 0);
}
};
const { signal } = this.#eventAbortController;
eventBus._on("pagerendered", this.#onPageRenderedCallback, { signal });
this.#switchAnnotationEditorModeAC = new AbortController();
const signal = AbortSignal.any([
this.#eventAbortController.signal,
this.#switchAnnotationEditorModeAC.signal,
]);
eventBus._on(
"pagerendered",
({ pageNumber }) => {
idsToRefresh.delete(pageNumber);
if (idsToRefresh.size === 0) {
this.#switchAnnotationEditorModeTimeoutId = setTimeout(
updater,
0
);
}
},
{ signal }
);
return;
}
}