Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-04-15 09:44:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20926 from calixteman/bug2022516

Browse Source 
Correctly focus the pasted page (bug 2022516)
This commit is contained in:
calixteman 2026-03-20 17:47:02 +01:00 committed by GitHub
commit 5bdeb79b09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
test/integration/reorganize_pages_spec.mjs
View File

@ -1271,6 +1271,68 @@ describe("Reorganize Pages View", () => {
})
);
});
it("should focus the newly pasted page after copy and paste (bug 2022516)", async () => {
await Promise.all(
pages.map(async ([browserName, page]) => {
await waitForThumbnailVisible(page, 1);
await page.waitForSelector("#viewsManagerStatusActionButton", {
visible: true,
});
// Select page 1 and copy it.
await waitAndClick(
page,
`.thumbnail:has(${getThumbnailSelector(1)}) input`
);
let handlePagesEdited = await waitForPagesEdited(page, "copy");
await waitAndClick(page, "#viewsManagerStatusActionButton");
await waitAndClick(page, "#viewsManagerStatusActionCopy");
await awaitPromise(handlePagesEdited);
// Paste after page 3: the pasted page lands at position 4.
handlePagesEdited = await waitForPagesEdited(page);
await waitAndClick(page, `${getThumbnailSelector(3)}+button`);
await awaitPromise(handlePagesEdited);
// Focus must be on the newly pasted page (position 4), not page 1.
await page.waitForSelector(`${getThumbnailSelector(4)}:focus`, {
visible: true,
});
})
);
});
it("should focus the newly pasted page after cut and paste (bug 2022516)", async () => {
await Promise.all(
pages.map(async ([browserName, page]) => {
await waitForThumbnailVisible(page, 1);
await page.waitForSelector("#viewsManagerStatusActionButton", {
visible: true,
});
// Select page 3 and cut it.
await waitAndClick(
page,
`.thumbnail:has(${getThumbnailSelector(3)}) input`
);
let handlePagesEdited = await waitForPagesEdited(page, "cut");
await waitAndClick(page, "#viewsManagerStatusActionButton");
await waitAndClick(page, "#viewsManagerStatusActionCut");
await awaitPromise(handlePagesEdited);
// Paste after page 1: the pasted page lands at position 2.
handlePagesEdited = await waitForPagesEdited(page);
await waitAndClick(page, `${getThumbnailSelector(1)}+button`);
await awaitPromise(handlePagesEdited);
// Focus must be on the newly pasted page (position 2), not page 1.
await page.waitForSelector(`${getThumbnailSelector(2)}:focus`, {
visible: true,
});
})
);
});
});
describe("Status label reflects number of checked thumbnails (bug 2010832)", () => {

7
web/pdf_thumbnail_viewer.js
View File

@ -730,13 +730,13 @@ class PDFThumbnailViewer {
this.#selectedPages.clear();
}
#updateCurrentPage(currentPageNumber) {
#updateCurrentPage(currentPageNumber, forceFocus = false) {
setTimeout(() => {
this.forceRendering();
const newPageNumber = currentPageNumber || 1;
this.linkService.goToPage(newPageNumber);
const thumbnailView = this._thumbnails[newPageNumber - 1];
if (!this.container.contains(document.activeElement)) {
if (forceFocus || !this.container.contains(document.activeElement)) {
thumbnailView.imageContainer.focus();
}
}, 0);
@ -898,7 +898,8 @@ class PDFThumbnailViewer {
: this._currentPageNumber;
pagesMapper.pastePages(index);
this.#updateCurrentPage(this.#updateThumbnails(currentPageNumber));
this.#updateThumbnails(currentPageNumber);
this.#updateCurrentPage(index + 1, /* forceFocus = */ true);
this.#computeThumbnailsPosition();
this.eventBus.dispatch("pagesedited", {