mirror of
https://github.com/mozilla/pdf.js.git
synced 2025-04-22 16:18:08 +02:00
[Editor] Disable existing highlights when drawing a new one (bug 1879035)
When the mouse was hovering an existing highlight, all the text in the page was selected. So when the user is selecting some text or drawing a free highlight, the mouse is disabled for the existing editors.
This commit is contained in:
parent
df5bc544df
commit
4e7c30da9a
4 changed files with 172 additions and 14 deletions
|
@ -230,6 +230,10 @@ class AnnotationEditorLayer {
|
|||
this.#uiManager.addCommands(params);
|
||||
}
|
||||
|
||||
toggleDrawing(enabled = false) {
|
||||
this.div.classList.toggle("drawing", !enabled);
|
||||
}
|
||||
|
||||
togglePointerEvents(enabled = false) {
|
||||
this.div.classList.toggle("disabled", !enabled);
|
||||
}
|
||||
|
@ -388,7 +392,12 @@ class AnnotationEditorLayer {
|
|||
// Unselect all the editors in order to let the user select some text
|
||||
// without being annoyed by an editor toolbar.
|
||||
this.#uiManager.unselectAll();
|
||||
if (event.target === this.#textLayer.div) {
|
||||
const { target } = event;
|
||||
if (
|
||||
target === this.#textLayer.div ||
|
||||
(target.classList.contains("endOfContent") &&
|
||||
this.#textLayer.div.contains(target))
|
||||
) {
|
||||
const { isMac } = FeatureTest.platform;
|
||||
if (event.button !== 0 || (event.ctrlKey && isMac)) {
|
||||
// Do nothing on right click.
|
||||
|
@ -400,6 +409,7 @@ class AnnotationEditorLayer {
|
|||
/* updateButton = */ true
|
||||
);
|
||||
this.#textLayer.div.classList.add("free");
|
||||
this.toggleDrawing();
|
||||
HighlightEditor.startHighlighting(
|
||||
this,
|
||||
this.#uiManager.direction === "ltr",
|
||||
|
@ -409,6 +419,7 @@ class AnnotationEditorLayer {
|
|||
"pointerup",
|
||||
() => {
|
||||
this.#textLayer.div.classList.remove("free");
|
||||
this.toggleDrawing(true);
|
||||
},
|
||||
{ once: true, signal: this.#uiManager._signal }
|
||||
);
|
||||
|
|
|
@ -967,6 +967,19 @@ class AnnotationEditorUIManager {
|
|||
: anchorNode;
|
||||
}
|
||||
|
||||
#getLayerForTextLayer(textLayer) {
|
||||
const { currentLayer } = this;
|
||||
if (currentLayer.hasTextLayer(textLayer)) {
|
||||
return currentLayer;
|
||||
}
|
||||
for (const layer of this.#allLayers.values()) {
|
||||
if (layer.hasTextLayer(textLayer)) {
|
||||
return layer;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
highlightSelection(methodOfCreation = "") {
|
||||
const selection = document.getSelection();
|
||||
if (!selection || selection.isCollapsed) {
|
||||
|
@ -988,19 +1001,17 @@ class AnnotationEditorUIManager {
|
|||
});
|
||||
this.showAllEditors("highlight", true, /* updateButton = */ true);
|
||||
}
|
||||
for (const layer of this.#allLayers.values()) {
|
||||
if (layer.hasTextLayer(textLayer)) {
|
||||
layer.createAndAddNewEditor({ x: 0, y: 0 }, false, {
|
||||
methodOfCreation,
|
||||
boxes,
|
||||
anchorNode,
|
||||
anchorOffset,
|
||||
focusNode,
|
||||
focusOffset,
|
||||
text,
|
||||
});
|
||||
break;
|
||||
}
|
||||
const layer = this.#getLayerForTextLayer(textLayer);
|
||||
if (layer) {
|
||||
layer.createAndAddNewEditor({ x: 0, y: 0 }, false, {
|
||||
methodOfCreation,
|
||||
boxes,
|
||||
anchorNode,
|
||||
anchorOffset,
|
||||
focusNode,
|
||||
focusOffset,
|
||||
text,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1062,6 +1073,7 @@ class AnnotationEditorUIManager {
|
|||
}
|
||||
return;
|
||||
}
|
||||
|
||||
this.#highlightToolbar?.hide();
|
||||
this.#selectedTextNode = anchorNode;
|
||||
this.#dispatchUpdateStates({
|
||||
|
@ -1081,12 +1093,19 @@ class AnnotationEditorUIManager {
|
|||
|
||||
this.#highlightWhenShiftUp = this.isShiftKeyDown;
|
||||
if (!this.isShiftKeyDown) {
|
||||
const activeLayer =
|
||||
this.#mode === AnnotationEditorType.HIGHLIGHT
|
||||
? this.#getLayerForTextLayer(textLayer)
|
||||
: null;
|
||||
activeLayer?.toggleDrawing();
|
||||
|
||||
const signal = this._signal;
|
||||
const pointerup = e => {
|
||||
if (e.type === "pointerup" && e.button !== 0) {
|
||||
// Do nothing on right click.
|
||||
return;
|
||||
}
|
||||
activeLayer?.toggleDrawing(true);
|
||||
window.removeEventListener("pointerup", pointerup);
|
||||
window.removeEventListener("blur", pointerup);
|
||||
if (e.type === "pointerup") {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue