new changes

3 files changed, 16 insertions, 11 deletions

diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index d81a340b0..69b880d20 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -72,7 +72,7 @@ export class CollectionFreeFormView extends CollectionSubView(PanZoomDocument) {
     }
     public getActiveDocuments = () => {
         const curPage = FieldValue(this.Document.curPage, -1);
-        return FieldValue(this.children, [] as Doc[]).filter(doc => {
+        return FieldValue(this.children, [] as Doc[]).filter((doc) => {
             var page = NumCast(doc.page, -1);
             return page === curPage || page === -1;
         });
diff --git a/src/client/views/nodes/KeyFrame.tsx b/src/client/views/nodes/KeyFrame.tsx
index 0f0615c5a..5c1157c9d 100644
--- a/src/client/views/nodes/KeyFrame.tsx
+++ b/src/client/views/nodes/KeyFrame.tsx
@@ -1,9 +1,9 @@
-import { Document } from '../../../fields/Document';
+import { Doc } from '../../../new_fields/Doc';
 
 export class KeyFrame {
-    private _document: any;
+    private _document: Doc;
     constructor() {
-        this._document = new Document();
+        this._document = new Doc();
 
 
     }
diff --git a/src/client/views/nodes/Timeline.tsx b/src/client/views/nodes/Timeline.tsx
index 14bcd738f..6fea51624 100644
--- a/src/client/views/nodes/Timeline.tsx
+++ b/src/client/views/nodes/Timeline.tsx
@@ -9,9 +9,9 @@ import { CollectionSubView, SubCollectionViewProps } from "../collections/Collec
 import { DocumentViewProps } from "./DocumentView";
 
 import { CollectionFreeFormView } from "../collections/collectionFreeForm/CollectionFreeFormView";
-import { Doc } from "../../../new_fields/Doc";
-import { Document } from "../../../new_fields/Schema";
-import { FieldValue } from "../../../new_fields/Types";
+import { Doc, Self } from "../../../new_fields/Doc";
+import { Document, listSpec } from "../../../new_fields/Schema";
+import { FieldValue, Cast } from "../../../new_fields/Types";
 
 @observer
 export class Timeline extends CollectionSubView(Document) {
@@ -65,12 +65,17 @@ export class Timeline extends CollectionSubView(Document) {
             this._currentBar = this.createBar(5);
             this._inner.current.appendChild(this._currentBar);
         }
-        let doc: Document = this.props.Document;
-        let childrenList = this.children;
+        let doc: Doc = this.props.Document;
+        let test = this.props.Document[this.props.fieldKey];
+        let children = Cast(this.props.Document[this.props.fieldKey], listSpec(Doc));
         // let keyFrame = new KeyFrame(); //should not be done here...
         // this._keyFrames.push(keyFrame)";
+        if (!children) {
+            return;
+        }
+        let childrenList = (children[Self] as any).__fields;
         let keys = ["x", "y"];
-        const addReaction = (element: Document) => {
+        const addReaction = (element: Doc) => {
             return reaction(() => {
 
                 return keys.map(key => FieldValue(element[key]));
@@ -92,7 +97,7 @@ export class Timeline extends CollectionSubView(Document) {
                 }
             });
         };
-        observe(childrenList as IObservableArray<Document>, change => {
+        observe(childrenList as IObservableArray<Doc>, change => {
             if (change.type === "update") {
                 this._reactionDisposers[change.index]();
                 this._reactionDisposers[change.index] = addReaction(change.newValue);