2 files changed, 12 insertions, 26 deletions

diff --git a/src/client/views/nodes/LinkMenuItem.tsx b/src/client/views/nodes/LinkMenuItem.tsx
index c3d9d033f..12eb2c2f7 100644
--- a/src/client/views/nodes/LinkMenuItem.tsx
+++ b/src/client/views/nodes/LinkMenuItem.tsx
@@ -32,30 +32,20 @@ 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;
 
-    componentDidMount = () => {
-        // document.addEventListener("pointerdown", this.unhighlight);
-    }
 
     unhighlight = () => {
-        // if (this.shouldUnhighlight)
-        // Doc.UnhighlightAll();
-        Doc.UnHighlightDoc(this.props.destinationDoc);
+        Doc.UnhighlightAll();
+        document.removeEventListener("pointerdown", this.unhighlight);
     }
 
     @action
     highlightDoc = () => {
-        // this.shouldUnhighlight = false;
         document.removeEventListener("pointerdown", this.unhighlight);
-
         Doc.HighlightDoc(this.props.destinationDoc);
-
         window.setTimeout(() => {
-            // this.shouldUnhighlight = true;
             document.addEventListener("pointerdown", this.unhighlight);
-
-        }, 3000);
+        }, 10000);
     }
 
     // NOT DONE?
diff --git a/src/new_fields/Doc.ts b/src/new_fields/Doc.ts
index 425d532c0..b47811ac6 100644
--- a/src/new_fields/Doc.ts
+++ b/src/new_fields/Doc.ts
@@ -624,35 +624,31 @@ export namespace Doc {
     }
 
     export class HighlightBrush {
-        @observable HighlightedDoc: ObservableMap<Doc, boolean> = new ObservableMap();
+        @observable HighlightedDoc: Map<Doc, boolean> = new Map();
     }
     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));
+        let IsHighlighted = highlightManager.HighlightedDoc.get(doc) || highlightManager.HighlightedDoc.get(Doc.GetDataDoc(doc));
+        return IsHighlighted;
     }
     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();
+        let mapEntries = highlightManager.HighlightedDoc.keys();
+        let docEntry: IteratorResult<Doc>;
+        while (!(docEntry = mapEntries.next()).done) {
+            let targetDoc = docEntry.value;
+            targetDoc && Doc.UnHighlightDoc(targetDoc);
         }
 
     }