Merge pull request #2 from browngraphicslab/move_doc_get_out_the_way

Move doc get out the way

2 files changed, 14 insertions, 0 deletions

diff --git a/src/views/freeformcanvas/CollectionFreeFormView.tsx b/src/views/freeformcanvas/CollectionFreeFormView.tsx
index d5343536d..4e9e0cd21 100644
--- a/src/views/freeformcanvas/CollectionFreeFormView.tsx
+++ b/src/views/freeformcanvas/CollectionFreeFormView.tsx
@@ -9,10 +9,12 @@ import { DocumentView } from "../nodes/DocumentView";
 import { ListField } from "../../fields/ListField";
 import { NumberField } from "../../fields/NumberField";
 import { SSL_OP_SINGLE_DH_USE } from "constants";
+import { DocumentDecorations } from "../../DocumentDecorations";
 
 interface IProps {
     fieldKey: Key;
     doc: Document;
+    isSelected: boolean;
 }
 
 @observer
@@ -26,6 +28,10 @@ export class CollectionFreeFormView extends React.Component<IProps> {
 
     @action
     onPointerDown = (e: React.PointerEvent): void => {
+        if (!this.props.isSelected) {
+            return;
+        }
+
         e.stopPropagation();
         if (e.button === 2) {
             this._isPointerDown = true;
@@ -54,10 +60,14 @@ export class CollectionFreeFormView extends React.Component<IProps> {
             return;
         }
         const { doc } = this.props;
+
         let x = doc.GetFieldValue(KeyStore.PanX, NumberField, Number(0));
         let y = doc.GetFieldValue(KeyStore.PanY, NumberField, Number(0));
         doc.SetFieldValue(KeyStore.PanX, x + e.movementX, NumberField);
         doc.SetFieldValue(KeyStore.PanY, y + e.movementY, NumberField);
+
+
+        DocumentDecorations.Instance.forceUpdate()
     }
 
     @action
diff --git a/src/views/freeformcanvas/FreeFormCanvas.tsx b/src/views/freeformcanvas/FreeFormCanvas.tsx
index 9ef5ab8f7..de5e88fa1 100644
--- a/src/views/freeformcanvas/FreeFormCanvas.tsx
+++ b/src/views/freeformcanvas/FreeFormCanvas.tsx
@@ -10,6 +10,7 @@ import {DocumentView} from "../nodes/DocumentView";
 import {TextField} from "../../fields/TextField";
 import {ListField} from "../../fields/ListField";
 import {Field} from "../../fields/Field";
+import { SelectionManager } from "../../util/SelectionManager";
 
 interface IProps {
     store: NodeCollectionStore;
@@ -34,6 +35,8 @@ export class FreeFormCanvas extends React.Component<IProps> {
             document.removeEventListener("pointerup", this.onPointerUp);
             document.addEventListener("pointerup", this.onPointerUp);
         }
+
+        SelectionManager.DeselectAll()
     }
 
     @action
@@ -57,6 +60,7 @@ export class FreeFormCanvas extends React.Component<IProps> {
         if (!this._isPointerDown) {
             return;
         }
+
         this.props.store.X += e.movementX;
         this.props.store.Y += e.movementY;
     }