merged

1 files changed, 18 insertions, 2 deletions

diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index e467d7c61..0d95bb96c 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -1,4 +1,4 @@
-import { UndoManager } from "../util/UndoManager";
+import { UndoManager, undoBatch } from "../util/UndoManager";
 import { SelectionManager } from "../util/SelectionManager";
 import { CollectionDockingView } from "./collections/CollectionDockingView";
 import { MainView } from "./MainView";
@@ -13,7 +13,7 @@ type KeyControlInfo = {
 };
 
 export default class KeyManager {
-    public static Handler: KeyManager = new KeyManager();
+    public static Instance: KeyManager = new KeyManager();
     private router = new Map<string, KeyHandler>();
 
     constructor() {
@@ -65,6 +65,15 @@ export default class KeyManager {
                         SelectionManager.DeselectAll();
                     }
                 }
+                MainView.Instance.toggleColorPicker(true);
+                break;
+            case "delete":
+            case "backspace":
+                SelectionManager.SelectedDocuments().map(docView => {
+                    let doc = docView.props.Document;
+                    let remove = docView.props.removeDocument;
+                    remove && remove(doc);
+                });
                 break;
         }
 
@@ -118,6 +127,13 @@ export default class KeyManager {
             case "z":
                 UndoManager.Undo();
                 break;
+            case "a":
+            case "c":
+            case "v":
+            case "x":
+                stopPropagation = false;
+                preventDefault = false;
+                break;
         }
 
         return {