interpolation fixed

1 files changed, 103 insertions, 116 deletions

diff --git a/src/client/views/nodes/Track.tsx b/src/client/views/nodes/Track.tsx
index ee8bee56f..92f66dad3 100644
--- a/src/client/views/nodes/Track.tsx
+++ b/src/client/views/nodes/Track.tsx
@@ -2,8 +2,8 @@ import * as React from "react";
 import { observer } from "mobx-react";
 import { observable, reaction, action, IReactionDisposer, observe, IObservableArray, computed, toJS, IObservableObject, runInAction } from "mobx";
 import "./Track.scss";
-import { Doc, DocListCastAsync, DocListCast } from "../../../new_fields/Doc";
-import {listSpec} from "../../../new_fields/Schema";
+import { Doc, DocListCastAsync, DocListCast, Field } from "../../../new_fields/Doc";
+import { listSpec } from "../../../new_fields/Schema";
 import { FieldValue, Cast, NumCast, BoolCast, StrCast } from "../../../new_fields/Types";
 import { List } from "../../../new_fields/List";
 import { Keyframe, KeyframeFunc, RegionData } from "./Keyframe";
@@ -14,17 +14,17 @@ import { AddComparisonParameters } from "../../northstar/model/idea/idea";
 interface IProps {
     node: Doc;
     currentBarX: number;
-    transform: Transform; 
-    changeCurrentBarX: (x:number) => void;
-    setFlyout: (props:FlyoutProps) => any; 
+    transform: Transform;
+    changeCurrentBarX: (x: number) => void;
+    setFlyout: (props: FlyoutProps) => any;
 }
 
 @observer
 export class Track extends React.Component<IProps> {
-    @observable private _inner = React.createRef<HTMLDivElement>();   
+    @observable private _inner = React.createRef<HTMLDivElement>();
     @observable private _reactionDisposers: IReactionDisposer[] = [];
-    @observable private _keyReaction:any; //reaction that is used to dispose when necessary 
-    @observable private _currentBarXReaction:any; 
+    @observable private _keyReaction: any; //reaction that is used to dispose when necessary 
+    @observable private _currentBarXReaction: any;
 
     @computed
     private get regions() {
@@ -32,80 +32,81 @@ export class Track extends React.Component<IProps> {
     }
 
     componentWillMount() {
-        if (!this.props.node.regions){
+        if (!this.props.node.regions) {
             this.props.node.regions = new List<Doc>();
         }
-        this.props.node.opacity = 1;         
+        this.props.node.opacity = 1;
     }
 
     componentDidMount() {
         runInAction(() => {
-            this.createRegion(this.props.currentBarX); 
-            this.props.node.hidden = false;  
-            this._currentBarXReaction = this.currentBarXReaction(); 
-        }); 
+            this._currentBarXReaction = this.currentBarXReaction();
+            if (this.regions.length === 0 ) this.createRegion(this.props.currentBarX);
+            this.props.node.hidden = false;
+        });
     }
 
     componentWillUnmount() {
-       runInAction(() => {
-           if (this._keyReaction) this._keyReaction(); 
-           if (this._currentBarXReaction) this._currentBarXReaction(); 
-       }); 
+        runInAction(() => {
+            if (this._keyReaction) this._keyReaction();
+            if (this._currentBarXReaction) this._currentBarXReaction();
+        });
     }
 
-    @action 
+    @action
     keyReaction = () => {
         return reaction(() => {
-            let keys = Doc.allKeys(this.props.node); 
-            return keys.map(key => FieldValue(this.props.node[key]));     
+            console.log("triggered keyReaction"); 
+            let keys = Doc.allKeys(this.props.node);
+            return keys.map(key => FieldValue(this.props.node[key]));
         }, data => {
-            console.log("full reaction"); 
+            console.log("full reaction");
             let regiondata = this.findRegion(this.props.currentBarX);
-            if (regiondata){
+            if (regiondata) {
                 DocListCast(regiondata.keyframes!).forEach((kf) => {
-                    if (kf.type === KeyframeFunc.KeyframeType.default){
-                        kf.key = Doc.MakeCopy(this.props.node, true); 
+                    if (kf.type === KeyframeFunc.KeyframeType.default && kf.time === this.props.currentBarX) {
+                        console.log("data updated"); 
+                        kf.key = Doc.MakeCopy(this.props.node, true);
                         let leftkf: (Doc | undefined) = this.calcMinLeft(regiondata!, kf); // lef keyframe, if it exists
                         let rightkf: (Doc | undefined) = this.calcMinRight(regiondata!, kf); //right keyframe, if it exists
-                        if (leftkf!.type === KeyframeFunc.KeyframeType.fade){ //replicating this keyframe to fades
-                            let edge = this.calcMinLeft(regiondata!, leftkf!); 
-                            edge!.key = Doc.MakeCopy(kf.key as Doc, true); 
-                            leftkf!.key = Doc.MakeCopy(kf.key as Doc, true) ; 
-                            (Cast(edge!.key, Doc)! as Doc).opacity = 0.1; 
-                            (Cast(leftkf!.key, Doc)! as Doc).opacity = 1; 
-                        } 
-                        if (rightkf!.type === KeyframeFunc.KeyframeType.fade){
-                            let edge = this.calcMinRight(regiondata!, rightkf!);  
-                            edge!.key = Doc.MakeCopy(kf.key as Doc, true); 
-                            rightkf!.key = Doc.MakeCopy(kf.key as Doc, true); 
-                            (Cast(edge!.key, Doc)! as Doc).opacity = 0.1; 
-                            (Cast(rightkf!.key, Doc)! as Doc).opacity = 1; 
+                        if (leftkf!.type === KeyframeFunc.KeyframeType.fade) { //replicating this keyframe to fades
+                            let edge = this.calcMinLeft(regiondata!, leftkf!);
+                            edge!.key = Doc.MakeCopy(kf.key as Doc, true);
+                            leftkf!.key = Doc.MakeCopy(kf.key as Doc, true);
+                            (Cast(edge!.key, Doc)! as Doc).opacity = 0.1;
+                            (Cast(leftkf!.key, Doc)! as Doc).opacity = 1;
+                        }
+                        if (rightkf!.type === KeyframeFunc.KeyframeType.fade) {
+                            let edge = this.calcMinRight(regiondata!, rightkf!);
+                            edge!.key = Doc.MakeCopy(kf.key as Doc, true);
+                            rightkf!.key = Doc.MakeCopy(kf.key as Doc, true);
+                            (Cast(edge!.key, Doc)! as Doc).opacity = 0.1;
+                            (Cast(rightkf!.key, Doc)! as Doc).opacity = 1;
                         }
-                    } 
-                }); 
+                    }
+                });
             }
-        }); 
+        });
     }
 
