enabled dragging documents onto tab bar without shift. modified link pivot document to automatically update when links are added and be a stacking view

4 files changed, 39 insertions, 28 deletions

diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index c9c499fff..0d6a77f71 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -458,9 +458,9 @@ export namespace DragManager {
             if (dragData instanceof DocumentDragData) {
                 dragData.userDropAction = e.ctrlKey && e.altKey ? "copy" : e.ctrlKey ? "alias" : dragData.defaultDropAction;
             }
-            if (e?.shiftKey && dragData.draggedDocuments.length === 1) {
+            if (((e.target as any)?.className === "lm_tabs" || e?.shiftKey) && dragData.draggedDocuments.length === 1) {
                 dragData.dropAction = dragData.userDropAction || "same";
-                if (dragData.dropAction === "move") {
+                if (dragData.dropAction === "move" || dragData.dropAction === "same") {
                     dragData.removeDocument?.(dragData.draggedDocuments[0]);
                 }
                 AbortDrag();
diff --git a/src/client/views/nodes/DocumentLinksButton.tsx b/src/client/views/nodes/DocumentLinksButton.tsx
index 7e6ca4248..804e82856 100644
--- a/src/client/views/nodes/DocumentLinksButton.tsx
+++ b/src/client/views/nodes/DocumentLinksButton.tsx
@@ -2,9 +2,10 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Tooltip } from "@material-ui/core";
 import { action, computed, observable, runInAction } from "mobx";
 import { observer } from "mobx-react";
-import { Doc, DocListCast, DocListCastAsync, Opt, WidthSym } from "../../../fields/Doc";
+import { Doc, Opt } from "../../../fields/Doc";
 import { Id } from "../../../fields/FieldSymbols";
-import { Cast, StrCast } from "../../../fields/Types";
+import { ScriptField } from "../../../fields/ScriptField";
+import { StrCast } from "../../../fields/Types";
 import { TraceMobx } from "../../../fields/util";
 import { emptyFunction, returnFalse, setupMoveUpEvents } from "../../../Utils";
 import { DocServer } from "../../DocServer";
@@ -20,7 +21,6 @@ import { DocumentView } from "./DocumentView";
 import { LinkDescriptionPopup } from "./LinkDescriptionPopup";
 import { TaskCompletionBox } from "./TaskCompletedBox";
 import React = require("react");
-import { Transform } from "../../util/Transform";
 
 const higflyout = require("@hig/flyout");
 export const { anchorPoints } = higflyout;
@@ -72,31 +72,18 @@ export class DocumentLinksButton extends React.Component<DocumentLinksButtonProp
     onLinkMenuOpen = (e: React.PointerEvent): void => {
         setupMoveUpEvents(this, e, this.onLinkButtonMoved, emptyFunction, action((e, doubleTap) => {
             if (doubleTap) {
-                const rootDoc = this.props.View.rootDoc;
-                const docid = Doc.CurrentUserEmail + Doc.GetProto(rootDoc)[Id] + "-pivotish";
-                DocServer.GetRefField(docid).then(async docx => {
+                const linkSource = this.props.View.rootDoc;
+                const docid = Doc.CurrentUserEmail + Doc.GetProto(linkSource)[Id] + "-pivotish";
+                DocServer.GetRefField(docid).then(docx => {
                     const rootAlias = () => {
-                        const rootAlias = Doc.MakeAlias(rootDoc);
+                        const rootAlias = Doc.MakeAlias(linkSource);
                         rootAlias.x = rootAlias.y = 0;
                         return rootAlias;
                     };
-                    let wid = rootDoc[WidthSym]();
-                    const target = ((docx instanceof Doc) && docx) || Docs.Create.FreeformDocument([rootAlias()], { title: this.props.View.Document.title + "-pivot", _width: 500, _height: 500, }, docid);
-                    const docs = await DocListCastAsync(Doc.GetProto(target).data);
-                    if (!target.pivotFocusish) (Doc.GetProto(target).pivotFocusish = target);
-                    DocListCast(rootDoc.links).forEach(link => {
-                        const other = LinkManager.getOppositeAnchor(link, rootDoc);
-                        const otherdoc = !other ? undefined : other.annotationOn ? Cast(other.annotationOn, Doc, null) : other;
-                        if (otherdoc && !docs?.some(d => Doc.AreProtosEqual(d, otherdoc))) {
-                            const alias = Doc.MakeAlias(otherdoc);
-                            alias.x = wid;
-                            alias.y = 0;
-                            alias._lockedPosition = false;
-                            wid += otherdoc[WidthSym]();
-                            Doc.AddDocToList(Doc.GetProto(target), "data", alias);
-                        }
-                    });
-                    LightboxView.SetLightboxDoc(target);
+                    const linkCollection = ((docx instanceof Doc) && docx) || Docs.Create.StackingDocument([/*rootAlias()*/], { title: this.props.View.Document.title + "-pivot", _width: 500, _height: 500, }, docid);
+                    linkCollection.linkSource = linkSource;
+                    if (!linkCollection.reactionScript) linkCollection.reactionScript = ScriptField.MakeScript("updateLinkCollection(self)");
+                    LightboxView.SetLightboxDoc(linkCollection);
                 });
             }
             else DocumentLinksButton.LinkEditorDocView = this.props.View;
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index e7de87ea5..955698190 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -2,7 +2,7 @@ import { IconProp } from "@fortawesome/fontawesome-svg-core";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { action, computed, IReactionDisposer, observable, reaction, runInAction } from "mobx";
 import { observer } from "mobx-react";
-import { AclAdmin, AclEdit, AclPrivate, DataSym, Doc, DocListCast, Field, Opt, StrListCast } from "../../../fields/Doc";
+import { AclAdmin, AclEdit, AclPrivate, DataSym, Doc, DocListCast, DocListCastAsync, Field, Opt, StrListCast, WidthSym } from "../../../fields/Doc";
 import { Document } from '../../../fields/documentSchemas';
 import { Id } from '../../../fields/FieldSymbols';
 import { InkTool } from '../../../fields/InkField';
@@ -1247,6 +1247,10 @@ export class DocumentView extends React.Component<DocumentViewProps> {
         return this.props.ScreenToLocalTransform().translate(-this.centeringX, -this.centeringY).scale(1 / this.nativeScaling);
     }
     componentDidMount() {
+        this._disposers.reactionScript = reaction(
+            () => ScriptCast(this.rootDoc.reactionScript)?.script?.run({ this: this.props.Document, self: Cast(this.rootDoc, Doc, null) || this.props.Document }).result,
+            output => output
+        );
         this._disposers.height = reaction(
             () => NumCast(this.layoutDoc._height),
             action(height => {
@@ -1298,4 +1302,24 @@ export class DocumentView extends React.Component<DocumentViewProps> {
 ScriptingGlobals.add(function toggleDetail(dv: DocumentView, detailLayoutKeySuffix: string) {
     if (dv.Document.layoutKey === "layout_" + detailLayoutKeySuffix) dv.switchViews(false, "layout");
     else dv.switchViews(true, detailLayoutKeySuffix);
+});
+
+ScriptingGlobals.add(function updateLinkCollection(linkCollection: Doc) {
+    const linkSource = Cast(linkCollection.linkSource, Doc, null);
+    const collectedLinks = DocListCast(Doc.GetProto(linkCollection).data);
+    let wid = linkSource[WidthSym]();
+    const links = DocListCast(linkSource.links);
+    links.forEach(link => {
+        const other = LinkManager.getOppositeAnchor(link, linkSource);
+        const otherdoc = !other ? undefined : other.annotationOn ? Cast(other.annotationOn, Doc, null) : other;
+        if (otherdoc && !collectedLinks?.some(d => Doc.AreProtosEqual(d, otherdoc))) {
+            const alias = Doc.MakeAlias(otherdoc);
+            alias.x = wid;
+            alias.y = 0;
+            alias._lockedPosition = false;
+            wid += otherdoc[WidthSym]();
+            Doc.AddDocToList(Doc.GetProto(linkCollection), "data", alias);
+        }
+    });
+    return links;
 });
\ No newline at end of file
diff --git a/src/client/views/nodes/WebBox.scss b/src/client/views/nodes/WebBox.scss
index 9d8825ad1..ff38e37dd 100644
--- a/src/client/views/nodes/WebBox.scss
+++ b/src/client/views/nodes/WebBox.scss
@@ -10,7 +10,7 @@
         width: 100%;
         height: 100%;
         cursor: ew-resize;
-        background: yellow;
+        background: darkgray;
     }
     .webBox-background { 
         width: 100%;