#5231 - Canvas should remain in edit mode if we insert monomer from t…

…he library (#6146)
epam · Dec 13, 2024 · 658a284 · 658a284
1 parent 892fe60
commit 658a284
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 6 deletions.
diff --git a/...at-preview-tooltip-for-Base-type-of-monomer-in-the-library-1-chromium-linux.png b/...at-preview-tooltip-for-Base-type-of-monomer-in-the-library-1-chromium-linux.png
diff --git a/...at-preview-tooltip-for-CHEM-type-of-monomer-in-the-library-1-chromium-linux.png b/...at-preview-tooltip-for-CHEM-type-of-monomer-in-the-library-1-chromium-linux.png
diff --git a/...view-tooltip-for-Nucleotide-type-of-monomer-in-the-library-1-chromium-linux.png b/...view-tooltip-for-Nucleotide-type-of-monomer-in-the-library-1-chromium-linux.png
diff --git a/...preview-tooltip-for-Peptide-type-of-monomer-in-the-library-1-chromium-linux.png b/...preview-tooltip-for-Peptide-type-of-monomer-in-the-library-1-chromium-linux.png
diff --git a/...eview-tooltip-for-Phosphate-type-of-monomer-in-the-library-1-chromium-linux.png b/...eview-tooltip-for-Phosphate-type-of-monomer-in-the-library-1-chromium-linux.png
diff --git a/...t-preview-tooltip-for-Sugar-type-of-monomer-in-the-library-1-chromium-linux.png b/...t-preview-tooltip-for-Sugar-type-of-monomer-in-the-library-1-chromium-linux.png
diff --git a/packages/ketcher-core/src/application/editor/modes/SequenceMode.ts b/packages/ketcher-core/src/application/editor/modes/SequenceMode.ts
@@ -847,12 +847,7 @@ export class SequenceMode extends BaseMode {
           ),
         ],
         handler: (event) => {
-          if (
-            SequenceRenderer.chainsCollection.length === 1 &&
-            SequenceRenderer.chainsCollection.firstNode instanceof
-              EmptySequenceNode &&
-            !this.isEditMode
-          ) {
+          if (SequenceRenderer.isEmptyCanvas() && !this.isEditMode) {
             this.turnOnEditMode();
             SequenceRenderer.setCaretPosition(0);
           }
@@ -1393,6 +1388,7 @@ export class SequenceMode extends BaseMode {
     const history = new EditorHistory(editor);
     const modelChanges = new Command();
     const selections = SequenceRenderer.selections;
+    const wasCanvasEmptyBeforeInsertion = SequenceRenderer.isEmptyCanvas();
 
     if (selections.length > 0) {
       if (
@@ -1465,6 +1461,11 @@ export class SequenceMode extends BaseMode {
       SequenceRenderer.moveCaretForward();
       history.update(modelChanges);
     }
+
+    if (wasCanvasEmptyBeforeInsertion) {
+      this.turnOnEditMode();
+      SequenceRenderer.moveCaretForward();
+    }
   }
 
   private createRnaPresetNode(preset: IRnaPreset, position: Vec2) {

diff --git a/packages/ketcher-core/src/application/render/renderers/sequence/SequenceRenderer.ts b/packages/ketcher-core/src/application/render/renderers/sequence/SequenceRenderer.ts
@@ -938,4 +938,11 @@ export class SequenceRenderer {
     newSequenceButton.show();
     this.newSequenceButtons.push(newSequenceButton);
   }
+
+  public static isEmptyCanvas() {
+    return (
+      SequenceRenderer.chainsCollection.length === 1 &&
+      SequenceRenderer.chainsCollection.firstNode instanceof EmptySequenceNode
+    );
+  }
 }