lots more dependency cycle unwinding.

1 files changed, 29 insertions, 56 deletions

diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 8f0c2b0bf..5bcac7330 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -1,23 +1,17 @@
 import { Howl } from 'howler';
 import { action, computed, makeObservable, observable, ObservableSet, observe } from 'mobx';
 import { Doc, Opt } from '../../fields/Doc';
-import { AclAdmin, AclEdit, Animation, DocData } from '../../fields/DocSymbols';
+import { Animation, DocData } from '../../fields/DocSymbols';
 import { Id } from '../../fields/FieldSymbols';
 import { listSpec } from '../../fields/Schema';
 import { Cast, DocCast, NumCast, StrCast } from '../../fields/Types';
 import { AudioField } from '../../fields/URLField';
-import { GetEffectiveAcl } from '../../fields/util';
 import { CollectionViewType } from '../documents/DocumentTypes';
-import { TabDocView } from '../views/collections/TabDocView';
 import { LightboxView } from '../views/LightboxView';
 import { DocumentView, DocumentViewInternal } from '../views/nodes/DocumentView';
 import { FocusViewOptions } from '../views/nodes/FocusViewOptions';
-import { KeyValueBox } from '../views/nodes/KeyValueBox';
-import { LinkAnchorBox } from '../views/nodes/LinkAnchorBox';
 import { OpenWhere } from '../views/nodes/OpenWhere';
 import { PresBox } from '../views/nodes/trails';
