From ea9f41a84a307343593245e6de0c721704dc60fa Mon Sep 17 00:00:00 2001 From: bob Date: Tue, 5 Feb 2019 11:51:59 -0500 Subject: more --- src/Main.tsx | 2 +- src/views/collections/CollectionDockingView.tsx | 4 ++-- src/views/collections/CollectionFreeFormView.tsx | 2 +- src/views/collections/CollectionSchemaView.tsx | 7 ++----- src/views/nodes/CollectionFreeFormDocumentView.tsx | 2 +- src/views/nodes/DocumentView.tsx | 8 ++++---- src/views/nodes/FieldView.tsx | 4 ++-- src/views/nodes/FormattedTextBox.tsx | 2 +- src/views/nodes/ImageBox.tsx | 4 ++-- 9 files changed, 16 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/Main.tsx b/src/Main.tsx index 7618630f8..b72083ee6 100644 --- a/src/Main.tsx +++ b/src/Main.tsx @@ -80,7 +80,7 @@ document.addEventListener("pointerdown", action(function (e: PointerEvent) { ReactDOM.render((
- +
), diff --git a/src/views/collections/CollectionDockingView.tsx b/src/views/collections/CollectionDockingView.tsx index 49f1a0bf0..2e8d5a514 100644 --- a/src/views/collections/CollectionDockingView.tsx +++ b/src/views/collections/CollectionDockingView.tsx @@ -96,7 +96,7 @@ export class CollectionDockingView extends CollectionViewBase { const value: Document[] = Document.GetFieldValue(fieldKey, ListField, []); for (var i: number = 0; i < value.length; i++) { if (value[i].Id === component) { - return (); + return (); } } if (component === "text") { @@ -237,7 +237,7 @@ export class CollectionDockingView extends CollectionViewBase { container.getElement().html("
"); setTimeout(function () { ReactDOM.render(( - // bcz: need to fill in DocumentContentsView with value of DocumentContents when created... + ), document.getElementById(containingDiv) ); diff --git a/src/views/collections/CollectionFreeFormView.tsx b/src/views/collections/CollectionFreeFormView.tsx index d266a55d9..abc811642 100644 --- a/src/views/collections/CollectionFreeFormView.tsx +++ b/src/views/collections/CollectionFreeFormView.tsx @@ -198,7 +198,7 @@ export class CollectionFreeFormView extends CollectionViewBase {
{value.map(doc => { - return (); + return (); })}
diff --git a/src/views/collections/CollectionSchemaView.tsx b/src/views/collections/CollectionSchemaView.tsx index b2ff95329..19b1434ef 100644 --- a/src/views/collections/CollectionSchemaView.tsx +++ b/src/views/collections/CollectionSchemaView.tsx @@ -20,13 +20,10 @@ export class CollectionSchemaView extends CollectionViewBase { selectedIndex = 0; renderCell = (rowProps: CellInfo) => { - if (!this.props.DocumentViewForCollection) { - return
- } let props: FieldViewProps = { doc: rowProps.value[0], fieldKey: rowProps.value[1], - documentViewContainer: this.props.DocumentViewForCollection + DocumentViewForField: undefined } return ( @@ -78,7 +75,7 @@ export class CollectionSchemaView extends CollectionViewBase { let content; if (this.selectedIndex != -1) { content = () } else { content =
diff --git a/src/views/nodes/CollectionFreeFormDocumentView.tsx b/src/views/nodes/CollectionFreeFormDocumentView.tsx index 78e3325ab..ebe6d411c 100644 --- a/src/views/nodes/CollectionFreeFormDocumentView.tsx +++ b/src/views/nodes/CollectionFreeFormDocumentView.tsx @@ -215,7 +215,7 @@ export class CollectionFreeFormDocumentView extends DocumentView { onContextMenu={this.onContextMenu} onPointerDown={this.onPointerDown}> - +
); } diff --git a/src/views/nodes/DocumentView.tsx b/src/views/nodes/DocumentView.tsx index 7ff1ef5cc..9a3783fdc 100644 --- a/src/views/nodes/DocumentView.tsx +++ b/src/views/nodes/DocumentView.tsx @@ -20,7 +20,7 @@ const JsxParser = require('react-jsx-parser').default;//TODO Why does this need export interface DocumentViewProps { Document: Document; ContainingCollectionView: Opt; - DocumentContentsView: Opt + DocumentView: Opt } @observer export class DocumentView extends React.Component { @@ -111,7 +111,7 @@ export class DocumentView extends React.Component { // if this collection view is nested within another collection view, then // first transform the local point into the parent collection's coordinate space. - let containingDocView = this.props.ContainingCollectionView != undefined ? this.props.ContainingCollectionView.props.DocumentViewForCollection : undefined;//.ContainingDocumentContentsView; + let containingDocView = this.props.ContainingCollectionView != undefined ? this.props.ContainingCollectionView.props.DocumentViewForCollection : 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; @@ -130,8 +130,8 @@ export class DocumentView extends React.Component { for (const key of this.layoutKeys) { bindings[key.Name + "Key"] = key; } - if (this.props.DocumentContentsView == undefined) - bindings.DocumentContentsView = this; + if (this.props.DocumentView == undefined) + bindings.DocumentView = this; for (const key of this.layoutFields) { let field = doc.GetField(key); if (field) { diff --git a/src/views/nodes/FieldView.tsx b/src/views/nodes/FieldView.tsx index 370f6d324..2a2355a23 100644 --- a/src/views/nodes/FieldView.tsx +++ b/src/views/nodes/FieldView.tsx @@ -20,12 +20,12 @@ import { DocumentView } from "./DocumentView"; export interface FieldViewProps { fieldKey: Key; doc: Document; - documentViewContainer: DocumentView + DocumentViewForField: Opt } @observer export class FieldView extends React.Component { - public static LayoutString(fieldType: string) { return `<${fieldType} doc={Document} documentViewContainer={DocumentContentsView} fieldKey={DataKey} />`; } + public static LayoutString(fieldType: string) { return `<${fieldType} doc={Document} DocumentViewForField={DocumentView} fieldKey={DataKey} />`; } @computed get field(): Opt { const { doc, fieldKey } = this.props; diff --git a/src/views/nodes/FormattedTextBox.tsx b/src/views/nodes/FormattedTextBox.tsx index d51e91315..9c4b24226 100644 --- a/src/views/nodes/FormattedTextBox.tsx +++ b/src/views/nodes/FormattedTextBox.tsx @@ -109,7 +109,7 @@ export class FormattedTextBox extends React.Component { } onPointerDown = (e: React.PointerEvent): void => { let me = this; - if (e.buttons === 1 && me.props.documentViewContainer instanceof CollectionFreeFormDocumentView && SelectionManager.IsSelected(me.props.documentViewContainer)) { + if (e.buttons === 1 && me.props.DocumentViewForField instanceof CollectionFreeFormDocumentView && SelectionManager.IsSelected(me.props.DocumentViewForField)) { e.stopPropagation(); } } diff --git a/src/views/nodes/ImageBox.tsx b/src/views/nodes/ImageBox.tsx index cced95c89..dd201f20f 100644 --- a/src/views/nodes/ImageBox.tsx +++ b/src/views/nodes/ImageBox.tsx @@ -39,7 +39,7 @@ export class ImageBox extends React.Component { onPointerDown = (e: React.PointerEvent): void => { if (Date.now() - this._lastTap < 300) { - if (e.buttons === 1 && this.props.documentViewContainer instanceof CollectionFreeFormDocumentView && SelectionManager.IsSelected(this.props.documentViewContainer)) { + if (e.buttons === 1 && this.props.DocumentViewForField instanceof CollectionFreeFormDocumentView && SelectionManager.IsSelected(this.props.DocumentViewForField)) { e.stopPropagation(); this._downX = e.clientX; this._downY = e.clientY; @@ -67,7 +67,7 @@ export class ImageBox extends React.Component { const images = [path,]; var lightbox = () => { const { photoIndex } = this.state; - if (this.state.isOpen && this.props.documentViewContainer instanceof CollectionFreeFormDocumentView && SelectionManager.IsSelected(this.props.documentViewContainer)) { + if (this.state.isOpen && this.props.DocumentViewForField instanceof CollectionFreeFormDocumentView && SelectionManager.IsSelected(this.props.DocumentViewForField)) { return (