Skip to content

Disable dragging a thumbnail when the user has to paste what they copied (bug 2021934) #20837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
calixteman wants to merge 1 commit into
base: master
Choose a base branch
from
+74 −16
Open

Disable dragging a thumbnail when the user has to paste what they copied (bug 2021934) #20837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 63 additions & 2 deletions test/integration/reorganize_pages_spec.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,12 @@ describe("Reorganize Pages View", () => {
return false;
}
);
const dndPromise = dragAndDrop(
await dragAndDrop(
page,
getThumbnailSelector(1),
[[0, rect2.y - rect1.y + rect2.height / 2]],
10
);
await dndPromise;
await awaitPromise(handleAddedMarker);
await awaitPromise(handleRemovedMarker);
})
Expand Down Expand Up @@ -1639,4 +1638,66 @@ describe("Reorganize Pages View", () => {
);
});
});

describe("Dragging mustn't be possible when pasting (bug 2021934)", () => {
let pages;

beforeEach(async () => {
pages = await loadAndWait(
"page_with_number.pdf",
"#viewsManagerToggleButton",
"page-fit",
null,
{ enableSplitMerge: true }
);
});

afterEach(async () => {
await closePages(pages);
});

it("should check that dragging is disabled when pasting", async () => {
await Promise.all(
pages.map(async ([browserName, page]) => {
await waitForThumbnailVisible(page, 1);

await Promise.all([
page.waitForSelector(`#thumbnailsView.isDragging`, {
visible: true,
}),
dragAndDrop(page, getThumbnailSelector(1), [[0, 10]], 10),
]);

await page.waitForSelector(`#thumbnailsView.isDragging`, {
hidden: true,
});
await waitAndClick(
page,
`.thumbnail:has(${getThumbnailSelector(1)}) input`
);
await waitAndClick(page, "#viewsManagerStatusActionButton");
await waitAndClick(page, "#viewsManagerStatusActionCopy");

// If dragging isn't disabled, the promise will resolve with the
// selector. Otherwise, it will resolve with undefined (dragAndDrop
// has no return), which is the expected behavior.
const abortController = new AbortController();
const first = await Promise.race([
page.waitForSelector(`#thumbnailsView.isDragging`, {
visible: true,
signal: abortController.signal,
}),
dragAndDrop(page, getThumbnailSelector(1), [[0, 10]], 10),
]);
abortController.abort();

expect(first)
.withContext(
`In ${browserName}, dragging should be disabled when pasting`
)
.toBeUndefined();
})
);
});
});
});
25 changes: 11 additions & 14 deletions web/pdf_thumbnail_viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ class PDFThumbnailViewer {

#undoCloseButton = null;

#isInPasteMode = false;

/**
* @param {PDFThumbnailViewerOptions} options
*/
Expand Down Expand Up @@ -525,6 +527,7 @@ class PDFThumbnailViewer {
}

#updateThumbnails(currentPageNumber) {
this.#resetCurrentThumbnail(0);
let newCurrentPageNumber = 0;
const pagesMapper = this.#pagesMapper;
const prevThumbnails = (this.#savedThumbnails = this._thumbnails);
Expand Down Expand Up @@ -658,13 +661,13 @@ class PDFThumbnailViewer {
const newIndex = lastDraggedOverIndex + 1;
const pagesToMove = Array.from(selectedPages).sort((a, b) => a - b);
const pagesMapper = this.#pagesMapper;
let currentPageNumber = isNaN(this.#pageNumberToRemove)
const currentPageNumber = isNaN(this.#pageNumberToRemove)
? pagesToMove[0]
: this.#pageNumberToRemove;

pagesMapper.movePages(selectedPages, pagesToMove, newIndex);

currentPageNumber = this.#updateThumbnails(currentPageNumber);
this.#updateCurrentPage(this.#updateThumbnails(currentPageNumber));
this.#computeThumbnailsPosition();

selectedPages.clear();
Expand All @@ -676,8 +679,6 @@ class PDFThumbnailViewer {
pagesMapper,
type: "move",
});

this.#updateCurrentPage(currentPageNumber);
}

if (!isNaN(this.#pageNumberToRemove)) {
Expand All @@ -695,7 +696,6 @@ class PDFThumbnailViewer {

#updateCurrentPage(currentPageNumber) {
setTimeout(() => {
this.#resetCurrentThumbnail(0);
this.forceRendering();
const newPageNumber = currentPageNumber || 1;
this.linkService.goToPage(newPageNumber);
Expand Down Expand Up @@ -765,6 +765,7 @@ class PDFThumbnailViewer {
}

#togglePasteMode(enable) {
this.#isInPasteMode = enable;
if (enable) {
this.container.classList.add("pasteMode");
for (const thumbnail of this._thumbnails) {
Expand Down Expand Up @@ -822,14 +823,14 @@ class PDFThumbnailViewer {
this.#toggleMenuEntries(true);

const pagesMapper = this.#pagesMapper;
let currentPageNumber = this.#copiedPageNumbers.includes(
const currentPageNumber = this.#copiedPageNumbers.includes(
this._currentPageNumber
)
? 0
: this._currentPageNumber;

pagesMapper.pastePages(index);
currentPageNumber = this.#updateThumbnails(currentPageNumber);
this.#updateCurrentPage(this.#updateThumbnails(currentPageNumber));

this.eventBus.dispatch("pagesedited", {
source: this,
Expand All @@ -842,8 +843,6 @@ class PDFThumbnailViewer {
this.#isCut = false;
this.#updateMenuEntries();
this.#updateStatus("select");

this.#updateCurrentPage(currentPageNumber);
}

#deletePages(type = "delete") {
Expand All @@ -855,15 +854,15 @@ class PDFThumbnailViewer {
this.#updateStatus("delete");
}
const pagesMapper = this.#pagesMapper;
let currentPageNumber = selectedPages.has(this._currentPageNumber)
const currentPageNumber = selectedPages.has(this._currentPageNumber)
? 0
: this._currentPageNumber;
const pagesToDelete = (this.#deletedPageNumbers = Uint32Array.from(
selectedPages
).sort((a, b) => a - b));

pagesMapper.deletePages(pagesToDelete);
currentPageNumber = this.#updateThumbnails(currentPageNumber);
this.#updateCurrentPage(this.#updateThumbnails(currentPageNumber));
selectedPages.clear();
this.#updateMenuEntries();

Expand All @@ -873,8 +872,6 @@ class PDFThumbnailViewer {
pageNumbers: pagesToDelete,
type,
});

this.#updateCurrentPage(currentPageNumber);
}

#updateMenuEntries() {
Expand Down Expand Up @@ -1224,7 +1221,7 @@ class PDFThumbnailViewer {
} = e;
if (
e.button !== 0 || // Skip right click.
this.#pagesMapper.copiedPageNumbers?.length > 0 ||
this.#isInPasteMode ||
!isNaN(this.#lastDraggedOverIndex) ||
!draggedImage.classList.contains("thumbnailImageContainer")
) {
Expand Down