[Editor] Avoid to add a new ink editor when we aren't editing anymore

mozilla · Nov 27, 2023 · 1d5fc57 · 1d5fc57
1 parent b7e943b
commit 1d5fc57
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/display/editor/annotation_editor_layer.js b/src/display/editor/annotation_editor_layer.js
@@ -152,10 +152,12 @@ class AnnotationEditorLayer {
   }
 
   addInkEditorIfNeeded(isCommitting) {
-    if (
-      !isCommitting &&
-      this.#uiManager.getMode() !== AnnotationEditorType.INK
-    ) {
+    const mode = this.#uiManager.getMode();
+    if (mode === AnnotationEditorType.NONE) {
+      return;
+    }
+
+    if (!isCommitting && mode !== AnnotationEditorType.INK) {
       return;
     }
 

diff --git a/src/display/editor/tools.js b/src/display/editor/tools.js
@@ -1604,7 +1604,11 @@ class AnnotationEditorUIManager {
     if (this.#activeEditor) {
       // An editor is being edited so just commit it.
       this.#activeEditor.commitOrRemove();
-      return;
+      if (this.#mode !== AnnotationEditorType.NONE) {
+        // If the mode is NONE, we want to really unselect the editor, hence we
+        // mustn't return here.
+        return;
+      }
     }
 
     if (!this.hasSelection) {