Merge pull request #16567 from calixteman/issue16566

[Editor] Show hidden annotations once editing is finished

src/display/editor/annotation_editor_layer.js

@@ -215,14 +215,32 @@ class AnnotationEditorLayer {
   disable() {
     this.#isDisabling = true;
     this.div.style.pointerEvents = "none";
+    const hiddenAnnotationIds = new Set();
     for (const editor of this.#editors.values()) {
       editor.disableEditing();
       if (!editor.annotationElementId || editor.serialize() !== null) {
+        hiddenAnnotationIds.add(editor.annotationElementId);
         continue;
       }
       this.getEditableAnnotation(editor.annotationElementId)?.show();
       editor.remove();
     }
+
+    if (this.#annotationLayer) {
+      // Show the annotations that were hidden in enable().
+      const editables = this.#annotationLayer.getEditableAnnotations();
+      for (const editable of editables) {
+        const { id } = editable.data;
+        if (
+          hiddenAnnotationIds.has(id) ||
+          this.#uiManager.isDeletedAnnotationElement(id)
+        ) {
+          continue;
+        }
+        editable.show();
+      }
+    }
+
     this.#cleanup();
     if (this.isEmpty) {
       this.div.hidden = true;

test/integration/annotation_spec.js

@@ -471,4 +471,41 @@ describe("ResetForm action", () => {
       });
     });
   });
+
+  describe("Ink widget and its popup after editing", () => {
+    describe("annotation-caret-ink.pdf", () => {
+      let pages;
+
+      beforeAll(async () => {
+        pages = await loadAndWait(
+          "annotation-caret-ink.pdf",
+          "[data-annotation-id='25R']"
+        );
+      });
+
+      afterAll(async () => {
+        await closePages(pages);
+      });
+
+      it("must check that the annotation has a popup", async () => {
+        await Promise.all(
+          pages.map(async ([browserName, page]) => {
+            await page.waitForFunction(
+              `document.querySelector("[data-annotation-id='25R']").hidden === false`
+            );
+            await page.click("#editorFreeText");
+            await page.waitForTimeout(10);
+            await page.waitForFunction(
+              `document.querySelector("[data-annotation-id='25R']").hidden === true`
+            );
+            await page.click("#editorFreeText");
+            await page.waitForTimeout(10);
+            await page.waitForFunction(
+              `document.querySelector("[data-annotation-id='25R']").hidden === false`
+            );
+          })
+        );
+      });
+    });
+  });
 });