pull from master

1 files changed, 35 insertions, 19 deletions

diff --git a/src/client/views/pdf/Annotation.tsx b/src/client/views/pdf/Annotation.tsx
index d29b638e6..84b14cd61 100644
--- a/src/client/views/pdf/Annotation.tsx
+++ b/src/client/views/pdf/Annotation.tsx
@@ -1,42 +1,46 @@
 import React = require("react");
 import { action, IReactionDisposer, observable, reaction, runInAction } from "mobx";
 import { observer } from "mobx-react";
-import { Doc, DocListCast, HeightSym, WidthSym } from "../../../fields/Doc";
+import { Doc, DocListCast, HeightSym, WidthSym, Field, Opt } from "../../../fields/Doc";
 import { Id } from "../../../fields/FieldSymbols";
 import { List } from "../../../fields/List";
-import { Cast, FieldValue, NumCast, StrCast } from "../../../fields/Types";
+import { Cast, FieldValue, BoolCast, NumCast, StrCast, PromiseValue } from "../../../fields/Types";
 import { DocumentManager } from "../../util/DocumentManager";
-import PDFMenu from "./PDFMenu";
+import { PDFMenu } from "./PDFMenu";
 import "./Annotation.scss";
+import { undoBatch } from "../../util/UndoManager";
 
 interface IAnnotationProps {
     anno: Doc;
     addDocTab: (document: Doc, where: string) => boolean;
-    pinToPres: (document: Doc) => void;
+    pinToPres: (document: Doc, unpin?: boolean) => void;
     focus: (doc: Doc) => void;
     dataDoc: Doc;
     fieldKey: string;
+    showInfo: (anno: Opt<Doc>) => void;
 }
 
 @observer
-export default
+export
     class Annotation extends React.Component<IAnnotationProps> {
     render() {
-        return DocListCast(this.props.anno.annotations).map(a => (
-            <RegionAnnotation {...this.props} document={a} x={NumCast(a.x)} y={NumCast(a.y)} width={a[WidthSym]()} height={a[HeightSym]()} key={a[Id]} />));
+        return DocListCast(this.props.anno.annotations).map(a =>
+            <RegionAnnotation {...this.props} showInfo={this.props.showInfo} pinToPres={this.props.pinToPres} document={a} x={NumCast(a.x)} y={NumCast(a.y)} width={a[WidthSym]()} height={a[HeightSym]()} key={a[Id]} />);
     }
 }
 
 interface IRegionAnnotationProps {
+    anno: Doc;
     x: number;
     y: number;
     width: number;
     height: number;
     addDocTab: (document: Doc, where: string) => boolean;
-    pinToPres: (document: Doc) => void;
+    pinToPres: (document: Doc, unpin: boolean) => void;
     document: Doc;
     dataDoc: Doc;
     fieldKey: string;
+    showInfo: (anno: Opt<Doc>) => void;
 }
 
 @observer
@@ -82,26 +86,37 @@ class RegionAnnotation extends React.Component<IRegionAnnotationProps> {
 
     pinToPres = () => {
         const group = FieldValue(Cast(this.props.document.group, Doc));
-        group && this.props.pinToPres(group);
+        const isPinned = group && Doc.isDocPinned(group) ? true : false;
+        group && this.props.pinToPres(group, isPinned);
     }
 
+    @undoBatch
+    makePushpin = action(() => {
+        const group = Cast(this.props.document.group, Doc, null);
+        group.isPushpin = !group.isPushpin;
+    });
+
+    isPushpin = () => BoolCast(Cast(this.props.document.group, Doc, null).isPushpin);
+
     @action
-    onPointerDown = async (e: React.PointerEvent) => {
+    onPointerDown = (e: React.PointerEvent) => {
         if (e.button === 2 || e.ctrlKey) {
             PDFMenu.Instance.Status = "annotation";
             PDFMenu.Instance.Delete = this.deleteAnnotation.bind(this);
             PDFMenu.Instance.Pinned = false;
             PDFMenu.Instance.AddTag = this.addTag.bind(this);
             PDFMenu.Instance.PinToPres = this.pinToPres;
+            PDFMenu.Instance.MakePushpin = this.makePushpin;
+            PDFMenu.Instance.IsPushpin = this.isPushpin;
             PDFMenu.Instance.jumpTo(e.clientX, e.clientY, true);
             e.stopPropagation();
         }
         else if (e.button === 0) {
-            const annoGroup = await Cast(this.props.document.group, Doc);
-            if (annoGroup) {
-                DocumentManager.Instance.FollowLink(undefined, annoGroup, (doc, followLinkLocation) => this.props.addDocTab(doc, e.ctrlKey ? "inTab" : followLinkLocation), false, undefined);
-                e.stopPropagation();
-            }
+            e.persist();
+            e.stopPropagation();
+            PromiseValue(this.props.document.group).then(annoGroup => annoGroup instanceof Doc &&
+                DocumentManager.Instance.FollowLink(undefined, annoGroup, (doc, followLinkLocation) => this.props.addDocTab(doc, e.ctrlKey ? "add" : followLinkLocation), false, undefined)
+            );
         }
     }
 
@@ -116,16 +131,17 @@ class RegionAnnotation extends React.Component<IRegionAnnotationProps> {
         return false;
     }
 
+    @observable _showInfo = false;
     render() {
-        return (<div className="pdfAnnotation" onPointerDown={this.onPointerDown} ref={this._mainCont}
+        return (<div className="pdfAnnotation" onPointerEnter={action(() => this.props.showInfo(this.props.anno))} onPointerLeave={action(() => this.props.showInfo(undefined))} onPointerDown={this.onPointerDown} ref={this._mainCont}
             style={{
                 top: this.props.y,
                 left: this.props.x,
                 width: this.props.width,
                 height: this.props.height,
-                opacity: this._brushed ? 0.5 : undefined,
+                opacity: !this._showInfo && this._brushed ? 0.5 : undefined,
                 backgroundColor: this._brushed ? "orange" : StrCast(this.props.document.backgroundColor),
-                transition: "opacity 0.5s",
-            }} />);
+            }} >
+        </div>);
     }
 }
\ No newline at end of file