fixed pdf boxes to handle marquee annotation scaling properly. allowed for docFilters to be specific to pdf sidebar. fixed issue with viewTransition remaining set after following link to doc that was in collection but needs to be created.

1 files changed, 12 insertions, 12 deletions

diff --git a/src/client/views/pdf/PDFViewer.tsx b/src/client/views/pdf/PDFViewer.tsx
index 1750b526e..c7359f74e 100644
--- a/src/client/views/pdf/PDFViewer.tsx
+++ b/src/client/views/pdf/PDFViewer.tsx
@@ -553,8 +553,8 @@ export class PDFViewer extends ViewBoxAnnotatableComponent<IViewerProps, PdfDocu
     contentZoom = () => this._zoomed;
     render() {
         TraceMobx();
-        return <div className="pdfViewer-content" ref={this._mainCont}>
-            <div className={`pdfViewerDash${this.annotationsActive() ? "-interactive" : ""}`}
+        return <div className="pdfViewer-content">
+            <div className={`pdfViewerDash${this.annotationsActive() ? "-interactive" : ""}`} ref={this._mainCont}
                 onScroll={this.onScroll} onWheel={this.onZoomWheel} onPointerDown={this.onPointerDown} onClick={this.onClick}
                 style={{
                     overflowX: this._zoomed !== 1 ? "scroll" : undefined,
@@ -565,17 +565,17 @@ export class PDFViewer extends ViewBoxAnnotatableComponent<IViewerProps, PdfDocu
                 {this.pdfViewerDiv}
                 {this.annotationLayer}
                 {this.overlayLayer}
+                {this.overlayInfo}
+                {this.standinViews}
+                {!this._marqueeing || !this._mainCont.current || !this._annotationLayer.current ? (null) :
+                    <MarqueeAnnotator rootDoc={this.rootDoc} scrollTop={0} down={this._marqueeing}
+                        anchorMenuClick={this.props.anchorMenuClick}
+                        addDocument={this.addDocument}
+                        finishMarquee={this.finishMarquee}
+                        getPageFromScroll={this.getPageFromScroll}
+                        savedAnnotations={this._savedAnnotations}
+                        annotationLayer={this._annotationLayer.current} mainCont={this._mainCont.current} />}
             </div>
-            {this.overlayInfo}
-            {this.standinViews}
-            {!this._marqueeing || !this._mainCont.current || !this._annotationLayer.current ? (null) :
-                <MarqueeAnnotator rootDoc={this.rootDoc} scrollTop={0} down={this._marqueeing}
-                    anchorMenuClick={this.props.anchorMenuClick}
-                    addDocument={this.addDocument}
-                    finishMarquee={this.finishMarquee}
-                    getPageFromScroll={this.getPageFromScroll}
-                    savedAnnotations={this._savedAnnotations}
-                    annotationLayer={this._annotationLayer.current} mainCont={this._mainCont.current} />}
         </div>;
     }
 }
\ No newline at end of file