Backmerge: #5725 - Cursor position is incorrect when editing sequence in Macro mode

ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-edit.spec.ts

@@ -185,7 +185,6 @@ test.describe('Sequence edit mode', () => {
       .first()
       .click({ button: 'right' });
     await page.getByTestId('edit_sequence').click();
-    await page.keyboard.press('ArrowRight');
     await enterSequence(page, 'u');
     await page.keyboard.press('Escape');
     await takeEditorScreenshot(page);
@@ -208,7 +207,6 @@ test.describe('Sequence edit mode', () => {
       .first()
       .click({ button: 'right' });
     await page.getByTestId('edit_sequence').click();
-    await page.keyboard.press('ArrowRight');
     await enterSequence(page, 'u');
     await page.keyboard.press('Escape');
     await takeEditorScreenshot(page);
@@ -227,6 +225,7 @@ test.describe('Sequence edit mode', () => {
     await openFileAndAddToCanvasMacro('KET/atuc.ket', page);
     await takeEditorScreenshot(page);
     await clickOnSequenceSymbol(page, 'T', { button: 'right' });
+    await page.keyboard.press('ArrowLeft');
     await page.getByTestId('edit_sequence').click();
     await enterSequence(page, 'u');
     await takeEditorScreenshot(page);
@@ -247,7 +246,6 @@ test.describe('Sequence edit mode', () => {
       .first()
       .click({ button: 'right' });
     await page.getByTestId('edit_sequence').click();
-    await page.keyboard.press('ArrowRight');
     await enterSequence(page, 'u');
     await page.keyboard.press('Escape');
     await selectSnakeLayoutModeTool(page);

ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts

@@ -74,6 +74,7 @@ test.describe('Sequence mode selection for edit mode', () => {
     await scrollDown(page, SCROLL_DOWN_VALUE);
     await getSequenceSymbolLocator(page, 'G').click({ button: 'right' });
     await page.getByTestId('edit_sequence').click();
+    await page.keyboard.press('ArrowLeft');
   });
 
   test('Select letters with LClick+drag', async ({ page }) => {

ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts

@@ -537,6 +537,7 @@ test.describe('Sequence Mode', () => {
       .first()
       .click({ button: 'right' });
     await page.getByTestId('edit_sequence').click();
+    await page.keyboard.press('ArrowLeft');
     await page.keyboard.press('Delete');
     await page.keyboard.press('Backspace');
     await selectFlexLayoutModeTool(page);
@@ -558,6 +559,7 @@ test.describe('Sequence Mode', () => {
       .first()
       .click({ button: 'right' });
     await page.getByTestId('edit_sequence').click();
+    await page.keyboard.press('ArrowLeft');
     await page.keyboard.press('Backspace');
     await selectFlexLayoutModeTool(page);
     await takeEditorScreenshot(page);

packages/ketcher-core/src/application/editor/modes/SequenceMode.ts

@@ -131,7 +131,7 @@ export class SequenceMode extends BaseMode {
     this.isEditMode = true;
     this.initialize(false, needToRemoveSelection);
     if (sequenceItemRenderer) {
-      SequenceRenderer.setCaretPositionByMonomer(
+      SequenceRenderer.setCaretPositionNextToMonomer(
         sequenceItemRenderer.node.monomer,
       );
     }

packages/ketcher-core/src/application/render/renderers/sequence/SequenceRenderer.ts

@@ -365,6 +365,22 @@ export class SequenceRenderer {
     this.setCaretPosition(newCaretPosition);
   }
 
+  public static setCaretPositionNextToMonomer(monomer: BaseMonomer) {
+    let newCaretPosition = -1;
+
+    SequenceRenderer.forEachNode(({ node, nodeIndexOverall }) => {
+      if (node.monomer === monomer) {
+        newCaretPosition = nodeIndexOverall;
+      }
+    });
+
+    if (newCaretPosition === -1) {
+      return;
+    }
+
+    this.setCaretPosition(newCaretPosition + 1);
+  }
+
   public static setCaretPositionByNode(nodeToCompare: SubChainNode) {
     let newCaretPosition = -1;