From c015dc3b76ec30e9d7057ee558787e59033af270 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Thu, 3 Mar 2022 18:37:30 -0500
Subject: fixed pdf rendering and interaction

---
 package-lock.json                  | 5 +++++
 package.json                       | 1 +
 src/client/views/nodes/PDFBox.tsx  | 2 +-
 src/client/views/pdf/PDFViewer.tsx | 6 +++---
 webpack.config.js                  | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 95cc7dec2..420f226e8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14795,6 +14795,11 @@
             "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz",
             "integrity": "sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ="
         },
+        "path-browserify": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+            "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="
+        },
         "path-dirname": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
diff --git a/package.json b/package.json
index 898256c99..5aa2cf32d 100644
--- a/package.json
+++ b/package.json
@@ -223,6 +223,7 @@
         "passport": "^0.4.0",
         "passport-google-oauth20": "^2.0.0",
         "passport-local": "^1.0.0",
+        "path-browserify": "^1.0.1",
         "pdf-parse": "^1.1.1",
         "pdfjs": "^2.4.7",
         "pdfjs-dist": "^2.13.216",
diff --git a/src/client/views/nodes/PDFBox.tsx b/src/client/views/nodes/PDFBox.tsx
index ebbcc67c6..91f0805bf 100644
--- a/src/client/views/nodes/PDFBox.tsx
+++ b/src/client/views/nodes/PDFBox.tsx
@@ -277,7 +277,7 @@ export class PDFBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
                     dataDoc={this.dataDoc}
                     pdf={this._pdf!}
                     url={this.pdfUrl!.url.pathname}
-                    isContentActive={this.props.isContentActive}
+                    isContentActive={this.isAnyChildContentActive}
                     anchorMenuClick={this.anchorMenuClick}
                     loaded={!Doc.NativeAspect(this.dataDoc) ? this.loaded : undefined}
                     setPdfViewer={this.setPdfViewer}
diff --git a/src/client/views/pdf/PDFViewer.tsx b/src/client/views/pdf/PDFViewer.tsx
index de23ac74d..e11792dc8 100644
--- a/src/client/views/pdf/PDFViewer.tsx
+++ b/src/client/views/pdf/PDFViewer.tsx
@@ -33,7 +33,7 @@ const _global = (window /* browser */ || global /* node */) as any;
 
 //pdfjsLib.GlobalWorkerOptions.workerSrc = `/assets/pdf.worker.js`;
 // The workerSrc property shall be specified.
-pdfjsLib.GlobalWorkerOptions.workerSrc = "https://unpkg.com/pdfjs-dist@2.4.456/build/pdf.worker.min.js";
+pdfjsLib.GlobalWorkerOptions.workerSrc = "https://unpkg.com/pdfjs-dist@2.13.216/build/pdf.worker.js";
 
 interface IViewerProps extends FieldViewProps {
     Document: Doc;
@@ -218,7 +218,7 @@ export class PDFViewer extends React.Component<IViewerProps> {
     }
 
     pagesinit = () => {
-        if (this._pdfViewer._setDocumentViewerElement.offsetParent) {
+        if (this._pdfViewer._setDocumentViewerElement?.offsetParent) {
             runInAction(() => this._pdfViewer.currentScaleValue = this._zoomed = 1);
             this.gotoPage(NumCast(this.props.Document._curPage, 1));
         }
@@ -473,7 +473,7 @@ export class PDFViewer extends React.Component<IViewerProps> {
 
     @action
     onZoomWheel = (e: React.WheelEvent) => {
-        if (this.props.isContentActive(true)) {
+        if (this.props.isSelected(false) || this.props.isContentActive(true)) {
             e.stopPropagation();
             if (e.ctrlKey) {
                 const curScale = Number(this._pdfViewer.currentScaleValue);
diff --git a/webpack.config.js b/webpack.config.js
index 05bf4ed76..3fd00bcf3 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -63,12 +63,12 @@ module.exports = {
             fs: false,
             tls: false,
             net: false,
-            path: false,
             zlib: false,
             dns: false,
             crypto: false,
             assert: false,
             os: false,
+            path: require.resolve("path-browserify"),
             http: require.resolve("http-browserify"),
             https: require.resolve("https-browserify"),
             stream: require.resolve("stream-browserify"),
-- 
cgit v1.2.3-70-g09d2