-    @action 
+    @action
     currentBarXReaction = () => {
-        return reaction(() => this.props.currentBarX, () => {            
-            console.log("currentbar changed"); 
+        return reaction(() =>  this.props.currentBarX, () => {
             if (this._keyReaction) this._keyReaction(); //dispose previous reaction first
             let regiondata: (Doc | undefined) = this.findRegion(this.props.currentBarX);
-            if (regiondata) {                  
-                this.props.node.hidden = false;                 
-                this.timeChange(this.props.currentBarX);                        
+            if (regiondata) {
+                this.props.node.hidden = false;                
+                this.timeChange(this.props.currentBarX);
                 DocListCast(regiondata.keyframes).forEach((kf) => {
-                    if (kf.time === this.props.currentBarX && kf.type === KeyframeFunc.KeyframeType.default){
-                        console.log("HI!"); 
+                    if (kf.time === this.props.currentBarX && kf.type === KeyframeFunc.KeyframeType.default) {
+                        this.applyKeys(kf); 
                         this._keyReaction = this.keyReaction(); //reactivates reaction. 
                     }
-                });                 
+                });                
             } else {
                 this.props.node.hidden = true;
             }
-        });
+        }, { fireImmediately: true });
     }
 
 
@@ -114,59 +115,54 @@ export class Track extends React.Component<IProps> {
         let regiondata = this.findRegion(Math.round(time)); //finds a region that the scrubber is on
         if (regiondata) {
             let leftkf: (Doc | undefined) = this.calcMinLeft(regiondata!); // lef keyframe, if it exists
-            let rightkf: (Doc | undefined) = this.calcMinRight(regiondata!); //right keyframe, if it exists
-            if(leftkf && rightkf) {
-                this.interpolate(leftkf, rightkf);
-            }            
+            let rightkf: (Doc | undefined) = this.calcMinRight(regiondata!); //right keyframe, if it exists            
             let currentkf: (Doc | undefined) = this.calcCurrent(regiondata!); //if the scrubber is on top of the keyframe
-
-            if (currentkf){
-                console.log(toJS(currentkf)); 
-                this.applyKeys(Cast(currentkf.key, Doc) as Doc);  
-            } 
+           
+            if (leftkf && rightkf) {
+                this.interpolate(leftkf, rightkf);
+            }  
         }
-       
     }
 
