diff options
| -rw-r--r-- | src/Main.tsx | 2 | ||||
| -rw-r--r-- | src/views/freeformcanvas/CollectionFreeFormView.tsx | 23 | ||||
| -rw-r--r-- | src/views/nodes/DocumentView.tsx | 6 | ||||
| -rw-r--r-- | src/views/nodes/NodeView.scss | 2 | ||||
| -rw-r--r-- | src/views/nodes/RichTextView.tsx | 0 |
5 files changed, 19 insertions, 14 deletions
diff --git a/src/Main.tsx b/src/Main.tsx index a3b9bc96f..604e443cf 100644 --- a/src/Main.tsx +++ b/src/Main.tsx @@ -45,7 +45,7 @@ runInAction(() => { doc2.SetField(KS.X, new NumberField(150)); doc2.SetField(KS.Y, new NumberField(20)); let doc3 = Documents.ImageDocument("https://static.boredpanda.com/blog/wp-content/uploads/2018/04/5acb63d83493f__700-png.jpg", { - x: 150, y: 500 + x: 450, y: 500 }); let docset = new Array<Document>(doc1, doc2); let doc4 = Documents.CollectionDocument(docset, { diff --git a/src/views/freeformcanvas/CollectionFreeFormView.tsx b/src/views/freeformcanvas/CollectionFreeFormView.tsx index 7812c4b36..33b7ed1ad 100644 --- a/src/views/freeformcanvas/CollectionFreeFormView.tsx +++ b/src/views/freeformcanvas/CollectionFreeFormView.tsx @@ -8,6 +8,7 @@ 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"; interface IProps { fieldKey: Key; @@ -79,12 +80,22 @@ export class CollectionFreeFormView extends React.Component<IProps> { const panx: number = doc.GetFieldValue(KeyStore.PanX, NumberField, Number(0)); const pany: number = doc.GetFieldValue(KeyStore.PanY, NumberField, Number(0)); return ( - <div className="collectionfreeformview-container" onPointerDown={this.onPointerDown} onWheel={this.onPointerWheel} onContextMenu={(e) => e.preventDefault()}> - <div className="collectionfreeformview" style={{ transform: `translate(${panx}px, ${pany}px)`, transformOrigin: '50% 50%' }}> - <div className="node-container"> - {value.map(doc => { - return (<DocumentView key={doc.Id} dvm={new DocumentViewModel(doc)} />); - })} + + <div className="border" style={{ + borderStyle: "solid", + borderWidth: "2px" + }}> + <div className="collectionfreeformview-container" onPointerDown={this.onPointerDown} onWheel={this.onPointerWheel} onContextMenu={(e) => e.preventDefault()} style={{ + width: "100%", + height: "calc(100% - 4px)", + overflow: "hidden" + }}> + <div className="collectionfreeformview" style={{ transform: `translate(${panx}px, ${pany}px)`, transformOrigin: '50% 50%' }}> + <div className="node-container"> + {value.map(doc => { + return (<DocumentView key={doc.Id} dvm={new DocumentViewModel(doc)} />); + })} + </div> </div> </div> </div> diff --git a/src/views/nodes/DocumentView.tsx b/src/views/nodes/DocumentView.tsx index c4101fab9..1f5ce7f22 100644 --- a/src/views/nodes/DocumentView.tsx +++ b/src/views/nodes/DocumentView.tsx @@ -52,12 +52,6 @@ export class DocumentView extends React.Component<IProps> { return this.props.dvm.Doc.GetFieldValue(KeyStore.Height, NumberField, Number(0)); } - //Temp - @computed - get data(): string { - return this.props.dvm.Doc.GetFieldValue(KeyStore.Data, TextField, String("")); - } - @computed get layout(): string { return this.props.dvm.Doc.GetFieldValue(KeyStore.Layout, TextField, String("<p>Error loading layout data</p>")); diff --git a/src/views/nodes/NodeView.scss b/src/views/nodes/NodeView.scss index e8964399b..a68335f87 100644 --- a/src/views/nodes/NodeView.scss +++ b/src/views/nodes/NodeView.scss @@ -1,6 +1,6 @@ .node { position: absolute; - // background: #cdcdcd; + background: #cdcdcd; overflow: hidden; diff --git a/src/views/nodes/RichTextView.tsx b/src/views/nodes/RichTextView.tsx new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/src/views/nodes/RichTextView.tsx |