-import { ScriptingGlobals } from './ScriptingGlobals';
-import { SelectionManager } from './SelectionManager';
 
 type childIterator = { viewSpec: Opt<Doc>; childDocView: Opt<DocumentView>; focused: boolean; contextPath: Doc[] };
 export class DocumentManager {
@@ -29,10 +23,9 @@ 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 private _documentViews = new Set<DocumentView>();
     @computed public get DocumentViews() {
-        return Array.from(this._documentViews).filter(view => !(view.ComponentView instanceof KeyValueBox) && (!LightboxView.LightboxDoc || LightboxView.Contains(view)));
+        return Array.from(this._documentViews).filter(view => (!view.ComponentView?.dontRegisterView?.() && !LightboxView.LightboxDoc) || LightboxView.Contains(view));
     }
     public AddDocumentView(dv: DocumentView) {
         this._documentViews.add(dv);
@@ -44,7 +37,19 @@ export class DocumentManager {
     // private constructor so no other class can create a nodemanager
     private constructor() {
         makeObservable(this);
-        observe(this.CurrentlyLoading, change => {
+
+        DocumentView.allViews = () => this.DocumentViews;
+        DocumentView.addView = this.AddView;
+        DocumentView.removeView = this.RemoveView;
+        DocumentView.showDocument = this.showDocument;
+        DocumentView.showDocumentView = this.showDocumentView;
+        DocumentView.linkCommonAncestor = DocumentManager.LinkCommonAncestor;
+        DocumentView.addViewRenderedCb = this.AddViewRenderedCb;
+        DocumentView.getFirstDocumentView = this.getFirstDocumentView;
+        DocumentView.getDocumentView = this.getDocumentView;
+        DocumentView.getContextPath = DocumentManager.GetContextPath;
+        DocumentView.getLightboxDocumentView = this.getLightboxDocumentView;
+        observe(Doc.CurrentlyLoading, change => {
             // watch CurrentlyLoading-- when something is loaded, it's removed from the list and we have to update its icon if it were iconified since LoadingBox icons are different than the media they become
             switch (change.type as any) {
                 case 'update':
@@ -92,17 +97,12 @@ export class DocumentManager {
 
     @action
     public AddView = (view: DocumentView) => {
-        if (!view._props.LayoutTemplateString?.includes(KeyValueBox.name) &&
-            !view._props.LayoutTemplateString?.includes(LinkAnchorBox.name)) {      
-            this.AddDocumentView(view);
-            this.callAddViewFuncs(view);
-        } // prettier-ignore
+        this.AddDocumentView(view);
+        this.callAddViewFuncs(view);
     };
     public RemoveView = action((view: DocumentView) => {
-        if (!view._props.LayoutTemplateString?.includes(KeyValueBox.name) && !view._props.LayoutTemplateString?.includes(LinkAnchorBox.name)) {
-            this.DeleteDocumentView(view);
-        }
-        SelectionManager.DeselectView(view);
+        this.DeleteDocumentView(view);
+        DocumentView.DeselectView(view);
     });
 
     // gets all views
@@ -203,6 +203,11 @@ export class DocumentManager {
     }
     static _overlayViews = new ObservableSet<DocumentView>();
 
+    /**
+     * Find the nearest common ancestor collection that contains a link's source and target
+     * @param linkDoc
+     * @returns common ancestor DocumentView
+     */
     public static LinkCommonAncestor(linkDoc: Doc) {
         const getAnchor = (which: number) => {
             const anch = DocCast(linkDoc['link_anchor_' + which]);
@@ -245,11 +250,8 @@ export class DocumentManager {
         Doc.RemoveDocFromList(Doc.MyRecentlyClosed, undefined, targetDoc);
         const docContextPath = DocumentManager.GetContextPath(targetDoc, true);
         if (docContextPath.some(doc => doc.hidden)) options.toggleTarget = false;
-        const tabView = Array.from(TabDocView._allTabs).find(view => view._document === docContextPath[0]);
-        if (!tabView?._activated && tabView?._document) {
-            options.toggleTarget = false;
-            TabDocView.Activate(tabView?._document);
-        }
+        if (DocumentView.activateTabView(docContextPath[0])) options.toggleTarget = false;
+
         const rootContextView =
             docContextPath.length &&
             (await new Promise<DocumentView>(res => {
@@ -260,7 +262,7 @@ export class DocumentManager {
                     return;
                 }
                 options.didMove = true;
-                (!LightboxView.LightboxDoc && docContextPath.some(doc => TabDocView.Activate(doc))) || DocumentViewInternal.addDocTabFunc(docContextPath[0], options.openLocation ?? OpenWhere.addRight);
+                (!LightboxView.LightboxDoc && docContextPath.some(doc => DocumentView.activateTabView(doc))) || DocumentViewInternal.addDocTabFunc(docContextPath[0], options.openLocation ?? OpenWhere.addRight);
                 this.AddViewRenderedCb(docContextPath[0], dv => res(dv));
             }));
         if (options.openLocation === OpenWhere.lightbox) {
@@ -355,33 +357,4 @@ export class DocumentManager {
         }
     }
 }
-// eslint-disable-next-line default-param-last
-export function DocFocusOrOpen(docIn: Doc, optionsIn: FocusViewOptions = { willZoomCentered: true, zoomScale: 0, openLocation: OpenWhere.toggleRight }, containingDoc?: Doc) {
-    let doc = docIn;
-    const options = optionsIn;
-    const func = () => {
-        const cv = DocumentManager.Instance.getDocumentView(containingDoc);
-        const dv = DocumentManager.Instance.getDocumentView(doc, cv);
-        if (dv && (!containingDoc || dv.containerViewPath?.().lastElement()?.Document === containingDoc)) {
-            DocumentManager.Instance.showDocumentView(dv, options).then(() => dv && Doc.linkFollowHighlight(dv.Document));
-        } else {
-            const container = DocCast(containingDoc ?? doc.embedContainer ?? Doc.BestEmbedding(doc));
-            const showDoc = !Doc.IsSystem(container) && !cv ? container : doc;
-            options.toggleTarget = undefined;
-            DocumentManager.Instance.showDocument(showDoc, options, () => DocumentManager.Instance.showDocument(doc, { ...options, openLocation: undefined })).then(() => {
-                const cvFound = DocumentManager.Instance.getDocumentView(containingDoc);
-                const dvFound = DocumentManager.Instance.getDocumentView(doc, cvFound);
-                dvFound && Doc.linkFollowHighlight(dvFound.Document);
-            });
-        }
-    };
-    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;
-        options.toggleTarget = false;
-        setTimeout(func);
-    } else func();
-}
-ScriptingGlobals.add(DocFocusOrOpen);
+setTimeout(() => DocumentManager.Instance);