Clear pointer type outside of the DrawingEditor to always keep the same, until the user changes the mode.

Author: legraina

src/display/editor/draw.js

@@ -820,7 +820,6 @@ class DrawingEditor extends AnnotationEditor {
       this._currentParent = null;
       DrawingEditor.#currentDraw = null;
       DrawingEditor.#currentDrawingOptions = null;
-      CurrentPointers.clearPointerType();
       CurrentPointers.clearTimeStamp();
     }
 

src/display/editor/tools.js

@@ -1877,13 +1877,16 @@ class AnnotationEditorUIManager {
    *   edit mode.
    * @param {boolean} [editComment] - true if the mode change is due to a
    *   comment edit.
+   * @param {boolean} [isFromEvent] - true if the mode change is due to an event
+   * (e.g. toolbar button clicked).
    */
   async updateMode(
     mode,
     editId = null,
     isFromKeyboard = false,
     mustEnterInEditMode = false,
-    editComment = false
+    editComment = false,
+    isFromEvent = false
   ) {
     if (this.#mode === mode) {
       return;
@@ -1921,6 +1924,10 @@ class AnnotationEditorUIManager {
     if (mode === AnnotationEditorType.SIGNATURE) {
       await this.#signatureManager?.loadSignatures();
     }
+    if (isFromEvent) {
+      // reinitialize the pointer type when mode changed by an event
+      CurrentPointers.clearPointerType();
+    }
 
     this.setEditingState(true);
     await this.#enableAll();