1 files changed, 42 insertions, 38 deletions

diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 40d28c690..67a61f17e 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -8,10 +8,9 @@ import { Cast, DocCast, NumCast, StrCast } from '../../fields/Types';
 import { AudioField } from '../../fields/URLField';
 import { GetEffectiveAcl } from '../../fields/util';
 import { CollectionViewType } from '../documents/DocumentTypes';
-import { CollectionDockingView } from '../views/collections/CollectionDockingView';
 import { TabDocView } from '../views/collections/TabDocView';
 import { LightboxView } from '../views/LightboxView';
-import { DocumentView, DocumentViewInternal, OpenWhere, OpenWhereMod } from '../views/nodes/DocumentView';
+import { DocumentView, DocumentViewInternal, OpenWhere } from '../views/nodes/DocumentView';
 import { FocusViewOptions } from '../views/nodes/FieldView';
 import { KeyValueBox } from '../views/nodes/KeyValueBox';
 import { LinkAnchorBox } from '../views/nodes/LinkAnchorBox';
@@ -20,12 +19,14 @@ import { ScriptingGlobals } from './ScriptingGlobals';
 import { SelectionManager } from './SelectionManager';
 
 export class DocumentManager {
+    // eslint-disable-next-line no-use-before-define
     private static _instance: DocumentManager;
     public static get Instance(): DocumentManager {
+        // eslint-disable-next-line no-return-assign
         return this._instance || (this._instance = new this());
     }
 
-    //global holds all of the nodes (regardless of which collection they're in)
+    // global holds all of the nodes (regardless of which collection they're in)
     @observable _documentViews = new Set<DocumentView>();
     @observable.shallow public CurrentlyLoading: Doc[] = [];
     @computed public get DocumentViews() {
@@ -38,7 +39,7 @@ export class DocumentManager {
         this._documentViews.delete(dv);
     }
 
-    //private constructor so no other class can create a nodemanager
+    // private constructor so no other class can create a nodemanager
     private constructor() {
         makeObservable(this);
         observe(this.CurrentlyLoading, change => {
@@ -52,6 +53,7 @@ export class DocumentManager {
                 case 'splice':
                     (change as any).removed.forEach((doc: Doc) => DocumentManager.Instance.getAllDocumentViews(doc).forEach(dv => StrCast(dv.Document.layout_fieldKey) === 'layout_icon' && dv.iconify(() => dv.iconify())));
                     break;
+                default:
             }
         });
     }
@@ -101,7 +103,7 @@ export class DocumentManager {
         SelectionManager.DeselectView(view);
     });
 
-    //gets all views
+    // gets all views
     public getDocumentViewsById(id: string) {
         const toReturn: DocumentView[] = [];
         DocumentManager.Instance.DocumentViews.forEach(view => {
@@ -135,25 +137,17 @@ export class DocumentManager {
         );
     }
 
-    public getLightboxDocumentView = (toFind: Doc, originatingDoc: Opt<Doc> = undefined): DocumentView | undefined => {
+    public getLightboxDocumentView = (toFind: Doc): DocumentView | undefined => {
         const views: DocumentView[] = [];
         DocumentManager.Instance.DocumentViews.forEach(view => LightboxView.Contains(view) && Doc.AreProtosEqual(view.Document, toFind) && views.push(view));
-        return views?.find(view => view.ContentDiv?.getBoundingClientRect().width /*&& view._props.focus !== returnFalse) || views?.find(view => view._props.focus !== returnFalse*/) || (views.length ? views[0] : undefined);
+        return views?.find(view => view.ContentDiv?.getBoundingClientRect().width /* && view._props.focus !== returnFalse) || views?.find(view => view._props.focus !== returnFalse */) || (views.length ? views[0] : undefined);
     };
-    public getFirstDocumentView = (toFind: Doc, originatingDoc: Opt<Doc> = undefined): DocumentView | undefined => {
-        if (LightboxView.LightboxDoc) return DocumentManager.Instance.getLightboxDocumentView(toFind, originatingDoc);
-        const views = this.getDocumentViews(toFind); //.filter(view => view.Document !== originatingDoc);
-        return views?.find(view => view.ContentDiv?.getBoundingClientRect().width /*&& view._props.focus !== returnFalse) || views?.find(view => view._props.focus !== returnFalse*/) || (views.length ? views[0] : undefined);
+    public getFirstDocumentView = (toFind: Doc): DocumentView | undefined => {
+        if (LightboxView.LightboxDoc) return DocumentManager.Instance.getLightboxDocumentView(toFind);
+        const views = this.getDocumentViews(toFind); // .filter(view => view.Document !== originatingDoc);
+        return views?.find(view => view.ContentDiv?.getBoundingClientRect().width /* && view._props.focus !== returnFalse) || views?.find(view => view._props.focus !== returnFalse */) || (views.length ? views[0] : undefined);
     };
-    public getDocumentViews(toFindIn: Doc): DocumentView[] {
-        const toFind =
-            // Array.from(DocumentManager.Instance.DocumentViews).find(
-            //     dv =>
-            //         ((dv.Document.data as any)?.url?.href && (dv.Document.data as any)?.url?.href === (toFindIn.data as any)?.url?.href) ||
-            //         ((DocCast(dv.Document.annotationOn)?.data as any)?.url?.href && (DocCast(dv.Document.annotationOn)?.data as any)?.url?.href === (DocCast(toFindIn.annotationOn)?.data as any)?.url?.href)
-            // )?.Document ??
-            toFindIn;
-
+    public getDocumentViews(toFind: Doc): DocumentView[] {
         const toReturn: DocumentView[] = [];
         const docViews = DocumentManager.Instance.DocumentViews.filter(view => !LightboxView.Contains(view));
         const lightViews = DocumentManager.Instance.DocumentViews.filter(view => LightboxView.Contains(view));
@@ -172,7 +166,7 @@ export class DocumentManager {
     static GetContextPath(doc: Opt<Doc>, includeExistingViews?: boolean) {
         if (!doc) return [];
         const srcContext = DocCast(doc.annotationOn, DocCast(doc.embedContainer));
-        var containerDocContext = srcContext ? [srcContext, doc] : [doc];
+        let containerDocContext = srcContext ? [srcContext, doc] : [doc];
         while (
             containerDocContext.length &&
             DocCast(containerDocContext[0]?.embedContainer) &&
@@ -204,10 +198,6 @@ export class DocumentManager {
         DocumentManager._overlayViews?.clear();
     }
     static _overlayViews = new ObservableSet<DocumentView>();
-    static addView = (doc: Doc, finished?: () => void) => {
-        CollectionDockingView.AddSplit(doc, OpenWhereMod.right);
-        finished?.();
-    };
 
     public static LinkCommonAncestor(linkDoc: Doc) {
         const anchor = (which: number) => {
@@ -228,7 +218,7 @@ export class DocumentManager {
     //           focusing on each context
     public showDocumentView = async (targetDocView: DocumentView, options: FocusViewOptions) => {
         const docViewPath = [...(targetDocView.containerViewPath?.() ?? []), targetDocView];
-        let rootContextView = docViewPath.shift();
+        const rootContextView = docViewPath.shift();
         await (rootContextView && this.focusViewsInPath(rootContextView, options, async () => ({ childDocView: docViewPath.shift(), viewSpec: undefined, focused: false })));
         if (options.toggleTarget && (!options.didMove || targetDocView.Document.hidden)) targetDocView.Document.hidden = !targetDocView.Document.hidden;
         else if (options.openLocation?.startsWith(OpenWhere.toggle) && !options.didMove && rootContextView) DocumentViewInternal.addDocTabFunc(rootContextView.Document, options.openLocation);
@@ -242,9 +232,10 @@ export class DocumentManager {
     //           and finally restoring the targetDoc to the viewSpec specified by the last document which may either be the targetDoc, or a viewSpec that describes the targetDoc configuration
     public showDocument = async (
         targetDoc: Doc, // document to display
-        options: FocusViewOptions, // options for how to navigate to target
+        optionsIn: FocusViewOptions, // options for how to navigate to target
         finished?: (changed: boolean) => void // func called after focusing on target with flag indicating whether anything needed to be done.
     ) => {
+        const options = optionsIn;
         Doc.RemoveDocFromList(Doc.MyRecentlyClosed, undefined, targetDoc);
         const docContextPath = DocumentManager.GetContextPath(targetDoc, true);
         if (docContextPath.some(doc => doc.hidden)) options.toggleTarget = false;
@@ -253,13 +244,14 @@ export class DocumentManager {
             options.toggleTarget = false;
             TabDocView.Activate(tabView?._document);
         }
-        let rootContextView =
+        const rootContextView =
             docContextPath.length &&
             (await new Promise<DocumentView>(res => {
                 const viewIndex = docContextPath.findIndex(doc => this.getDocumentView(doc));
                 if (viewIndex !== -1) {
                     viewIndex && docContextPath.splice(0, viewIndex);
-                    return res(this.getDocumentView(docContextPath[0])!);
+                    res(this.getDocumentView(docContextPath[0])!);
+                    return;
                 }
                 options.didMove = true;
                 (!LightboxView.LightboxDoc && docContextPath.some(doc => TabDocView.Activate(doc))) || DocumentViewInternal.addDocTabFunc(docContextPath[0], options.openLocation ?? OpenWhere.addRight);
@@ -270,7 +262,9 @@ export class DocumentManager {
             const target = DocCast(targetDoc.annotationOn, targetDoc);
             const contextView = this.getDocumentView(DocCast(target.embedContainer));
             if (contextView?.ComponentView?.addDocTab?.(target, OpenWhere.lightbox)) {
-                await new Promise<void>(waitres => setTimeout(() => waitres()));
+                await new Promise<void>(waitres => {
+                    setTimeout(() => waitres());
+                });
             }
         }
         docContextPath.shift();
@@ -287,19 +281,25 @@ export class DocumentManager {
     };
 
     focusViewsInPath = async (
-        docView: DocumentView, //
-        options: FocusViewOptions,
+        docViewIn: DocumentView, //
+        optionsIn: FocusViewOptions,
         iterator: (docView: DocumentView) => Promise<{ viewSpec: Opt<Doc>; childDocView: Opt<DocumentView>; focused: boolean }>
     ) => {
         let contextView: DocumentView | undefined; // view containing context that contains target
         let focused = false;
+        let docView = docViewIn;
+        const options = optionsIn;
         while (true) {
             if (docView.Document.layout_fieldKey === 'layout_icon') {
-                await new Promise<void>(res => docView.iconify(res));
+                // eslint-disable-next-line no-await-in-loop
+                await new Promise<any>(res => {
+                    docView.iconify(res);
+                });
                 options.didMove = true;
             }
             const nextFocus = docView._props.focus(docView.Document, options); // focus the view within its container
-            focused = focused || (nextFocus === undefined ? false : true); // keep track of whether focusing on a view needed to actually change anything
+            focused = focused || nextFocus !== undefined; // keep track of whether focusing on a view needed to actually change anything
+            // eslint-disable-next-line no-await-in-loop
             const { childDocView, viewSpec } = await iterator(docView);
             if (!childDocView) return { viewSpec: options.anchorDoc ?? viewSpec ?? docView.Document, docView, contextView, focused };
             contextView = options.anchorDoc?.layout_unrendered && !childDocView.Document.layout_unrendered ? childDocView : docView;
@@ -308,10 +308,11 @@ export class DocumentManager {
     };
 
     @action
-    restoreDocView(viewSpec: Opt<Doc>, docView: DocumentView, options: FocusViewOptions, contextView: Opt<DocumentView>, targetDoc: Doc) {
+    restoreDocView(viewSpec: Opt<Doc>, docViewIn: DocumentView, options: FocusViewOptions, contextView: Opt<DocumentView>, targetDoc: Doc) {
+        const docView = docViewIn;
         if (viewSpec && docView) {
-            //if (docView.ComponentView instanceof FormattedTextBox)
-            //viewSpec !== docView.Document &&
+            // if (docView.ComponentView instanceof FormattedTextBox)
+            // viewSpec !== docView.Document &&
             docView.ComponentView?.focus?.(viewSpec, options);
             PresBox.restoreTargetDocView(docView, viewSpec, options.zoomTime ?? 500);
             Doc.linkFollowHighlight(viewSpec ? [docView.Document, viewSpec] : docView.Document, undefined, options.effect);
@@ -332,7 +333,10 @@ export class DocumentManager {
         }
     }
 }
-export function DocFocusOrOpen(doc: Doc, options: FocusViewOptions = { willZoomCentered: true, zoomScale: 0, openLocation: OpenWhere.toggleRight }, containingDoc?: Doc) {
+// 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);