diff options
Diffstat (limited to 'src/views/freeformcanvas/CollectionFreeFormView.tsx')
| -rw-r--r-- | src/views/freeformcanvas/CollectionFreeFormView.tsx | 59 |
1 files changed, 27 insertions, 32 deletions
diff --git a/src/views/freeformcanvas/CollectionFreeFormView.tsx b/src/views/freeformcanvas/CollectionFreeFormView.tsx index f3ee2da23..fc473f0a6 100644 --- a/src/views/freeformcanvas/CollectionFreeFormView.tsx +++ b/src/views/freeformcanvas/CollectionFreeFormView.tsx @@ -1,20 +1,20 @@ -import { observer } from "mobx-react"; -import { Key, KeyStore } from "../../fields/Key"; +import {observer} from "mobx-react"; +import {Key, KeyStore} from "../../fields/Key"; import React = require("react"); -import { action, observable, computed } from "mobx"; -import { Document } from "../../fields/Document"; -import { DocumentViewModel } from "../../viewmodels/DocumentViewModel"; -import { DocumentView } from "../nodes/DocumentView"; -import { ListField } from "../../fields/ListField"; -import { NumberField } from "../../fields/NumberField"; -import { SSL_OP_SINGLE_DH_USE } from "constants"; -import { DocumentDecorations } from "../../DocumentDecorations"; -import { SelectionManager } from "../../util/SelectionManager"; -import { Documents } from "../../documents/Documents"; -import { ContextMenu } from "../ContextMenu"; -import { Opt } from "../../fields/Field"; -import { DragManager } from "../../util/DragManager"; -import { Utils } from "../../Utils"; +import {action, observable, computed} from "mobx"; +import {Document} from "../../fields/Document"; +import {DocumentViewModel} from "../../viewmodels/DocumentViewModel"; +import {DocumentView} from "../nodes/DocumentView"; +import {ListField} from "../../fields/ListField"; +import {NumberField} from "../../fields/NumberField"; +import {SSL_OP_SINGLE_DH_USE} from "constants"; +import {DocumentDecorations} from "../../DocumentDecorations"; +import {SelectionManager} from "../../util/SelectionManager"; +import {Documents} from "../../documents/Documents"; +import {ContextMenu} from "../ContextMenu"; +import {Opt} from "../../fields/Field"; +import {DragManager} from "../../util/DragManager"; +import {Utils} from "../../Utils"; interface IProps { fieldKey: Key; @@ -44,15 +44,15 @@ export class CollectionFreeFormView extends React.Component<IProps> { if (!ele) { return; } - const doc = de.data["document"]; - const xOffset = de.data["xOffset"] as number || 0; - const yOffset = de.data["yOffset"] as number || 0; + const doc = de.data[ "document" ]; + const xOffset = de.data[ "xOffset" ] as number || 0; + const yOffset = de.data[ "yOffset" ] as number || 0; if (doc instanceof DocumentView) { if (doc.props.ContainingCollectionView && doc.props.ContainingCollectionView !== this) { doc.props.ContainingCollectionView.removeDocument(doc.props.Document); this.addDocument(doc.props.Document); } - const { scale, translateX, translateY } = Utils.GetScreenTransform(ele); + const {scale, translateX, translateY} = Utils.GetScreenTransform(ele); const screenX = de.x - xOffset; const screenY = de.y - yOffset; const docX = (screenX - translateX) / scale; @@ -61,7 +61,7 @@ export class CollectionFreeFormView extends React.Component<IProps> { doc.y = docY; } e.stopPropagation(); - + DocumentDecorations.Instance.forceUpdate(); } componentDidMount() { @@ -95,11 +95,6 @@ export class CollectionFreeFormView extends React.Component<IProps> { document.removeEventListener("pointermove", this.onPointerMove); document.removeEventListener("pointerup", this.onPointerUp); e.stopPropagation(); - - var topMost = this.props.ContainingDocumentView != undefined && this.props.ContainingDocumentView.props.ContainingCollectionView == undefined; - if (topMost) { - SelectionManager.DeselectAll() - } } @action @@ -131,7 +126,7 @@ export class CollectionFreeFormView extends React.Component<IProps> { let ContainerY = inputY; if (me.props.ContainingDocumentView != undefined) { let pme = me.props.ContainingDocumentView!; - let { LocalX, LocalY } = this.getLocalPoint(pme, ContainerX, ContainerY); + let {LocalX, LocalY} = this.getLocalPoint(pme, ContainerX, ContainerY); ContainerX = LocalX; ContainerY = LocalY; } @@ -145,14 +140,14 @@ export class CollectionFreeFormView extends React.Component<IProps> { let LocalX = W / 2 - (Xx + Panxx) / Ss + (ContainerX - W / 2) / Ss; let LocalY = -(Yy + Panyy) / Ss + ContainerY / Ss; - return { LocalX, Ss, W, Panxx, Xx, LocalY, Panyy, Yy, ContainerX, ContainerY }; + return {LocalX, Ss, W, Panxx, Xx, LocalY, Panyy, Yy, ContainerX, ContainerY}; } @action onPointerWheel = (e: React.WheelEvent): void => { e.stopPropagation(); - let { LocalX, Ss, W, Panxx, Xx, LocalY, Panyy, Yy, ContainerX, ContainerY } = this.getLocalPoint(this.props.ContainingDocumentView!, e.pageX, e.pageY); + let {LocalX, Ss, W, Panxx, Xx, LocalY, Panyy, Yy, ContainerX, ContainerY} = this.getLocalPoint(this.props.ContainingDocumentView!, e.pageX, e.pageY); var deltaScale = (1 - (e.deltaY / 1000)) * Ss; @@ -173,7 +168,7 @@ export class CollectionFreeFormView extends React.Component<IProps> { e.stopPropagation() e.preventDefault() let fReader = new FileReader() - let file = e.dataTransfer.items[0].getAsFile(); + let file = e.dataTransfer.items[ 0 ].getAsFile(); let that = this; const panx: number = this.props.Document.GetFieldValue(KeyStore.PanX, NumberField, Number(0)); const pany: number = this.props.Document.GetFieldValue(KeyStore.PanY, NumberField, Number(0)); @@ -222,7 +217,7 @@ export class CollectionFreeFormView extends React.Component<IProps> { onDragOver = (e: React.DragEvent): void => { } render() { - const { fieldKey, Document: Document } = this.props; + const {fieldKey, Document: Document} = this.props; const value: Document[] = Document.GetFieldValue(fieldKey, ListField, []); const panx: number = Document.GetFieldValue(KeyStore.PanX, NumberField, Number(0)); @@ -239,7 +234,7 @@ export class CollectionFreeFormView extends React.Component<IProps> { height: "calc(100% - 4px)", overflow: "hidden" }} onDrop={this.onDrop} onDragOver={this.onDragOver} ref={this._containerRef}> - <div className="collectionfreeformview" style={{ transform: `translate(${panx}px, ${pany}px) scale(${currScale}, ${currScale})`, transformOrigin: `left, top` }} ref={this._canvasRef}> + <div className="collectionfreeformview" style={{transform: `translate(${panx}px, ${pany}px) scale(${currScale}, ${currScale})`, transformOrigin: `left, top`}} ref={this._canvasRef}> <div className="node-container"> {value.map(doc => { |