#2060 - fix redundant actions on mouse events when not over canvas

epam · Jan 10, 2023 · 838bf08 · 838bf08
1 parent 24e78e2
commit 838bf08
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/ketcher-react/src/script/editor/Editor.ts b/packages/ketcher-react/src/script/editor/Editor.ts
@@ -598,7 +598,7 @@ function isMouseRight(event) {
 }
 
 function resetSelectionOnCanvasClick(editor: Editor, eventName: string) {
-  if (eventName === 'mouseup') {
+  if (eventName === 'mouseup' && editor.selection()) {
     editor.selection(null)
   }
 }
@@ -645,7 +645,11 @@ function domEventSetup(editor: Editor, clientArea) {
       }
       const EditorTool = editor.tool()
       editor.lastEvent = event
-      if (EditorTool && eventName in EditorTool) {
+      if (
+        EditorTool &&
+        eventName in EditorTool &&
+        clientArea.contains(event.target)
+      ) {
         EditorTool[eventName](event)
         return true
       }