From b57741dbed846313e1b9d0dad3b6c8add2566277 Mon Sep 17 00:00:00 2001
From: bob <bcz@cs.brown.edu>
Date: Wed, 25 Sep 2019 11:03:11 -0400
Subject: fixing up pdf rendering...

---
 .../views/nodes/CollectionFreeFormDocumentView.tsx |   1 +
 src/client/views/nodes/PDFBox.scss                 | 152 ++++++++++-----------
 src/client/views/nodes/PDFBox.tsx                  |  10 +-
 3 files changed, 82 insertions(+), 81 deletions(-)

(limited to 'src/client/views/nodes')

diff --git a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx
index 9685f9bca..91037df7f 100644
--- a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx
+++ b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx
@@ -99,6 +99,7 @@ export class CollectionFreeFormDocumentView extends DocComponent<CollectionFreeF
     @observable _animPos: number[] | undefined = undefined;
 
     render() {
+        trace();
         return (
             <div className="collectionFreeFormDocumentView-container"
                 style={{
diff --git a/src/client/views/nodes/PDFBox.scss b/src/client/views/nodes/PDFBox.scss
index b55ca8ba5..cbea47e20 100644
--- a/src/client/views/nodes/PDFBox.scss
+++ b/src/client/views/nodes/PDFBox.scss
@@ -9,103 +9,101 @@
 
 .pdfBox-cont {
     pointer-events: none;
-}
-
-.pdfBox-cont-interactive {
-    pointer-events: all;
-
     .pdfPage-textlayer {
         span {
-            pointer-events: all !important;
-            user-select: text;
+            pointer-events: none !important;
+            user-select: none; 
         }
     }
 }
 
-.pdfViewer-text {
-    .textLayer {
-        span {
-            user-select: text;
+.pdfBox-cont-interactive {
+    pointer-events: all;
+    .pdfViewer-text {
+        .textLayer {
+            span {
+                user-select: text;
+            }
         }
     }
+}
 
-    .react-pdf__Page {
-        transform-origin: left top;
-        position: absolute;
-        top: 0;
-        left: 0;
-    }
+.react-pdf__Page {
+    transform-origin: left top;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
 
-    .react-pdf__Page__textContent span {
-        user-select: text;
-    }
+.react-pdf__Page__textContent span {
+    user-select: text;
+}
 
-    .react-pdf__Document {
-        position: absolute;
-    }
+.react-pdf__Document {
+    position: absolute;
+}
 
 
-    .pdfBox-settingsCont {
-        position: absolute;
-        right: 0;
-        top: 0;
+.pdfBox-settingsCont {
+    position: absolute;
+    right: 0;
+    top: 0;
+
+    .pdfBox-settingsButton {
+        border-bottom-left-radius: 50%;
+        display: flex;
+        justify-content: space-evenly;
+        align-items: center;
+        height: 70px;
+        background: none;
+        padding: 0;
+
+        .pdfBox-settingsButton-arrow {
+            width: 0;
+            height: 0;
+            border-top: 25px solid transparent;
+            border-bottom: 25px solid transparent;
+            border-right: 25px solid #121721;
+            transition: all 0.5s;
+        }
 
-        .pdfBox-settingsButton {
-            border-bottom-left-radius: 50%;
+        .pdfBox-settingsButton-iconCont {
+            background: #121721;
+            height: 50px;
+            width: 70px;
             display: flex;
-            justify-content: space-evenly;
+            justify-content: center;
             align-items: center;
-            height: 70px;
-            background: none;
-            padding: 0;
-
-            .pdfBox-settingsButton-arrow {
-                width: 0;
-                height: 0;
-                border-top: 25px solid transparent;
-                border-bottom: 25px solid transparent;
-                border-right: 25px solid #121721;
-                transition: all 0.5s;
-            }
-
-            .pdfBox-settingsButton-iconCont {
-                background: #121721;
-                height: 50px;
-                width: 70px;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                margin-left: -2px;
-                border-radius: 3px;
-            }
-        }
-
-        .pdfBox-settingsButton:hover {
-            background: none;
+            margin-left: -2px;
+            border-radius: 3px;
         }
+    }
 
-        .pdfBox-settingsFlyout {
-            width: 600px;
-            position: absolute;
-            background: #323232;
-            box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.25);
-            left: -400px;
-            border-radius: 7px;
-            padding: 20px;
-            display: flex;
-            flex-direction: column;
-            font-size: 30px;
-            transition: all 0.5s;
+    .pdfBox-settingsButton:hover {
+        background: none;
+    }
 
-            .pdfBox-settingsFlyout-title {
-                color: white;
-            }
+    .pdfBox-settingsFlyout {
+        width: 600px;
+        position: absolute;
+        background: #323232;
+        box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.25);
+        left: -400px;
+        border-radius: 7px;
+        padding: 20px;
+        display: flex;
+        flex-direction: column;
+        font-size: 30px;
+        transition: all 0.5s;
+
+        .pdfBox-settingsFlyout-title {
+            color: white;
+        }
 
-            .pdfBox-settingsFlyout-kvpInput {
-                margin-top: 20px;
-                display: grid;
-                grid-template-columns: 47.5% 5% 47.5%;
-            }
+        .pdfBox-settingsFlyout-kvpInput {
+            margin-top: 20px;
+            display: grid;
+            grid-template-columns: 47.5% 5% 47.5%;
         }
     }
 }
\ No newline at end of file
diff --git a/src/client/views/nodes/PDFBox.tsx b/src/client/views/nodes/PDFBox.tsx
index 8471aefe0..a582ef2cc 100644
--- a/src/client/views/nodes/PDFBox.tsx
+++ b/src/client/views/nodes/PDFBox.tsx
@@ -176,10 +176,12 @@ export class PDFBox extends DocComponent<FieldViewProps, PdfDocument>(PdfDocumen
         let classname = "pdfBox-cont" + (this.props.active() && !InkingControl.Instance.selectedTool && !this._alt ? "-interactive" : "");
         return (!(pdfUrl instanceof PdfField) || !this._pdf ?
             <div>{`pdf, ${this.dataDoc[this.props.fieldKey]}, not found`}</div> :
-            <div className={classname}
-                onScroll={this.onScroll}
-                style={{ marginTop: `${(this.Document.panY || 0)}px` }}
-                ref={this._mainCont}>
+            <div className={classname} onWheel={(e: React.WheelEvent) => e.stopPropagation()} onPointerDown={(e: React.PointerEvent) => {
+                let hit = document.elementFromPoint(e.clientX, e.clientY);
+                if (hit && hit.localName === "span") {
+                    e.button === 0 && e.stopPropagation();
+                }
+            }}>
                 <PDFViewer pdf={this._pdf} url={pdfUrl.url.pathname} active={this.props.active} scrollTo={this.scrollTo} loaded={this.loaded} panY={this.Document.panY || 0}
                     Document={this.props.Document} DataDoc={this.dataDoc}
                     addDocTab={this.props.addDocTab} setPanY={this.setPanY} GoToPage={this.GotoPage}
-- 
cgit v1.2.3-70-g09d2