From 764c2e639cb4aaa52013ca9734ace03a17386d53 Mon Sep 17 00:00:00 2001
From: Calixte Denizet <calixte.denizet@gmail.com>
Date: Mon, 15 Sep 2025 21:26:23 +0200
Subject: [PATCH] [Editor] Fix the position of the comment popup and its dialog

Only fix the popup position if the user didn't change it.
And don't adjust the dialog position since it should have the same as the popup.
---
 src/display/annotation_layer.js |  4 ++++
 src/display/editor/comment.js   |  4 ++++
 src/display/editor/editor.js    |  4 ++++
 web/comment_manager.js          | 30 +++++++++---------------------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/display/annotation_layer.js b/src/display/annotation_layer.js
index 11217c1d7..027ad2b6f 100644
--- a/src/display/annotation_layer.js
+++ b/src/display/annotation_layer.js
@@ -2555,6 +2555,10 @@ class PopupElement {
     this.#popupPosition = pos;
   }
 
+  hasDefaultPopupPosition() {
+    return this.#popupPosition === null;
+  }
+
   get commentButtonPosition() {
     return this.#commentButtonPosition;
   }
diff --git a/src/display/editor/comment.js b/src/display/editor/comment.js
index 733247d89..caa13a5bb 100644
--- a/src/display/editor/comment.js
+++ b/src/display/editor/comment.js
@@ -111,6 +111,10 @@ class Comment {
     this.#popupPosition = pos;
   }
 
+  hasDefaultPopupPosition() {
+    return this.#popupPosition === null;
+  }
+
   removeStandaloneCommentButton() {
     this.#commentStandaloneButton?.remove();
     this.#commentStandaloneButton = null;
diff --git a/src/display/editor/editor.js b/src/display/editor/editor.js
index 8f28c67b6..f4c87425f 100644
--- a/src/display/editor/editor.js
+++ b/src/display/editor/editor.js
@@ -1953,6 +1953,10 @@ class AnnotationEditor {
     this.#comment.commentPopupPositionInLayer = pos;
   }
 
+  hasDefaultPopupPosition() {
+    return this.#comment.hasDefaultPopupPosition();
+  }
+
   get commentButtonWidth() {
     return this.#comment.commentButtonWidth;
   }
diff --git a/web/comment_manager.js b/web/comment_manager.js
index 6e322b168..f0683eaf0 100644
--- a/web/comment_manager.js
+++ b/web/comment_manager.js
@@ -46,7 +46,7 @@ class CommentManager {
       dateStyle: "long",
     });
     this.dialogElement = commentDialog.dialog;
-    this.#dialog = new CommentDialog(commentDialog, overlayManager, ltr);
+    this.#dialog = new CommentDialog(commentDialog, overlayManager);
     this.#popup = new CommentPopup(dateFormat, ltr, this.dialogElement);
     this.#sidebar = new CommentSidebar(
       sidebar,
@@ -572,19 +572,15 @@ class CommentDialog {
 
   #dialogY = 0;
 
-  #isLTR;
-
   constructor(
     { dialog, toolbar, title, textInput, cancelButton, saveButton },
-    overlayManager,
-    ltr
+    overlayManager
   ) {
     this.#dialog = dialog;
     this.#textInput = textInput;
     this.#overlayManager = overlayManager;
     this.#saveButton = saveButton;
     this.#title = title;
-    this.#isLTR = ltr;
 
     const finishBound = this.#finish.bind(this);
     dialog.addEventListener("close", finishBound);
@@ -686,17 +682,6 @@ class CommentDialog {
     }
     this.#uiManager?.removeEditListeners();
     this.#saveButton.disabled = true;
-    const parentDimensions = options?.parentDimensions;
-    if (
-      parentDimensions &&
-      ((this.#isLTR &&
-        posX + this._dialogWidth >
-          parentDimensions.x + parentDimensions.width) ||
-        (!this.#isLTR && posX - this._dialogWidth < parentDimensions.x))
-    ) {
-      const buttonWidth = this.#editor.commentButtonWidth;
-      posX -= this._dialogWidth - buttonWidth * parentDimensions.width;
-    }
 
     this.#setPosition(posX, posY);
 
@@ -903,7 +888,7 @@ class CommentPopup {
           this.#setPosition(
             this.#posX + (x - this.#prevDragX) / parentWidth,
             this.#posY + (y - this.#prevDragY) / parentHeight,
-            /* isDragging = */ true
+            /* correctPosition = */ false
           );
           this.#prevDragX = x;
           this.#prevDragY = y;
@@ -1019,7 +1004,10 @@ class CommentPopup {
     this.#time.textContent = this.#dateFormat.format(
       PDFDateString.toDateObject(modificationDate || creationDate)
     );
-    this.#setPosition(...editor.commentPopupPosition);
+    this.#setPosition(
+      ...editor.commentPopupPosition,
+      /* correctPosition = */ editor.hasDefaultPopupPosition()
+    );
     editor.elementBeforePopup.after(container);
     container.addEventListener(
       "focus",
@@ -1033,8 +1021,8 @@ class CommentPopup {
     }
   }
 
-  #setPosition(x, y, isDragging = false) {
-    if (isDragging) {
+  #setPosition(x, y, correctPosition = true) {
+    if (!correctPosition) {
       this.#editor.commentPopupPosition = [x, y];
     } else {
       const widthRatio =