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

Merge pull request #18366 from calixteman/clean_switch_annot

Browse source 
[Editor] Make sure everything is cleaned up when we switch to annotation editor mode
This commit is contained in:
calixteman 2024-07-02 17:13:57 +02:00 • committed by GitHub
commit 59620d3748
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/integration/test_utils.mjs
View file

@ -135,6 +135,7 @@ function getSelector(id) {
async function getRect(page, selector) {
// In Chrome something is wrong when serializing a `DomRect`,
// so we extract the values and return them ourselves.
await page.waitForSelector(selector);
return page.$eval(selector, el => {
const { x, y, width, height } = el.getBoundingClientRect();
return { x, y, width, height };

29
web/pdf_viewer.js
View file

@ -1122,9 +1122,7 @@ class PDFViewer {
this.#hiddenCopyElement?.remove();
this.#hiddenCopyElement = null;
this.#onPageRenderedCallback = null;
clearTimeout(this.#switchAnnotationEditorModeTimeoutId);
this.#switchAnnotationEditorModeTimeoutId = null;
this.#cleanupSwitchAnnotationEditorMode();
}
#ensurePageViewVisible() {
@ -2263,6 +2261,17 @@ class PDFViewer {
]);
}
#cleanupSwitchAnnotationEditorMode() {
if (this.#onPageRenderedCallback) {
this.eventBus._off("pagerendered", this.#onPageRenderedCallback);
this.#onPageRenderedCallback = null;
}
if (this.#switchAnnotationEditorModeTimeoutId !== null) {
clearTimeout(this.#switchAnnotationEditorModeTimeoutId);
this.#switchAnnotationEditorModeTimeoutId = null;
}
}
get annotationEditorMode() {
return this.#annotationEditorUIManager
? this.#annotationEditorMode
@ -2296,14 +2305,7 @@ class PDFViewer {
const { eventBus } = this;
const updater = () => {
if (this.#onPageRenderedCallback) {
eventBus._off("pagerendered", this.#onPageRenderedCallback);
this.#onPageRenderedCallback = null;
}
if (this.#switchAnnotationEditorModeTimeoutId !== null) {
clearTimeout(this.#switchAnnotationEditorModeTimeoutId);
this.#switchAnnotationEditorModeTimeoutId = null;
}
this.#cleanupSwitchAnnotationEditorMode();
this.#annotationEditorMode = mode;
eventBus.dispatch("annotationeditormodechanged", {
source: this,
@ -2329,15 +2331,14 @@ class PDFViewer {
if (isEditing && editId && idsToRefresh) {
// We're editing an existing annotation so we must switch to editing
// mode when the rendering is done.
const { signal } = this.#eventAbortController;
this.#cleanupSwitchAnnotationEditorMode();
this.#onPageRenderedCallback = ({ pageNumber }) => {
idsToRefresh.delete(pageNumber);
if (idsToRefresh.size === 0) {
eventBus._off("pagerendered", this.#onPageRenderedCallback);
this.#onPageRenderedCallback = null;
this.#switchAnnotationEditorModeTimeoutId = setTimeout(updater, 0);
}
};
const { signal } = this.#eventAbortController;
eventBus._on("pagerendered", this.#onPageRenderedCallback, { signal });
return;
}