fixed and cleaned up snapping lines

4 files changed, 50 insertions, 79 deletions

diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index ba7a26a7a..7fcda75cc 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -1,4 +1,4 @@
-import { action, computed, makeObservable, observable, ObservableSet, observe } from 'mobx';
+import { action, computed, makeObservable, observable, ObservableSet, observe, reaction } from 'mobx';
 import { Doc, DocListCast, Opt } from '../../fields/Doc';
 import { AclAdmin, AclEdit, Animation } from '../../fields/DocSymbols';
 import { Id } from '../../fields/FieldSymbols';
@@ -20,8 +20,14 @@ import { SelectionManager } from './SelectionManager';
 const { Howl } = require('howler');
 
 export class DocumentManager {
+    private static _instance: DocumentManager;
+    public static get Instance(): DocumentManager {
+        return this._instance || (this._instance = new this());
+    }
+
     //global holds all of the nodes (regardless of which collection they're in)
     @observable _documentViews = new Set<DocumentView>();
+    @observable.shallow public CurrentlyLoading: Doc[] = [];
     @observable.shallow public LinkAnchorBoxViews: DocumentView[] = [];
     @observable.shallow public LinkedDocumentViews: { a: DocumentView; b: DocumentView; l: Doc }[] = [];
     @computed public get DocumentViews() {
@@ -34,12 +40,6 @@ export class DocumentManager {
         this._documentViews.delete(dv);
     }
 
-    private static _instance: DocumentManager;
-    public static get Instance(): DocumentManager {
-        return this._instance || (this._instance = new this());
-    }
-    @observable.shallow public CurrentlyLoading: Doc[] = []; // this assignment doesn't work. the actual assignment happens in DocumentManager's constructor
-
     //private constructor so no other class can create a nodemanager
     private constructor() {
         makeObservable(this);
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index 4b1cc1702..10ef16265 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -294,14 +294,14 @@ export namespace DragManager {
             const dist = Math.sqrt((dragx - x) * (dragx - x) + (dragy - y) * (dragy - y));
             return { pt: [x, y], dist };
         };
-        SnappingManager.vertSnapLines().forEach((xCoord, i) => {
+        SnappingManager.VertSnapLines.forEach((xCoord, i) => {
             const pt = intersect(dragPt[0], dragPt[1], dragPt[0] + snapAspect, dragPt[1] + 1, xCoord, -1, xCoord, 1, dragPt[0], dragPt[1]);
             if (pt && pt.dist < closest) {
                 closest = pt.dist;
                 near = pt.pt;
             }
         });
-        SnappingManager.horizSnapLines().forEach((yCoord, i) => {
+        SnappingManager.HorizSnapLines.forEach((yCoord, i) => {
             const pt = intersect(dragPt[0], dragPt[1], dragPt[0] + snapAspect, dragPt[1] + 1, -1, yCoord, 1, yCoord, dragPt[0], dragPt[1]);
             if (pt && pt.dist < closest) {
                 closest = pt.dist;
@@ -325,8 +325,8 @@ export namespace DragManager {
             return drag;
         };
         return {
-            x: snapVal([xFromLeft, xFromRight], e.pageX, SnappingManager.vertSnapLines()),
-            y: snapVal([yFromTop, yFromBottom], e.pageY, SnappingManager.horizSnapLines()),
+            x: snapVal([xFromLeft, xFromRight], e.pageX, SnappingManager.VertSnapLines),
+            y: snapVal([yFromTop, yFromBottom], e.pageY, SnappingManager.HorizSnapLines),
         };
     }
     export let docsBeingDragged: Doc[] = observable([] as Doc[]);
@@ -470,7 +470,7 @@ export namespace DragManager {
         runInAction(() => docsBeingDragged.push(...docsToDrag));
 
         const hideDragShowOriginalElements = (hide: boolean) => {
-            dragLabel.style.display = hide && !SnappingManager.GetCanEmbed() ? '' : 'none';
+            dragLabel.style.display = hide && !SnappingManager.CanEmbed ? '' : 'none';
             !hide && dragElements.map(dragElement => dragElement.parentNode === dragDiv && dragDiv.removeChild(dragElement));
             setTimeout(() => eles.forEach(ele => (ele.hidden = hide)));
         };
@@ -571,7 +571,7 @@ export namespace DragManager {
                     );
 
                     scrollAwaiter && clearTimeout(scrollAwaiter);
-                    SnappingManager.GetIsDragging() && (scrollAwaiter = setTimeout(autoScrollHandler, 25));
+                    SnappingManager.IsDragging && (scrollAwaiter = setTimeout(autoScrollHandler, 25));
                 };
                 scrollAwaiter && clearTimeout(scrollAwaiter);
                 scrollAwaiter = setTimeout(autoScrollHandler, 250);
@@ -604,7 +604,7 @@ export namespace DragManager {
                 altKey: e.altKey,
                 metaKey: e.metaKey,
                 ctrlKey: e.ctrlKey,
-                embedKey: SnappingManager.GetCanEmbed(),
+                embedKey: SnappingManager.CanEmbed,
             },
         };
         target.dispatchEvent(new CustomEvent<DropEvent>('dashPreDrop', dropArgs));
diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
index cacfcf856..ccb3c6b98 100644
--- a/src/client/util/LinkManager.ts
+++ b/src/client/util/LinkManager.ts
@@ -23,8 +23,8 @@ import { ScriptingGlobals } from './ScriptingGlobals';
 export class LinkManager {
     @observable static _instance: LinkManager;
     @observable.shallow userLinkDBs: Doc[] = [];
-    @observable public static currentLink: Opt<Doc>;
-    @observable public static currentLinkAnchor: Opt<Doc>;
+    @observable public static currentLink: Opt<Doc> = undefined;
+    @observable public static currentLinkAnchor: Opt<Doc> = undefined;
     public static get Instance() {
         return LinkManager._instance;
     }
@@ -42,7 +42,6 @@ export class LinkManager {
         this.userLinkDBs.push(linkDb);
     };
     public static AutoKeywords = 'keywords:Usages';
-    static _links: Doc[] = [];
     constructor() {
         makeObservable(this);
         LinkManager._instance = this;
@@ -85,7 +84,6 @@ export class LinkManager {
             );
 
         const watchUserLinkDB = (userLinkDBDoc: Doc) => {
-            LinkManager._links.push(...DocListCast(userLinkDBDoc.data));
             const toRealField = (field: Field) => (field instanceof ProxyField ? field.value : field); // see List.ts.  data structure is not a simple list of Docs, but a list of ProxyField/Fields
             if (userLinkDBDoc.data) {
                 observe(
@@ -135,7 +133,7 @@ export class LinkManager {
             },
             true
         );
-        runInAction(() => (FieldLoader.ServerLoadStatus.message = 'links'));
+        FieldLoader.ServerLoadStatus.message = 'links';
         this.addLinkDB(Doc.LinkDBDoc());
     }
 
diff --git a/src/client/util/SnappingManager.ts b/src/client/util/SnappingManager.ts
index 715eb021f..44c6aad52 100644
--- a/src/client/util/SnappingManager.ts
+++ b/src/client/util/SnappingManager.ts
@@ -1,68 +1,41 @@
-import { observable, action, runInAction } from 'mobx';
+import { observable, action, runInAction, reaction, makeObservable } from 'mobx';
 import { Doc } from '../../fields/Doc';
 
-export namespace SnappingManager {
-    class Manager {
-        @observable ShiftKey = false;
-        @observable CtrlKey = false;
-        @observable IsDragging: boolean = false;
-        @observable IsResizing: Doc | undefined = undefined;
-        @observable CanEmbed: boolean = false;
-        @observable public horizSnapLines: number[] = [];
-        @observable public vertSnapLines: number[] = [];
-        @action public clearSnapLines() {
-            this.vertSnapLines = [];
-            this.horizSnapLines = [];
-        }
-        @action public addSnapLines(horizLines: number[], vertLines: number[]) {
-            this.horizSnapLines.push(...horizLines);
-            this.vertSnapLines.push(...vertLines);
-        }
+export class SnappingManager {
+    static _manager: SnappingManager;
+    private static get Instance() {
+        return SnappingManager._manager ?? new SnappingManager();
     }
 
-    const manager = new Manager();
+    @observable _shiftKey = false;
+    @observable _ctrlKey = false;
+    @observable _isDragging: boolean = false;
+    @observable _isResizing: Doc | undefined = undefined;
+    @observable _canEmbed: boolean = false;
+    @observable _horizSnapLines: number[] = [];
+    @observable _vertSnapLines: number[] = [];
 
-    export function clearSnapLines() {
-        manager.clearSnapLines();
-    }
-    export function addSnapLines(horizLines: number[], vertLines: number[]) {
-        manager.addSnapLines(horizLines, vertLines);
-    }
-    export function horizSnapLines() {
-        return manager.horizSnapLines;
-    }
-    export function vertSnapLines() {
-        return manager.vertSnapLines;
+    constructor() {
+        SnappingManager._manager = this;
+        makeObservable(this);
     }
 
-    export function SetShiftKey(down: boolean) {
-        runInAction(() => (manager.ShiftKey = down));
-    }
-    export function SetCtrlKey(down: boolean) {
-        runInAction(() => (manager.CtrlKey = down));
-    }
-    export function SetIsDragging(dragging: boolean) {
-        runInAction(() => (manager.IsDragging = dragging));
-    }
-    export function SetIsResizing(doc: Doc | undefined) {
-        runInAction(() => (manager.IsResizing = doc));
-    }
-    export function SetCanEmbed(canEmbed: boolean) {
-        runInAction(() => (manager.CanEmbed = canEmbed));
-    }
-    export function GetShiftKey() {
-        return manager.ShiftKey;
-    }
-    export function GetCtrlKey() {
-        return manager.CtrlKey;
-    }
-    export function GetIsDragging() {
-        return manager.IsDragging;
-    }
-    export function GetIsResizing() {
-        return manager.IsResizing;
-    }
-    export function GetCanEmbed() {
-        return manager.CanEmbed;
-    }
+    @action public static clearSnapLines = () => (this.Instance._vertSnapLines.length = this.Instance._horizSnapLines.length = 0);
+    @action public static addSnapLines = (horizLines: number[], vertLines: number[]) => {
+        this.Instance._horizSnapLines.push(...horizLines);
+        this.Instance._vertSnapLines.push(...vertLines);
+    };
+
+    public static get HorizSnapLines() { return SnappingManager.Instance._horizSnapLines; } // prettier-ignore
+    public static get VertSnapLines()  { return  SnappingManager.Instance._vertSnapLines; } // prettier-ignore
+    public static get ShiftKey()       { return SnappingManager.Instance._shiftKey; } // prettier-ignore
+    public static get CtrlKey()        { return SnappingManager.Instance._ctrlKey; } // prettier-ignore
+    public static get IsDragging()     { return SnappingManager.Instance._isDragging; } // prettier-ignore
+    public static get IsResizing()     { return SnappingManager.Instance._isResizing; } // prettier-ignore
+    public static get CanEmbed()       { return SnappingManager.Instance._canEmbed; } // prettier-ignore
+    public static SetShiftKey = (down: boolean) => runInAction(() => (SnappingManager.Instance._shiftKey = down));
+    public static SetCtrlKey = (down: boolean) => runInAction(() => (SnappingManager.Instance._ctrlKey = down));
+    public static SetIsDragging = (dragging: boolean) => runInAction(() => (SnappingManager.Instance._isDragging = dragging));
+    public static SetIsResizing = (doc: Doc | undefined) => runInAction(() => (SnappingManager.Instance._isResizing = doc));
+    public static SetCanEmbed = (canEmbed: boolean) => runInAction(() => (SnappingManager.Instance._canEmbed = canEmbed));
 }