merge

1 files changed, 57 insertions, 73 deletions

diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index 7b693c8da..87f81fe76 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -33,6 +33,7 @@ type KeyControlInfo = {
     stopPropagation: boolean;
 };
 
+export let CtrlKey = false;
 export class KeyManager {
     public static Instance: KeyManager = new KeyManager();
     private router = new Map<string, KeyHandler>();
@@ -49,11 +50,19 @@ export class KeyManager {
     }
 
     public unhandle = action((e: KeyboardEvent) => {
-        if (e.key?.toLowerCase() === 'shift') runInAction(() => (DocumentDecorations.Instance.AddToSelection = false));
+        e.key === 'Control' && (CtrlKey = false);
+    });
+    public handleModifiers = action((e: KeyboardEvent) => {
+        if (e.shiftKey) SnappingManager.SetShiftKey(true);
+        if (e.ctrlKey) SnappingManager.SetCtrlKey(true);
+    });
+    public unhandleModifiers = action((e: KeyboardEvent) => {
+        if (!e.shiftKey) SnappingManager.SetShiftKey(false);
+        if (!e.ctrlKey) SnappingManager.SetCtrlKey(false);
     });
 
     public handle = action((e: KeyboardEvent) => {
-        if (e.key?.toLowerCase() === 'shift') DocumentDecorations.Instance.AddToSelection = true;
+        e.key === 'Control' && (CtrlKey = true);
         //if (!Doc.noviceMode && e.key.toLocaleLowerCase() === "shift") DocServer.UPDATE_SERVER_CACHE(true);
         const keyname = e.key && e.key.toLowerCase();
         this.handleGreedy(keyname);
@@ -81,41 +90,32 @@ export class KeyManager {
         }
     });
 
+    nudge = (x: number, y: number, label: string) => {
+        const nudgeable = SelectionManager.Views().some(dv => dv.CollectionFreeFormDocumentView?.nudge);
+        nudgeable && UndoManager.RunInBatch(() => SelectionManager.Views().map(dv => dv.CollectionFreeFormDocumentView?.nudge(x, y)), label);
+        return { stopPropagation: nudgeable, preventDefault: nudgeable };
+    };
+
     private unmodified = action((keyname: string, e: KeyboardEvent) => {
-        const hasFffView = SelectionManager.Views().some(dv => dv.props.CollectionFreeFormDocumentView?.());
         switch (keyname) {
             case 'u':
-                if (document.activeElement?.tagName === 'INPUT' || document.activeElement?.tagName === 'TEXTAREA') {
-                    return { stopPropagation: false, preventDefault: false };
+                if (document.activeElement?.tagName !== 'INPUT' && document.activeElement?.tagName !== 'TEXTAREA') {
+                    const ungroupings = SelectionManager.Views();
+                    UndoManager.RunInBatch(() => ungroupings.map(dv => (dv.layoutDoc.group = undefined)), 'ungroup');
+                    SelectionManager.DeselectAll();
                 }
-
-                const ungroupings = SelectionManager.Views().slice();
-                UndoManager.RunInBatch(() => ungroupings.map(dv => (dv.layoutDoc.group = undefined)), 'ungroup');
-                SelectionManager.DeselectAll();
                 break;
             case 'g':
-                if (document.activeElement?.tagName === 'INPUT' || document.activeElement?.tagName === 'TEXTAREA') {
-                    return { stopPropagation: false, preventDefault: false };
-                }
-
-                const groupings = SelectionManager.Views().slice();
-                const randomGroup = random(0, 1000);
-                const collectionView = groupings.reduce(
-                    (col, g) => (col === null || g.props.CollectionFreeFormDocumentView?.().props.CollectionFreeFormView === col ? g.props.CollectionFreeFormDocumentView?.().props.CollectionFreeFormView : undefined),
-                    null as null | undefined | CollectionFreeFormView
-                );
-                if (collectionView) {
-                    UndoManager.RunInBatch(() => {
-                        collectionView._marqueeViewRef.current?.collection(
-                            e,
-                            true,
-                            groupings.map(g => g.rootDoc)
-                        );
-                    }, 'grouping');
-                    break;
+                if (document.activeElement?.tagName !== 'INPUT' && document.activeElement?.tagName !== 'TEXTAREA') {
+                    const selected = SelectionManager.Views();
+                    const collectionView = selected.reduce((col, dv) => (col === null || dv.CollectionFreeFormView === col ? dv.CollectionFreeFormView : undefined), null as null | undefined | CollectionFreeFormView);
+                    if (collectionView) {
+                        UndoManager.RunInBatch(() =>
+                            collectionView._marqueeViewRef.current?.collection(e, true, SelectionManager.Docs())
+                        , 'grouping');
+                        break;
+                    }
                 }
-                UndoManager.RunInBatch(() => groupings.map(dv => (dv.layoutDoc.group = randomGroup)), 'group');
-                SelectionManager.DeselectAll();
                 break;
             case ' ':
                 // MarqueeView.DragMarquee = !MarqueeView.DragMarquee; // bcz: this needs a better disclosure UI
@@ -139,7 +139,7 @@ export class KeyManager {
                 }
                 if (doDeselect) {
                     SelectionManager.DeselectAll();
-                    LightboxView.SetLightboxDoc(undefined);
+                    LightboxView.Instance.SetLightboxDoc(undefined);
                 }
                 // DictationManager.Controls.stop();
                 GoogleAuthenticationManager.Instance.cancel();
@@ -158,25 +158,17 @@ export class KeyManager {
             case 'backspace':
                 if (document.activeElement?.tagName !== 'INPUT' && document.activeElement?.tagName !== 'TEXTAREA') {
                     if (LightboxView.LightboxDoc) {
-                        LightboxView.SetLightboxDoc(undefined);
+                        LightboxView.Instance.SetLightboxDoc(undefined);
                         SelectionManager.DeselectAll();
                     } else DocumentDecorations.Instance.onCloseClick(true);
                     return { stopPropagation: true, preventDefault: true };
                 }
                 break;
-            case 'arrowleft':
-                UndoManager.RunInBatch(() => SelectionManager.Views().map(dv => dv.props.CollectionFreeFormDocumentView?.().nudge(-1, 0)), 'nudge left');
-                return { stopPropagation: hasFffView, preventDefault: hasFffView };
-            case 'arrowright':
-                UndoManager.RunInBatch(() => SelectionManager.Views().map(dv => dv.props.CollectionFreeFormDocumentView?.().nudge?.(1, 0)), 'nudge right');
-                return { stopPropagation: hasFffView, preventDefault: hasFffView };
-            case 'arrowup':
-                UndoManager.RunInBatch(() => SelectionManager.Views().map(dv => dv.props.CollectionFreeFormDocumentView?.().nudge?.(0, -1)), 'nudge up');
-                return { stopPropagation: hasFffView, preventDefault: hasFffView };
-            case 'arrowdown':
-                UndoManager.RunInBatch(() => SelectionManager.Views().map(dv => dv.props.CollectionFreeFormDocumentView?.().nudge?.(0, 1)), 'nudge down');
-                return { stopPropagation: hasFffView, preventDefault: hasFffView };
-        }
+            case 'arrowleft':  return this.nudge(-1,0, 'nudge left')
+            case 'arrowright': return this.nudge(1,0, 'nudge right');
+            case 'arrowup':    return this.nudge(0, -1, 'nudge up');
+            case 'arrowdown':  return this.nudge(0, 1, 'nudge down');
+        } // prettier-ignore
 
         return {
             stopPropagation: false,
@@ -185,37 +177,29 @@ export class KeyManager {
     });
 
     private shift = action((keyname: string) => {
-        const stopPropagation = false;
-        const preventDefault = false;
-
         switch (keyname) {
-            case 'arrowleft':
-                UndoManager.RunInBatch(() => SelectionManager.Views().map(dv => dv.props.CollectionFreeFormDocumentView?.().nudge?.(-10, 0)), 'nudge left');
-                break;
-            case 'arrowright':
-                UndoManager.RunInBatch(() => SelectionManager.Views().map(dv => dv.props.CollectionFreeFormDocumentView?.().nudge?.(10, 0)), 'nudge right');
-                break;
-            case 'arrowup':
-                UndoManager.RunInBatch(() => SelectionManager.Views().map(dv => dv.props.CollectionFreeFormDocumentView?.().nudge?.(0, -10)), 'nudge up');
-                break;
-            case 'arrowdown':
-                UndoManager.RunInBatch(() => SelectionManager.Views().map(dv => dv.props.CollectionFreeFormDocumentView?.().nudge?.(0, 10)), 'nudge down');
+            case 'arrowleft':  return this.nudge(-10,0, 'nudge left');
+            case 'arrowright': return this.nudge(10, 0, 'nudge right');
+            case 'arrowup':    return this.nudge(0, -10, 'nudge up');
+            case 'arrowdown':  return this.nudge(0, 10, 'nudge down');
+            case 'u' : 
+                if (document.activeElement?.tagName !== 'INPUT' && document.activeElement?.tagName !== 'TEXTAREA') {
+                    UndoManager.RunInBatch(() => SelectionManager.Docs().forEach(doc => (doc.group = undefined)), 'unggroup');
+                    SelectionManager.DeselectAll();
+                }
                 break;
             case 'g':
-                if (document.activeElement?.tagName === 'INPUT' || document.activeElement?.tagName === 'TEXTAREA') {
-                    return { stopPropagation: false, preventDefault: false };
+                if (document.activeElement?.tagName !== 'INPUT' && document.activeElement?.tagName !== 'TEXTAREA') {
+                    const randomGroup = random(0, 1000);
+                    UndoManager.RunInBatch(() => SelectionManager.Docs().forEach(doc => (doc.group = randomGroup)), 'group');
+                    SelectionManager.DeselectAll();
                 }
-
-                const groupings = SelectionManager.Views().slice();
-                const randomGroup = random(0, 1000);
-                UndoManager.RunInBatch(() => groupings.map(dv => (dv.layoutDoc.group = randomGroup)), 'group');
-                SelectionManager.DeselectAll();
                 break;
-        }
+        } // prettier-ignore
 
         return {
-            stopPropagation: stopPropagation,
-            preventDefault: preventDefault,
+            stopPropagation: false,
+            preventDefault: false,
         };
     });
 
@@ -227,7 +211,7 @@ export class KeyManager {
             case 'ƒ':
             case 'f':
                 const dv = SelectionManager.Views()?.[0];
-                UndoManager.RunInBatch(() => dv.props.CollectionFreeFormDocumentView?.().float(), 'float');
+                UndoManager.RunInBatch(() => dv.CollectionFreeFormDocumentView?.float(), 'float');
         }
 
         return {
@@ -262,7 +246,7 @@ export class KeyManager {
                 PromiseValue(Cast(Doc.UserDoc()['tabs-button-tools'], Doc)).then(pv => pv && (pv.onClick as ScriptField).script.run({ this: pv }));
                 break;
             case 'i':
-                    const importBtn = DocListCast(Doc.MyLeftSidebarMenu.data).find(d => d.target === Doc.MyImports);
+                const importBtn = DocListCast(Doc.MyLeftSidebarMenu.data).find(d => d.target === Doc.MyImports);
                 if (importBtn) {
                     MainView.Instance.selectMenu(importBtn);
                 }
@@ -284,10 +268,10 @@ export class KeyManager {
                 }
                 break;
             case 'e':
-                Doc.ActiveTool = (Doc.ActiveTool === InkTool.Eraser ? InkTool.None : InkTool.Eraser);
+                Doc.ActiveTool = Doc.ActiveTool === InkTool.Eraser ? InkTool.None : InkTool.Eraser;
                 break;
             case 'p':
-                Doc.ActiveTool = (Doc.ActiveTool === InkTool.Pen ? InkTool.None : InkTool.Pen);
+                Doc.ActiveTool = Doc.ActiveTool === InkTool.Pen ? InkTool.None : InkTool.Pen;
                 break;
             case 'r':
                 preventDefault = false;