pdfjs-dist 2.6.347 → 2.7.570

package/lib/web/pdf_sidebar.js

@@ -24,22 +24,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PDFSidebar = exports.SidebarView = void 0;
+exports.PDFSidebar = void 0;
 
 var _ui_utils = require("./ui_utils.js");
 
 var _pdf_rendering_queue = require("./pdf_rendering_queue.js");
 
 const UI_NOTIFICATION_CLASS = "pdfSidebarNotification";
-const SidebarView = {
-  UNKNOWN: -1,
-  NONE: 0,
-  THUMBS: 1,
-  OUTLINE: 2,
-  ATTACHMENTS: 3,
-  LAYERS: 4
-};
-exports.SidebarView = SidebarView;
 
 class PDFSidebar {
   constructor({
@@ -47,11 +38,10 @@ class PDFSidebar {
     pdfViewer,
     pdfThumbnailViewer,
     eventBus,
-    l10n = _ui_utils.NullL10n,
-    disableNotification = false
+    l10n = _ui_utils.NullL10n
   }) {
     this.isOpen = false;
-    this.active = SidebarView.THUMBS;
+    this.active = _ui_utils.SidebarView.THUMBS;
     this.isInitialViewSet = false;
     this.onToggled = null;
     this.pdfViewer = pdfViewer;
@@ -67,9 +57,10 @@ class PDFSidebar {
     this.outlineView = elements.outlineView;
     this.attachmentsView = elements.attachmentsView;
     this.layersView = elements.layersView;
+    this._outlineOptionsContainer = elements.outlineOptionsContainer;
+    this._currentOutlineItemButton = elements.currentOutlineItemButton;
     this.eventBus = eventBus;
     this.l10n = l10n;
-    this._disableNotification = disableNotification;
 
     this._addEventListeners();
   }
@@ -77,42 +68,43 @@ class PDFSidebar {
   reset() {
     this.isInitialViewSet = false;
 
-    this._hideUINotification(null);
+    this._hideUINotification(true);
 
-    this.switchView(SidebarView.THUMBS);
+    this.switchView(_ui_utils.SidebarView.THUMBS);
     this.outlineButton.disabled = false;
     this.attachmentsButton.disabled = false;
     this.layersButton.disabled = false;
+    this._currentOutlineItemButton.disabled = true;
   }
 
   get visibleView() {
-    return this.isOpen ? this.active : SidebarView.NONE;
+    return this.isOpen ? this.active : _ui_utils.SidebarView.NONE;
   }
 
   get isThumbnailViewVisible() {
-    return this.isOpen && this.active === SidebarView.THUMBS;
+    return this.isOpen && this.active === _ui_utils.SidebarView.THUMBS;
   }
 
   get isOutlineViewVisible() {
-    return this.isOpen && this.active === SidebarView.OUTLINE;
+    return this.isOpen && this.active === _ui_utils.SidebarView.OUTLINE;
   }
 
   get isAttachmentsViewVisible() {
-    return this.isOpen && this.active === SidebarView.ATTACHMENTS;
+    return this.isOpen && this.active === _ui_utils.SidebarView.ATTACHMENTS;
   }
 
   get isLayersViewVisible() {
-    return this.isOpen && this.active === SidebarView.LAYERS;
+    return this.isOpen && this.active === _ui_utils.SidebarView.LAYERS;
   }
 
-  setInitialView(view = SidebarView.NONE) {
+  setInitialView(view = _ui_utils.SidebarView.NONE) {
     if (this.isInitialViewSet) {
       return;
     }
 
     this.isInitialViewSet = true;
 
-    if (view === SidebarView.NONE || view === SidebarView.UNKNOWN) {
+    if (view === _ui_utils.SidebarView.NONE || view === _ui_utils.SidebarView.UNKNOWN) {
       this._dispatchEvent();
 
       return;
@@ -132,7 +124,7 @@ class PDFSidebar {
     let shouldForceRendering = false;
 
     switch (view) {
-      case SidebarView.NONE:
+      case _ui_utils.SidebarView.NONE:
         if (this.isOpen) {
           this.close();
           return true;
@@ -140,28 +132,28 @@ class PDFSidebar {
 
         return false;
 
-      case SidebarView.THUMBS:
+      case _ui_utils.SidebarView.THUMBS:
         if (this.isOpen && isViewChanged) {
           shouldForceRendering = true;
         }
 
         break;
 
-      case SidebarView.OUTLINE:
+      case _ui_utils.SidebarView.OUTLINE:
         if (this.outlineButton.disabled) {
           return false;
         }
 
         break;
 
-      case SidebarView.ATTACHMENTS:
+      case _ui_utils.SidebarView.ATTACHMENTS:
         if (this.attachmentsButton.disabled) {
           return false;
         }
 
         break;
 
-      case SidebarView.LAYERS:
+      case _ui_utils.SidebarView.LAYERS:
         if (this.layersButton.disabled) {
           return false;
         }
@@ -174,14 +166,16 @@ class PDFSidebar {
     }
 
     this.active = view;
-    this.thumbnailButton.classList.toggle("toggled", view === SidebarView.THUMBS);
-    this.outlineButton.classList.toggle("toggled", view === SidebarView.OUTLINE);
-    this.attachmentsButton.classList.toggle("toggled", view === SidebarView.ATTACHMENTS);
-    this.layersButton.classList.toggle("toggled", view === SidebarView.LAYERS);
-    this.thumbnailView.classList.toggle("hidden", view !== SidebarView.THUMBS);
-    this.outlineView.classList.toggle("hidden", view !== SidebarView.OUTLINE);
-    this.attachmentsView.classList.toggle("hidden", view !== SidebarView.ATTACHMENTS);
-    this.layersView.classList.toggle("hidden", view !== SidebarView.LAYERS);
+    this.thumbnailButton.classList.toggle("toggled", view === _ui_utils.SidebarView.THUMBS);
+    this.outlineButton.classList.toggle("toggled", view === _ui_utils.SidebarView.OUTLINE);
+    this.attachmentsButton.classList.toggle("toggled", view === _ui_utils.SidebarView.ATTACHMENTS);
+    this.layersButton.classList.toggle("toggled", view === _ui_utils.SidebarView.LAYERS);
+    this.thumbnailView.classList.toggle("hidden", view !== _ui_utils.SidebarView.THUMBS);
+    this.outlineView.classList.toggle("hidden", view !== _ui_utils.SidebarView.OUTLINE);
+    this.attachmentsView.classList.toggle("hidden", view !== _ui_utils.SidebarView.ATTACHMENTS);
+    this.layersView.classList.toggle("hidden", view !== _ui_utils.SidebarView.LAYERS);
+
+    this._outlineOptionsContainer.classList.toggle("hidden", view !== _ui_utils.SidebarView.OUTLINE);
 
     if (forceOpen && !this.isOpen) {
       this.open();
@@ -198,8 +192,6 @@ class PDFSidebar {
       this._dispatchEvent();
     }
 
-    this._hideUINotification(this.active);
-
     return isViewChanged;
   }
 
@@ -212,7 +204,7 @@ class PDFSidebar {
     this.toggleButton.classList.add("toggled");
     this.outerContainer.classList.add("sidebarMoving", "sidebarOpen");
 
-    if (this.active === SidebarView.THUMBS) {
+    if (this.active === _ui_utils.SidebarView.THUMBS) {
       this._updateThumbnailViewer();
     }
 
@@ -220,7 +212,7 @@ class PDFSidebar {
 
     this._dispatchEvent();
 
-    this._hideUINotification(this.active);
+    this._hideUINotification();
   }
 
   close() {
@@ -281,75 +273,26 @@ class PDFSidebar {
     pdfThumbnailViewer.scrollThumbnailIntoView(pdfViewer.currentPageNumber);
   }
 
-  _showUINotification(view) {
-    if (this._disableNotification) {
-      return;
-    }
-
+  _showUINotification() {
     this.l10n.get("toggle_sidebar_notification2.title", null, "Toggle Sidebar (document contains outline/attachments/layers)").then(msg => {
       this.toggleButton.title = msg;
     });
 
     if (!this.isOpen) {
       this.toggleButton.classList.add(UI_NOTIFICATION_CLASS);
-    } else if (view === this.active) {
-      return;
-    }
-
-    switch (view) {
-      case SidebarView.OUTLINE:
-        this.outlineButton.classList.add(UI_NOTIFICATION_CLASS);
-        break;
-
-      case SidebarView.ATTACHMENTS:
-        this.attachmentsButton.classList.add(UI_NOTIFICATION_CLASS);
-        break;
-
-      case SidebarView.LAYERS:
-        this.layersButton.classList.add(UI_NOTIFICATION_CLASS);
-        break;
     }
   }
 
-  _hideUINotification(view) {
-    if (this._disableNotification) {
-      return;
+  _hideUINotification(reset = false) {
+    if (this.isOpen || reset) {
+      this.toggleButton.classList.remove(UI_NOTIFICATION_CLASS);
     }
 
-    const removeNotification = sidebarView => {
-      switch (sidebarView) {
-        case SidebarView.OUTLINE:
-          this.outlineButton.classList.remove(UI_NOTIFICATION_CLASS);
-          break;
-
-        case SidebarView.ATTACHMENTS:
-          this.attachmentsButton.classList.remove(UI_NOTIFICATION_CLASS);
-          break;
-
-        case SidebarView.LAYERS:
-          this.layersButton.classList.remove(UI_NOTIFICATION_CLASS);
-          break;
-      }
-    };
-
-    if (!this.isOpen && view !== null) {
-      return;
-    }
-
-    this.toggleButton.classList.remove(UI_NOTIFICATION_CLASS);
-
-    if (view !== null) {
-      removeNotification(view);
-      return;
-    }
-
-    for (view in SidebarView) {
-      removeNotification(SidebarView[view]);
+    if (reset) {
+      this.l10n.get("toggle_sidebar.title", null, "Toggle Sidebar").then(msg => {
+        this.toggleButton.title = msg;
+      });
     }
-
-    this.l10n.get("toggle_sidebar.title", null, "Toggle Sidebar").then(msg => {
-      this.toggleButton.title = msg;
-    });
   }
 
   _addEventListeners() {
@@ -362,10 +305,10 @@ class PDFSidebar {
       this.toggle();
     });
     this.thumbnailButton.addEventListener("click", () => {
-      this.switchView(SidebarView.THUMBS);
+      this.switchView(_ui_utils.SidebarView.THUMBS);
     });
     this.outlineButton.addEventListener("click", () => {
-      this.switchView(SidebarView.OUTLINE);
+      this.switchView(_ui_utils.SidebarView.OUTLINE);
     });
     this.outlineButton.addEventListener("dblclick", () => {
       this.eventBus.dispatch("toggleoutlinetree", {
@@ -373,10 +316,10 @@ class PDFSidebar {
       });
     });
     this.attachmentsButton.addEventListener("click", () => {
-      this.switchView(SidebarView.ATTACHMENTS);
+      this.switchView(_ui_utils.SidebarView.ATTACHMENTS);
     });
     this.layersButton.addEventListener("click", () => {
-      this.switchView(SidebarView.LAYERS);
+      this.switchView(_ui_utils.SidebarView.LAYERS);
     });
     this.layersButton.addEventListener("dblclick", () => {
       this.eventBus.dispatch("resetlayers", {
@@ -384,30 +327,42 @@ class PDFSidebar {
       });
     });
 
+    this._currentOutlineItemButton.addEventListener("click", () => {
+      this.eventBus.dispatch("currentoutlineitem", {
+        source: this
+      });
+    });
+
     const onTreeLoaded = (count, button, view) => {
       button.disabled = !count;
 
       if (count) {
-        this._showUINotification(view);
+        this._showUINotification();
       } else if (this.active === view) {
-        this.switchView(SidebarView.THUMBS);
+        this.switchView(_ui_utils.SidebarView.THUMBS);
       }
     };
 
     this.eventBus._on("outlineloaded", evt => {
-      onTreeLoaded(evt.outlineCount, this.outlineButton, SidebarView.OUTLINE);
+      onTreeLoaded(evt.outlineCount, this.outlineButton, _ui_utils.SidebarView.OUTLINE);
+
+      if (evt.enableCurrentOutlineItemButton) {
+        this.pdfViewer.pagesPromise.then(() => {
+          this._currentOutlineItemButton.disabled = !this.isInitialViewSet;
+        });
+      }
     });
 
     this.eventBus._on("attachmentsloaded", evt => {
-      onTreeLoaded(evt.attachmentsCount, this.attachmentsButton, SidebarView.ATTACHMENTS);
+      onTreeLoaded(evt.attachmentsCount, this.attachmentsButton, _ui_utils.SidebarView.ATTACHMENTS);
     });
 
     this.eventBus._on("layersloaded", evt => {
-      onTreeLoaded(evt.layersCount, this.layersButton, SidebarView.LAYERS);
+      onTreeLoaded(evt.layersCount, this.layersButton, _ui_utils.SidebarView.LAYERS);
     });
 
     this.eventBus._on("presentationmodechanged", evt => {
-      if (!evt.active && !evt.switchInProgress && this.isThumbnailViewVisible) {
+      if (evt.state === _ui_utils.PresentationModeState.NORMAL && this.isThumbnailViewVisible) {
         this._updateThumbnailViewer();
       }
     });

package/lib/web/pdf_sidebar_resizer.js

@@ -34,7 +34,6 @@ const SIDEBAR_RESIZING_CLASS = "sidebarResizing";
 
 class PDFSidebarResizer {
   constructor(options, eventBus, l10n = _ui_utils.NullL10n) {
-    this.enabled = false;
     this.isRTL = false;
     this.sidebarOpen = false;
     this.doc = document.documentElement;
@@ -44,16 +43,7 @@ class PDFSidebarResizer {
     this.outerContainer = options.outerContainer;
     this.resizer = options.resizer;
     this.eventBus = eventBus;
-    this.l10n = l10n;
-
-    if (typeof CSS === "undefined" || typeof CSS.supports !== "function" || !CSS.supports(SIDEBAR_WIDTH_VAR, `calc(-1 * ${SIDEBAR_MIN_WIDTH}px)`)) {
-      console.warn("PDFSidebarResizer: " + "The browser does not support resizing of the sidebar.");
-      return;
-    }
-
-    this.enabled = true;
-    this.resizer.classList.remove("hidden");
-    this.l10n.getDirection().then(dir => {
+    l10n.getDirection().then(dir => {
       this.isRTL = dir === "rtl";
     });
 
@@ -69,18 +59,22 @@ class PDFSidebarResizer {
   }
 
   _updateWidth(width = 0) {
-    if (!this.enabled) {
-      return false;
+    const maxWidth = Math.floor(this.outerContainerWidth / 2);
+
+    if (width > maxWidth) {
+      width = maxWidth;
     }
 
-    const newWidth = (0, _ui_utils.clamp)(width, SIDEBAR_MIN_WIDTH, Math.floor(this.outerContainerWidth / 2));
+    if (width < SIDEBAR_MIN_WIDTH) {
+      width = SIDEBAR_MIN_WIDTH;
+    }
 
-    if (newWidth === this._width) {
+    if (width === this._width) {
       return false;
     }
 
-    this._width = newWidth;
-    this.doc.style.setProperty(SIDEBAR_WIDTH_VAR, `${newWidth}px`);
+    this._width = width;
+    this.doc.style.setProperty(SIDEBAR_WIDTH_VAR, `${width}px`);
     return true;
   }
 
@@ -105,10 +99,6 @@ class PDFSidebarResizer {
   }
 
   _addEventListeners() {
-    if (!this.enabled) {
-      return;
-    }
-
     const _boundEvents = this._boundEvents;
     _boundEvents.mouseMove = this._mouseMove.bind(this);
     _boundEvents.mouseUp = this._mouseUp.bind(this);

package/lib/web/pdf_single_page_viewer.js

@@ -43,6 +43,10 @@ class PDFSinglePageViewer extends _base_viewer.BaseViewer {
     return (0, _pdf.shadow)(this, "_viewerElement", this._shadowViewer);
   }
 
+  get _pageWidthScaleFactor() {
+    return 1;
+  }
+
   _resetView() {
     super._resetView();
 
@@ -132,6 +136,10 @@ class PDFSinglePageViewer extends _base_viewer.BaseViewer {
 
   _updateSpreadMode() {}
 
+  _getPageAdvance() {
+    return 1;
+  }
+
 }
 
 exports.PDFSinglePageViewer = PDFSinglePageViewer;

package/lib/web/pdf_thumbnail_view.js

@@ -24,12 +24,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PDFThumbnailView = void 0;
-
-var _pdf = require("../pdf");
+exports.TempImageFactory = exports.PDFThumbnailView = void 0;
 
 var _ui_utils = require("./ui_utils.js");
 
+var _pdf = require("../pdf");
+
 var _pdf_rendering_queue = require("./pdf_rendering_queue.js");
 
 const MAX_NUM_SCALING_STEPS = 3;
@@ -74,6 +74,8 @@ const TempImageFactory = function TempImageFactoryClosure() {
   };
 }();
 
+exports.TempImageFactory = TempImageFactory;
+
 class PDFThumbnailView {
   constructor({
     container,
@@ -120,7 +122,7 @@ class PDFThumbnailView {
     });
 
     anchor.onclick = function () {
-      linkService.page = id;
+      linkService.goToPage(id);
       return false;
     };
 
@@ -205,7 +207,7 @@ class PDFThumbnailView {
     this.resume = null;
   }
 
-  _getPageDrawContext(noCtxScale = false) {
+  _getPageDrawContext() {
     const canvas = document.createElement("canvas");
     this.canvas = canvas;
     canvas.mozOpaque = true;
@@ -217,12 +219,8 @@ class PDFThumbnailView {
     canvas.height = this.canvasHeight * outputScale.sy | 0;
     canvas.style.width = this.canvasWidth + "px";
     canvas.style.height = this.canvasHeight + "px";
-
-    if (!noCtxScale && outputScale.scaled) {
-      ctx.scale(outputScale.sx, outputScale.sy);
-    }
-
-    return ctx;
+    const transform = outputScale.scaled ? [outputScale.sx, 0, 0, outputScale.sy, 0, 0] : null;
+    return [ctx, transform];
   }
 
   _convertCanvasToImage() {
@@ -282,15 +280,13 @@ class PDFThumbnailView {
     }
 
     this.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
-    const renderCapability = (0, _pdf.createPromiseCapability)();
 
-    const finishRenderTask = error => {
+    const finishRenderTask = async (error = null) => {
       if (renderTask === this.renderTask) {
         this.renderTask = null;
       }
 
       if (error instanceof _pdf.RenderingCancelledException) {
-        renderCapability.resolve(undefined);
         return;
       }
 
@@ -298,14 +294,12 @@ class PDFThumbnailView {
 
       this._convertCanvasToImage();
 
-      if (!error) {
-        renderCapability.resolve(undefined);
-      } else {
-        renderCapability.reject(error);
+      if (error) {
+        throw error;
       }
     };
 
-    const ctx = this._getPageDrawContext();
+    const [ctx, transform] = this._getPageDrawContext();
 
     const drawViewport = this.viewport.clone({
       scale: this.scale
@@ -328,17 +322,27 @@ class PDFThumbnailView {
 
     const renderContext = {
       canvasContext: ctx,
+      transform,
       viewport: drawViewport,
       optionalContentConfigPromise: this._optionalContentConfigPromise
     };
     const renderTask = this.renderTask = pdfPage.render(renderContext);
     renderTask.onContinue = renderContinueCallback;
-    renderTask.promise.then(function () {
+    const resultPromise = renderTask.promise.then(function () {
       finishRenderTask(null);
     }, function (error) {
       finishRenderTask(error);
     });
-    return renderCapability.promise;
+    resultPromise.finally(() => {
+      const pageCached = this.linkService.isPageCached(this.id);
+
+      if (pageCached) {
+        return;
+      }
+
+      this.pdfPage?.cleanup();
+    });
+    return resultPromise;
   }
 
   setImage(pageView) {
@@ -362,7 +366,7 @@ class PDFThumbnailView {
 
     this.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
 
-    const ctx = this._getPageDrawContext(true);
+    const [ctx] = this._getPageDrawContext();
 
     const canvas = ctx.canvas;
 
@@ -429,10 +433,6 @@ class PDFThumbnailView {
     });
   }
 
-  static cleanup() {
-    TempImageFactory.destroyCanvas();
-  }
-
 }
 
 exports.PDFThumbnailView = PDFThumbnailView;

package/lib/web/pdf_thumbnail_viewer.js

@@ -30,6 +30,8 @@ var _ui_utils = require("./ui_utils.js");
 
 var _pdf_thumbnail_view = require("./pdf_thumbnail_view.js");
 
+var _pdf_rendering_queue = require("./pdf_rendering_queue.js");
+
 const THUMBNAIL_SCROLL_MARGIN = -19;
 const THUMBNAIL_SELECTED_CLASS = "selected";
 
@@ -63,7 +65,10 @@ class PDFThumbnailViewer {
   }
 
   _getVisibleThumbs() {
-    return (0, _ui_utils.getVisibleElements)(this.container, this._thumbnails);
+    return (0, _ui_utils.getVisibleElements)({
+      scrollEl: this.container,
+      views: this._thumbnails
+    });
   }
 
   scrollThumbnailIntoView(pageNumber) {
@@ -141,7 +146,13 @@ class PDFThumbnailViewer {
   }
 
   cleanup() {
-    _pdf_thumbnail_view.PDFThumbnailView.cleanup();
+    for (let i = 0, ii = this._thumbnails.length; i < ii; i++) {
+      if (this._thumbnails[i] && this._thumbnails[i].renderingState !== _pdf_rendering_queue.RenderingStates.FINISHED) {
+        this._thumbnails[i].reset();
+      }
+    }
+
+    _pdf_thumbnail_view.TempImageFactory.destroyCanvas();
   }
 
   _resetView() {

package/lib/web/pdf_viewer.component.js

@@ -143,5 +143,5 @@ var _pdf_single_page_viewer = require("./pdf_single_page_viewer.js");
 
 var _pdf_viewer = require("./pdf_viewer.js");
 
-const pdfjsVersion = '2.6.347';
-const pdfjsBuild = '3be9c65f';
+const pdfjsVersion = '2.7.570';
+const pdfjsBuild = 'f2c7338b0';

package/lib/web/pdf_viewer.js

@@ -26,6 +26,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PDFViewer = void 0;
 
+var _ui_utils = require("./ui_utils.js");
+
 var _base_viewer = require("./base_viewer.js");
 
 var _pdf = require("../pdf");
@@ -84,7 +86,7 @@ class PDFViewer extends _base_viewer.BaseViewer {
         break;
       }
 
-      if (page.id === currentId) {
+      if (page.id === currentId && this._scrollMode === _ui_utils.ScrollMode.VERTICAL && this._spreadMode === _ui_utils.SpreadMode.NONE) {
         stillFullyVisible = true;
         break;
       }