1 files changed, 24 insertions, 8 deletions
diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index ea2e3e196..59d120974 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -3,7 +3,7 @@ import { SelectionManager } from "../util/SelectionManager";
 import { CollectionDockingView } from "./collections/CollectionDockingView";
 import { MainView } from "./MainView";
 import { DragManager } from "../util/DragManager";
-import { action } from "mobx";
+import { action, runInAction } from "mobx";
 import { Doc } from "../../new_fields/Doc";
 import { CognitiveServices } from "../cognitive_services/CognitiveServices";
 import DictationManager from "../util/DictationManager";
@@ -62,7 +62,8 @@ export default class KeyManager {
     private unmodified = action((keyname: string, e: KeyboardEvent) => {
         switch (keyname) {
             case "escape":
-                if (MainView.Instance.isPointerDown) {
+                let main = MainView.Instance;
+                if (main.isPointerDown) {
                     DragManager.AbortDrag();
                 } else {
                     if (CollectionDockingView.Instance.HasFullScreen()) {
@@ -71,8 +72,12 @@ export default class KeyManager {
                         SelectionManager.DeselectAll();
                     }
                 }
-                MainView.Instance.toggleColorPicker(true);
+                main.toggleColorPicker(true);
                 SelectionManager.DeselectAll();
+                DictationManager.Instance.stop();
+                main.dictationOverlayVisible = false;
+                main.dictationSuccess = undefined;
+                main.overlayTimeout && clearTimeout(main.overlayTimeout);
                 break;
             case "delete":
             case "backspace":
@@ -106,13 +111,24 @@ export default class KeyManager {
 
         switch (keyname) {
             case " ":
-                let transcript = await DictationManager.Instance.listen();
-                console.log(`I heard${transcript ? `: ${transcript.toLowerCase()}` : " nothing: I thought I was still listening from an earlier session."}`);
-                let command: ContextMenuProps | undefined;
-                transcript && (command = ContextMenu.Instance.findByDescription(transcript, true)) && "event" in command && command.event();
+                let main = MainView.Instance;
+                main.dictationOverlayVisible = true;
+                main.isListening = true;
+                let manager = DictationManager.Instance;
+                let command = await manager.listen();
+                main.isListening = false;
+                if (!command) {
+                    break;
+                }
+                command = command.toLowerCase();
+                main.dictatedPhrase = command;
+                main.dictationSuccess = await manager.execute(command);
+                main.overlayTimeout = setTimeout(() => {
+                    main.dictationOverlayVisible = false;
+                    main.dictationSuccess = undefined;
+                }, 3000);
                 stopPropagation = true;
                 preventDefault = true;
-                break;
         }
 
         return {