stephanrauh/ngx-extended-pdf-viewer#2339, stephanrauh/ngx-extended-pd…

…f-viewer#2524 the PDF viewer didn't scroll find matches reliably into view
stephanrauh · Aug 24, 2024 · 730abdc · 730abdc
1 parent 726cebb
commit 730abdc
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 17 deletions.
diff --git a/web/app.js b/web/app.js
@@ -419,15 +419,15 @@ const PDFViewerApplication = {
 
     const downloadManager = (this.downloadManager = new DownloadManager());
 
-    // #2399 modified by ngx-extended-pdf-viewer
+    // #2339 modified by ngx-extended-pdf-viewer
     let FindControllerConstructor = PDFFindController;
     if (AppOptions.get("findController")) {
       FindControllerConstructor = AppOptions.get("findController");
     }
-    // #2399 end of modification by ngx-extended-pdf-viewer
+    // #2339 end of modification by ngx-extended-pdf-viewer
 
     // #2488 modified by ngx-extended-pdf-viewer
-    const customFindController = new FindControllerConstructor({ // #2399 modified by ngx-extended-pdf-viewer
+    const customFindController = new FindControllerConstructor({ // #2339 modified by ngx-extended-pdf-viewer
       linkService: pdfLinkService,
       eventBus,
       // #492 modified by ngx-extended-pdf-viewer
@@ -437,11 +437,12 @@ const PDFViewerApplication = {
         typeof PDFJSDev === "undefined"
           ? !window.isGECKOVIEW
           : !PDFJSDev.test("GECKOVIEW"),
+      listenToEventBus: false,
     });
     this.customFindController = customFindController;
     // #2488 end of modification by ngx-extended-pdf-viewer
 
-    const findController = new FindControllerConstructor({ // #2399 modified by ngx-extended-pdf-viewer
+    const findController = new FindControllerConstructor({ // #2339 modified by ngx-extended-pdf-viewer
       linkService: pdfLinkService,
       eventBus,
       // #492 modified by ngx-extended-pdf-viewer
@@ -451,6 +452,7 @@ const PDFViewerApplication = {
         typeof PDFJSDev === "undefined"
           ? !window.isGECKOVIEW
           : !PDFJSDev.test("GECKOVIEW"),
+          listenToEventBus: true,
     });
     this.findController = findController;
 

diff --git a/web/pdf_find_bar.js b/web/pdf_find_bar.js
@@ -37,8 +37,8 @@ class PDFFindBar {
     this.currentPage = options.findCurrentPageCheckbox;
     this.pageRange = options.findPageRangeField;
     this.caseSensitive = options.caseSensitiveCheckbox;
-    this.findMultipleCheckbox = options.findMultipleCheckbox;
-    this.matchRegExpCheckbox = options.matchRegExpCheckbox;
+    this.findMultipleCheckbox = options.findMultipleCheckbox; // #2509 modified by ngx-extended-pdf-viewer
+    this.matchRegExpCheckbox = options.matchRegExpCheckbox; // #2509 modified by ngx-extended-pdf-viewer
     this.matchDiacritics = options.matchDiacriticsCheckbox;
     this.entireWord = options.entireWordCheckbox;
     this.findMsg = options.findMsg;
@@ -86,11 +86,12 @@ class PDFFindBar {
       this.dispatchEvent("casesensitivitychange");
     });
 
-    this.findMultipleCheckbox.addEventListener("click", () => {
+    // #2509 modified by ngx-extended-pdf-viewer
+    this.findMultipleCheckbox?.addEventListener("click", () => {
       this.dispatchEvent("findmultiplechange");
     });
 
-    this.matchRegExpCheckbox.addEventListener("click", () => {
+    this.matchRegExpCheckbox?.addEventListener("click", () => {
       if (this.matchRegExpCheckbox.checked) {
         this.findMultipleCheckbox.checked = false;
         this.findMultipleCheckbox.disabled = true;
@@ -105,6 +106,7 @@ class PDFFindBar {
       }
       this.dispatchEvent("findregexpchange");
     });
+    // #2509 end of modification by ngx-extended-pdf-viewer
 
     this.entireWord.addEventListener("click", () => {
       this.dispatchEvent("entirewordchange");
@@ -125,8 +127,8 @@ class PDFFindBar {
       type,
       query: this.findField.value,
       caseSensitive: this.caseSensitive.checked,
-      findMultiple: this.findMultipleCheckbox.checked,
-      matchRegExp: this.matchRegExpCheckbox.checked,
+      findMultiple: this.findMultipleCheckbox?.checked, // #2509 modified by ngx-extended-pdf-viewer
+      matchRegExp: this.matchRegExpCheckbox?.checked, // #2509 modified by ngx-extended-pdf-viewer
       entireWord: this.entireWord.checked,
       highlightAll: this.highlightAll.checked,
       findPrevious: findPrev,

diff --git a/web/pdf_find_controller.js b/web/pdf_find_controller.js
@@ -400,7 +400,13 @@ class PDFFindController {
   /**
    * @param {PDFFindControllerOptions} options
    */
-  constructor({ linkService, eventBus, updateMatchesCountOnProgress = true, pageViewMode }) {
+  constructor({
+    linkService,
+    eventBus,
+    updateMatchesCountOnProgress = true,
+    pageViewMode,
+    listenToEventBus, // #2339 modified by ngx-extended-pdf-viewer
+  }) {
     this._linkService = linkService;
     this._eventBus = eventBus;
     this.#updateMatchesCountOnProgress = updateMatchesCountOnProgress;
@@ -413,8 +419,10 @@ class PDFFindController {
     this.onIsPageVisible = null;
 
     this.#reset();
-    eventBus._on("find", this.#onFind.bind(this));
-    eventBus._on("findbarclose", this.#onFindBarClose.bind(this));
+    if (listenToEventBus) { // #2339 modified by ngx-extended-pdf-viewer
+      eventBus._on("find", this.#onFind.bind(this));
+      eventBus._on("findbarclose", this.#onFindBarClose.bind(this));
+    } // #2339 modified by ngx-extended-pdf-viewer
   }
 
   get highlightMatches() {
@@ -577,10 +585,13 @@ class PDFFindController {
     // #2482 end of modification by ngx-extended-pdf-viewer
     if (!this._scrollMatches || !element) {
       return;
-    } else if (matchIndex === -1 || matchIndex !== this._selected.matchIdx) {
-      return;
-    } else if (pageIndex === -1 || pageIndex !== this._selected.pageIdx) {
-      return;
+      // #2339 modified by ngx-extended-pdf-viewer: the method is only called
+      // on selected matches, and since adding the customFindController, the
+      // index is not always correct, let's skip the check
+      // } else if (matchIndex===-1 || matchIndex !== this._selected.matchIdx) {
+      //  return;
+      // } else if (pageIndex === -1 || pageIndex !== this._selected.pageIdx) {
+      //  return;
     }
     this._scrollMatches = false; // Ensure that scrolling only happens once.