1 files changed, 32 insertions, 22 deletions

diff --git a/src/Main.tsx b/src/Main.tsx
index 7560abca7..02b866753 100644
--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -12,10 +12,9 @@ import { configure, runInAction, action } from 'mobx';
 import { NodeStore } from './stores/NodeStore';
 import { Documents } from './documents/Documents';
 import { DocumentDecorations } from './DocumentDecorations';
-import { CollectionFreeFormView } from './views/freeformcanvas/CollectionFreeFormView';
+import { CollectionFreeFormView } from './views/collections/CollectionFreeFormView';
 import { ListField } from './fields/ListField';
 import { DocumentView } from './views/nodes/DocumentView';
-import { DocumentViewModel } from './viewmodels/DocumentViewModel';
 import { ContextMenu } from './views/ContextMenu';
 
 configure({
@@ -23,8 +22,8 @@ configure({
 });
 
 const mainNodeCollection = new Array<Document>();
-let mainContainer = Documents.CollectionDocument(mainNodeCollection, {
-    x: 0, y: 0, width: window.screen.width, height: window.screen.height
+let mainContainer = Documents.DockDocument(mainNodeCollection, {
+    x: 0, y: 0, width: window.screen.width, height: window.screen.height, title: "main container"
 })
 
 window.addEventListener("drop", function (e) {
@@ -39,37 +38,48 @@ document.addEventListener("pointerdown", action(function (e: PointerEvent) {
     }
 }), true)
 
-ReactDOM.render((
-    <div style={{ display: "grid" }}>
-        <h1>Dash Web</h1>
-        <DocumentView Document={mainContainer} ContainingCollectionView={undefined} ContainingDocumentView={undefined} />
-        <DocumentDecorations />
-        <ContextMenu />
-    </div>), document.getElementById('root'));
 
-runInAction(() => {
-    let doc1 = Documents.TextDocument("Hello world");
+//runInAction(() => 
+{
+    let doc1 = Documents.TextDocument("Hello world", { title: "hello" });
     let doc2 = doc1.MakeDelegate();
     doc2.SetField(KS.X, new NumberField(150));
     doc2.SetField(KS.Y, new NumberField(20));
     let doc3 = Documents.ImageDocument("https://upload.wikimedia.org/wikipedia/commons/thumb/3/3a/Cat03.jpg/1200px-Cat03.jpg", {
         x: 450, y: 500
     });
-    let docset = new Array<Document>(doc1, doc2);
+    let docset = new Array<Document>(doc1, doc2, doc3);
     let doc4 = Documents.CollectionDocument(docset, {
-        x: 0, y: 400
+        x: 0, y: 400, title: "mini collection"
     });
     let doc5 = Documents.ImageDocument("https://upload.wikimedia.org/wikipedia/commons/thumb/3/3a/Cat03.jpg/1200px-Cat03.jpg", {
-        x: 650, y: 500
+        x: 650, y: 500, width: 600, height: 600, title: "cat"
     });
-    let mainNodes = mainContainer.GetFieldT(KeyStore.Data, ListField);
+    let docset2 = new Array<Document>(doc4, doc1, doc3);
+    let doc6 = Documents.DockDocument(docset2, {
+        x: 350, y: 100, width: 600, height: 600, title: "docking collection"
+    });
+    let mainNodes = null;// mainContainer.GetFieldT(KeyStore.Data, ListField);
     if (!mainNodes) {
         mainNodes = new ListField<Document>();
-        mainContainer.SetField(KeyStore.Data, mainNodes);
     }
-    mainNodes.Data.push(doc1);
-    mainNodes.Data.push(doc2);
+    // mainNodes.Data.push(doc1);
+    // mainNodes.Data.push(doc2);
     mainNodes.Data.push(doc4);
-    mainNodes.Data.push(doc3);
+    // mainNodes.Data.push(doc3);
     mainNodes.Data.push(doc5);
-});
\ No newline at end of file
+    // mainNodes.Data.push(doc1);
+    mainNodes.Data.push(doc2);
+    //mainNodes.Data.push(doc6);
+    mainContainer.SetField(KeyStore.Data, mainNodes);
+}
+//);
+
+ReactDOM.render((
+    <div style={{ display: "grid" }}>
+        <h1>Dash Web</h1>
+        <DocumentView Document={mainContainer} ContainingCollectionView={undefined} ContainingDocumentView={undefined} />
+        <DocumentDecorations />
+        <ContextMenu />
+    </div>),
+    document.getElementById('root'));
\ No newline at end of file