@d-i-t-a/reader 2.2.0-beta.1 → 2.2.0-beta.3

package/dist/esm/index.js

@@ -55563,17 +55563,7 @@ var TextHighlighter = class {
           toolbox.style.top = ev.clientY + (self2.delegate.attributes?.navHeight ?? 0) + "px";
           toolbox.style.left = ev.clientX + "px";
           if (getComputedStyle(toolbox).display === "none") {
-            let noteH = function() {
-              self2.delegate.annotationModule?.api?.addCommentToAnnotation(anno).then((result) => {
-                self2.delegate.annotationModule?.updateAnnotation(result).then(async () => {
-                  import_loglevel5.default.log("update highlight " + result.id);
-                  toolbox.style.display = "none";
-                  self2.selectionMenuClosed();
-                });
-                toolbox.style.display = "none";
-                self2.selectionMenuClosed();
-              });
-            }, deleteH = function() {
+            let deleteH = function() {
               if (self2.delegate.rights.enableAnnotations) {
                 self2.delegate.annotationModule?.deleteSelectedHighlight(anno).then(async () => {
                   import_loglevel5.default.log("delete highlight " + anno.id);
@@ -55608,14 +55598,6 @@ var TextHighlighter = class {
             }
             if (commentIcon) {
               commentIcon.style.display = "none";
-              let clone = commentIcon.cloneNode(true);
-              let parent = commentIcon.parentElement;
-              clone.style.display = "unset";
-              clone.id = "cloneCommentIcon";
-              clone.addEventListener("click", noteH, false);
-              if (parent) {
-                parent.append(clone);
-              }
             }
             let deleteIcon = document.getElementById("deleteIcon");
             let cloneDeleteIcon = document.getElementById("cloneDeleteIcon");
@@ -58323,6 +58305,9 @@ var ContentProtectionModule = class {
     return true;
   }
   restrictCopy(event) {
+    if (this.citation) {
+      return;
+    }
     import_loglevel13.default.log("copy action initiated");
     let win = this.delegate.iframes[0].contentWindow;
     if (win) {
@@ -58982,14 +58967,14 @@ var SearchModule = class {
     this.currentSearchHighlights = [];
     this.bookSearchResult = [];
     reset();
-    this.searchAndPaintChapter(term, 0, async () => {
+    await this.searchAndPaintChapter(term, 0, async () => {
     });
-    var chapter = this.searchChapter(term);
-    var book = this.searchBook(term);
     if (current) {
-      return chapter;
+      await this.searchBook(term);
+      return await this.searchChapter(term);
     } else {
-      return book;
+      await this.searchChapter(term);
+      return await this.searchBook(term);
     }
   }
   async goToSearchID(href, index2, current) {
@@ -59197,18 +59182,33 @@ var SearchModule = class {
       }
       if (tocItem) {
         let href = this.publication.getAbsoluteHref(tocItem.Href);
-        await fetch(href, this.delegate.requestConfig).then((r) => r.text()).then(async (data) => {
-          let parser = new DOMParser();
-          let doc = parser.parseFromString(this.delegate.requestConfig?.encoded ? this.decodeBase64(data) : data, "application/xhtml+xml");
-          if (tocItem) {
-            searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
-              result.forEach((searchItem) => {
-                localSearchResultBook.push(searchItem);
-                this.bookSearchResult.push(searchItem);
+        if (this.delegate.api?.getContent) {
+          await this.delegate.api?.getContent(href).then((content) => {
+            let parser = new DOMParser();
+            let doc = parser.parseFromString(this.delegate.requestConfig?.encoded ? this.decodeBase64(content) : content, "application/xhtml+xml");
+            if (tocItem) {
+              searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
+                result.forEach((searchItem) => {
+                  localSearchResultBook.push(searchItem);
+                  this.bookSearchResult.push(searchItem);
+                });
               });
-            });
-          }
-        });
+            }
+          });
+        } else {
+          await fetch(href, this.delegate.requestConfig).then((r) => r.text()).then(async (data) => {
+            let parser = new DOMParser();
+            let doc = parser.parseFromString(this.delegate.requestConfig?.encoded ? this.decodeBase64(data) : data, "application/xhtml+xml");
+            if (tocItem) {
+              searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
+                result.forEach((searchItem) => {
+                  localSearchResultBook.push(searchItem);
+                  this.bookSearchResult.push(searchItem);
+                });
+              });
+            }
+          });
+        }
       }
       if (index2 === this.publication.readingOrder.length - 1) {
         return localSearchResultBook;
@@ -59234,17 +59234,31 @@ var SearchModule = class {
     }
     if (tocItem) {
       let href = this.publication.getAbsoluteHref(tocItem.Href);
-      await fetch(href, this.delegate.requestConfig).then((r) => r.text()).then(async (data) => {
-        let parser = new DOMParser();
-        let doc = parser.parseFromString(this.delegate.requestConfig?.encoded ? this.decodeBase64(data) : data, "application/xhtml+xml");
-        if (tocItem) {
-          searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
-            result.forEach((searchItem) => {
-              localSearchResultBook.push(searchItem);
+      if (this.delegate.api?.getContent) {
+        await this.delegate.api?.getContent(href).then((content) => {
+          let parser = new DOMParser();
+          let doc = parser.parseFromString(this.delegate.requestConfig?.encoded ? this.decodeBase64(content) : content, "application/xhtml+xml");
+          if (tocItem) {
+            searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
+              result.forEach((searchItem) => {
+                localSearchResultBook.push(searchItem);
+              });
             });
-          });
-        }
-      });
+          }
+        });
+      } else {
+        await fetch(href, this.delegate.requestConfig).then((r) => r.text()).then(async (data) => {
+          let parser = new DOMParser();
+          let doc = parser.parseFromString(this.delegate.requestConfig?.encoded ? this.decodeBase64(data) : data, "application/xhtml+xml");
+          if (tocItem) {
+            searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
+              result.forEach((searchItem) => {
+                localSearchResultBook.push(searchItem);
+              });
+            });
+          }
+        });
+      }
     }
     return localSearchResultBook;
   }
@@ -64360,9 +64374,12 @@ var CitationModule = class {
     return module2;
   }
   async stop() {
-    import_loglevel23.default.log("Timeline module stop");
+    import_loglevel23.default.log("Citation module stop");
   }
   copyToClipboard(textToClipboard) {
+    if (this.delegate?.contentProtectionModule) {
+      this.delegate.contentProtectionModule.citation = true;
+    }
     let success = true;
     if (window.clipboardData) {
       window.clipboardData.setData("text/plain", textToClipboard);
@@ -64412,7 +64429,11 @@ var CitationModule = class {
           let chicagoString = "";
           let mlaString = "";
           let apaString = "";
-          if (self2.publication.Metadata.Author?.length > 0) {
+          if (self2.properties.author) {
+            apaString = apaString + self2.properties.author;
+            mlaString = mlaString + self2.properties.author;
+            chicagoString = chicagoString + self2.properties.author;
+          } else if (self2.publication.Metadata.Author?.length > 0) {
             let authorIndex = 0;
             if (authorIndex === 0) {
               if (self2.publication.Metadata.Author[0].Name) {
@@ -64433,11 +64454,18 @@ var CitationModule = class {
           let chicagoString = "";
           let mlaString = "";
           let apaString = "";
-          if (self2.publication.Metadata.Publisher && self2.publication.Metadata.Publisher[0].Name) {
+          if (self2.properties.publisher) {
+            mlaString = mlaString + self2.properties.publisher + ", ";
+            chicagoString = chicagoString + self2.properties.publisher + ", ";
+          } else if (self2.publication.Metadata.Publisher && self2.publication.Metadata.Publisher[0].Name) {
             mlaString = mlaString + self2.publication.Metadata.Publisher[0].Name + ", ";
             chicagoString = chicagoString + self2.publication.Metadata.Publisher[0].Name + ", ";
           }
-          if (self2.publication.Metadata.PublicationDate) {
+          if (self2.properties.published) {
+            apaString = apaString + "(" + self2.properties.published + ")";
+            mlaString = mlaString + self2.properties.published;
+            chicagoString = chicagoString + self2.properties.published;
+          } else if (self2.publication.Metadata.PublicationDate) {
             if (self2.publication.Metadata.PublicationDate.getFullYear() > 0) {
               apaString = apaString + "(" + self2.publication.Metadata.PublicationDate.getFullYear() + ")";
               mlaString = mlaString + self2.publication.Metadata.PublicationDate.getFullYear();
@@ -64450,7 +64478,13 @@ var CitationModule = class {
           return ["", "", ""];
         };
         let bookTitleFormatted = function() {
-          if (self2.publication.Metadata.Title) {
+          if (self2.properties.title) {
+            return [
+              self2.properties.title + ". ",
+              self2.properties.title + ". ",
+              self2.properties.title + ". "
+            ];
+          } else if (self2.publication.Metadata.Title) {
             return [
               self2.publication.Metadata.Title + ". ",
               self2.publication.Metadata.Title + ". ",
@@ -64467,7 +64501,11 @@ var CitationModule = class {
           let chicagoString = "";
           let mlaString = "";
           let apaString = "";
-          if (self2.publication.Metadata.Publisher && self2.publication.Metadata.Publisher[0].Name) {
+          if (self2.properties.publisher) {
+            mlaString = mlaString + self2.properties.publisher + ", ";
+            chicagoString = chicagoString + self2.properties.publisher + ", ";
+            apaString = apaString + self2.properties.publisher + ", ";
+          } else if (self2.publication.Metadata.Publisher && self2.publication.Metadata.Publisher[0].Name) {
             mlaString = mlaString + self2.publication.Metadata.Publisher[0].Name + ", ";
             chicagoString = chicagoString + self2.publication.Metadata.Publisher[0].Name + ", ";
             apaString = apaString + self2.publication.Metadata.Publisher[0].Name + ", ";
@@ -64549,13 +64587,126 @@ var CitationModule = class {
 init_polyfills();
 var import_eventemitter32 = __toModule(require_eventemitter3());
 var import_pdfjs_dist = __toModule(require_pdf());
+
+// src/utils/GrabToPan.ts
+init_polyfills();
+var CSS_CLASS_GRAB = "grab-to-pan-grab";
+var _onMouseDown, onMouseDown_fn, _onMouseMove, onMouseMove_fn, _endPan, endPan_fn;
+var GrabToPan = class {
+  constructor(options) {
+    __privateAdd(this, _onMouseDown);
+    __privateAdd(this, _onMouseMove);
+    __privateAdd(this, _endPan);
+    this.element = options.element;
+    this.document = options.element.ownerDocument;
+    if (typeof options.ignoreTarget === "function") {
+      this.ignoreTarget = options.ignoreTarget;
+    }
+    this.onActiveChanged = options.onActiveChanged;
+    this.activate = this.activate.bind(this);
+    this.deactivate = this.deactivate.bind(this);
+    this.toggle = this.toggle.bind(this);
+    this._onMouseDown = __privateMethod(this, _onMouseDown, onMouseDown_fn).bind(this);
+    this._onMouseMove = __privateMethod(this, _onMouseMove, onMouseMove_fn).bind(this);
+    this._endPan = __privateMethod(this, _endPan, endPan_fn).bind(this);
+    const overlay = this.overlay = document.createElement("div");
+    overlay.className = "grab-to-pan-grabbing";
+  }
+  activate() {
+    if (!this.active) {
+      this.active = true;
+      this.element.addEventListener("mousedown", this._onMouseDown, true);
+      this.element.classList.add(CSS_CLASS_GRAB);
+      this.onActiveChanged?.(true);
+    }
+  }
+  deactivate() {
+    if (this.active) {
+      this.active = false;
+      this.element.removeEventListener("mousedown", this._onMouseDown, true);
+      this._endPan();
+      this.element.classList.remove(CSS_CLASS_GRAB);
+      this.onActiveChanged?.(false);
+    }
+  }
+  toggle() {
+    if (this.active) {
+      this.deactivate();
+    } else {
+      this.activate();
+    }
+  }
+  ignoreTarget(node) {
+    return node.matches("a[href], a[href] *, input, textarea, button, button *, select, option");
+  }
+};
+_onMouseDown = new WeakSet();
+onMouseDown_fn = function(event) {
+  if (event.button !== 0 || this.ignoreTarget(event.target)) {
+    return;
+  }
+  if (event.originalTarget) {
+    try {
+      event.originalTarget.tagName;
+    } catch (e) {
+      return;
+    }
+  }
+  this.scrollLeftStart = this.element.scrollLeft;
+  this.scrollTopStart = this.element.scrollTop;
+  this.clientXStart = event.clientX;
+  this.clientYStart = event.clientY;
+  this.document.addEventListener("mousemove", this._onMouseMove, true);
+  this.document.addEventListener("mouseup", this._endPan, true);
+  this.element.addEventListener("scroll", this._endPan, true);
+  event.preventDefault();
+  event.stopPropagation();
+  const focusedElement = document.activeElement;
+  if (focusedElement && !focusedElement.contains(event.target)) {
+    focusedElement.blur();
+  }
+};
+_onMouseMove = new WeakSet();
+onMouseMove_fn = function(event) {
+  this.element.removeEventListener("scroll", this._endPan, true);
+  if (!(event.buttons & 1)) {
+    this._endPan();
+    return;
+  }
+  const xDiff = event.clientX - this.clientXStart;
+  const yDiff = event.clientY - this.clientYStart;
+  const scrollTop = this.scrollTopStart - yDiff;
+  const scrollLeft = this.scrollLeftStart - xDiff;
+  if (this.element.scrollTo) {
+    this.element.scrollTo({
+      top: scrollTop,
+      left: scrollLeft,
+      behavior: "instant"
+    });
+  } else {
+    this.element.scrollTop = scrollTop;
+    this.element.scrollLeft = scrollLeft;
+  }
+  if (!this.overlay.parentNode) {
+    document.body.append(this.overlay);
+  }
+};
+_endPan = new WeakSet();
+endPan_fn = function() {
+  this.element.removeEventListener("scroll", this._endPan, true);
+  this.document.removeEventListener("mousemove", this._onMouseMove, true);
+  this.document.removeEventListener("mouseup", this._endPan, true);
+  this.overlay.remove();
+};
+
+// src/navigator/PDFNavigator.ts
 var ScaleType;
 (function(ScaleType2) {
   ScaleType2[ScaleType2["Page"] = 0] = "Page";
   ScaleType2[ScaleType2["Width"] = 1] = "Width";
 })(ScaleType || (ScaleType = {}));
 var PDFNavigator = class extends import_eventemitter32.default {
-  constructor(settings, publication) {
+  constructor(settings, publication, api) {
     super();
     this.pdfDoc = null;
     this.pageNum = 1;
@@ -64570,9 +64721,10 @@ var PDFNavigator = class extends import_eventemitter32.default {
     };
     this.settings = settings;
     this.publication = publication;
+    this.api = api;
   }
   static async create(config2) {
-    const navigator2 = new this(config2.settings, config2.publication);
+    const navigator2 = new this(config2.settings, config2.publication, config2.api);
     await navigator2.start(config2.mainElement, config2.headerMenu, config2.footerMenu);
     return new Promise((resolve) => resolve(navigator2));
   }
@@ -64585,34 +64737,58 @@ var PDFNavigator = class extends import_eventemitter32.default {
     console.log(this.resource);
     console.log(this.resource.Href1);
     import_pdfjs_dist.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/2.16.105/pdf.worker.js`;
-    this.canvas = document.getElementById("the-canvas");
-    this.ctx = this.canvas.getContext("2d");
+    this.wrapper = findRequiredElement(this.mainElement, "main#iframe-wrapper");
+    this.pdfContainer = findRequiredElement(this.mainElement, "#pdf-container");
+    this.handTool = new GrabToPan({
+      element: this.pdfContainer
+    });
     const self2 = this;
-    (0, import_pdfjs_dist.getDocument)(this.resource.Href1).promise.then(function(pdfDoc_) {
+    let loadingMessage = document.createElement("div");
+    loadingMessage.id = "loadingpdf";
+    loadingMessage.innerHTML = readerLoading;
+    loadingMessage.style.width = getComputedStyle(this.wrapper).width;
+    loadingMessage.style.height = getComputedStyle(this.wrapper).height;
+    loadingMessage.style.display = "flex";
+    loadingMessage.style.zIndex = "100";
+    loadingMessage.style.position = "absolute";
+    loadingMessage.style.alignItems = "center";
+    loadingMessage.style.justifyContent = "center";
+    loadingMessage.style.background = "white";
+    loadingMessage.className = "loading is-loading";
+    this.pdfContainer.appendChild(loadingMessage);
+    (0, import_pdfjs_dist.getDocument)(this.publication.getAbsoluteHref(this.resource.Href)).promise.then(function(pdfDoc_) {
       self2.pdfDoc = pdfDoc_;
-      self2.renderPage(self2.pageNum, self2.scaleType);
+      self2.loadPDFJS(self2.pageNum);
     });
     this.setupEvents();
   }
   async handleResize() {
-    this.renderPage(this.pageNum, this.scaleType);
+    this.loadPDFJS(this.pageNum);
   }
   setupEvents() {
     addEventListenerOptional(window, "resize", this.onResize);
   }
-  renderPage(num, type) {
+  loadPDFJS(num) {
     const self2 = this;
-    const main = findRequiredElement(this.mainElement, "main");
-    self2.pageRendering = true;
-    const wrapper = findRequiredElement(self2.mainElement, "main#iframe-wrapper");
-    wrapper.style.height = "calc(100vh - 10px)";
-    self2.pdfDoc.getPage(num).then(function(page) {
+    let currentPage = 1;
+    this.wrapper.style.height = "calc(100vh - 10px)";
+    this.pdfContainer.style.height = "calc(100vh - 10px)";
+    this.pdfContainer.style.flexDirection = "column";
+    let collection = document.getElementsByTagName("canvas");
+    Array.from(collection).forEach(function(element) {
+      element?.parentNode?.removeChild(element);
+    });
+    function renderPage(page) {
+      const canvas = document.createElement("canvas");
+      canvas.id = String(currentPage);
+      canvas.style.border = "1px solid gray";
+      canvas.style.margin = "1px";
       let viewport = page.getViewport({ scale: self2.scale });
       if (self2.scale === 1) {
-        const fitPage = main.clientHeight / viewport.height;
-        const fitWidth = main.clientWidth / viewport.width;
+        const fitPage = self2.wrapper.clientHeight / viewport.height;
+        const fitWidth = self2.wrapper.clientWidth / viewport.width;
         console.log(fitPage, fitWidth);
-        if (type === 0) {
+        if (self2.scaleType === 0) {
           viewport = page.getViewport({
             scale: fitPage < fitWidth ? fitPage : fitWidth
           });
@@ -64620,41 +64796,55 @@ var PDFNavigator = class extends import_eventemitter32.default {
           viewport = page.getViewport({ scale: fitWidth });
         }
       }
-      self2.canvas.height = viewport.height;
-      self2.canvas.width = viewport.width;
+      self2.pdfContainer.appendChild(canvas);
+      const context = canvas.getContext("2d");
+      canvas.height = viewport.height;
+      canvas.width = viewport.width;
       const renderContext = {
-        canvasContext: self2.ctx,
+        canvasContext: context,
         viewport
       };
+      let pdfload = document.getElementById("loadingpdf");
+      pdfload.style.display = "flex";
+      pdfload.style.width = getComputedStyle(self2.wrapper).width;
+      pdfload.style.height = getComputedStyle(self2.wrapper).height;
       const renderTask = page.render(renderContext);
       renderTask.promise.then(function() {
-        self2.pageRendering = false;
-        if (self2.pageNumPending !== null) {
-          self2.renderPage(self2.pageNumPending, type);
-          self2.pageNumPending = null;
+        if (currentPage < self2.pdfDoc.numPages) {
+          currentPage++;
+          self2.pdfDoc.getPage(currentPage).then(renderPage);
+        } else {
+          document.getElementById(String(num))?.scrollIntoView();
+          pdfload.style.display = "none";
         }
       });
-    });
+    }
+    this.pdfDoc.getPage(currentPage).then(renderPage);
   }
   queueRenderPage(num) {
     const self2 = this;
     if (self2.pageRendering) {
       self2.pageNumPending = num;
     } else {
-      self2.renderPage(num, self2.scaleType);
+      this.pageNum = num;
+      document.getElementById(String(num))?.scrollIntoView();
     }
   }
   readingOrder() {
+    return this.publication.readingOrder;
   }
   tableOfContents() {
+    return this.publication.tableOfContents;
   }
   currentResource() {
   }
   totalResources() {
+    return this.publication.readingOrder.length;
   }
   currentLocator() {
   }
   positions() {
+    return this.publication.positions ? this.publication.positions : [];
   }
   nextPage() {
     const self2 = this;
@@ -64683,10 +64873,10 @@ var PDFNavigator = class extends import_eventemitter32.default {
     self2.resourceIndex++;
     self2.resource = this.publication.readingOrder[self2.resourceIndex];
     console.log(this.resource.Href1);
-    (0, import_pdfjs_dist.getDocument)(this.resource.Href1).promise.then(function(pdfDoc_) {
+    (0, import_pdfjs_dist.getDocument)(this.publication.getAbsoluteHref(this.resource.Href)).promise.then(function(pdfDoc_) {
       self2.pdfDoc = pdfDoc_;
       self2.pageNum = 1;
-      self2.renderPage(self2.pageNum, self2.scaleType);
+      self2.loadPDFJS(self2.pageNum);
     });
   }
   previousResource() {
@@ -64698,41 +64888,70 @@ var PDFNavigator = class extends import_eventemitter32.default {
     self2.resourceIndex--;
     self2.resource = this.publication.readingOrder[self2.resourceIndex];
     console.log(this.resource.Href1);
-    (0, import_pdfjs_dist.getDocument)(this.resource.Href1).promise.then(function(pdfDoc_) {
+    (0, import_pdfjs_dist.getDocument)(this.publication.getAbsoluteHref(this.resource.Href)).promise.then(function(pdfDoc_) {
       self2.pdfDoc = pdfDoc_;
       self2.pageNum = self2.pdfDoc.numPages;
-      self2.renderPage(self2.pageNum, self2.scaleType);
+      self2.loadPDFJS(self2.pageNum);
     });
   }
   goTo(locator) {
     console.log(locator);
+    const url = new URL(locator.href);
+    if (url.searchParams.has("start")) {
+      const page = url.searchParams.get("start");
+      if (page) {
+        this.queueRenderPage(parseInt(page));
+      }
+    } else {
+      this.queueRenderPage(1);
+    }
   }
   goToPosition(value) {
     console.log(value);
+    this.queueRenderPage(value);
   }
   async goToPage(page) {
     console.log(page);
     this.queueRenderPage(page);
   }
   fitToWidth() {
-    console.log("fit to width");
+    console.log("fit to width", this.pageNum);
     this.scale = 1;
     this.scaleType = 1;
-    this.renderPage(this.pageNum, this.scaleType);
+    this.loadPDFJS(this.pageNum);
   }
   fitToPage() {
-    console.log("fit to page");
+    console.log("fit to page", this.pageNum);
     this.scale = 1;
     this.scaleType = 0;
-    this.renderPage(this.pageNum, this.scaleType);
+    this.loadPDFJS(this.pageNum);
   }
   zoomIn() {
     this.scale = this.scale + 0.2;
-    this.renderPage(this.pageNum, this.scaleType);
+    this.loadPDFJS(this.pageNum);
   }
   zoomOut() {
     this.scale = this.scale - 0.2;
-    this.renderPage(this.pageNum, this.scaleType);
+    this.loadPDFJS(this.pageNum);
+  }
+  activateHand() {
+    this.handTool.activate();
+  }
+  deactivateHand() {
+    this.handTool.deactivate();
+  }
+  async scroll(scroll, direction) {
+    if (scroll) {
+      if (direction === "horizontal") {
+        this.pdfContainer.style.flexDirection = "row";
+      } else {
+        this.pdfContainer.style.flexDirection = "column";
+      }
+      this.pdfContainer.style.overflow = "auto";
+    } else {
+      this.pdfContainer.style.flexDirection = "column";
+      this.pdfContainer.style.overflow = "hidden";
+    }
   }
   stop() {
     removeEventListenerOptional(window, "resize", this.onResize);
@@ -64862,7 +65081,10 @@ var D2Reader = class {
     this.applyUserSettings = async (userSettings) => {
       return await this.settings.applyUserSettings(userSettings);
     };
-    this.scroll = async (value) => {
+    this.scroll = async (value, direction) => {
+      if (this.navigator instanceof PDFNavigator) {
+        return this.navigator.scroll(value, direction);
+      }
       return await this.settings.scroll(value);
     };
     this.increase = async (incremental) => {
@@ -64945,6 +65167,16 @@ var D2Reader = class {
         this.navigator.zoomOut();
       }
     };
+    this.activateHand = () => {
+      if (this.navigator instanceof PDFNavigator) {
+        this.navigator.activateHand();
+      }
+    };
+    this.deactivateHand = () => {
+      if (this.navigator instanceof PDFNavigator) {
+        this.navigator.deactivateHand();
+      }
+    };
     this.copyToClipboard = (text) => {
       this.contentProtectionModule?.copyToClipboard(text);
     };
@@ -65144,6 +65376,11 @@ var D2Reader = class {
       const contentProtectionModule = rights.enableContentProtection ? await ContentProtectionModule.create(__spreadValues({
         delegate: navigator2
       }, initialConfig.protection)) : void 0;
+      const citationModule = rights.enableCitations ? await CitationModule.create(__spreadValues({
+        publication,
+        delegate: navigator2,
+        highlighter
+      }, initialConfig.citations)) : void 0;
       const enableMediaOverlays = rights.enableMediaOverlays;
       const mediaOverlaySettings = enableMediaOverlays ? await MediaOverlaySettings.create(__spreadValues({
         store: settingsStore,
@@ -65172,11 +65409,6 @@ var D2Reader = class {
         delegate: navigator2,
         headerMenu
       }) : void 0;
-      const citationModule = rights.enableCitations ? await CitationModule.create(__spreadValues({
-        publication,
-        delegate: navigator2,
-        highlighter
-      }, initialConfig.citations)) : void 0;
       return new D2Reader(settings, navigator2, highlighter, bookmarkModule, annotationModule, ttsSettings, ttsModule, searchModule, definitionsModule, contentProtectionModule, timelineModule, mediaOverlaySettings, mediaOverlayModule, pageBreakModule, lineFocusModule, historyModule, citationModule);
     }
   }