From 84eea14a86265ce0585342d9f3a3c4107c02df17 Mon Sep 17 00:00:00 2001 From: Tyler Schicke Date: Wed, 6 Feb 2019 01:43:09 -0500 Subject: Simplified function names in Document class --- src/views/collections/CollectionDockingView.tsx | 12 +++--- src/views/collections/CollectionFreeFormView.tsx | 44 +++++++++++----------- src/views/collections/CollectionSchemaView.tsx | 4 +- src/views/collections/CollectionViewBase.tsx | 4 +- src/views/nodes/CollectionFreeFormDocumentView.tsx | 20 +++++----- src/views/nodes/DocumentView.tsx | 30 +++++++-------- src/views/nodes/FieldView.tsx | 2 +- src/views/nodes/FormattedTextBox.tsx | 8 ++-- src/views/nodes/ImageBox.tsx | 2 +- 9 files changed, 63 insertions(+), 63 deletions(-) (limited to 'src/views') diff --git a/src/views/collections/CollectionDockingView.tsx b/src/views/collections/CollectionDockingView.tsx index 92b5e563c..de68cf0d7 100644 --- a/src/views/collections/CollectionDockingView.tsx +++ b/src/views/collections/CollectionDockingView.tsx @@ -25,7 +25,7 @@ export class CollectionDockingView extends CollectionViewBase { @computed private get modelForFlexLayout() { const { CollectionFieldKey: fieldKey, DocumentForCollection: Document } = this.props; - const value: Document[] = Document.GetFieldValue(fieldKey, ListField, []); + const value: Document[] = Document.GetData(fieldKey, ListField, []); var docs = value.map(doc => { return { type: 'tabset', weight: 50, selected: 0, children: [{ type: "tab", name: doc.Title, component: doc.Id }] }; }); @@ -41,7 +41,7 @@ export class CollectionDockingView extends CollectionViewBase { @computed private get modelForGoldenLayout(): any { const { CollectionFieldKey: fieldKey, DocumentForCollection: Document } = this.props; - const value: Document[] = Document.GetFieldValue(fieldKey, ListField, []); + const value: Document[] = Document.GetData(fieldKey, ListField, []); var docs = value.map(doc => { return { type: 'component', componentName: 'documentViewComponent', componentState: { doc: doc } }; }); @@ -93,7 +93,7 @@ export class CollectionDockingView extends CollectionViewBase { return ; } const { CollectionFieldKey: fieldKey, DocumentForCollection: Document } = this.props; - const value: Document[] = Document.GetFieldValue(fieldKey, ListField, []); + const value: Document[] = Document.GetData(fieldKey, ListField, []); for (var i: number = 0; i < value.length; i++) { if (value[i].Id === component) { return (); @@ -253,11 +253,11 @@ export class CollectionDockingView extends CollectionViewBase { render() { const { CollectionFieldKey: fieldKey, DocumentForCollection: Document } = this.props; - const value: Document[] = Document.GetFieldValue(fieldKey, ListField, []); + const value: Document[] = Document.GetData(fieldKey, ListField, []); // bcz: not sure why, but I need these to force the flexlayout to update when the collection size changes. var s = this.props.ContainingDocumentView != undefined ? this.props.ContainingDocumentView!.ScalingToScreenSpace : 1; - var w = Document.GetFieldValue(KeyStore.Width, NumberField, Number(0)) / s; - var h = Document.GetFieldValue(KeyStore.Height, NumberField, Number(0)) / s; + var w = Document.GetData(KeyStore.Width, NumberField, Number(0)) / s; + var h = Document.GetData(KeyStore.Height, NumberField, Number(0)) / s; var chooseLayout = () => { if (!CollectionDockingView.UseGoldenLayout) diff --git a/src/views/collections/CollectionFreeFormView.tsx b/src/views/collections/CollectionFreeFormView.tsx index cc907b2cc..c07a7e563 100644 --- a/src/views/collections/CollectionFreeFormView.tsx +++ b/src/views/collections/CollectionFreeFormView.tsx @@ -39,7 +39,7 @@ export class CollectionFreeFormView extends CollectionViewBase { const xOffset = de.data["xOffset"] as number || 0; const yOffset = de.data["yOffset"] as number || 0; const { scale, translateX, translateY } = Utils.GetScreenTransform(this._canvasRef.current!); - let sscale = this.props.ContainingDocumentView!.props.Document.GetFieldValue(KeyStore.Scale, NumberField, Number(1)) + let sscale = this.props.ContainingDocumentView!.props.Document.GetData(KeyStore.Scale, NumberField, Number(1)) const screenX = de.x - xOffset; const screenY = de.y - yOffset; const docX = (screenX - translateX) / sscale / scale; @@ -95,10 +95,10 @@ export class CollectionFreeFormView extends CollectionViewBase { e.preventDefault(); e.stopPropagation(); let currScale: number = this.props.ContainingDocumentView!.ScalingToScreenSpace; - let x = this.props.DocumentForCollection.GetFieldValue(KeyStore.PanX, NumberField, Number(0)); - let y = this.props.DocumentForCollection.GetFieldValue(KeyStore.PanY, NumberField, Number(0)); - this.props.DocumentForCollection.SetFieldValue(KeyStore.PanX, x + (e.pageX - this._lastX) / currScale, NumberField); - this.props.DocumentForCollection.SetFieldValue(KeyStore.PanY, y + (e.pageY - this._lastY) / currScale, NumberField); + let x = this.props.DocumentForCollection.GetData(KeyStore.PanX, NumberField, Number(0)); + let y = this.props.DocumentForCollection.GetData(KeyStore.PanY, NumberField, Number(0)); + this.props.DocumentForCollection.SetData(KeyStore.PanX, x + (e.pageX - this._lastX) / currScale, NumberField); + this.props.DocumentForCollection.SetData(KeyStore.PanY, y + (e.pageY - this._lastY) / currScale, NumberField); } this._lastX = e.pageX; this._lastY = e.pageY; @@ -118,9 +118,9 @@ export class CollectionFreeFormView extends CollectionViewBase { let dx = ContainerX - newContainerX; let dy = ContainerY - newContainerY; - this.props.DocumentForCollection.SetField(KeyStore.Scale, new NumberField(deltaScale)); - this.props.DocumentForCollection.SetFieldValue(KeyStore.PanX, Panxx + dx, NumberField); - this.props.DocumentForCollection.SetFieldValue(KeyStore.PanY, Panyy + dy, NumberField); + this.props.DocumentForCollection.Set(KeyStore.Scale, new NumberField(deltaScale)); + this.props.DocumentForCollection.SetData(KeyStore.PanX, Panxx + dx, NumberField); + this.props.DocumentForCollection.SetData(KeyStore.PanY, Panyy + dy, NumberField); } @action @@ -130,8 +130,8 @@ export class CollectionFreeFormView extends CollectionViewBase { let fReader = new FileReader() let file = e.dataTransfer.items[0].getAsFile(); let that = this; - const panx: number = this.props.DocumentForCollection.GetFieldValue(KeyStore.PanX, NumberField, Number(0)); - const pany: number = this.props.DocumentForCollection.GetFieldValue(KeyStore.PanY, NumberField, Number(0)); + const panx: number = this.props.DocumentForCollection.GetData(KeyStore.PanX, NumberField, Number(0)); + const pany: number = this.props.DocumentForCollection.GetData(KeyStore.PanY, NumberField, Number(0)); let x = e.pageX - panx let y = e.pageY - pany @@ -141,10 +141,10 @@ export class CollectionFreeFormView extends CollectionViewBase { let doc = Documents.ImageDocument(url, { x: x, y: y }) - let docs = that.props.DocumentForCollection.GetFieldT(KeyStore.Data, ListField); + let docs = that.props.DocumentForCollection.GetT(KeyStore.Data, ListField); if (!docs) { docs = new ListField(); - that.props.DocumentForCollection.SetField(KeyStore.Data, docs) + that.props.DocumentForCollection.Set(KeyStore.Data, docs) } docs.Data.push(doc); } @@ -162,26 +162,26 @@ export class CollectionFreeFormView extends CollectionViewBase { bringToFront(doc: CollectionFreeFormDocumentView) { const { CollectionFieldKey: fieldKey, DocumentForCollection: Document } = this.props; - const value: Document[] = Document.GetListField(fieldKey, []); - var topmost = value.reduce((topmost, d) => Math.max(d.GetNumberField(KeyStore.ZIndex, 0), topmost), -1000); + const value: Document[] = Document.GetList(fieldKey, []); + var topmost = value.reduce((topmost, d) => Math.max(d.GetNumber(KeyStore.ZIndex, 0), topmost), -1000); value.map(d => { - var zind = d.GetNumberField(KeyStore.ZIndex, 0); + var zind = d.GetNumber(KeyStore.ZIndex, 0); if (zind != topmost - 1 - (topmost - zind) && d != doc.props.Document) { - d.SetFieldValue(KeyStore.ZIndex, topmost - 1 - (topmost - zind), NumberField); + d.SetData(KeyStore.ZIndex, topmost - 1 - (topmost - zind), NumberField); } }) - if (doc.props.Document.GetNumberField(KeyStore.ZIndex, 0) != 0) { - doc.props.Document.SetFieldValue(KeyStore.ZIndex, 0, NumberField); + if (doc.props.Document.GetNumber(KeyStore.ZIndex, 0) != 0) { + doc.props.Document.SetData(KeyStore.ZIndex, 0, NumberField); } } render() { const { CollectionFieldKey: fieldKey, DocumentForCollection: Document } = this.props; - const value: Document[] = Document.GetListField(fieldKey, []); - const panx: number = Document.GetNumberField(KeyStore.PanX, 0); - const pany: number = Document.GetNumberField(KeyStore.PanY, 0); - const currScale: number = Document.GetNumberField(KeyStore.Scale, 1); + const value: Document[] = Document.GetList(fieldKey, []); + const panx: number = Document.GetNumber(KeyStore.PanX, 0); + const pany: number = Document.GetNumber(KeyStore.PanY, 0); + const currScale: number = Document.GetNumber(KeyStore.Scale, 1); return (
(fieldKey, []); - const columns = Document.GetListField(KS.ColumnsKey, + const children = Document.GetList(fieldKey, []); + const columns = Document.GetList(KS.ColumnsKey, [KS.Title, KS.Data, KS.Author]) let content; if (this.selectedIndex != -1) { diff --git a/src/views/collections/CollectionViewBase.tsx b/src/views/collections/CollectionViewBase.tsx index 76145f12b..35d938d43 100644 --- a/src/views/collections/CollectionViewBase.tsx +++ b/src/views/collections/CollectionViewBase.tsx @@ -38,14 +38,14 @@ export class CollectionViewBase extends React.Component { @action addDocument = (doc: Document): void => { //TODO This won't create the field if it doesn't already exist - const value = this.props.DocumentForCollection.GetFieldValue(this.props.CollectionFieldKey, ListField, new Array()) + const value = this.props.DocumentForCollection.GetData(this.props.CollectionFieldKey, ListField, new Array()) value.push(doc); } @action removeDocument = (doc: Document): void => { //TODO This won't create the field if it doesn't already exist - const value = this.props.DocumentForCollection.GetFieldValue(this.props.CollectionFieldKey, ListField, new Array()) + const value = this.props.DocumentForCollection.GetData(this.props.CollectionFieldKey, ListField, new Array()) if (value.indexOf(doc) !== -1) { value.splice(value.indexOf(doc), 1) diff --git a/src/views/nodes/CollectionFreeFormDocumentView.tsx b/src/views/nodes/CollectionFreeFormDocumentView.tsx index ebe6d411c..23863ce18 100644 --- a/src/views/nodes/CollectionFreeFormDocumentView.tsx +++ b/src/views/nodes/CollectionFreeFormDocumentView.tsx @@ -30,20 +30,20 @@ export class CollectionFreeFormDocumentView extends DocumentView { @computed get x(): number { - return this.props.Document.GetFieldValue(KeyStore.X, NumberField, Number(0)); + return this.props.Document.GetData(KeyStore.X, NumberField, Number(0)); } @computed get y(): number { - return this.props.Document.GetFieldValue(KeyStore.Y, NumberField, Number(0)); + return this.props.Document.GetData(KeyStore.Y, NumberField, Number(0)); } set x(x: number) { - this.props.Document.SetFieldValue(KeyStore.X, x, NumberField) + this.props.Document.SetData(KeyStore.X, x, NumberField) } set y(y: number) { - this.props.Document.SetFieldValue(KeyStore.Y, y, NumberField) + this.props.Document.SetData(KeyStore.Y, y, NumberField) } @computed @@ -53,29 +53,29 @@ export class CollectionFreeFormDocumentView extends DocumentView { @computed get width(): number { - return this.props.Document.GetFieldValue(KeyStore.Width, NumberField, Number(0)); + return this.props.Document.GetData(KeyStore.Width, NumberField, Number(0)); } set width(w: number) { - this.props.Document.SetFieldValue(KeyStore.Width, w, NumberField) + this.props.Document.SetData(KeyStore.Width, w, NumberField) } @computed get height(): number { - return this.props.Document.GetFieldValue(KeyStore.Height, NumberField, Number(0)); + return this.props.Document.GetData(KeyStore.Height, NumberField, Number(0)); } set height(h: number) { - this.props.Document.SetFieldValue(KeyStore.Height, h, NumberField) + this.props.Document.SetData(KeyStore.Height, h, NumberField) } @computed get zIndex(): number { - return this.props.Document.GetFieldValue(KeyStore.ZIndex, NumberField, Number(0)); + return this.props.Document.GetData(KeyStore.ZIndex, NumberField, Number(0)); } set zIndex(h: number) { - this.props.Document.SetFieldValue(KeyStore.ZIndex, h, NumberField) + this.props.Document.SetData(KeyStore.ZIndex, h, NumberField) } @action diff --git a/src/views/nodes/DocumentView.tsx b/src/views/nodes/DocumentView.tsx index a1262e2ba..5be17fe54 100644 --- a/src/views/nodes/DocumentView.tsx +++ b/src/views/nodes/DocumentView.tsx @@ -31,17 +31,17 @@ export class DocumentView extends React.Component { } @computed get layout(): string { - return this.props.Document.GetFieldValue(KeyStore.Layout, TextField, String("

Error loading layout data

")); + return this.props.Document.GetData(KeyStore.Layout, TextField, String("

Error loading layout data

")); } @computed get layoutKeys(): Key[] { - return this.props.Document.GetFieldValue(KeyStore.LayoutKeys, ListField, new Array()); + return this.props.Document.GetData(KeyStore.LayoutKeys, ListField, new Array()); } @computed get layoutFields(): Key[] { - return this.props.Document.GetFieldValue(KeyStore.LayoutFields, ListField, new Array()); + return this.props.Document.GetData(KeyStore.LayoutFields, ListField, new Array()); } // @@ -50,7 +50,7 @@ export class DocumentView extends React.Component { @computed public get ScalingToScreenSpace(): number { if (this.props.ContainingCollectionView != undefined && this.props.ContainingCollectionView.props.ContainingDocumentView != undefined) { - let ss = this.props.ContainingCollectionView.props.DocumentForCollection.GetFieldValue(KeyStore.Scale, NumberField, Number(1)); + let ss = this.props.ContainingCollectionView.props.DocumentForCollection.GetData(KeyStore.Scale, NumberField, Number(1)); return this.props.ContainingCollectionView.props.ContainingDocumentView.ScalingToScreenSpace * ss; } return 1; @@ -68,8 +68,8 @@ export class DocumentView extends React.Component { let ContainerX: number = parentX - COLLECTION_BORDER_WIDTH; let ContainerY: number = parentY - COLLECTION_BORDER_WIDTH; - var Xx = this.props.Document.GetFieldValue(KeyStore.X, NumberField, Number(0)); - var Yy = this.props.Document.GetFieldValue(KeyStore.Y, NumberField, Number(0)); + var Xx = this.props.Document.GetData(KeyStore.X, NumberField, Number(0)); + var Yy = this.props.Document.GetData(KeyStore.Y, NumberField, Number(0)); // CollectionDockingViews change the location of their children frames without using a Dash transformation. // They also ignore any transformation that may have been applied to their content document. // NOTE: this currently assumes CollectionDockingViews aren't nested. @@ -79,9 +79,9 @@ export class DocumentView extends React.Component { Yy = ry - COLLECTION_BORDER_WIDTH; } - let Ss = this.props.Document.GetFieldValue(KeyStore.Scale, NumberField, Number(1)); - let Panxx = this.props.Document.GetFieldValue(KeyStore.PanX, NumberField, Number(0)); - let Panyy = this.props.Document.GetFieldValue(KeyStore.PanY, NumberField, Number(0)); + let Ss = this.props.Document.GetData(KeyStore.Scale, NumberField, Number(1)); + let Panxx = this.props.Document.GetData(KeyStore.PanX, NumberField, Number(0)); + let Panyy = this.props.Document.GetData(KeyStore.PanY, NumberField, Number(0)); let LocalX = (ContainerX - (Xx + Panxx)) / Ss; let LocalY = (ContainerY - (Yy + Panyy)) / Ss; @@ -93,8 +93,8 @@ export class DocumentView extends React.Component { // public TransformToScreenPoint(localX: number, localY: number, Ss: number = 1, Panxx: number = 0, Panyy: number = 0): { ScreenX: number, ScreenY: number } { - var Xx = this.props.Document.GetFieldValue(KeyStore.X, NumberField, Number(0)); - var Yy = this.props.Document.GetFieldValue(KeyStore.Y, NumberField, Number(0)); + var Xx = this.props.Document.GetData(KeyStore.X, NumberField, Number(0)); + var Yy = this.props.Document.GetData(KeyStore.Y, NumberField, Number(0)); // CollectionDockingViews change the location of their children frames without using a Dash transformation. // They also ignore any transformation that may have been applied to their content document. // NOTE: this currently assumes CollectionDockingViews aren't nested. @@ -113,9 +113,9 @@ export class DocumentView extends React.Component { // first transform the local point into the parent collection's coordinate space. let containingDocView = this.props.ContainingCollectionView != undefined ? this.props.ContainingCollectionView.props.ContainingDocumentView : undefined; if (containingDocView != undefined) { - let ss = containingDocView.props.Document.GetFieldValue(KeyStore.Scale, NumberField, Number(1)); - let panxx = containingDocView.props.Document.GetFieldValue(KeyStore.PanX, NumberField, Number(0)) + COLLECTION_BORDER_WIDTH * ss; - let panyy = containingDocView.props.Document.GetFieldValue(KeyStore.PanY, NumberField, Number(0)) + COLLECTION_BORDER_WIDTH * ss; + let ss = containingDocView.props.Document.GetData(KeyStore.Scale, NumberField, Number(1)); + let panxx = containingDocView.props.Document.GetData(KeyStore.PanX, NumberField, Number(0)) + COLLECTION_BORDER_WIDTH * ss; + let panyy = containingDocView.props.Document.GetData(KeyStore.PanY, NumberField, Number(0)) + COLLECTION_BORDER_WIDTH * ss; let { ScreenX, ScreenY } = containingDocView.TransformToScreenPoint(parentX, parentY, ss, panxx, panyy); parentX = ScreenX; parentY = ScreenY; @@ -133,7 +133,7 @@ export class DocumentView extends React.Component { if (bindings.DocumentView === undefined) bindings.DocumentView = this; for (const key of this.layoutFields) { - let field = doc.GetField(key); + let field = doc.Get(key); if (field) { bindings[key.Name] = field.GetValue(); } diff --git a/src/views/nodes/FieldView.tsx b/src/views/nodes/FieldView.tsx index 2a2355a23..71e24986a 100644 --- a/src/views/nodes/FieldView.tsx +++ b/src/views/nodes/FieldView.tsx @@ -29,7 +29,7 @@ export class FieldView extends React.Component { @computed get field(): Opt { const { doc, fieldKey } = this.props; - return doc.GetField(fieldKey); + return doc.Get(fieldKey); } render() { const field = this.field; diff --git a/src/views/nodes/FormattedTextBox.tsx b/src/views/nodes/FormattedTextBox.tsx index 9c4b24226..e00ab6701 100644 --- a/src/views/nodes/FormattedTextBox.tsx +++ b/src/views/nodes/FormattedTextBox.tsx @@ -50,7 +50,7 @@ export class FormattedTextBox extends React.Component { const state = this._editorView.state.apply(tx); this._editorView.updateState(state); const { doc, fieldKey } = this.props; - doc.SetFieldValue(fieldKey, JSON.stringify(state.toJSON()), RichTextField); + doc.SetData(fieldKey, JSON.stringify(state.toJSON()), RichTextField); } } @@ -66,7 +66,7 @@ export class FormattedTextBox extends React.Component { ] }; - let field = doc.GetFieldT(fieldKey, RichTextField); + let field = doc.GetT(fieldKey, RichTextField); if (field) { state = EditorState.fromJSON(config, JSON.parse(field.Data)); } else { @@ -80,7 +80,7 @@ export class FormattedTextBox extends React.Component { } this._reactionDisposer = reaction(() => { - const field = this.props.doc.GetFieldT(this.props.fieldKey, RichTextField); + const field = this.props.doc.GetT(this.props.fieldKey, RichTextField); return field ? field.Data : undefined; }, (field) => { if (field && this._editorView) { @@ -105,7 +105,7 @@ export class FormattedTextBox extends React.Component { @action onChange(e: React.ChangeEvent) { const { fieldKey, doc } = this.props; - doc.SetFieldValue(fieldKey, e.target.value, RichTextField); + doc.SetData(fieldKey, e.target.value, RichTextField); } onPointerDown = (e: React.PointerEvent): void => { let me = this; diff --git a/src/views/nodes/ImageBox.tsx b/src/views/nodes/ImageBox.tsx index dd201f20f..eceb04b07 100644 --- a/src/views/nodes/ImageBox.tsx +++ b/src/views/nodes/ImageBox.tsx @@ -59,7 +59,7 @@ export class ImageBox extends React.Component { } render() { - let field = this.props.doc.GetFieldT(this.props.fieldKey, ImageField); + let field = this.props.doc.GetT(this.props.fieldKey, ImageField); let path = ""; if (field) { path = field.Data.href; -- cgit v1.2.3-70-g09d2