pull from master

1 files changed, 53 insertions, 99 deletions

diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index be6aa6be2..1b2395423 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -1,4 +1,4 @@
-import { action } from "mobx";
+import { action, observable } from "mobx";
 import { DateField } from "../../fields/DateField";
 import { Doc, DocListCast } from "../../fields/Doc";
 import { Id } from "../../fields/FieldSymbols";
@@ -6,23 +6,26 @@ import { InkTool } from "../../fields/InkField";
 import { List } from "../../fields/List";
 import { ScriptField } from "../../fields/ScriptField";
 import { Cast, PromiseValue } from "../../fields/Types";
-import GoogleAuthenticationManager from "../apis/GoogleAuthenticationManager";
+import { GoogleAuthenticationManager } from "../apis/GoogleAuthenticationManager";
 import { DocServer } from "../DocServer";
 import { DocumentType } from "../documents/DocumentTypes";
 import { DictationManager } from "../util/DictationManager";
 import { DragManager } from "../util/DragManager";
+import { GroupManager } from "../util/GroupManager";
 import { SelectionManager } from "../util/SelectionManager";
-import SharingManager from "../util/SharingManager";
+import { SharingManager } from "../util/SharingManager";
 import { undoBatch, UndoManager } from "../util/UndoManager";
 import { CollectionDockingView } from "./collections/CollectionDockingView";
+import { CollectionFreeFormViewChrome } from "./collections/CollectionMenu";
+import { ContextMenu } from "./ContextMenu";
 import { DocumentDecorations } from "./DocumentDecorations";
+import { InkStrokeProperties } from "./InkStrokeProperties";
 import { MainView } from "./MainView";
-import { DocumentView } from "./nodes/DocumentView";
 import { DocumentLinksButton } from "./nodes/DocumentLinksButton";
-import PDFMenu from "./pdf/PDFMenu";
-import { ContextMenu } from "./ContextMenu";
-import GroupManager from "../util/GroupManager";
-import { CollectionFreeFormViewChrome } from "./collections/CollectionMenu";
+import { DocumentView } from "./nodes/DocumentView";
+import { PDFMenu } from "./pdf/PDFMenu";
+import { SnappingManager } from "../util/SnappingManager";
+import { SearchBox } from "./search/SearchBox";
 
 const modifiers = ["control", "meta", "shift", "alt"];
 type KeyHandler = (keycode: string, e: KeyboardEvent) => KeyControlInfo | Promise<KeyControlInfo>;
@@ -31,9 +34,10 @@ type KeyControlInfo = {
     stopPropagation: boolean
 };
 
