Merge branch 'master' into geireann_dash_components

1 files changed, 16 insertions, 13 deletions

diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 612f16ce9..7e3302067 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -246,16 +246,18 @@ export class DocumentManager {
     ) => {
         const docContextPath = DocumentManager.GetContextPath(targetDoc, true);
         if (docContextPath.some(doc => doc.hidden)) options.toggleTarget = false;
-        let rootContextView = 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])!);
-            }
-            options.didMove = true;
-            docContextPath.some(doc => TabDocView.Activate(doc)) || DocumentViewInternal.addDocTabFunc(docContextPath[0], options.openLocation ?? OpenWhere.addRight);
-            this.AddViewRenderedCb(docContextPath[0], dv => res(dv));
-        });
+        let 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])!);
+                }
+                options.didMove = true;
+                docContextPath.some(doc => TabDocView.Activate(doc)) || DocumentViewInternal.addDocTabFunc(docContextPath[0], options.openLocation ?? OpenWhere.addRight);
+                this.AddViewRenderedCb(docContextPath[0], dv => res(dv));
+            }));
         if (options.openLocation === OpenWhere.lightbox) {
             // even if we found the document view, if the target is a lightbox, we try to open it in the lightbox to preserve lightbox semantics (eg, there's only one active doc in the lightbox)
             const target = DocCast(targetDoc.annotationOn, targetDoc);
@@ -269,9 +271,10 @@ export class DocumentManager {
             const innerDoc = docContextPath.shift();
             return { viewSpec: innerDoc, childDocView: innerDoc && !innerDoc.layout_unrendered ? (await docView.ComponentView?.getView?.(innerDoc)) ?? this.getDocumentView(innerDoc) : undefined };
         };
-        const target = await this.focusViewsInPath(rootContextView, options, childViewIterator);
-        this.restoreDocView(target.viewSpec, target.docView, options, target.contextView ?? target.docView, targetDoc);
-
+        if (rootContextView) {
+            const target = await this.focusViewsInPath(rootContextView, options, childViewIterator);
+            this.restoreDocView(target.viewSpec, target.docView, options, target.contextView ?? target.docView, targetDoc);
+        }
         finished?.();
     };