From 35f0c9940d0ea7c0cb37c711557454b77ac038ad Mon Sep 17 00:00:00 2001 From: bobzel Date: Tue, 1 Mar 2022 19:59:47 -0500 Subject: updated to webpack 5 --- src/client/views/pdf/PDFViewer.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/client/views/pdf') diff --git a/src/client/views/pdf/PDFViewer.tsx b/src/client/views/pdf/PDFViewer.tsx index 3f7f38bdf..de23ac74d 100644 --- a/src/client/views/pdf/PDFViewer.tsx +++ b/src/client/views/pdf/PDFViewer.tsx @@ -26,7 +26,6 @@ import { StyleProp } from "../StyleProvider"; import { AnchorMenu } from "./AnchorMenu"; import { Annotation } from "./Annotation"; import "./PDFViewer.scss"; -const pdfjs = require('pdfjs-dist/es5/build/pdf.js'); import React = require("react"); const PDFJSViewer = require("pdfjs-dist/web/pdf_viewer"); const pdfjsLib = require("pdfjs-dist"); @@ -159,7 +158,7 @@ export class PDFViewer extends React.Component { initialLoad = async () => { if (this._pageSizes.length === 0) { this._pageSizes = Array<{ width: number, height: number }>(this.props.pdf.numPages); - await Promise.all(this._pageSizes.map>((val, i) => + await Promise.all(this._pageSizes.map((val, i) => this.props.pdf.getPage(i + 1).then(action((page: Pdfjs.PDFPageProxy) => { const page0or180 = page.rotate === 0 || page.rotate === 180; this._pageSizes.splice(i, 1, { -- cgit v1.2.3-70-g09d2 From c015dc3b76ec30e9d7057ee558787e59033af270 Mon Sep 17 00:00:00 2001 From: bobzel 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(-) (limited to 'src/client/views/pdf') 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 { } 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 { @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 From 7fa30c3edd851cc42cb68063d9dbdd7335fe7370 Mon Sep 17 00:00:00 2001 From: bobzel Date: Mon, 7 Mar 2022 11:07:26 -0500 Subject: fixed pdf text selection/interaction --- src/client/views/nodes/PDFBox.tsx | 3 ++- src/client/views/pdf/PDFViewer.tsx | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/client/views/pdf') diff --git a/src/client/views/nodes/PDFBox.tsx b/src/client/views/nodes/PDFBox.tsx index 5b98103da..cbbf46a59 100644 --- a/src/client/views/nodes/PDFBox.tsx +++ b/src/client/views/nodes/PDFBox.tsx @@ -245,6 +245,7 @@ export class PDFBox extends ViewBoxAnnotatableComponent 1; + isPdfContentActive = () => this.isAnyChildContentActive() || this.props.isSelected(); @computed get renderPdfView() { TraceMobx(); const previewScale = this._previewNativeWidth ? 1 - this.sidebarWidth() / this._previewNativeWidth : 1; @@ -269,7 +270,7 @@ export class PDFBox extends ViewBoxAnnotatableComponent { @action onZoomWheel = (e: React.WheelEvent) => { - if (this.props.isSelected(false) || this.props.isContentActive(true)) { + if (this.props.isContentActive(true)) { e.stopPropagation(); if (e.ctrlKey) { const curScale = Number(this._pdfViewer.currentScaleValue); @@ -554,7 +554,7 @@ export class PDFViewer extends React.Component { ; } @computed get pdfViewerDiv() { - return
; + return
; } @computed get contentScaling() { return this.props.ContentScaling?.() || 1; } @computed get standinViews() { -- cgit v1.2.3-70-g09d2