Merge pull request #20343 from calixteman/bug1992832

[Editor] Make sure the editor is focused after the comment has been deleted (bug 1992832)

Author: calixteman

test/integration/comment_spec.mjs

@@ -699,5 +699,42 @@ describe("Comment", () => {
         })
       );
     });
+
+    it("must check that the focus is moved on the editor once the popup is deleted", async () => {
+      await Promise.all(
+        pages.map(async ([, page]) => {
+          await switchToHighlight(page);
+
+          await highlightSpan(page, 1, "Abstract");
+          const editorSelector = getEditorSelector(0);
+          await editComment(page, editorSelector, "Hello world!");
+
+          await waitAndClick(
+            page,
+            `${editorSelector} button.annotationCommentButton`
+          );
+
+          const popupSelector = "#commentPopup";
+          await page.waitForSelector(popupSelector, { visible: true });
+          const handle = await page.evaluateHandle(
+            sel => [
+              new Promise(resolve => {
+                document
+                  .querySelector(sel)
+                  .addEventListener("focusin", resolve, {
+                    once: true,
+                  });
+              }),
+            ],
+            editorSelector
+          );
+          await waitAndClick(
+            page,
+            `${popupSelector} button.commentPopupDelete`
+          );
+          await awaitPromise(handle);
+        })
+      );
+    });
   });
 });

web/comment_manager.js

@@ -1048,6 +1048,7 @@ class CommentPopup {
         },
       });
       this.#editor.comment = null;
+      this.#editor.focus();
       this.destroy();
     });
     del.addEventListener("contextmenu", noContextMenu);