Cursor position after adding preset in sequence mode causes an incorr…

…ect sequence formation (#6436)
epam · Feb 6, 2025 · b332258 · b332258
1 parent 5bf9f53
commit b332258
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/packages/ketcher-core/src/application/editor/modes/SequenceMode.ts b/packages/ketcher-core/src/application/editor/modes/SequenceMode.ts
@@ -1676,7 +1676,6 @@ 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 (this.isSelectionsContainAntisenseChains(selections)) {
@@ -1760,11 +1759,6 @@ export class SequenceMode extends BaseMode {
       );
       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
@@ -468,8 +468,8 @@ export class SequenceRenderer {
 
     SequenceRenderer.forEachNode(({ twoStrandedNode, nodeIndexOverall }) => {
       if (
-        twoStrandedNode.senseNode?.monomer === monomer ||
-        twoStrandedNode.antisenseNode?.monomer === monomer
+        twoStrandedNode.senseNode?.monomers.includes(monomer) ||
+        twoStrandedNode.antisenseNode?.monomers.includes(monomer)
       ) {
         newCaretPosition = nodeIndexOverall;
       }
@@ -483,8 +483,8 @@ export class SequenceRenderer {
 
     SequenceRenderer.forEachNode(({ twoStrandedNode, nodeIndexOverall }) => {
       if (
-        twoStrandedNode.senseNode?.monomer === monomer ||
-        twoStrandedNode.antisenseNode?.monomer === monomer
+        twoStrandedNode.senseNode?.monomers.includes(monomer) ||
+        twoStrandedNode.antisenseNode?.monomers.includes(monomer)
       ) {
         newCaretPosition = nodeIndexOverall;
       }
@@ -1154,8 +1154,8 @@ export class SequenceRenderer {
 
     SequenceRenderer.forEachNode(({ twoStrandedNode }) => {
       if (
-        twoStrandedNode.senseNode?.monomer === monomer ||
-        twoStrandedNode.antisenseNode?.monomer === monomer
+        twoStrandedNode.senseNode?.monomers.includes(monomer) ||
+        twoStrandedNode.antisenseNode?.monomers.includes(monomer)
       ) {
         rendererToReturn =
           twoStrandedNode.senseNode?.renderer ||