From a866baea5fdbf30650cbfbf4aa383019ef61ec3d Mon Sep 17 00:00:00 2001 From: bobzel Date: Fri, 27 Oct 2023 13:39:04 -0400 Subject: added collection itself to timeline --- src/client/views/animationtimeline/Timeline.tsx | 14 +++----------- src/client/views/animationtimeline/Track.tsx | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'src/client/views/animationtimeline') diff --git a/src/client/views/animationtimeline/Timeline.tsx b/src/client/views/animationtimeline/Timeline.tsx index 71517d4fe..4be3b05ab 100644 --- a/src/client/views/animationtimeline/Timeline.tsx +++ b/src/client/views/animationtimeline/Timeline.tsx @@ -543,7 +543,7 @@ export class Timeline extends React.Component {
- {this.children.map(doc => ( + {[...this.children, this.props.Document].map(doc => ( this.mapOfTracks.push(ref)} timeline={this} @@ -562,16 +562,8 @@ export class Timeline extends React.Component {
Current: {this.getCurrentTime()}
- {this.children.map(doc => ( -
{ - Doc.BrushDoc(doc); - }} - onPointerOut={() => { - Doc.UnBrushDoc(doc); - }}> + {[...this.children, this.props.Document].map(doc => ( +
Doc.BrushDoc(doc)} onPointerOut={() => Doc.UnBrushDoc(doc)}>

{StrCast(doc.title)}

))} diff --git a/src/client/views/animationtimeline/Track.tsx b/src/client/views/animationtimeline/Track.tsx index b90ff5eaf..dfab849a4 100644 --- a/src/client/views/animationtimeline/Track.tsx +++ b/src/client/views/animationtimeline/Track.tsx @@ -34,7 +34,7 @@ export class Track extends React.Component { @observable private _newKeyframe: boolean = false; private readonly MAX_TITLE_HEIGHT = 75; @observable private _trackHeight = 0; - private primitiveWhitelist = ['x', 'y', '_width', '_height', '_rotation', 'opacity', '_layout_scrollTop']; + private primitiveWhitelist = ['x', 'y', '_freeform_panX', '_freeform_panY', '_width', '_height', '_rotation', 'opacity', '_layout_scrollTop']; private objectWhitelist = ['data']; @computed private get regions() { -- cgit v1.2.3-70-g09d2