1 files changed, 33 insertions, 32 deletions

diff --git a/src/views/nodes/ImageBox.tsx b/src/views/nodes/ImageBox.tsx
index eceb04b07..123c76d19 100644
--- a/src/views/nodes/ImageBox.tsx
+++ b/src/views/nodes/ImageBox.tsx
@@ -7,19 +7,20 @@ import React = require("react")
 import { ImageField } from '../../fields/ImageField';
 import { FieldViewProps, FieldView } from './FieldView';
 import { CollectionFreeFormDocumentView } from './CollectionFreeFormDocumentView';
+import { FieldWaiting } from '../../fields/Field';
+import { observer } from "mobx-react"
+import { observable, action } from 'mobx';
 
-interface ImageBoxState {
-    photoIndex: number,
-    isOpen: boolean,
-};
-
-export class ImageBox extends React.Component<FieldViewProps, ImageBoxState> {
+@observer
+export class ImageBox extends React.Component<FieldViewProps> {
 
     public static LayoutString() { return FieldView.LayoutString("ImageBox"); }
     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(props: FieldViewProps) {
         super(props);
@@ -50,42 +51,42 @@ export class ImageBox extends React.Component<FieldViewProps, ImageBoxState> {
             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.setState({ isOpen: true })
+            this._isOpen = true;
         }
         e.stopPropagation();
     }
 
-    render() {
-        let field = this.props.doc.GetT(this.props.fieldKey, ImageField);
-        let path = "";
-        if (field) {
-            path = field.Data.href;
-        }
-        const images = [path,];
-        var lightbox = () => {
-            const { photoIndex } = this.state;
-            if (this.state.isOpen && this.props.DocumentViewForField instanceof CollectionFreeFormDocumentView && SelectionManager.IsSelected(this.props.DocumentViewForField)) {
-                return (<Lightbox
-                    mainSrc={images[photoIndex]}
-                    nextSrc={photoIndex + 1 < images.length ? images[(photoIndex + 1) % images.length] : undefined}
-                    prevSrc={photoIndex - 1 > 0 ? images[(photoIndex + images.length - 1) % images.length] : undefined}
-                    onCloseRequest={() => this.setState({ isOpen: false })}
-                    onMovePrevRequest={() =>
-                        this.setState({ photoIndex: (photoIndex + images.length - 1) % images.length, })
-                    }
-                    onMoveNextRequest={() =>
-                        this.setState({ photoIndex: (photoIndex + 1) % images.length, })
-                    }
-                />)
-            }
+    lightbox = (path: string) => {
+        const images = [path, "http://www.cs.brown.edu/~bcz/face.gif"];
+        if (this._isOpen && this.props.DocumentViewForField instanceof CollectionFreeFormDocumentView && SelectionManager.IsSelected(this.props.DocumentViewForField)) {
+            return (<Lightbox
+                mainSrc={images[this._photoIndex]}
+                nextSrc={images[(this._photoIndex + 1) % images.length]}
+                prevSrc={images[(this._photoIndex + images.length - 1) % images.length]}
+                onCloseRequest={() => this.setState({ 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";
+
         return (
             <div className="imageBox-cont" onPointerDown={this.onPointerDown} ref={this._ref} >
-                <img src={images[0]} width="100%" alt="Image not found" />
-                {lightbox()}
+                <img src={path} width="100%" alt="Image not found" />
+                {this.lightbox(path)}
             </div>)
     }
 }
\ No newline at end of file