aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
diff options
context:
space:
mode:
authorHannah Chow <hannah_chow@brown.edu>2019-04-09 22:01:44 -0400
committerHannah Chow <hannah_chow@brown.edu>2019-04-09 22:01:44 -0400
commitf8d4fa3d161da88e63e51c4a8940a3c44d0ae62e (patch)
tree16e2b24c5f8c3c2c5a7f48550125fdb99c84454d /src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
parent755769e3604d48148ad1670ce3cce1a785c1766d (diff)
for now
Diffstat (limited to 'src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx')
-rw-r--r--src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index 1feb30db1..4562fd8a7 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -206,6 +206,7 @@ export class CollectionFreeFormView extends CollectionSubView {
const newPanY = Math.min((1 - 1 / x1) * this.nativeHeight, Math.max(0, panY));
this.props.Document.SetNumber(KeyStore.PanX, this.isAnnotationOverlay ? newPanX : panX);
this.props.Document.SetNumber(KeyStore.PanY, this.isAnnotationOverlay ? newPanY : panY);
+
}
@action
@@ -249,10 +250,16 @@ export class CollectionFreeFormView extends CollectionSubView {
}
focusDocument = (doc: Document) => {
+ this.props.Document.SetText(KeyStore.PanTransformType, "Ease");
let x = doc.GetNumber(KeyStore.X, 0) + doc.GetNumber(KeyStore.Width, 0) / 2;
let y = doc.GetNumber(KeyStore.Y, 0) + doc.GetNumber(KeyStore.Height, 0) / 2;
this.SetPan(x, y);
this.props.focus(this.props.Document);
+ // if(this.props.Document.GetText(KeyStore.PanTransformType, "") === "Ease") {
+ // setTimeout(function(){
+ // this.props.Document.SetText(KeyStore.PanTransformType, "None");
+ // }.bind(this),5000); // wait 5 seconds, then reset to false
+ // }
}
getDocumentViewProps(document: Document): DocumentViewProps {
@@ -311,6 +318,12 @@ export class CollectionFreeFormView extends CollectionSubView {
const panx: number = -this.props.Document.GetNumber(KeyStore.PanX, 0);
const pany: number = -this.props.Document.GetNumber(KeyStore.PanY, 0);
+ if (this.props.Document.GetText(KeyStore.PanTransformType, "") === "Ease") {
+ var freeformclass = "collectionfreeformview-ease";
+ } else {
+ var freeformclass = "collectionfreeformview-none";
+ }
+
return (
<Measure onResize={(r: any) => runInAction(() => { this._pwidth = r.entry.width; this._pheight = r.entry.height })}>
{({ measureRef }) => (
@@ -324,7 +337,7 @@ export class CollectionFreeFormView extends CollectionSubView {
getContainerTransform={this.getContainerTransform} getTransform={this.getTransform}>
<PreviewCursor container={this} addLiveTextDocument={this.addLiveTextBox}
getContainerTransform={this.getContainerTransform} getTransform={this.getTransform} >
- <div className="collectionfreeformview" ref={this._canvasRef}
+ <div className={freeformclass} ref={this._canvasRef}
style={{ transform: `translate(${dx}px, ${dy}px) scale(${this.zoomScaling}, ${this.zoomScaling}) translate(${panx}px, ${pany}px)` }}>
{this.backgroundView}
<CollectionFreeFormLinksView {...this.props}>