-export default class KeyManager {
+export class KeyManager {
     public static Instance: KeyManager = new KeyManager();
     private router = new Map<string, KeyHandler>();
+    @observable ShiftPressed = false;
 
     constructor() {
         const isMac = navigator.platform.toLowerCase().indexOf("mac") >= 0;
@@ -46,7 +50,12 @@ export default class KeyManager {
         this.router.set("1000", this.shift);
     }
 
-    public handle = async (e: KeyboardEvent) => {
+    public unhandle = action((e: KeyboardEvent) => {
+        if (e.key.toLowerCase() === "shift") KeyManager.Instance.ShiftPressed = false;
+    });
+
+    public handle = action(async (e: KeyboardEvent) => {
+        if (e.key.toLowerCase() === "shift") KeyManager.Instance.ShiftPressed = true;
         const keyname = e.key && e.key.toLowerCase();
         this.handleGreedy(keyname);
 
@@ -66,7 +75,7 @@ export default class KeyManager {
 
         control.stopPropagation && e.stopPropagation();
         control.preventDefault && e.preventDefault();
-    }
+    });
 
     private handleGreedy = action((keyname: string) => {
         switch (keyname) {
@@ -81,26 +90,18 @@ export default class KeyManager {
                 // MarqueeView.DragMarquee = !MarqueeView.DragMarquee; // bcz: this needs a better disclosure UI
                 break;
             case "escape":
-                // if (DocumentLinksButton.StartLink) {
-                //     if (DocumentLinksButton.StartLink.Document) {
-                //         action((e: React.PointerEvent<HTMLDivElement>) => {
-                //             Doc.UnBrushDoc(DocumentLinksButton.StartLink?.Document as Doc);
-                //         });
-                //     }
-                // }
                 DocumentLinksButton.StartLink = undefined;
+                DocumentLinksButton.StartLinkView = undefined;
+                InkStrokeProperties.Instance && (InkStrokeProperties.Instance._controlBtn = false);
 
-                const main = MainView.Instance;
                 Doc.SetSelectedTool(InkTool.None);
                 var doDeselect = true;
-                if (main.isPointerDown) {
+                if (SnappingManager.GetIsDragging()) {
                     DragManager.AbortDrag();
+                } else if (CollectionDockingView.Instance.HasFullScreen) {
+                    CollectionDockingView.Instance.CloseFullScreen();
                 } else {
-                    if (CollectionDockingView.Instance.HasFullScreen()) {
-                        CollectionDockingView.Instance.CloseFullScreen();
-                    } else {
-                        doDeselect = !ContextMenu.Instance.closeMenu();
-                    }
+                    doDeselect = !ContextMenu.Instance.closeMenu();
                 }
                 doDeselect && SelectionManager.DeselectAll();
                 DictationManager.Controls.stop();
@@ -113,30 +114,18 @@ export default class KeyManager {
                 break;
             case "delete":
             case "backspace":
-                if (document.activeElement) {
-                    if (document.activeElement.tagName === "INPUT" || document.activeElement.tagName === "TEXTAREA") {
-                        return { stopPropagation: false, preventDefault: false };
-                    }
+                if (document.activeElement?.tagName === "INPUT" || document.activeElement?.tagName === "TEXTAREA") {
+                    return { stopPropagation: false, preventDefault: false };
                 }
 
                 const selected = SelectionManager.SelectedDocuments().slice();
-                UndoManager.RunInBatch(() => {
-                    selected.map(dv => dv.props.removeDocument?.(dv.props.Document));
-                }, "delete");
+                UndoManager.RunInBatch(() => selected.map(dv => !dv.props.Document._stayInCollection && dv.props.removeDocument?.(dv.props.Document)), "delete");
                 SelectionManager.DeselectAll();
                 break;
-            case "arrowleft":
-                UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(-1, 0)), "nudge left");
-                break;
-            case "arrowright":
-                UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(1, 0)), "nudge right");
-                break;
-            case "arrowup":
-                UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(0, -1)), "nudge up");
-                break;
-            case "arrowdown":
-                UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(0, 1)), "nudge down");
-                break;
+            case "arrowleft": UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(-1, 0)), "nudge left"); break;
+            case "arrowright": UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(1, 0)), "nudge right"); break;
+            case "arrowup": UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(0, -1)), "nudge up"); break;
+            case "arrowdown": UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(0, 1)), "nudge down"); break;
         }
 
         return {
@@ -145,34 +134,22 @@ export default class KeyManager {
         };
     });
 
-    private shift = async (keyname: string) => {
+    private shift = action(async (keyname: string) => {
         const stopPropagation = false;
         const preventDefault = false;
 
         switch (keyname) {
-            // case "~":
-            //     DictationManager.Controls.listen({ useOverlay: true, tryExecute: true });
-            //     stopPropagation = true;
-            //     preventDefault = true;
-            case "arrowleft":
-                UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(-10, 0)), "nudge left");
-                break;
-            case "arrowright":
-                UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(10, 0)), "nudge right");
-                break;
-            case "arrowup":
-                UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(0, -10)), "nudge up");
-                break;
-            case "arrowdown":
-                UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(0, 10)), "nudge down");
-                break;
+            case "arrowleft": UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(-10, 0)), "nudge left"); break;
+            case "arrowright": UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(10, 0)), "nudge right"); break;
+            case "arrowup": UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(0, -10)), "nudge up"); break;
+            case "arrowdown": UndoManager.RunInBatch(() => SelectionManager.SelectedDocuments().map(dv => dv.props.nudge?.(0, 10)), "nudge down"); break;
         }
 
         return {
             stopPropagation: stopPropagation,
             preventDefault: preventDefault
         };
