final refactor and commenting

2 files changed, 23 insertions, 7 deletions

diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index b1ea92bb8..82289c249 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -74,7 +74,7 @@ export default class KeyManager {
                 DictationManager.Controls.stop();
                 main.dictationOverlayVisible = false;
                 main.dictationSuccess = undefined;
-                main.overlayTimeout && clearTimeout(main.overlayTimeout);
+                main.cancelDictationFade();
                 break;
             case "delete":
             case "backspace":
@@ -110,19 +110,19 @@ export default class KeyManager {
             case " ":
                 let main = MainView.Instance;
                 main.dictationOverlayVisible = true;
+
                 main.isListening = true;
                 let command = await DictationManager.Controls.listen((results: any) => console.log(results));
                 main.isListening = false;
+
                 if (!command) {
                     break;
                 }
-                command = command.toLowerCase();
-                main.dictatedPhrase = command;
+
+                main.dictatedPhrase = command = command.toLowerCase();
                 main.dictationSuccess = await DictationManager.Commands.execute(command);
-                main.overlayTimeout = setTimeout(() => {
-                    main.dictationOverlayVisible = false;
-                    main.dictationSuccess = undefined;
-                }, 2000);
+                main.initiateDictationFade();
+
                 stopPropagation = true;
                 preventDefault = true;
         }
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index 4a5e4a3d1..748e1e634 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -39,6 +39,7 @@ import { FilterBox } from './search/FilterBox';
 import { CollectionTreeView } from './collections/CollectionTreeView';
 import { ClientUtils } from '../util/ClientUtils';
 import { SchemaHeaderField, RandomPastel } from '../../new_fields/SchemaHeaderField';
+import { DictationManager } from '../util/DictationManager';
 
 @observer
 export class MainView extends React.Component {
@@ -55,6 +56,21 @@ export class MainView extends React.Component {
 
     public overlayTimeout: NodeJS.Timeout | undefined;
 
+    public initiateDictationFade = () => {
+        let duration = DictationManager.Commands.dictationFadeDuration;
+        this.overlayTimeout = setTimeout(() => {
+            this.dictationOverlayVisible = false;
+            this.dictationSuccess = undefined;
+        }, duration);
+    }
+
+    public cancelDictationFade = () => {
+        if (this.overlayTimeout) {
+            clearTimeout(this.overlayTimeout);
+            this.overlayTimeout = undefined;
+        }
+    }
+
     @computed private get mainContainer(): Opt<Doc> {
         return FieldValue(Cast(CurrentUserUtils.UserDocument.activeWorkspace, Doc));
     }