zoom, contextmenu fix

5 files changed, 13 insertions, 11 deletions

diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index 6331763f1..139ac11db 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -206,8 +206,7 @@ export class MainView extends React.Component {
         if (targets && targets.length && targets[0].className.toString().indexOf("contextMenu") === -1) {
             ContextMenu.Instance.closeMenu();
         }
-        console.log(targets.toString()); 
-        if (targets && targets.length && targets[0].className.toString().indexOf("timeline-menu-desc") === -1 || targets[0].className.toString().indexOf("timeline-menu-item") === -1 || targets[0].className.toString().indexOf("timeline-menu-item") === -1 || targets[0].className.toString().indexOf("timeline-menu-input") === -1){
+        if (targets && (targets.length && targets[0].className.toString() !== "timeline-menu-desc" && targets[0].className.toString() !== "timeline-menu-item" && targets[0].className.toString() !=="timeline-menu-input")){
             TimelineMenu.Instance.closeMenu(); 
         } 
     });
diff --git a/src/client/views/animationtimeline/Timeline.tsx b/src/client/views/animationtimeline/Timeline.tsx
index 187c9396d..c50ffa51b 100644
--- a/src/client/views/animationtimeline/Timeline.tsx
+++ b/src/client/views/animationtimeline/Timeline.tsx
@@ -352,11 +352,14 @@ export class Timeline extends React.Component<FieldViewProps> {
         e.preventDefault(); 
         e.stopPropagation(); 
         let offset = e.clientX - this._infoContainer.current!.getBoundingClientRect().left; 
-        let prevTime = KeyframeFunc.convertPixelTime(this._visibleStart + offset, "mili", "time", this._tickSpacing, this._tickIncrement); 
+        let prevTime = KeyframeFunc.convertPixelTime(this._visibleStart + offset, "mili", "time", this._tickSpacing, this._tickIncrement);
+        let prevCurrent = KeyframeFunc.convertPixelTime(this._currentBarX,"mili", "time", this._tickSpacing, this._tickIncrement);  
         e.deltaY < 0 ? this.zoom(true) : this.zoom(false); 
         let currPixel = KeyframeFunc.convertPixelTime(prevTime, "mili", "pixel", this._tickSpacing, this._tickIncrement); 
+        let currCurrent = KeyframeFunc.convertPixelTime(prevCurrent, "mili", "pixel", this._tickSpacing, this._tickIncrement); 
         this._infoContainer.current!.scrollLeft = currPixel - offset; 
-        this._visibleStart = currPixel - offset;    
+        this._visibleStart = currPixel - offset;  
+        this.changeCurrentBarX(currCurrent);  
     }
 
     @action
diff --git a/src/client/views/animationtimeline/TimelineMenu.tsx b/src/client/views/animationtimeline/TimelineMenu.tsx
index 572b35b90..1fd97c6c1 100644
--- a/src/client/views/animationtimeline/TimelineMenu.tsx
+++ b/src/client/views/animationtimeline/TimelineMenu.tsx
@@ -44,12 +44,16 @@ export class TimelineMenu extends React.Component {
                 document.addEventListener("keypress", (e:KeyboardEvent) => {
                     if (e.keyCode === 13) {
                         event(text); 
+                        this.closeMenu(); 
                     }
                 });
             }}/></div>); 
         } else if (type === "button") {
             let buttonRef = React.createRef<HTMLDivElement>(); 
-            this._currentMenu.push( <div className="timeline-menu-item"><FontAwesomeIcon icon={faChartLine}size="lg"/><p className="timeline-menu-desc" onClick={event}>{title}</p></div>); 
+            this._currentMenu.push( <div className="timeline-menu-item"><FontAwesomeIcon icon={faChartLine}size="lg"/><p className="timeline-menu-desc" onClick={(e) => {
+                event(e); 
+                this.closeMenu(); 
+            }}>{title}</p></div>); 
         }
     }
 
diff --git a/src/client/views/animationtimeline/Track.tsx b/src/client/views/animationtimeline/Track.tsx
index e99da6648..89533c4df 100644
--- a/src/client/views/animationtimeline/Track.tsx
+++ b/src/client/views/animationtimeline/Track.tsx
@@ -53,10 +53,6 @@ export class Track extends React.Component<IProps> {
             if (this.regions.length === 0) this.createRegion(KeyframeFunc.convertPixelTime(this.props.currentBarX, "mili", "time", this.props.tickSpacing, this.props.tickIncrement));
             this.props.node.hidden = false;                   
             this.props.node.opacity = 1; 
-            let state = new Doc();  
-            state.key = Doc.MakeCopy(await this.props.node, true);
-            console.log(this.props.node.x); 
-            this._storedState = state;             
         });
 
     }
@@ -101,7 +97,7 @@ export class Track extends React.Component<IProps> {
     @action 
     revertState = () => {
         let copyDoc = Doc.MakeCopy(this.props.node, true); 
-        this.applyKeys(this._storedState!); 
+        if (this._storedState) this.applyKeys(this._storedState);
         let newState = new Doc(); 
         newState.key = copyDoc; 
         this._storedState = newState; 
diff --git a/src/new_fields/Doc.ts b/src/new_fields/Doc.ts
index e3b5f78a7..01a064b69 100644
--- a/src/new_fields/Doc.ts
+++ b/src/new_fields/Doc.ts
@@ -334,7 +334,7 @@ export namespace Doc {
     }
 
     export function IndexOf(toFind: Doc, list: Doc[]) {
-        return list.findIndex(doc => doc === toFind || Doc.AreProtosEqual(doc, toFind))
+        return list.findIndex(doc => doc === toFind || Doc.AreProtosEqual(doc, toFind));
     }
     export function AddDocToList(target: Doc, key: string, doc: Doc, relativeTo?: Doc, before?: boolean, first?: boolean, allowDuplicates?: boolean, reversed?: boolean) {
         if (target[key] === undefined) {