More stuff set up

2 files changed, 13 insertions, 9 deletions

diff --git a/src/views/freeformcanvas/FreeFormCanvas.tsx b/src/views/freeformcanvas/FreeFormCanvas.tsx
index a80e11ef5..3552ffa54 100644
--- a/src/views/freeformcanvas/FreeFormCanvas.tsx
+++ b/src/views/freeformcanvas/FreeFormCanvas.tsx
@@ -3,8 +3,10 @@ import { NodeCollectionStore } from "../../stores/NodeCollectionStore";
 import "./FreeFormCanvas.scss";
 import { NodeContainer } from "./NodeContainer";
 import React = require("react");
-import { KeyStore } from "../../controllers/KeyController";
-import { NumberController } from "../../controllers/NumberController";
+import { KeyStore } from "../../fields/Key";
+import { NumberField } from "../../fields/NumberField";
+import { TextField } from "../../fields/TextField";
+import { action } from "mobx";
 
 interface IProps {
     store: NodeCollectionStore
@@ -15,6 +17,7 @@ export class FreeFormCanvas extends React.Component<IProps> {
 
     private _isPointerDown: boolean = false;
 
+    @action
     onPointerDown = (e: React.PointerEvent): void => {
         e.stopPropagation();
         e.preventDefault();
@@ -25,6 +28,7 @@ export class FreeFormCanvas extends React.Component<IProps> {
         document.addEventListener("pointerup", this.onPointerUp);
     }
 
+    @action
     onPointerUp = (e: PointerEvent): void => {
         e.stopPropagation();
         e.preventDefault();
@@ -33,14 +37,12 @@ export class FreeFormCanvas extends React.Component<IProps> {
         document.removeEventListener("pointerup", this.onPointerUp);
 
         let doc = this.props.store.Docs[0];
-        let xField = doc.GetFieldT(KeyStore.X, NumberController);
-        let x = xField ? xField.Data : 0;
-        let yField = doc.GetFieldT(KeyStore.Y, NumberController);
-        let y = yField ? yField.Data : 0;
-        this.props.store.Docs[0].SetFieldValue(KeyStore.X, x + 10, NumberController);
-        this.props.store.Docs[0].SetFieldValue(KeyStore.Y, y + 10, NumberController);
+        let dataField = doc.GetFieldT(KeyStore.Data, TextField);
+        let data = dataField ? dataField.Data : "";
+        this.props.store.Docs[0].SetFieldValue(KeyStore.Data, data + " hello", TextField);
     }
 
+    @action
     onPointerMove = (e: PointerEvent): void => {
         e.stopPropagation();
         e.preventDefault();
@@ -51,6 +53,7 @@ export class FreeFormCanvas extends React.Component<IProps> {
         this.props.store.Y += e.movementY;
     }
 
+    @action
     onPointerWheel = (e: React.WheelEvent): void => {
         e.stopPropagation();
         e.preventDefault();
diff --git a/src/views/freeformcanvas/NodeContainer.tsx b/src/views/freeformcanvas/NodeContainer.tsx
index c59ab194e..6c3cb2af2 100644
--- a/src/views/freeformcanvas/NodeContainer.tsx
+++ b/src/views/freeformcanvas/NodeContainer.tsx
@@ -7,6 +7,7 @@ import { VideoNodeView } from "../nodes/VideoNodeView";
 import "./FreeFormCanvas.scss";
 import React = require("react");
 import { DocumentView } from "../nodes/DocumentView";
+import { DocumentViewModel } from "../../viewmodels/DocumentViewModel";
 
 interface IProps {
     store: NodeCollectionStore
@@ -19,7 +20,7 @@ export class NodeContainer extends React.Component<IProps> {
         return (
             <div className="node-container">
                 {this.props.store.Docs.map(doc => {
-                    return (<DocumentView key={doc.Id} doc={doc} />);
+                    return (<DocumentView key={doc.Id} dvm={new DocumentViewModel(doc)} />);
                 })}
             </div>
         );