#4694 - Add Hotkeys in Macro mode similar to Micro mode

packages/ketcher-core/src/application/editor/Editor.ts

@@ -755,10 +755,10 @@ export class CoreEditor {
     this.events.pasteFromClipboard.add(() => {
       this.mode.onPaste();
     });
+
     this.events.deleteSelectedStructure.add(() => {
       if (this.mode instanceof SequenceMode) {
         this.mode.deleteSelection();
-
         return;
       }
 
@@ -772,6 +772,21 @@ export class CoreEditor {
         this.drawingEntitiesManager.selectedEntities.map((entity) => entity[1]),
       );
     });
+
+    this.events.deleteHoveredStructure.add(() => {
+      if (this.mode instanceof SequenceMode) {
+        this.mode.deleteSelection();
+        return;
+      }
+
+      const command = new Command();
+      const history = new EditorHistory(this);
+
+      command.merge(this.drawingEntitiesManager.deleteHoveredEntities());
+      history.update(command);
+      this.renderersContainer.update(command);
+    });
+
     this.events.modifyAminoAcids.add(
       ({ monomers, modificationType }: ModifyAminoAcidsHandlerParams) => {
         this.onModifyAminoAcids(monomers, modificationType);

packages/ketcher-core/src/application/editor/editorEvents.ts

@@ -63,6 +63,7 @@ export interface IEditorEvents {
   copySelectedStructure: Subscription;
   pasteFromClipboard: Subscription;
   deleteSelectedStructure: Subscription;
+  deleteHoveredStructure: Subscription;
   selectEntities: Subscription;
   toggleMacromoleculesPropertiesVisibility: Subscription;
   modifyAminoAcids: Subscription;
@@ -139,6 +140,7 @@ export function resetEditorEvents() {
     copySelectedStructure: new Subscription(),
     pasteFromClipboard: new Subscription(),
     deleteSelectedStructure: new Subscription(),
+    deleteHoveredStructure: new Subscription(),
     selectEntities: new Subscription(),
     toggleMacromoleculesPropertiesVisibility: new Subscription(),
     modifyAminoAcids: new Subscription(),
@@ -246,13 +248,25 @@ export const hotkeysConfiguration = {
       editor.onSelectHistory('redo');
     },
   },
+  'single-bond': {
+    shortcut: '1',
+    handler: (editor: CoreEditor) => {
+      editor.events.selectTool.dispatch([
+        ToolName.bondSingle,
+        { toolName: ToolName.bondSingle },
+      ]);
+    },
+  },
   erase: {
     shortcut: ['Delete', 'Backspace'],
     handler: (editor: CoreEditor) => {
       // TODO create an ability to stop event propagation from mode event handlers to keyboard shortcuts handlers
       if (editor.isSequenceEditMode) return;
       editor.events.selectTool.dispatch([ToolName.erase]);
       editor.events.selectTool.dispatch([ToolName.selectRectangle]);
+      if (editor.drawingEntitiesManager.hoveredEntities.length > 0) {
+        editor.events.deleteHoveredStructure.dispatch();
+      }
     },
   },
   clear: {

packages/ketcher-core/src/application/editor/tools/Erase.ts

@@ -18,6 +18,7 @@ import { BaseRenderer } from 'application/render/renderers/BaseRenderer';
 import { BaseTool } from 'application/editor/tools/Tool';
 import { BaseSequenceRenderer } from 'application/render/renderers/sequence/BaseSequenceRenderer';
 import { SequenceMode } from '../modes';
+import { Command } from 'domain/entities';
 
 class EraserTool implements BaseTool {
   private readonly history: EditorHistory;
@@ -29,7 +30,7 @@ class EraserTool implements BaseTool {
       !(this.editor.mode instanceof SequenceMode)
     ) {
       const modelChanges =
-        this.editor.drawingEntitiesManager.deleteSelectedEntities();
+        this.editor.drawingEntitiesManager.deleteSelectedEntities() as Command;
       modelChanges.merge(
         this.editor.drawingEntitiesManager.recalculateAntisenseChains(),
       );

packages/ketcher-core/src/domain/entities/DrawingEntitiesManager.ts

@@ -210,6 +210,12 @@ export class DrawingEntitiesManager {
     );
   }
 
+  public get hoveredEntities() {
+    return this.allEntities.filter(
+      ([, drawingEntity]) => drawingEntity.hovered,
+    );
+  }
+
   public get selectedMonomers() {
     return this.monomersArray.filter((monomer) => monomer.selected);
   }
@@ -298,6 +304,9 @@ export class DrawingEntitiesManager {
   }
 
   public deleteSelectedEntities() {
+    if (this.hoveredEntities.length !== 0) {
+      return new Command();
+    }
     const mergedCommand = new Command();
     this.selectedEntities.forEach(([, drawingEntity]) => {
       const command = this.deleteDrawingEntity(drawingEntity);
@@ -306,6 +315,15 @@ export class DrawingEntitiesManager {
     return mergedCommand;
   }
 
+  public deleteHoveredEntities() {
+    const mergedCommand = new Command();
+    this.hoveredEntities.forEach(([, drawingEntity]) => {
+      const command = this.deleteDrawingEntity(drawingEntity);
+      mergedCommand.merge(command);
+    });
+    return mergedCommand;
+  }
+
   public deleteAllEntities() {
     const mergedCommand = new Command();
     this.allEntities.forEach(([, drawingEntity]) => {

packages/ketcher-core/src/utilities/keynorm.ts

@@ -28,6 +28,7 @@ export const KeyboardModifiers = {
 export const KeyCodePrefixes = {
   Key: 'Key',
   Digit: 'Digit',
+  Numpad: 'Numpad',
 };
 
 export const CanonicalModifiersOrder = [
@@ -52,6 +53,9 @@ const normalizeCode = (code: string) => {
   if (code.startsWith(KeyCodePrefixes.Digit)) {
     return code.slice(5);
   }
+  if (code.startsWith(KeyCodePrefixes.Numpad)) {
+    return code.slice(6);
+  }
 
   return code;
 };

packages/ketcher-macromolecules/src/EditorEvents.tsx

@@ -366,6 +366,7 @@ export const EditorEvents = () => {
 
     const onMoveHandler = (e) => {
       handleClosePreview();
+
       const isLeftClick = e.buttons === 1;
       if (!isLeftClick || !noPreviewTools.includes(activeTool)) {
         handleOpenPreview(e);