diff options
-rw-r--r-- | src/client/views/collections/CollectionFreeFormView.tsx | 6 | ||||
-rw-r--r-- | src/client/views/collections/CollectionView.tsx | 2 | ||||
-rw-r--r-- | src/client/views/nodes/DocumentView.tsx | 16 | ||||
-rw-r--r-- | src/client/views/nodes/KeyValuePane.scss | 0 | ||||
-rw-r--r-- | src/client/views/nodes/KeyValuePane.tsx | 124 |
5 files changed, 148 insertions, 0 deletions
diff --git a/src/client/views/collections/CollectionFreeFormView.tsx b/src/client/views/collections/CollectionFreeFormView.tsx index 63255dd90..29d254e56 100644 --- a/src/client/views/collections/CollectionFreeFormView.tsx +++ b/src/client/views/collections/CollectionFreeFormView.tsx @@ -194,6 +194,11 @@ export class CollectionFreeFormView extends CollectionViewBase { }); } + @action + addKVP(doc: Document) { + let fields = doc.fields; + //TODO: return kvpg + } @computed get backgroundLayout(): string | undefined { let field = this.props.Document.GetT(KeyStore.BackgroundLayout, TextField); @@ -261,6 +266,7 @@ export class CollectionFreeFormView extends CollectionViewBase { } render() { + //TODO: put KVP stuff in this function //determines whether preview text cursor should be visible (ie when user taps this collection it should) let cursor = null; diff --git a/src/client/views/collections/CollectionView.tsx b/src/client/views/collections/CollectionView.tsx index 8332249c9..f938d2237 100644 --- a/src/client/views/collections/CollectionView.tsx +++ b/src/client/views/collections/CollectionView.tsx @@ -49,6 +49,7 @@ export class CollectionView extends React.Component<CollectionViewProps> { } } + @action removeDocument = (doc: Document): boolean => { //TODO This won't create the field if it doesn't already exist @@ -60,6 +61,7 @@ export class CollectionView extends React.Component<CollectionViewProps> { break; } } + if (index !== -1) { value.splice(index, 1) diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx index d5b4a723d..d1706c80c 100644 --- a/src/client/views/nodes/DocumentView.tsx +++ b/src/client/views/nodes/DocumentView.tsx @@ -15,11 +15,19 @@ import { CollectionView, CollectionViewType } from "../collections/CollectionVie import { ContextMenu } from "../ContextMenu"; import { FormattedTextBox } from "../nodes/FormattedTextBox"; import { ImageBox } from "../nodes/ImageBox"; +import { Documents } from "../../documents/Documents" +import { KeyValuePane } from "../nodes/KeyValuePane" import { WebBox } from "../nodes/WebBox"; import "./DocumentView.scss"; import React = require("react"); const JsxParser = require('react-jsx-parser').default;//TODO Why does this need to be imported like this? +/* + if containingcollectionview is CollectionFreeformView: + (ContainingCollectionView as CollectionFreeformView)?.addKVP +*/ + + export interface DocumentViewProps { ContainingCollectionView: Opt<CollectionView>; @@ -151,12 +159,19 @@ export class DocumentView extends React.Component<DocumentViewProps> { this.props.RemoveDocument(this.props.Document); } } + + fieldsClicked = (e: React.MouseEvent): void => { + if (this.props.ContainingCollectionView) { + (this.props.ContainingCollectionView as unknown as CollectionFreeFormView).addKVP(this.props.Document); + } + } fullScreenClicked = (e: React.MouseEvent): void => { CollectionDockingView.Instance.OpenFullScreen(this.props.Document); ContextMenu.Instance.clearItems(); ContextMenu.Instance.addItem({ description: "Close Full Screen", event: this.closeFullScreenClicked }); ContextMenu.Instance.displayMenu(e.pageX - 15, e.pageY - 15) } + closeFullScreenClicked = (e: React.MouseEvent): void => { CollectionDockingView.Instance.CloseFullScreen(); ContextMenu.Instance.clearItems(); @@ -175,6 +190,7 @@ export class DocumentView extends React.Component<DocumentViewProps> { e.preventDefault() ContextMenu.Instance.addItem({ description: "Full Screen", event: this.fullScreenClicked }) + ContextMenu.Instance.addItem({ description: "Fields", event: () => this.fieldsClicked }) ContextMenu.Instance.addItem({ description: "Open Right", event: () => CollectionDockingView.Instance.AddRightSplit(this.props.Document) }) ContextMenu.Instance.addItem({ description: "Freeform", event: () => this.props.Document.SetNumber(KeyStore.ViewType, CollectionViewType.Freeform) }) ContextMenu.Instance.addItem({ description: "Schema", event: () => this.props.Document.SetNumber(KeyStore.ViewType, CollectionViewType.Schema) }) diff --git a/src/client/views/nodes/KeyValuePane.scss b/src/client/views/nodes/KeyValuePane.scss new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/src/client/views/nodes/KeyValuePane.scss diff --git a/src/client/views/nodes/KeyValuePane.tsx b/src/client/views/nodes/KeyValuePane.tsx new file mode 100644 index 000000000..26d5ed9fd --- /dev/null +++ b/src/client/views/nodes/KeyValuePane.tsx @@ -0,0 +1,124 @@ + +import Lightbox from 'react-image-lightbox'; +import 'react-image-lightbox/style.css'; // This only needs to be imported once in your app +import "./KeyValuePane.scss"; +import React = require("react") +import { FieldViewProps, FieldView } from './FieldView'; +import { FieldWaiting } from '../../../fields/Field'; +import { observer } from "mobx-react" +import { observable, action } from 'mobx'; +import { KeyStore } from '../../../fields/KeyStore'; +import { element } from 'prop-types'; +import { props } from 'bluebird'; + +@observer +export class KeyValuePane extends React.Component/*<FieldViewProps>*/ { + + public static LayoutString() { return FieldView.LayoutString(KeyValuePane) } + //private _ref: React.RefObject<HTMLDivElement>; + // private _downX: number = 0; + // private _downY: number = 0; + // private _lastTap: number = 0; + // @observable private _photoIndex: number = 0; + // @observable private _isOpen: boolean = false; + + constructor() { + super(props); + } + // constructor(props: FieldViewProps) { + // super(props); + + // // this._ref = React.createRef(); + // // this._imgRef = React.createRef(); + // // this.state = { + // // photoIndex: 0, + // // isOpen: false, + // // }; + // } + + // @action + // onLoad = (target: any) => { + // var h = this._imgRef.current!.naturalHeight; + // var w = this._imgRef.current!.naturalWidth; + // this.props.doc.SetNumber(KeyStore.NativeHeight, this.props.doc.GetNumber(KeyStore.NativeWidth, 0) * h / w) + // } + + // componentDidMount() { + // } + + // componentWillUnmount() { + // } + + // onPointerDown = (e: React.PointerEvent): void => { + // if (Date.now() - this._lastTap < 300) { + // if (e.buttons === 1 && this.props.isSelected()) { + // e.stopPropagation(); + // this._downX = e.clientX; + // this._downY = e.clientY; + // document.removeEventListener("pointerup", this.onPointerUp); + // document.addEventListener("pointerup", this.onPointerUp); + // } + // } else { + // this._lastTap = Date.now(); + // } + // } + // @action + // onPointerUp = (e: PointerEvent): void => { + // document.removeEventListener("pointerup", this.onPointerUp); + // if (Math.abs(e.clientX - this._downX) < 2 && Math.abs(e.clientY - this._downY) < 2) { + // this._isOpen = true; + // } + // e.stopPropagation(); + // } + + // lightbox = (path: string) => { + // const images = [path, "http://www.cs.brown.edu/~bcz/face.gif"]; + // if (this._isOpen && this.props.isSelected()) { + // return (<Lightbox + // mainSrc={images[this._photoIndex]} + // nextSrc={images[(this._photoIndex + 1) % images.length]} + // prevSrc={images[(this._photoIndex + images.length - 1) % images.length]} + // onCloseRequest={action(() => + // this._isOpen = false + // )} + // onMovePrevRequest={action(() => + // this._photoIndex = (this._photoIndex + images.length - 1) % images.length + // )} + // onMoveNextRequest={action(() => + // this._photoIndex = (this._photoIndex + 1) % images.length + // )} + // />) + // } + // } + + render() { + // let field = this.props.doc.Get(this.props.fieldKey); + // let path = field == FieldWaiting ? "https://image.flaticon.com/icons/svg/66/66163.svg" : + // field instanceof ImageField ? field.Data.href : "http://www.cs.brown.edu/~bcz/face.gif"; + // let nativeWidth = this.props.doc.GetNumber(KeyStore.NativeWidth, 1); + // return ( + // <div className="imageBox-cont" onPointerDown={this.onPointerDown} ref={this._ref} > + // <img src={path} width={nativeWidth} alt="Image not found" ref={this._imgRef} onLoad={this.onLoad} /> + // {this.lightbox(path)} + // </div>) + console.log("bleh"); + return (<table> + <tr> + <th>Key</th> + <th>Fields</th> + </tr> + <tr> + <td>Jill</td> + <td>Smith</td> + </tr> + <tr> + <td>Eve</td> + <td>Jackson</td> + </tr> + <tr> + <td>John</td> + <td>Doe</td> + </tr> + </table>) + } +}
\ No newline at end of file |