things won't highlight more than once

3 files changed, 129 insertions, 56 deletions

diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index 6f5235c4a..900cd266e 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -747,18 +747,20 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu
         }
         let showTextTitle = showTitle && StrCast(this.layoutDoc.layout).startsWith("<FormattedTextBox") ? showTitle : undefined;
         let brushDegree = Doc.IsBrushedDegree(this.props.Document);
+        let fullDegree = Doc.isBrushedHighlightedDegree(this.props.Document);
+        // console.log(fullDegree)
         let borderRounding = StrCast(Doc.GetProto(this.props.Document).borderRounding);
-        let localScale = this.props.ScreenToLocalTransform().Scale * brushDegree;
+        let localScale = this.props.ScreenToLocalTransform().Scale * fullDegree;
         return (
             <div className={`documentView-node${this.topMost ? "-topmost" : ""}`}
                 ref={this._mainCont}
                 style={{
                     pointerEvents: this.layoutDoc.isBackground && !this.isSelected() ? "none" : "all",
                     color: foregroundColor,
-                    outlineColor: ["transparent", "maroon", "maroon"][brushDegree],
-                    outlineStyle: ["none", "dashed", "solid"][brushDegree],
-                    outlineWidth: brushDegree && !borderRounding ? `${localScale}px` : "0px",
-                    border: brushDegree && borderRounding ? `${["none", "dashed", "solid"][brushDegree]} ${["transparent", "maroon", "maroon"][brushDegree]} ${localScale}px` : undefined,
+                    outlineColor: ["transparent", "maroon", "maroon", "yellow"][fullDegree],
+                    outlineStyle: ["none", "dashed", "solid", "solid"][fullDegree],
+                    outlineWidth: fullDegree && !borderRounding ? `${localScale}px` : "0px",
+                    border: fullDegree && borderRounding ? `${["none", "dashed", "solid", "solid"][fullDegree]} ${["transparent", "maroon", "maroon", "yellow"][fullDegree]} ${localScale}px` : undefined,
                     borderRadius: "inherit",
                     background: backgroundColor,
                     width: nativeWidth,
diff --git a/src/client/views/nodes/LinkMenuItem.tsx b/src/client/views/nodes/LinkMenuItem.tsx
index caae88943..c3d9d033f 100644
--- a/src/client/views/nodes/LinkMenuItem.tsx
+++ b/src/client/views/nodes/LinkMenuItem.tsx
@@ -32,45 +32,30 @@ export class LinkMenuItem extends React.Component<LinkMenuItemProps> {
     private _drag = React.createRef<HTMLDivElement>();
     @observable private _showMore: boolean = false;
     @action toggleShowMore() { this._showMore = !this._showMore; }
+    @observable shouldUnhighlight: boolean = false;
 
-    @undoBatch
-    onFollowLink = async (e: React.PointerEvent): Promise<void> => {
-        e.stopPropagation();
-        e.persist();
-        let jumpToDoc = this.props.destinationDoc;
-        let pdfDoc = FieldValue(Cast(this.props.destinationDoc, Doc));
-        if (pdfDoc) {
-            jumpToDoc = pdfDoc;
-        }
-        let proto = Doc.GetProto(this.props.linkDoc);
-        let targetContext = await Cast(proto.targetContext, Doc);
-        let sourceContext = await Cast(proto.sourceContext, Doc);
-        let self = this;
+    componentDidMount = () => {
+        // document.addEventListener("pointerdown", this.unhighlight);
+    }
 
+    unhighlight = () => {
+        // if (this.shouldUnhighlight)
+        // Doc.UnhighlightAll();
+        Doc.UnHighlightDoc(this.props.destinationDoc);
+    }
 
-        let dockingFunc = (document: Doc) => { this.props.addDocTab(document, undefined, "inTab"); SelectionManager.DeselectAll(); };
-        if (e.ctrlKey) {
-            dockingFunc = (document: Doc) => CollectionDockingView.Instance.AddRightSplit(document, undefined);
-        }
+    @action
+    highlightDoc = () => {
+        // this.shouldUnhighlight = false;
+        document.removeEventListener("pointerdown", this.unhighlight);
 
-        if (this.props.destinationDoc === self.props.linkDoc.anchor2 && targetContext) {
-            DocumentManager.Instance.jumpToDocument(jumpToDoc, e.altKey, false, async document => dockingFunc(document), undefined, targetContext!);
-            console.log("1")
-        }
-        else if (this.props.destinationDoc === self.props.linkDoc.anchor1 && sourceContext) {
-            DocumentManager.Instance.jumpToDocument(jumpToDoc, e.altKey, false, document => dockingFunc(sourceContext!));
-            console.log("2")
-        }
-        else if (DocumentManager.Instance.getDocumentView(jumpToDoc)) {
-            DocumentManager.Instance.jumpToDocument(jumpToDoc, e.altKey, undefined, undefined, NumCast((this.props.destinationDoc === self.props.linkDoc.anchor2 ? self.props.linkDoc.anchor2Page : self.props.linkDoc.anchor1Page)));
-            console.log("3")
+        Doc.HighlightDoc(this.props.destinationDoc);
 
-        }
-        else {
-            DocumentManager.Instance.jumpToDocument(jumpToDoc, e.altKey, false, dockingFunc);
-            console.log("4")
+        window.setTimeout(() => {
+            // this.shouldUnhighlight = true;
+            document.addEventListener("pointerdown", this.unhighlight);
 
-        }
+        }, 3000);
     }
 
     // NOT DONE?
@@ -92,17 +77,18 @@ export class LinkMenuItem extends React.Component<LinkMenuItemProps> {
     // this opens the linked doc in a right split, NOT in its collection
     @undoBatch
     openLinkRight = () => {
+        this.highlightDoc();
         let alias = Doc.MakeAlias(this.props.destinationDoc);
         CollectionDockingView.Instance.AddRightSplit(alias, undefined);
         SelectionManager.DeselectAll();
-
     }
 
-    // NOT DONE
+    // DONE
     // this is the standard "follow link" (jump to document)
     // taken from follow link
     @undoBatch
     jumpToLink = async (shouldZoom: boolean = false) => {
+        this.highlightDoc();
         let jumpToDoc = this.props.destinationDoc;
         let pdfDoc = FieldValue(Cast(this.props.destinationDoc, Doc));
         if (pdfDoc) {
@@ -113,7 +99,6 @@ export class LinkMenuItem extends React.Component<LinkMenuItemProps> {
         let sourceContext = await Cast(proto.sourceContext, Doc);
         let self = this;
 
-
         let dockingFunc = (document: Doc) => { this.props.addDocTab(document, undefined, "inTab"); SelectionManager.DeselectAll(); };
 
         if (this.props.destinationDoc === self.props.linkDoc.anchor2 && targetContext) {
@@ -136,6 +121,7 @@ export class LinkMenuItem extends React.Component<LinkMenuItemProps> {
     // this opens it full screen, do we need a separate full screen option?
     @undoBatch
     openLinkTab = () => {
+        this.highlightDoc();
         let fullScreenAlias = Doc.MakeAlias(this.props.destinationDoc);
         this.props.addDocTab(fullScreenAlias, undefined, "inTab");
         SelectionManager.DeselectAll();
@@ -146,12 +132,14 @@ export class LinkMenuItem extends React.Component<LinkMenuItemProps> {
     // target = the document to center on
     @undoBatch
     openLinkColTab = ({ col, target }: { col: Doc, target: Doc }) => {
-
+        this.highlightDoc();
     }
 
     // this will open a link next to the source doc
     @undoBatch
     openLinkInPlace = () => {
+        this.highlightDoc();
+
         let alias = Doc.MakeAlias(this.props.destinationDoc);
         let y = this.props.sourceDoc.y;
         let x = this.props.sourceDoc.x;
@@ -160,7 +148,7 @@ export class LinkMenuItem extends React.Component<LinkMenuItemProps> {
     }
 
     //set this to be the default link behavior, can be any of the above
-    private defaultLinkBehavior: any = this.openLinkInPlace;
+    private defaultLinkBehavior: any = this.openLinkRight;
 
     onEdit = (e: React.PointerEvent): void => {
         e.stopPropagation();
@@ -237,4 +225,44 @@ export class LinkMenuItem extends React.Component<LinkMenuItemProps> {
             </div >
         );
     }
-}
\ No newline at end of file
+}
+
+    // @undoBatch
+    // onFollowLink = async (e: React.PointerEvent): Promise<void> => {
+    //     e.stopPropagation();
+    //     e.persist();
+    //     let jumpToDoc = this.props.destinationDoc;
+    //     let pdfDoc = FieldValue(Cast(this.props.destinationDoc, Doc));
+    //     if (pdfDoc) {
+    //         jumpToDoc = pdfDoc;
+    //     }
+    //     let proto = Doc.GetProto(this.props.linkDoc);
+    //     let targetContext = await Cast(proto.targetContext, Doc);
+    //     let sourceContext = await Cast(proto.sourceContext, Doc);
+    //     let self = this;
+
+
+    //     let dockingFunc = (document: Doc) => { this.props.addDocTab(document, undefined, "inTab"); SelectionManager.DeselectAll(); };
+    //     if (e.ctrlKey) {
+    //         dockingFunc = (document: Doc) => CollectionDockingView.Instance.AddRightSplit(document, undefined);
+    //     }
+
+    //     if (this.props.destinationDoc === self.props.linkDoc.anchor2 && targetContext) {
+    //         DocumentManager.Instance.jumpToDocument(jumpToDoc, e.altKey, false, async document => dockingFunc(document), undefined, targetContext!);
+    //         console.log("1")
+    //     }
+    //     else if (this.props.destinationDoc === self.props.linkDoc.anchor1 && sourceContext) {
+    //         DocumentManager.Instance.jumpToDocument(jumpToDoc, e.altKey, false, document => dockingFunc(sourceContext!));
+    //         console.log("2")
+    //     }
+    //     else if (DocumentManager.Instance.getDocumentView(jumpToDoc)) {
+    //         DocumentManager.Instance.jumpToDocument(jumpToDoc, e.altKey, undefined, undefined, NumCast((this.props.destinationDoc === self.props.linkDoc.anchor2 ? self.props.linkDoc.anchor2Page : self.props.linkDoc.anchor1Page)));
+    //         console.log("3")
+
+    //     }
+    //     else {
+    //         DocumentManager.Instance.jumpToDocument(jumpToDoc, e.altKey, false, dockingFunc);
+    //         console.log("4")
+
+    //     }
+    // }
\ No newline at end of file
diff --git a/src/new_fields/Doc.ts b/src/new_fields/Doc.ts
index d634cf57f..425d532c0 100644
--- a/src/new_fields/Doc.ts
+++ b/src/new_fields/Doc.ts
@@ -329,12 +329,12 @@ export namespace Doc {
 
     export function AddDocToList(target: Doc, key: string, doc: Doc, relativeTo?: Doc, before?: boolean, first?: boolean, allowDuplicates?: boolean) {
         if (target[key] === undefined) {
-            console.log("target key undefined");
+            // console.log("target key undefined");
             Doc.GetProto(target)[key] = new List<Doc>();
         }
         let list = Cast(target[key], listSpec(Doc));
         if (list) {
-            console.log("has list");
+            // console.log("has list");
             if (allowDuplicates !== true) {
                 let pind = list.reduce((l, d, i) => d instanceof Doc && Doc.AreProtosEqual(d, doc) ? i : l, -1);
                 if (pind !== -1) {
@@ -342,15 +342,15 @@ export namespace Doc {
                 }
             }
             if (first) {
-                console.log("is first");
+                // console.log("is first");
                 list.splice(0, 0, doc);
             }
             else {
-                console.log("not first");
+                // console.log("not first");
                 let ind = relativeTo ? list.indexOf(relativeTo) : -1;
                 if (ind === -1) list.push(doc);
                 else list.splice(before ? ind : ind + 1, 0, doc);
-                console.log("index", ind);
+                // console.log("index", ind);
             }
         }
         return true;
@@ -595,23 +595,66 @@ export namespace Doc {
         });
     }
 
+    export function isBrushedHighlightedDegree(doc: Doc) {
+        if (Doc.IsHighlighted(doc)) {
+            return 3;
+        }
+        else {
+            return Doc.IsBrushedDegree(doc);
+        }
+    }
+
     export class DocBrush {
         @observable BrushedDoc: ObservableMap<Doc, boolean> = new ObservableMap();
     }
-    const manager = new DocBrush();
+    const brushManager = new DocBrush();
     export function IsBrushed(doc: Doc) {
-        return manager.BrushedDoc.has(doc) || manager.BrushedDoc.has(Doc.GetDataDoc(doc));
+        return brushManager.BrushedDoc.has(doc) || brushManager.BrushedDoc.has(Doc.GetDataDoc(doc));
     }
     export function IsBrushedDegree(doc: Doc) {
-        return manager.BrushedDoc.has(Doc.GetDataDoc(doc)) ? 2 : manager.BrushedDoc.has(doc) ? 1 : 0;
+        return brushManager.BrushedDoc.has(Doc.GetDataDoc(doc)) ? 2 : brushManager.BrushedDoc.has(doc) ? 1 : 0;
     }
     export function BrushDoc(doc: Doc) {
-        manager.BrushedDoc.set(doc, true);
-        manager.BrushedDoc.set(Doc.GetDataDoc(doc), true);
+        brushManager.BrushedDoc.set(doc, true);
+        brushManager.BrushedDoc.set(Doc.GetDataDoc(doc), true);
     }
     export function UnBrushDoc(doc: Doc) {
-        manager.BrushedDoc.delete(doc);
-        manager.BrushedDoc.delete(Doc.GetDataDoc(doc));
+        brushManager.BrushedDoc.delete(doc);
+        brushManager.BrushedDoc.delete(Doc.GetDataDoc(doc));
+    }
+
+    export class HighlightBrush {
+        @observable HighlightedDoc: ObservableMap<Doc, boolean> = new ObservableMap();
+    }
+    const highlightManager = new HighlightBrush();
+    export function IsHighlighted(doc: Doc) {
+        // return highlightManager.HighlightedDoc.has(doc) || highlightManager.HighlightedDoc.has(Doc.GetDataDoc(doc));
+        return highlightManager.HighlightedDoc.get(doc) || highlightManager.HighlightedDoc.get(Doc.GetDataDoc(doc));
+    }
+    export function HighlightDoc(doc: Doc) {
+        console.log("is highlighting")
+        runInAction(() => {
+            highlightManager.HighlightedDoc.set(doc, true);
+            highlightManager.HighlightedDoc.set(Doc.GetDataDoc(doc), true);
+        });
+    }
+    export function UnHighlightDoc(doc: Doc) {
+        // highlightManager.HighlightedDoc.delete(doc);
+        // highlightManager.HighlightedDoc.delete(Doc.GetDataDoc(doc));
+        runInAction(() => {
+            highlightManager.HighlightedDoc.set(doc, false);
+            highlightManager.HighlightedDoc.set(Doc.GetDataDoc(doc), false);
+        })
+    }
+    export function UnhighlightAll() {
+        // highlightManager.HighlightedDoc.clear();
+        let docs = highlightManager.HighlightedDoc.keys();
+        let doc = docs.next();
+        while (docs.next !== null) {
+            Doc.UnHighlightDoc(doc.value);
+            doc = docs.next();
+        }
+
     }
 }
 Scripting.addGlobal(function renameAlias(doc: any, n: any) { return StrCast(doc.title).replace(/\([0-9]*\)/, "") + `(${n})`; });