diff options
| author | andrewdkim <adkim414@gmail.com> | 2019-07-26 17:37:12 -0400 | 
|---|---|---|
| committer | andrewdkim <adkim414@gmail.com> | 2019-07-26 17:37:12 -0400 | 
| commit | 2dfd6378cf3f472132143bc231090777e49eeec7 (patch) | |
| tree | 34e631e0551391e5786ae136ba1d596dbc876c76 /src/client/views/nodes/CollectionFreeFormDocumentView.tsx | |
| parent | 7cb850105aeefd1234f76aaab5badd45a8660dc4 (diff) | |
| parent | e189378e5ce01eedd1373172fbd8d8dabf2ad197 (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into animationtimeline
Diffstat (limited to 'src/client/views/nodes/CollectionFreeFormDocumentView.tsx')
| -rw-r--r-- | src/client/views/nodes/CollectionFreeFormDocumentView.tsx | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx index b09538d1a..389b9f68b 100644 --- a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx +++ b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx @@ -82,6 +82,7 @@ export class CollectionFreeFormDocumentView extends DocComponent<CollectionFreeF      }      render() { +        const hasPosition = this.props.x !== undefined || this.props.y !== undefined;          return (              <div className="collectionFreeFormDocumentView-container"                  style={{ @@ -90,7 +91,7 @@ export class CollectionFreeFormDocumentView extends DocComponent<CollectionFreeF                      backgroundColor: "transparent",                      borderRadius: this.borderRounding(),                      transform: this.transform, -                    transition: StrCast(this.props.Document.transition), +                    transition: hasPosition ? "transform 1s" : StrCast(this.props.Document.transition),                      width: this.width,                      height: this.height,                      zIndex: this.Document.zIndex || 0,  | 
