Merge branch 'master' into data-visualization-sarah

1 files changed, 22 insertions, 33 deletions

diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index f730d17fe..7407fa2b3 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);
@@ -234,6 +209,20 @@ export class DocumentManager {
         finished?.();
     };
 
+    public static LinkCommonAncestor(linkDoc: Doc) {
+        const anchor = (which: number) => {
+            const anch = DocCast(linkDoc['link_anchor_' + which]);
+            const anchor = anch?.layout_unrendered ? DocCast(anch.annotationOn) : anch;
+            return DocumentManager.Instance.getDocumentView(anchor);
+        };
+        const anchor1 = anchor(1);
+        const anchor2 = anchor(2);
+        return anchor1
+            ?.docViewPath()
+            .reverse()
+            .find(ancestor => anchor2?.docViewPath().includes(ancestor));
+    }
+
     // shows a documentView by:
     // traverses down through the viewPath of contexts to the view:
     //           focusing on each context
@@ -355,8 +344,8 @@ export function DocFocusOrOpen(doc: Doc, options: FocusViewOptions = { willZoomC
             });
         }
     };
-    if (Doc.IsDataProto(doc) && DocListCast(doc.proto_embeddings).some(embed => embed.hidden && [AclAdmin, AclEdit].includes(GetEffectiveAcl(embed)))) {
-        doc = DocListCast(doc.proto_embeddings).find(embed => embed.hidden && [AclAdmin, AclEdit].includes(GetEffectiveAcl(embed)))!;
+    if (Doc.IsDataProto(doc) && Doc.GetEmbeddings(doc).some(embed => embed.hidden && [AclAdmin, AclEdit].includes(GetEffectiveAcl(embed)))) {
+        doc = Doc.GetEmbeddings(doc).find(embed => embed.hidden && [AclAdmin, AclEdit].includes(GetEffectiveAcl(embed)))!;
     }
     if (doc.hidden) {
         doc.hidden = false;