#4533 - After inserting a nucleotide in the Text-editing mode, the cu…

…rsor blinks in the wrong place
epam · Dec 18, 2024 · 42ef3a8 · 42ef3a8
1 parent 02a8413
commit 42ef3a8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/packages/ketcher-core/src/application/editor/modes/SequenceMode.ts b/packages/ketcher-core/src/application/editor/modes/SequenceMode.ts
@@ -1040,8 +1040,7 @@ export class SequenceMode extends BaseMode {
     const currentSequence = SequenceRenderer.currentChain;
 
     const currentSequenceHasPhosphate =
-      currentSequence?.lastNonEmptyNode?.monomer?.monomerItem?.props?.Name ===
-      'Phosphate';
+      currentSequence?.lastNonEmptyNode?.monomer?.isPhosphate;
 
     let nextCaretPosition =
       SequenceRenderer.caretPosition + chainsCollection.length;
@@ -1050,6 +1049,13 @@ export class SequenceMode extends BaseMode {
       nextCaretPosition -= 1;
     }
 
+    const hasPhosphateAtChainEnd =
+      chainsCollection?.lastNode?.monomer?.isPhosphate;
+
+    if (!SequenceRenderer.isCaretAtChainEnd && hasPhosphateAtChainEnd) {
+      nextCaretPosition -= 1;
+    }
+
     const modelChanges = this.insertNewSequenceFragment(chainsCollection);
 
     modelChanges.addOperation(new ReinitializeModeOperation());

diff --git a/packages/ketcher-core/src/application/render/renderers/sequence/SequenceRenderer.ts b/packages/ketcher-core/src/application/render/renderers/sequence/SequenceRenderer.ts
@@ -945,4 +945,8 @@ export class SequenceRenderer {
       SequenceRenderer.chainsCollection.firstNode instanceof EmptySequenceNode
     );
   }
+
+  public static get isCaretAtChainEnd() {
+    return SequenceRenderer.currentEdittingNode instanceof EmptySequenceNode;
+  }
 }
diff --git a/packages/ketcher-core/src/domain/entities/BaseMonomer.ts b/packages/ketcher-core/src/domain/entities/BaseMonomer.ts
@@ -13,6 +13,7 @@ import assert from 'assert';
 import {
   IKetAttachmentPoint,
   IKetAttachmentPointType,
+  KetMonomerClass,
 } from 'application/formatters/types/ket';
 import { RnaSubChain } from 'domain/entities/monomer-chains/RnaSubChain';
 import { ChemSubChain } from 'domain/entities/monomer-chains/ChemSubChain';
@@ -329,6 +330,10 @@ export abstract class BaseMonomer extends DrawingEntity {
     return this.attachmentPointsToBonds[attachmentPointName] !== undefined;
   }
 
+  public get isPhosphate() {
+    return this.monomerItem?.props?.MonomerClass === KetMonomerClass.Phosphate;
+  }
+
   public get usedAttachmentPointsNamesList() {
     const list: AttachmentPointName[] = [];