Merge pull request #4466 from epam/4369-del-button-works-as-backspace…

…-button-that-is-wrong Backmerge: #4369 - Del button works as Backspace button that is wrong
epam · Apr 16, 2024 · ca3b83f · ca3b83f
2 parents 0bb94c6 + d761100
commit ca3b83f
Showing 1 changed file with 61 additions and 48 deletions.
diff --git a/packages/ketcher-core/src/application/editor/modes/SequenceMode.ts b/packages/ketcher-core/src/application/editor/modes/SequenceMode.ts
@@ -41,6 +41,11 @@ const naturalAnalogues = uniq([
   ...peptideNaturalAnalogues,
 ]);
 
+enum Direction {
+  Left = 'left',
+  Right = 'right',
+}
+
 export class SequenceMode extends BaseMode {
   private _isEditMode = false;
   private _isEditInRNABuilderMode = false;
@@ -541,57 +546,65 @@ export class SequenceMode extends BaseMode {
   }
 
   get keyboardEventHandlers() {
-    return {
-      delete: {
-        shortcut: ['Backspace', 'Delete'],
-        handler: () => {
-          if (!this.isEditMode) {
-            return;
-          }
-          const editor = CoreEditor.provideEditorInstance();
-          const previousNode = SequenceRenderer.previousNode;
-          const previousCaretPosition = SequenceRenderer.caretPosition;
-          const selections = SequenceRenderer.selections;
-          const modelChanges = new Command();
-          let nodesToDelete: NodesSelection;
-
-          if (selections.length) {
-            modelChanges.merge(this.deleteSelectedDrawingEntities());
-            nodesToDelete = selections;
-          } else if (previousNode) {
-            previousNode.monomers.forEach((monomer) => {
-              modelChanges.merge(
-                editor.drawingEntitiesManager.deleteMonomer(monomer),
-              );
-            });
-            nodesToDelete = [
-              [
-                {
-                  node: previousNode,
-                  nodeIndexOverall:
-                    SequenceRenderer.previousCaretPosition as number,
-                },
-              ],
-            ];
-          } else {
-            return;
-          }
+    const deleteNode = (direction: Direction) => {
+      const editor = CoreEditor.provideEditorInstance();
+      const nodeToDelete =
+        direction === Direction.Left
+          ? SequenceRenderer.previousNode
+          : SequenceRenderer.getNodeByPointer(SequenceRenderer.caretPosition);
+      const caretPosition =
+        direction === Direction.Left
+          ? (SequenceRenderer.previousCaretPosition as number)
+          : SequenceRenderer.caretPosition;
+      const selections = SequenceRenderer.selections;
+      const modelChanges = new Command();
+      let nodesToDelete: NodesSelection;
+
+      if (selections.length) {
+        modelChanges.merge(this.deleteSelectedDrawingEntities());
+        nodesToDelete = selections;
+      } else if (nodeToDelete) {
+        nodeToDelete.monomers.forEach((monomer) => {
+          modelChanges.merge(
+            editor.drawingEntitiesManager.deleteMonomer(monomer),
+          );
+        });
+        nodesToDelete = [
+          [
+            {
+              node: nodeToDelete,
+              nodeIndexOverall: caretPosition,
+            },
+          ],
+        ];
+      } else {
+        return;
+      }
 
-          modelChanges.merge(this.handleNodesDeletion(nodesToDelete));
+      modelChanges.merge(this.handleNodesDeletion(nodesToDelete));
 
-          this.finishNodesDeletion(
-            modelChanges,
-            previousCaretPosition,
-            nodesToDelete[0][0].nodeIndexOverall,
-          );
+      this.finishNodesDeletion(
+        modelChanges,
+        nodesToDelete[0][0].nodeIndexOverall,
+        nodesToDelete[0][0].nodeIndexOverall,
+      );
 
-          if (
-            SequenceRenderer.caretPosition === 0 &&
-            SequenceRenderer.chainsCollection.chains.length === 0
-          ) {
-            this.startNewSequence();
-          }
-        },
+      if (
+        SequenceRenderer.caretPosition === 0 &&
+        SequenceRenderer.chainsCollection.chains.length === 0
+      ) {
+        this.startNewSequence();
+      }
+    };
+
+    return {
+      delete: {
+        shortcut: ['Delete'],
+        handler: () => deleteNode(Direction.Right),
+      },
+      backspace: {
+        shortcut: ['Backspace'],
+        handler: () => deleteNode(Direction.Left),
       },
       'turn-off-edit-mode': {
         shortcut: ['Escape'],