Merge pull request #20578 from calixteman/bug2010820

Select the dropped thumbnail (bug 2010820)
This commit is contained in:
Tim van der Meij 2026-01-18 13:03:47 +01:00 committed by GitHub
commit fef0cb1a6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 40 additions and 0 deletions

View File

@ -231,5 +231,35 @@ describe("Reorganize Pages View", () => {
})
);
});
it("should select the dropped page (bug 2010820)", async () => {
await Promise.all(
pages.map(async ([browserName, page]) => {
await waitForThumbnailVisible(page, 1);
const rect1 = await getRect(page, getThumbnailSelector(1));
const rect2 = await getRect(page, getThumbnailSelector(2));
await page.click(getThumbnailSelector(2));
await page.waitForSelector(
`${getThumbnailSelector(2)}[aria-current="page"]`
);
const handlePagesEdited = await waitForPagesEdited(page);
await dragAndDrop(
page,
getThumbnailSelector(1),
[[0, rect2.y - rect1.y + rect2.height / 2]],
10
);
await awaitPromise(handlePagesEdited);
await page.waitForSelector(
`${getThumbnailSelector(2)}[aria-current="false"]`
);
await page.waitForSelector(
`${getThumbnailSelector(1)}[aria-current="page"]`
);
})
);
});
});
});

View File

@ -487,6 +487,11 @@ class PDFThumbnailViewer {
const N = thumbnails.length;
pagesMapper.pagesNumber = N;
const currentPageId = pagesMapper.getPageId(this._currentPageNumber);
const newCurrentPageId = pagesMapper.getPageId(
isNaN(this.#pageNumberToRemove)
? pagesToMove[0]
: this.#pageNumberToRemove
);
// Move the thumbnails in the DOM.
let thumbnail = thumbnails[pagesToMove[0] - 1];
@ -532,6 +537,11 @@ class PDFThumbnailViewer {
index: newIndex,
pagesToMove,
});
const newCurrentPageNumber = pagesMapper.getPageNumber(newCurrentPageId);
setTimeout(() => {
this.linkService.goToPage(newCurrentPageNumber);
}, 0);
}
if (!isNaN(this.#pageNumberToRemove)) {