aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/collections
diff options
context:
space:
mode:
authorlaurawilsonri <laura_wilson@brown.edu>2019-02-23 21:42:21 -0500
committerlaurawilsonri <laura_wilson@brown.edu>2019-02-23 21:42:21 -0500
commitc2400538b8ca4b68eb8767c8976531202f2ee748 (patch)
treecd7034e33e209d253b46d9763b03057ea4c65dad /src/client/views/collections
parent9cf013c5b64af47d5199ef8168a5af6c29461ed9 (diff)
everything works except text can't be set for textboxes
Diffstat (limited to 'src/client/views/collections')
-rw-r--r--src/client/views/collections/CollectionFreeFormView.tsx22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/client/views/collections/CollectionFreeFormView.tsx b/src/client/views/collections/CollectionFreeFormView.tsx
index 8facc8f3c..e1b1db685 100644
--- a/src/client/views/collections/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/CollectionFreeFormView.tsx
@@ -27,12 +27,11 @@ export class CollectionFreeFormView extends CollectionViewBase {
private _lastX: number = 0;
private _lastY: number = 0;
- @observable
private _downX: number = 0;
- @observable
private _downY: number = 0;
//determines whether the blinking cursor for indicating whether a text will be made on key down is visible
+ @observable
private _previewCursorVisible: boolean = false;
constructor(props: CollectionViewProps) {
@@ -100,10 +99,10 @@ export class CollectionFreeFormView extends CollectionViewBase {
this._downX = e.pageX;
this._downY = e.pageY;
//update downX/downY to update UI (used for preview text cursor)
- //this.setState({
- // DownX: e.pageX,
- // DownY: e.pageY,
- //})
+ this.setState({
+ DownX: e.pageX,
+ DownY: e.pageY,
+ })
}
}
@@ -129,9 +128,8 @@ export class CollectionFreeFormView extends CollectionViewBase {
let currScale: number = this.props.ContainingDocumentView!.ScalingToScreenSpace;
let x = this.props.DocumentForCollection.GetNumber(KeyStore.PanX, 0);
let y = this.props.DocumentForCollection.GetNumber(KeyStore.PanY, 0);
-
+ this._previewCursorVisible = false;
this.SetPan(x + (e.pageX - this._lastX) / currScale, y + (e.pageY - this._lastY) / currScale);
- console.log("SET PAN");
}
this._lastX = e.pageX;
this._lastY = e.pageY;
@@ -212,7 +210,7 @@ export class CollectionFreeFormView extends CollectionViewBase {
let newBox = Documents.TextDocument({ width: 200, height: 100, x: LocalX, y: LocalY, title: "new" });
//set text to be the typed key and get focus on text box
//newBox.SetText(KeyStore.Layout, new TextField(FormattedTextBox.LayoutString()));
- newBox.SetText(KeyStore.Data, e.key, true);
+ //newBox.setText(KeyStore.Data, e.key, true);
//newBox.SetData(KeyStore.Data, e.key, RichTextField);
//SelectionManager.SelectDoc(newBox, false);
this.addDocument(newBox);
@@ -258,6 +256,12 @@ export class CollectionFreeFormView extends CollectionViewBase {
return this.props.GetTransform().scaled(this.scale).translate(x, y);
}
+ //hides the preview cursor for generating new text boxes - called when other docs are selected/dragged
+ @action
+ hidePreviewCursor() {
+ this._previewCursorVisible = false;
+ }
+
render() {
const Document: Document = this.props.DocumentForCollection;
const value: Document[] = Document.GetList<Document>(this.props.CollectionFieldKey, []);