changed so link docs are added to common ancestor of anchors so that they can appear above/below intermediary docs using z order. fixed dragging to tab bar to start dragging document as a tab.

2 files changed, 15 insertions, 1 deletions

diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index eada5af75..7407fa2b3 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -209,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
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index 78356888a..1f093a33c 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -506,7 +506,7 @@ export namespace DragManager {
             if (dragData instanceof DocumentDragData) {
                 dragData.userDropAction = e.ctrlKey && e.altKey ? 'copy' : e.shiftKey ? 'move' : e.ctrlKey ? 'embed' : dragData.defaultDropAction;
             }
-            if (((e.target as any)?.className === 'lm_tabs' || (e.target as any)?.className === 'lm_header') && dragData.draggedDocuments.length === 1) {
+            if (['lm_tab', 'lm_title_wrap', 'lm_tabs', 'lm_header'].includes(typeof (e.target as any).className === 'string' ? (e.target as any)?.className : '') && dragData.draggedDocuments.length === 1) {
                 if (!startWindowDragTimer) {
                     startWindowDragTimer = setTimeout(async () => {
                         startWindowDragTimer = undefined;