diff options
Diffstat (limited to 'src/client/views/nodes')
| -rw-r--r-- | src/client/views/nodes/Keyframe.scss | 1 | ||||
| -rw-r--r-- | src/client/views/nodes/Keyframe.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/nodes/Track.tsx | 10 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/client/views/nodes/Keyframe.scss b/src/client/views/nodes/Keyframe.scss index 19a61bde1..11672388f 100644 --- a/src/client/views/nodes/Keyframe.scss +++ b/src/client/views/nodes/Keyframe.scss @@ -3,7 +3,6 @@ .bar { height: 100%; width: 5px; - background-color: #4d9900; position: absolute; // pointer-events: none; diff --git a/src/client/views/nodes/Keyframe.tsx b/src/client/views/nodes/Keyframe.tsx index 82f5b18cc..6ff925cb5 100644 --- a/src/client/views/nodes/Keyframe.tsx +++ b/src/client/views/nodes/Keyframe.tsx @@ -322,7 +322,7 @@ export class Keyframe extends React.Component<IProps> { render() { return ( <div> - <div className="bar" ref={this._bar} style={{ transform: `translate(${this.regiondata.position}px)`, width: `${this.regiondata.duration}px` }} + <div className="bar" ref={this._bar} style={{ transform: `translate(${this.regiondata.position}px)`, width: `${this.regiondata.duration}px`, background: `linear-gradient(90deg, rgba(77, 153, 0, 0) 0%, rgba(77, 153, 0, 1) ${this.regiondata.fadeIn / this.regiondata.duration * 100}%, rgba(77, 153, 0, 1) ${(this.regiondata.duration - this.regiondata.fadeOut)/this.regiondata.duration * 100}%, rgba(77, 153, 0, 0) 100% )` }} onPointerDown={this.onBarPointerDown} onDoubleClick={this.createKeyframe} onContextMenu={action((e: React.MouseEvent) => { diff --git a/src/client/views/nodes/Track.tsx b/src/client/views/nodes/Track.tsx index e4302e721..39f83639c 100644 --- a/src/client/views/nodes/Track.tsx +++ b/src/client/views/nodes/Track.tsx @@ -113,7 +113,7 @@ export class Track extends React.Component<IProps> { let rightkf: (Doc | undefined) = await this.calcMinRight(regiondata!); //right keyframe, if it exists let currentkf: (Doc | undefined) = await this.calcCurrent(regiondata!); //if the scrubber is on top of the keyframe if (currentkf) { - this.applyKeys(currentkf); + await this.applyKeys(currentkf); this._keyReaction = this.keyReaction(); //reactivates reaction. } else if (leftkf && rightkf) { this.interpolate(leftkf, rightkf); @@ -122,12 +122,11 @@ export class Track extends React.Component<IProps> { } @action - private applyKeys = (kf: Doc) => { - let kfNode = Cast(kf.key, Doc) as Doc; + private applyKeys = async (kf: Doc) => { + let kfNode = await Cast(kf.key, Doc) as Doc; let docFromApply = kfNode; if (this.filterKeys(Doc.allKeys(this.props.node)).length > this.filterKeys(Doc.allKeys(kfNode)).length) docFromApply = this.props.node; this.filterKeys(Doc.allKeys(docFromApply)).forEach(key => { - // if (key === "title" || key === "documentText") Doc.SetOnPrototype(this.props.node, key, StrCast(kf[key])); if (!kfNode[key]) { this.props.node[key] = undefined; } else { @@ -205,8 +204,7 @@ export class Track extends React.Component<IProps> { const diff = NumCast(rightNode[key]) - NumCast(leftNode[key]); const adjusted = diff * ratio; this.props.node[key] = NumCast(leftNode[key]) + adjusted; - } else if (key === "title" || key === "documentText") { - Doc.SetOnPrototype(this.props.node, key, StrCast(leftNode[key])); + } else { this.props.node[key] = leftNode[key]; } }); |