Merge pull request #4385 from epam/4028-macro-when-monomers-are-selec…

…ted-del-and-backspace-hotkey-delete-selected-monomers-and-switches-to-erase-tool #4028 - Macro: When monomers are selected Del and Backspace hotkey delete selected monomers and switches to Erase tool
epam · Apr 2, 2024 · 9af6cf2 · 9af6cf2
1 parent c4110ef
commit 9af6cf2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-1-chromium-linux.png b/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-1-chromium-linux.png
diff --git a/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-2-chromium-linux.png b/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-2-chromium-linux.png
diff --git a/packages/ketcher-core/src/application/editor/editorEvents.ts b/packages/ketcher-core/src/application/editor/editorEvents.ts
@@ -90,6 +90,7 @@ export const hotkeysConfiguration = {
       // TODO create an ability to stop event propagation from mode event handlers to keyboard shortcuts handlers
       if (editor.isSequenceEditMode) return;
       editor.events.selectTool.dispatch('erase');
+      editor.events.selectTool.dispatch('select-rectangle');
     },
   },
   clear: {

diff --git a/packages/ketcher-macromolecules/src/Editor.tsx b/packages/ketcher-macromolecules/src/Editor.tsx
@@ -422,10 +422,23 @@ function MenuComponent() {
     } else if (!['zoom-in', 'zoom-out', 'zoom-reset'].includes(name)) {
       editor.events.selectTool.dispatch(name);
       if (name === 'clear') {
-        dispatch(selectTool('select-rectangle'));
-        editor.events.selectTool.dispatch('select-rectangle');
-      } else {
-        dispatch(selectTool(name));
+        if (
+          name === 'erase' &&
+          editor.drawingEntitiesManager.selectedEntities.length
+        ) {
+          dispatch(selectTool('select-rectangle'));
+          editor.events.selectTool.dispatch(name);
+          editor.events.selectTool.dispatch('select-rectangle');
+        } else {
+          dispatch(selectTool(name));
+          editor.events.selectTool.dispatch(name);
+          if (name === 'clear') {
+            dispatch(selectTool('select-rectangle'));
+            editor.events.selectTool.dispatch('select-rectangle');
+          } else {
+            dispatch(selectTool(name));
+          }
+        }
       }
     }
   };