-    @action 
+    @action
     private applyKeys = (kf: Doc) => {
         this.filterKeys(Doc.allKeys(kf)).forEach(key => {
             if (key === "title" || key === "documentText") Doc.SetOnPrototype(this.props.node, key, StrCast(kf[key]));
-            this.props.node[key] = kf[key]; 
-        }); 
+            this.props.node[key] = kf[key];
+        });
     }
 
 
-    @action 
-    private filterKeys = (keys:string[]):string[] => {
-        return keys.reduce((acc:string[], key:string) => {
-            if ( key !== "regions" && key !== "data" && key !== "creationDate" && key !== "cursors" && key !== "hidden") acc.push(key); 
-            return acc; 
+    @action
+    private filterKeys = (keys: string[]): string[] => {
+        return keys.reduce((acc: string[], key: string) => {
+            if (key !== "regions" && key !== "data" && key !== "creationDate" && key !== "cursors" && key !== "hidden" && key !== "nativeHeight" && key!== "nativeWidth") acc.push(key);
+            return acc;
         }, []) as string[];
     }
 
-    @action 
-    calcCurrent = (region:Doc):(Doc|undefined) => {
-        let currentkf:(Doc|undefined) = undefined; 
+    @action
+    calcCurrent = (region: Doc): (Doc | undefined) => {
+        let currentkf: (Doc | undefined) = undefined;
         DocListCast(region.keyframes!).forEach((kf) => {
-            if (NumCast(kf.time) === Math.round(this.props.currentBarX)) currentkf = kf; 
-        }); 
-        return currentkf; 
+            if (NumCast(kf.time) === Math.round(this.props.currentBarX)) currentkf = kf;
+        });
+        return currentkf;
     }
 
 
     @action
-    calcMinLeft = (region: Doc, ref?:Doc): (Doc | undefined) => { //returns the time of the closet keyframe to the left
-        let leftKf:(Doc| undefined) = undefined;
-        let time:number = 0; 
+    calcMinLeft = (region: Doc, ref?: Doc): (Doc | undefined) => { //returns the time of the closet keyframe to the left
+        let leftKf: (Doc | undefined) = undefined;
+        let time: number = 0;
         DocListCast(region.keyframes!).forEach((kf) => {
-            let compTime = this.props.currentBarX; 
-            if (ref){
-                compTime = NumCast(ref.time); 
-            } 
+            let compTime = this.props.currentBarX;
+            if (ref) {
+                compTime = NumCast(ref.time);
+            }
             if (NumCast(kf.time) < compTime && NumCast(kf.time) >= time) {
                 leftKf = kf;
-                time = NumCast(kf.time); 
+                time = NumCast(kf.time);
             }
         });
         return leftKf;
@@ -174,17 +170,17 @@ export class Track extends React.Component<IProps> {
 
 
     @action
-    calcMinRight = (region: Doc, ref?:Doc): (Doc | undefined) => { //returns the time of the closest keyframe to the right 
-        let rightKf: (Doc|undefined) = undefined;
-        let time:number = Infinity; 
+    calcMinRight = (region: Doc, ref?: Doc): (Doc | undefined) => { //returns the time of the closest keyframe to the right 
+        let rightKf: (Doc | undefined) = undefined;
+        let time: number = Infinity;
         DocListCast(region.keyframes!).forEach((kf) => {
-            let compTime = this.props.currentBarX; 
-            if (ref){
-                compTime = NumCast(ref.time); 
+            let compTime = this.props.currentBarX;
+            if (ref) {
+                compTime = NumCast(ref.time);
             }
             if (NumCast(kf.time) > compTime && NumCast(kf.time) <= NumCast(time)) {
                 rightKf = kf;
-                time = NumCast(kf.time); 
+                time = NumCast(kf.time);
             }
         });
         return rightKf;
@@ -192,37 +188,28 @@ export class Track extends React.Component<IProps> {
 
     @action
     interpolate = (left: Doc, right: Doc) => {
-        console.log("interpolating"); 
+        console.log("interpolating");
         let leftNode = left.key as Doc;
         let rightNode = right.key as Doc;
-
-        console.log(toJS(leftNode)); 
-        console.log(toJS(rightNode)); 
-
         const dif_time = NumCast(right.time) - NumCast(left.time);
         const ratio = (this.props.currentBarX - NumCast(left.time)) / dif_time; //linear 
-
-
         this.filterKeys(Doc.allKeys(leftNode)).forEach(key => {
-            console.log(key); 
-            if (leftNode[key] && rightNode[key] && typeof(leftNode[key]) === "number" && typeof(rightNode[key]) === "number"){ //if it is number, interpolate
+            if (leftNode[key] && rightNode[key] && typeof (leftNode[key]) === "number" && typeof (rightNode[key]) === "number") { //if it is number, interpolate
                 const diff = NumCast(rightNode[key]) - NumCast(leftNode[key]);
                 const adjusted = diff * ratio;
-                this.props.node[key] = NumCast(leftNode[key]) + adjusted;
+                this.props.node[key] = NumCast(leftNode[key]) + adjusted;                
             } else if (key === "title" || key === "documentText") {
                 Doc.SetOnPrototype(this.props.node, key, StrCast(leftNode[key]));
-                this.props.node[key] = leftNode[key]; 
+                this.props.node[key] = leftNode[key];
             }
-            console.log(this.props.node[key]); 
         });
-        console.log("done"); 
     }
 
     @action
-    findRegion(time: number): (Doc | undefined) {
+    findRegion(time: number): (RegionData | undefined) {
         let foundRegion = undefined;
-        this.regions.map(region => {
-            region = region as Doc; 
+        DocListCast(this.regions).map(region => {
+            region = region as RegionData; 
             if (time >= NumCast(region.position) && time <= (NumCast(region.position) + NumCast(region.duration))) {
                 foundRegion = region;
             }
@@ -234,21 +221,21 @@ export class Track extends React.Component<IProps> {
     onInnerDoubleClick = (e: React.MouseEvent) => {
         let inner = this._inner.current!;
         let offsetX = Math.round((e.clientX - inner.getBoundingClientRect().left) * this.props.transform.Scale);
-        this.createRegion(offsetX); 
+        this.createRegion(offsetX);
     }
 
     createRegion = (position: number) => {
         let regiondata = KeyframeFunc.defaultKeyframe();
-        regiondata.position = position; 
-        let leftRegion = KeyframeFunc.findAdjacentRegion(KeyframeFunc.Direction.left, regiondata, this.regions); 
-        let rightRegion = KeyframeFunc.findAdjacentRegion(KeyframeFunc.Direction.right, regiondata, this.regions); 
-        if ((rightRegion && leftRegion && rightRegion.position - (leftRegion.position + leftRegion.duration) < NumCast(regiondata.fadeIn) + NumCast(regiondata.fadeOut)) || (rightRegion && rightRegion.position - regiondata.position < NumCast(regiondata.fadeIn) + NumCast(regiondata.fadeOut))){
-            return; 
-        } else if (rightRegion && rightRegion.position - regiondata.position >= NumCast(regiondata.fadeIn) + NumCast(regiondata.fadeOut)){
-            regiondata.duration = rightRegion.position - regiondata.position; 
+        regiondata.position = position;
+        let leftRegion = KeyframeFunc.findAdjacentRegion(KeyframeFunc.Direction.left, regiondata, this.regions);
+        let rightRegion = KeyframeFunc.findAdjacentRegion(KeyframeFunc.Direction.right, regiondata, this.regions);
+        if ((rightRegion && leftRegion && rightRegion.position - (leftRegion.position + leftRegion.duration) < NumCast(regiondata.fadeIn) + NumCast(regiondata.fadeOut)) || (rightRegion && rightRegion.position - regiondata.position < NumCast(regiondata.fadeIn) + NumCast(regiondata.fadeOut))) {
+            return;
+        } else if (rightRegion && rightRegion.position - regiondata.position >= NumCast(regiondata.fadeIn) + NumCast(regiondata.fadeOut)) {
+            regiondata.duration = rightRegion.position - regiondata.position;
         }
         this.regions.push(regiondata);
-        return regiondata; 
+        return regiondata;
     }
 
 
@@ -258,7 +245,7 @@ export class Track extends React.Component<IProps> {
                 <div className="track">
                     <div className="inner" ref={this._inner} onDoubleClick={this.onInnerDoubleClick}>
                         {DocListCast(this.regions).map((region) => {
-                            return <Keyframe node={this.props.node} RegionData={region} changeCurrentBarX={this.props.changeCurrentBarX} setFlyout={this.props.setFlyout} transform={this.props.transform}/>;
+                            return <Keyframe node={this.props.node} RegionData={region} changeCurrentBarX={this.props.changeCurrentBarX} setFlyout={this.props.setFlyout} transform={this.props.transform} />;
                         })}
                     </div>
                 </div>