-    }
+    });
 
     private alt = action((keyname: string) => {
         const stopPropagation = true;
@@ -204,64 +181,43 @@ export default class KeyManager {
 
         switch (keyname) {
             case "arrowright":
-                if (document.activeElement) {
-                    if (document.activeElement.tagName === "INPUT" || document.activeElement.tagName === "TEXTAREA") {
-                        return { stopPropagation: false, preventDefault: false };
-                    }
+                if (document.activeElement?.tagName === "INPUT" || document.activeElement?.tagName === "TEXTAREA") {
+                    return { stopPropagation: false, preventDefault: false };
                 }
-                MainView.Instance.mainFreeform && CollectionDockingView.AddRightSplit(MainView.Instance.mainFreeform);
+                MainView.Instance.mainFreeform && CollectionDockingView.AddSplit(MainView.Instance.mainFreeform, "right");
                 break;
             case "arrowleft":
-                if (document.activeElement) {
-                    if (document.activeElement.tagName === "INPUT" || document.activeElement.tagName === "TEXTAREA") {
-                        return { stopPropagation: false, preventDefault: false };
-                    }
+                if (document.activeElement?.tagName === "INPUT" || document.activeElement?.tagName === "TEXTAREA") {
+                    return { stopPropagation: false, preventDefault: false };
                 }
-                MainView.Instance.mainFreeform && CollectionDockingView.CloseRightSplit(MainView.Instance.mainFreeform);
+                MainView.Instance.mainFreeform && CollectionDockingView.CloseSplit(MainView.Instance.mainFreeform);
                 break;
             case "backspace":
-                if (document.activeElement) {
-                    if (document.activeElement.tagName === "INPUT" || document.activeElement.tagName === "TEXTAREA") {
-                        return { stopPropagation: false, preventDefault: false };
-                    }
+                if (document.activeElement?.tagName === "INPUT" || document.activeElement?.tagName === "TEXTAREA") {
+                    return { stopPropagation: false, preventDefault: false };
                 }
                 break;
             case "t":
                 PromiseValue(Cast(Doc.UserDoc()["tabs-button-tools"], Doc)).then(pv => pv && (pv.onClick as ScriptField).script.run({ this: pv }));
-                if (MainView.Instance.flyoutWidth === 240) {
-                    MainView.Instance.flyoutWidth = 0;
-                } else {
-                    MainView.Instance.flyoutWidth = 240;
-                }
-                break;
-            case "l":
-                PromiseValue(Cast(Doc.UserDoc()["tabs-button-library"], Doc)).then(pv => pv && (pv.onClick as ScriptField).script.run({ this: pv }));
-                if (MainView.Instance.flyoutWidth === 250) {
-                    MainView.Instance.flyoutWidth = 0;
-                } else {
-                    MainView.Instance.flyoutWidth = 250;
-                }
                 break;
             case "f":
-                PromiseValue(Cast(Doc.UserDoc()["tabs-button-search"], Doc)).then(pv => pv && (pv.onClick as ScriptField).script.run({ this: pv }));
-                if (MainView.Instance.flyoutWidth === 400) {
-                    MainView.Instance.flyoutWidth = 0;
-                } else {
-                    MainView.Instance.flyoutWidth = 400;
-                }
+                SearchBox.Instance._searchFullDB = "My Stuff";
+                SearchBox.Instance.enter(undefined);
                 break;
             case "o":
                 const target = SelectionManager.SelectedDocuments()[0];
-                target && CollectionDockingView.Instance && CollectionDockingView.Instance.OpenFullScreen(target);
+                target && CollectionDockingView.OpenFullScreen(target.props.Document);
                 break;
             case "r":
                 preventDefault = false;
                 break;
             case "y":
+                SelectionManager.DeselectAll();
                 UndoManager.Redo();
                 stopPropagation = false;
                 break;
             case "z":
+                SelectionManager.DeselectAll();
                 UndoManager.Undo();
                 stopPropagation = false;
                 break;
@@ -309,7 +265,7 @@ export default class KeyManager {
                 let count = 1;
                 const list: Doc[] = [];
                 const targetDataDoc = Doc.GetProto(first.props.Document);
-                const fieldKey = Doc.LayoutFieldKey(first.props.Document);
+                const fieldKey = first.LayoutFieldKey;
                 const docList = DocListCast(targetDataDoc[fieldKey]);
                 docids.map((did, i) => i && DocServer.GetRefField(did).then(async doc => {
                     count++;
@@ -323,8 +279,6 @@ export default class KeyManager {
                             undoBatch(() => {
                                 targetDataDoc[fieldKey] = new List<Doc>([...docList, ...added]);
                                 targetDataDoc[fieldKey + "-lastModified"] = new DateField(new Date(Date.now()));
-                                const lastModified = "lastModified";
-                                targetDataDoc[lastModified] = new DateField(new Date(Date.now()));
                             })();
                         }
                     }