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

Merge pull request #18301 from calixteman/no_signal

Browse Source 
[Editor] Don't create an observer for the stamp annotation after the viewer has been closed
This commit is contained in:
calixteman 2024-06-20 13:42:54 +02:00 committed by GitHub
commit 9afd3a5b2f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/display/editor/stamp.js
View File

@ -538,6 +538,11 @@ class StampEditor extends AnnotationEditor {
* Create the resize observer. * Create the resize observer.
*/ */
#createObserver() { #createObserver() {
if (!this._uiManager._signal) {
// This method is called after the canvas has been created but the canvas
// creation is async, so it's possible that the viewer has been closed.
return;
}
this.#observer = new ResizeObserver(entries => { this.#observer = new ResizeObserver(entries => {
const rect = entries[0].contentRect; const rect = entries[0].contentRect;
if (rect.width && rect.height) { if (rect.width && rect.height) {

27
test/integration/stamp_editor_spec.mjs
View File

@ -597,18 +597,19 @@ describe("Stamp Editor", () => {
await Promise.all( await Promise.all(
pages.map(async ([browserName, page]) => { pages.map(async ([browserName, page]) => {
await switchToStamp(page); await switchToStamp(page);
const selector = getEditorSelector(0);
await copyImage(page, "../images/firefox_logo.png", 0); await copyImage(page, "../images/firefox_logo.png", 0);
await page.waitForSelector(getEditorSelector(0)); await page.waitForSelector(selector);
await waitForSerialized(page, 1); await waitForSerialized(page, 1);
await page.waitForSelector(`${getEditorSelector(0)} button.delete`); await page.waitForSelector(`${selector} button.delete`);
await page.click(`${getEditorSelector(0)} button.delete`); await page.click(`${selector} button.delete`);
await waitForSerialized(page, 0); await waitForSerialized(page, 0);
await kbUndo(page); await kbUndo(page);
await waitForSerialized(page, 1); await waitForSerialized(page, 1);
await page.waitForSelector(getEditorSelector(0)); await page.waitForSelector(`${selector} canvas`);
}) })
); );
}); });
@ -629,13 +630,14 @@ describe("Stamp Editor", () => {
await Promise.all( await Promise.all(
pages.map(async ([browserName, page]) => { pages.map(async ([browserName, page]) => {
await switchToStamp(page); await switchToStamp(page);
const selector = getEditorSelector(0);
await copyImage(page, "../images/firefox_logo.png", 0); await copyImage(page, "../images/firefox_logo.png", 0);
await page.waitForSelector(getEditorSelector(0)); await page.waitForSelector(selector);
await waitForSerialized(page, 1); await waitForSerialized(page, 1);
await page.waitForSelector(`${getEditorSelector(0)} button.delete`); await page.waitForSelector(`${selector} button.delete`);
await page.click(`${getEditorSelector(0)} button.delete`); await page.click(`${selector} button.delete`);
await waitForSerialized(page, 0); await waitForSerialized(page, 0);
const twoToFourteen = Array.from(new Array(13).keys(), n => n + 2); const twoToFourteen = Array.from(new Array(13).keys(), n => n + 2);
@ -653,7 +655,7 @@ describe("Stamp Editor", () => {
await scrollIntoView(page, pageSelector); await scrollIntoView(page, pageSelector);
} }
await page.waitForSelector(getEditorSelector(0)); await page.waitForSelector(`${selector} canvas`);
}) })
); );
}); });
@ -674,13 +676,14 @@ describe("Stamp Editor", () => {
await Promise.all( await Promise.all(
pages.map(async ([browserName, page]) => { pages.map(async ([browserName, page]) => {
await switchToStamp(page); await switchToStamp(page);
const selector = getEditorSelector(0);
await copyImage(page, "../images/firefox_logo.png", 0); await copyImage(page, "../images/firefox_logo.png", 0);
await page.waitForSelector(getEditorSelector(0)); await page.waitForSelector(selector);
await waitForSerialized(page, 1); await waitForSerialized(page, 1);
await page.waitForSelector(`${getEditorSelector(0)} button.delete`); await page.waitForSelector(`${selector} button.delete`);
await page.click(`${getEditorSelector(0)} button.delete`); await page.click(`${selector} button.delete`);
await waitForSerialized(page, 0); await waitForSerialized(page, 0);
const twoToOne = Array.from(new Array(13).keys(), n => n + 2).concat( const twoToOne = Array.from(new Array(13).keys(), n => n + 2).concat(
@ -693,7 +696,7 @@ describe("Stamp Editor", () => {
await kbUndo(page); await kbUndo(page);
await waitForSerialized(page, 1); await waitForSerialized(page, 1);
await page.waitForSelector(getEditorSelector(0)); await page.waitForSelector(`${selector} canvas`);
}) })
); );
}); });