keyhandler fixes and global pointer down in mainview

1 files changed, 9 insertions, 5 deletions

diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index 95a367cea..ac1c33c71 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -4,7 +4,6 @@ import { CollectionDockingView } from "./collections/CollectionDockingView";
 import { MainView } from "./MainView";
 import { DragManager } from "../util/DragManager";
 import { action } from "mobx";
-import { emptyFunction } from "../../Utils";
 
 const modifiers = ["control", "meta", "shift", "alt"];
 type KeyHandler = (keycode: string) => KeyControlInfo;
@@ -23,6 +22,8 @@ export default class KeyManager {
 
         let isMac = navigator.platform.toLowerCase().indexOf("mac") >= 0;
 
+        // SHIFT CONTROL ALT META
+
         this.router.set("0000", this.unmodified);
         this.router.set(isMac ? "0001" : "0100", this.ctrl);
         this.router.set(isMac ? "0100" : "0010", this.alt);
@@ -59,12 +60,15 @@ export default class KeyManager {
     private unmodified = action((keyname: string) => {
         switch (keyname) {
             case "escape":
-                if (CollectionDockingView.Instance.HasFullScreen()) {
-                    CollectionDockingView.Instance.CloseFullScreen();
+                if (this.mainView.isPointerDown) {
+                    DragManager.AbortDrag();
                 } else {
-                    SelectionManager.DeselectAll();
+                    if (CollectionDockingView.Instance.HasFullScreen()) {
+                        CollectionDockingView.Instance.CloseFullScreen();
+                    } else {
+                        SelectionManager.DeselectAll();
+                    }
                 }
-                DragManager.AbortDrag();
                 break;
         }