lots more dependency cycle unwinding.

1 files changed, 17 insertions, 12 deletions

diff --git a/src/client/util/SelectionManager.ts b/src/client/util/SelectionManager.ts
index 7e8f42de9..0b942116c 100644
--- a/src/client/util/SelectionManager.ts
+++ b/src/client/util/SelectionManager.ts
@@ -1,6 +1,5 @@
 import { action, makeObservable, observable, runInAction } from 'mobx';
 import { Doc, Opt } from '../../fields/Doc';
-import { DocViews } from '../../fields/DocSymbols';
 import { List } from '../../fields/List';
 import { listSpec } from '../../fields/Schema';
 import { Cast, DocCast } from '../../fields/Types';
@@ -24,6 +23,13 @@ export class SelectionManager {
     private constructor() {
         SelectionManager._manager = this;
         makeObservable(this);
+        DocumentView.DeselectAll = SelectionManager.DeselectAll;
+        DocumentView.DeselectView = SelectionManager.DeselectView;
+        DocumentView.SelectView = SelectionManager.SelectView;
+        DocumentView.SelectedDocs = SelectionManager.Docs;
+        DocumentView.Selected = SelectionManager.Views;
+        DocumentView.SelectSchemaDoc = SelectionManager.SelectSchemaViewDoc;
+        DocumentView.SelectedSchemaDoc = () => this.SelectedSchemaDocument;
     }
 
     @action
@@ -54,8 +60,10 @@ export class SelectionManager {
     public static DeselectAll = (except?: Doc): void => {
         const found = this.Instance.SelectedViews.find(dv => dv.Document === except);
         runInAction(() => {
-            LinkManager.Instance.currentLink = undefined;
-            LinkManager.Instance.currentLinkAnchor = undefined;
+            if (LinkManager.Instance) {
+                LinkManager.Instance.currentLink = undefined;
+                LinkManager.Instance.currentLinkAnchor = undefined;
+            }
             this.Instance.SelectedSchemaDocument = undefined;
         });
         this.Instance.SelectedViews.forEach(dv => {
@@ -68,19 +76,18 @@ export class SelectionManager {
         if (found) this.SelectView(found, false);
     };
 
-    public static IsSelected = (doc?: Doc) => Array.from(doc?.[DocViews] ?? []).some(dv => dv?.IsSelected);
-    public static get Views() { return this.Instance.SelectedViews; } // prettier-ignore
-    public static get SelectedSchemaDoc() { return this.Instance.SelectedSchemaDocument; } // prettier-ignore
-    public static get Docs() { return this.Instance.SelectedViews.map(dv => dv.Document).filter(doc => doc?._type_collection !== CollectionViewType.Docking); } // prettier-ignore
+    public static Views() { return SelectionManager.Instance.SelectedViews; } // prettier-ignore
+    public static get SelectedSchemaDoc() { return SelectionManager.Instance.SelectedSchemaDocument; } // prettier-ignore
+    public static Docs() { return SelectionManager.Instance.SelectedViews.map(dv => dv.Document).filter(doc => doc?._type_collection !== CollectionViewType.Docking); } // prettier-ignore
 }
 
 // eslint-disable-next-line prefer-arrow-callback
 ScriptingGlobals.add(function SelectedDocType(type: string, expertMode: boolean, checkContext?: boolean) {
     if (Doc.noviceMode && expertMode) return false;
     if (type === 'tab') {
-        return SelectionManager.Views.lastElement()?._props.renderDepth === 0;
+        return DocumentView.Selected().lastElement()?._props.renderDepth === 0;
     }
-    const selected = (sel => (checkContext ? DocCast(sel?.embedContainer) : sel))(SelectionManager.SelectedSchemaDoc ?? SelectionManager.Docs.lastElement());
+    const selected = (sel => (checkContext ? DocCast(sel?.embedContainer) : sel))(DocumentView.SelectedSchemaDoc() ?? SelectionManager.Docs().lastElement());
     return selected?.type === type || selected?.type_collection === type || !type;
 });
 // eslint-disable-next-line prefer-arrow-callback
@@ -109,8 +116,6 @@ ScriptingGlobals.add(function redo() {
 });
 // eslint-disable-next-line prefer-arrow-callback
 ScriptingGlobals.add(function selectedDocs(container: Doc, excludeCollections: boolean, prevValue: any) {
-    const docs = SelectionManager.Views.map(dv => dv.Document).filter(
-        d => !Doc.AreProtosEqual(d, container) && !d.annotationOn && d.type !== DocumentType.KVP && (!excludeCollections || d.type !== DocumentType.COL || !Cast(d.data, listSpec(Doc), null))
-    );
+    const docs = SelectionManager.Docs().filter(d => !Doc.AreProtosEqual(d, container) && !d.annotationOn && d.type !== DocumentType.KVP && (!excludeCollections || d.type !== DocumentType.COL || !Cast(d.data, listSpec(Doc), null)));
     return docs.length ? new List(docs) : prevValue;
 });