stephanrauh/ngx-extended-pdf-viewer#2339 allow for custom find contro…

…llers
stephanrauh · Aug 14, 2024 · 818631d · 818631d
1 parent 2117c3d
commit 818631d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/web/app.js b/web/app.js
@@ -436,8 +436,15 @@ const PDFViewerApplication = {
 
     const downloadManager = (this.downloadManager = new DownloadManager());
 
+    // #2399 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
+
     // #2488 modified by ngx-extended-pdf-viewer
-    const customFindController = new PDFFindController({
+    const customFindController = new FindControllerConstructor({ // #2399 modified by ngx-extended-pdf-viewer
       linkService: pdfLinkService,
       eventBus,
       // #492 modified by ngx-extended-pdf-viewer
@@ -451,7 +458,7 @@ const PDFViewerApplication = {
     this.customFindController = customFindController;
     // #2488 end of modification by ngx-extended-pdf-viewer
 
-    const findController = new PDFFindController({
+    const findController = new FindControllerConstructor({ // #2399 modified by ngx-extended-pdf-viewer
       linkService: pdfLinkService,
       eventBus,
       // #492 modified by ngx-extended-pdf-viewer

diff --git a/web/app_options.js b/web/app_options.js
@@ -95,6 +95,25 @@ const defaultOptions = {
     kind: OptionKind.VIEWER,
   },
   // #2459 end of modification by ngx-extended-pdf-viewer
+  // #2480 modified by ngx-extended-pdf-viewer
+  worker: {
+    /** @type {Object} */
+    value: null,
+    kind: OptionKind.WORKER,
+  },
+  // #2480 end of modification by ngx-extended-pdf-viewer
+  // #2339 modified by ngx-extended-pdf-viewer
+  findController: {
+    /** @type {Object} */
+    value: null,
+    kind: OptionKind.VIEWER,
+  },
+  secondaryFindController: {
+    /** @type {Object} */
+    value: null,
+    kind: OptionKind.VIEWER,
+  },
+  // #2339 end of modification by ngx-extended-pdf-viewer
   allowedGlobalEvents: {
     /** @type {Object} */
     value: null,
@@ -664,7 +683,7 @@ class AppOptions {
           }
         }
         if (!(typeof userOpt === typeof defaultOpt.value || Type[(typeof userOpt).toUpperCase()] & defaultOpt.type)) {
-          if (name !== "maxZoom" && name !== "minZoom" && name !== "passwordPrompt" && name !== "defaultZoomValue") {
+          if (!["maxZoom", "minZoom", "passwordPrompt", "defaultZoomValue", "findController"].includes(name)) {
             console.error("Invalid AppOptions value: " + name + " = " + userOpt);
             continue;
           }

diff --git a/web/pdf_find_controller.js b/web/pdf_find_controller.js
@@ -588,7 +588,7 @@ class PDFFindController {
       left: selectedLeft + MATCH_SCROLL_OFFSET_LEFT,
     };
     /** #492 modified by ngx-extended-pdf-viewer */
-    scrollIntoView(element, spot, /* scrollMatches = */ true, this._pageViewMode === 'infinite-scroll');
+    scrollIntoView(element, spot, /* scrollMatches = */ true, this._pageViewMode === "infinite-scroll");
     /** #492 end of modification */
   }