added back shiftkey to drag and embed. got rid of overlayplane link view. got rid of auto arrange. fixed text edit color for linkBox's

2 files changed, 7 insertions, 32 deletions

diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 53d472c66..eada5af75 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -1,6 +1,6 @@
 import { Howl } from 'howler';
 import { action, computed, makeObservable, observable, ObservableSet, observe } from 'mobx';
-import { Doc, DocListCast, Opt } from '../../fields/Doc';
+import { Doc, Opt } from '../../fields/Doc';
 import { AclAdmin, AclEdit, Animation, DocData } from '../../fields/DocSymbols';
 import { Id } from '../../fields/FieldSymbols';
 import { listSpec } from '../../fields/Schema';
@@ -28,8 +28,6 @@ export class DocumentManager {
     //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() {
         return Array.from(this._documentViews).filter(view => !(view.ComponentView instanceof KeyValueBox) && (!LightboxView.LightboxDoc || LightboxView.Contains(view)));
     }
@@ -90,37 +88,14 @@ export class DocumentManager {
 
     @action
     public AddView = (view: DocumentView) => {
-        if (view._props.LayoutTemplateString?.includes(KeyValueBox.name)) return;
-        if (view._props.LayoutTemplateString?.includes(LinkAnchorBox.name)) {
-            const viewAnchorIndex = view._props.LayoutTemplateString.includes('link_anchor_2') ? 'link_anchor_2' : 'link_anchor_1';
-            const link = view.Document;
-            this.LinkAnchorBoxViews?.filter(dv => Doc.AreProtosEqual(dv.Document, link) && !dv._props.LayoutTemplateString?.includes(viewAnchorIndex)).forEach(otherView =>
-                this.LinkedDocumentViews.push({
-                    a: viewAnchorIndex === 'link_anchor_2' ? otherView : view,
-                    b: viewAnchorIndex === 'link_anchor_2' ? view : otherView,
-                    l: link,
-                })
-            );
-            this.LinkAnchorBoxViews.push(view);
-        } else {
+        if (!view._props.LayoutTemplateString?.includes(KeyValueBox.name) &&
+            !view._props.LayoutTemplateString?.includes(LinkAnchorBox.name)) {      
             this.AddDocumentView(view);
-        }
-        this.callAddViewFuncs(view);
+            this.callAddViewFuncs(view);
+        } // prettier-ignore
     };
     public RemoveView = action((view: DocumentView) => {
-        this.LinkedDocumentViews.slice().forEach(
-            action(pair => {
-                if (pair.a === view || pair.b === view) {
-                    const li = this.LinkedDocumentViews.indexOf(pair);
-                    li !== -1 && this.LinkedDocumentViews.splice(li, 1);
-                }
-            })
-        );
-
-        if (view._props.LayoutTemplateString?.includes(LinkAnchorBox.name)) {
-            const index = this.LinkAnchorBoxViews.indexOf(view);
-            this.LinkAnchorBoxViews.splice(index, 1);
-        } else {
+        if (!view._props.LayoutTemplateString?.includes(KeyValueBox.name) && !view._props.LayoutTemplateString?.includes(LinkAnchorBox.name)) {
             this.DeleteDocumentView(view);
         }
         SelectionManager.DeselectView(view);
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index a6ad0f1b3..78356888a 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -504,7 +504,7 @@ export namespace DragManager {
         const moveHandler = (e: PointerEvent) => {
             e.preventDefault(); // required or dragging text menu link item ends up dragging the link button as native drag/drop
             if (dragData instanceof DocumentDragData) {
-                dragData.userDropAction = e.ctrlKey && e.altKey ? 'copy' : e.ctrlKey ? 'embed' : dragData.defaultDropAction;
+                dragData.userDropAction = e.ctrlKey && e.altKey ? 'copy' : e.shiftKey ? 'move' : e.ctrlKey ? 'embed' : dragData.defaultDropAction;
             }
             if (((e.target as any)?.className === 'lm_tabs' || (e.target as any)?.className === 'lm_header') && dragData.draggedDocuments.length === 1) {
                 if (!startWindowDragTimer) {