2 files changed, 65 insertions, 10 deletions

diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
new file mode 100644
index 000000000..5b99b4ef8
--- /dev/null
+++ b/src/client/util/DocumentManager.ts
@@ -0,0 +1,51 @@
+import React = require('react')
+import { observer } from 'mobx-react';
+import { observable, action } from 'mobx';
+import { Document } from "../../fields/Document"
+import { DocumentView } from '../views/nodes/DocumentView';
+
+
+export class DocumentManager {
+
+    //global holds all of the nodes (regardless of which collection they're in)
+    @observable
+    public DocumentViews: DocumentView[] = [];
+
+    // singleton instance
+    private static _instance: DocumentManager;
+
+    // create one and only one instance of NodeManager
+    public static get Instance(): DocumentManager {
+        return this._instance || (this._instance = new this());
+    }
+
+    //private constructor so no other class can create a nodemanager
+    private constructor() {
+        // this.DocumentViews = new Array<DocumentView>();
+    }
+
+    public getDocumentView(toFind: Document): DocumentView | null {
+
+        let toReturn: DocumentView | null;
+        toReturn = null;
+
+        //gets document view that is in a freeform canvas collection
+        DocumentManager.Instance.DocumentViews.map(view => {
+            let doc = view.props.Document;
+            // if (view.props.ContainingCollectionView instanceof CollectionFreeFormView) {
+            //     if (Object.is(doc, toFind)) {
+            //         toReturn = view;
+            //         return;
+            //     }
+            // }
+
+            if (Object.is(doc, toFind)) {
+                toReturn = view;
+                return;
+            }
+
+        })
+
+        return (toReturn);
+    }
+}
\ No newline at end of file
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index 513a6ac9e..4a61220a5 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -97,9 +97,9 @@ export namespace DragManager {
     }
 
     export function StartDrag(ele: HTMLElement, dragData: { [id: string]: any }, options?: DragOptions) {
-        DocumentDecorations.Instance.Hidden = true;
         if (!dragDiv) {
             dragDiv = document.createElement("div");
+            dragDiv.className = "dragManager-dragDiv"
             DragManager.Root().appendChild(dragDiv);
         }
         const w = ele.offsetWidth, h = ele.offsetHeight;
@@ -124,17 +124,21 @@ export namespace DragManager {
         //      So we replace the pdf's canvas with the image thumbnail
         const docView: DocumentView = dragData["documentView"];
         const doc: Document = docView ? docView.props.Document : dragData["document"];
-        var pdfBox = dragElement.getElementsByClassName("pdfBox-cont")[0] as HTMLElement;
-        let thumbnail = doc.GetT(KeyStore.Thumbnail, ImageField);
-        if (pdfBox && pdfBox.childElementCount && thumbnail) {
-            let img = new Image();
-            img!.src = thumbnail.toString();
-            img!.style.position = "absolute";
-            img!.style.width = `${rect.width / scaleX}px`;
-            img!.style.height = `${rect.height / scaleY}px`;
-            pdfBox.replaceChild(img!, pdfBox.children[0])
+
+        if (doc) {
+            var pdfBox = dragElement.getElementsByClassName("pdfBox-cont")[0] as HTMLElement;
+            let thumbnail = doc.GetT(KeyStore.Thumbnail, ImageField);
+            if (pdfBox && pdfBox.childElementCount && thumbnail) {
+                let img = new Image();
+                img!.src = thumbnail.toString();
+                img!.style.position = "absolute";
+                img!.style.width = `${rect.width / scaleX}px`;
+                img!.style.height = `${rect.height / scaleY}px`;
+                pdfBox.replaceChild(img!, pdfBox.children[0])
+            }
         }
 
+
         dragDiv.appendChild(dragElement);
 
         let hideSource = false;