aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
diff options
context:
space:
mode:
authorAndrew Kim <andrewdkim@users.noreply.github.com>2019-04-20 18:40:29 -0400
committerAndrew Kim <andrewdkim@users.noreply.github.com>2019-04-20 18:40:29 -0400
commit604d20941837fa90c06a7da7e77a27c262cd4648 (patch)
tree61dac46586566195a3a6c238336a599b0851b757 /src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
parent83367785f0414232c29150ab043e1999ea4796e4 (diff)
reaction
Diffstat (limited to 'src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx')
-rw-r--r--src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index a77a28aa7..fb3304e1f 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -20,7 +20,7 @@ import React = require("react");
import v5 = require("uuid/v5");
import { CollectionFreeFormRemoteCursors } from "./CollectionFreeFormRemoteCursors";
import { PreviewCursor } from "./PreviewCursor";
-import { Timeline } from "../../nodes/Timeline"
+import { Timeline } from "../../nodes/Timeline";
import { DocumentManager } from "../../../util/DocumentManager";
import { SelectionManager } from "../../../util/SelectionManager";
import { NumberField } from "../../../../fields/NumberField";
@@ -285,6 +285,7 @@ export class CollectionFreeFormView extends CollectionSubView {
}
return prev;
}, [] as JSX.Element[]);
+
}
@computed
@@ -313,7 +314,7 @@ export class CollectionFreeFormView extends CollectionSubView {
const pany: number = -this.props.Document.GetNumber(KeyStore.PanY, 0);
return (
- <Measure onResize={(r: any) => runInAction(() => { this._pwidth = r.entry.width; this._pheight = r.entry.height })}>
+ <Measure onResize={(r: any) => runInAction(() => { this._pwidth = r.entry.width; this._pheight = r.entry.height; })}>
{({ measureRef }) => (
<div className={`collectionfreeformview-measure`} ref={measureRef}>
<div className={`collectionfreeformview${this.isAnnotationOverlay ? "-overlay" : "-container"}`}
@@ -337,7 +338,8 @@ export class CollectionFreeFormView extends CollectionSubView {
</div>
{this.overlayView}
</PreviewCursor>
- <Timeline />
+
+ <Timeline {...this.getDocumentViewProps(this.props.Document)} />
</MarqueeView>
</div>
</div>)}