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