From a38a26ac3aa8bbce0dabf8495af29a48e2c039e4 Mon Sep 17 00:00:00 2001 From: madelinegr Date: Mon, 25 Feb 2019 18:34:10 -0500 Subject: redid presentation view class --- src/client/views/PresentationView.tsx | 94 +++++++++++++--------- .../views/collections/CollectionTreeView.tsx | 1 + 2 files changed, 59 insertions(+), 36 deletions(-) (limited to 'src') diff --git a/src/client/views/PresentationView.tsx b/src/client/views/PresentationView.tsx index 6835b9a9f..9ba812ba0 100644 --- a/src/client/views/PresentationView.tsx +++ b/src/client/views/PresentationView.tsx @@ -1,53 +1,75 @@ -import React = require("react"); -import { observable } from "mobx"; import { observer } from "mobx-react"; -import "./ContextMenu.scss" -import { CollectionFreeFormDocumentView } from "./nodes/CollectionFreeFormDocumentView"; +import { Document } from "../../fields/Document"; +import { KeyStore } from "../../fields/KeyStore"; +import { ListField } from "../../fields/ListField"; +import React = require("react") +import { TextField } from "../../fields/TextField"; +import { observable, action } from "mobx"; +import "./CollectionTreeView.scss"; -@observer -export class PresentationView extends React.Component { - static Instance: PresentationView - - @observable private _pageX: number = 0; - @observable private _pageY: number = 0; - @observable private _display: string = "none"; +export interface PresViewProps { + Document: Document; +} - private ref: React.RefObject; +@observer +/** + * Component that takes in a document prop and a boolean whether it's collapsed or not. + */ +class PresentationViewItem extends React.Component { - constructor(props: Readonly<{}>) { - super(props); + //observable means render is re-called every time variable is changed + @observable + collapsed: boolean = false; - this.ref = React.createRef() + /** + * Renders a single child document. It will just append a list element. + * @param document The document to render. + */ + renderChild(document: Document) { + let title = document.GetT(KeyStore.Title, TextField); - PresentationView.Instance = this; + // if the title hasn't loaded, immediately return the div + if (!title || title === "") { + return
; + } + // finally, if it's a normal document, then render it as such. + else { + return
  • {title.Data}
  • ; + } } + render() { + var children = this.props.Document.GetT>(KeyStore.Data, ListField); - displayMenu(x: number, y: number) { - this._pageX = x - this._pageY = y - - this._display = "flex" - } - - intersects = (x: number, y: number): boolean => { - if (this.ref.current && this._display !== "none") { - if (x >= this._pageX && x <= this._pageX + this.ref.current.getBoundingClientRect().width) { - if (y >= this._pageY && y <= this._pageY + this.ref.current.getBoundingClientRect().height) { - return true; - } - } + if (children && children !== "") { + return (
    + {children.Data.map(value => this.renderChild(value))} +
    ) + } else { + return
    ; } - return false; } +} + + +@observer +export class PresentationView extends React.Component { render() { + let titleStr = ""; + let title = this.props.Document.GetT(KeyStore.Title, TextField); + if (title && title !== "") { + titleStr = title.Data; + } return ( -
    - {this._items.map(prop => { - return - })} +
    +

    {titleStr}

    +
      + +
    - ) + ); } } \ No newline at end of file diff --git a/src/client/views/collections/CollectionTreeView.tsx b/src/client/views/collections/CollectionTreeView.tsx index 52e853bf7..bad3e3b69 100644 --- a/src/client/views/collections/CollectionTreeView.tsx +++ b/src/client/views/collections/CollectionTreeView.tsx @@ -18,6 +18,7 @@ export interface TreeViewProps { */ class TreeView extends React.Component { + //observable means render is re-called every time variable is changed @observable collapsed: boolean = false; -- cgit v1.2.3-70-g09d2