@d-i-t-a/reader 2.0.0-beta.7 → 2.0.0

package/dist/esm/index.js

@@ -46005,6 +46005,9 @@ var Publication = class extends import_publication.Publication {
   get readingOrder() {
     return this.Spine ?? [];
   }
+  get resources() {
+    return this.Resources ?? [];
+  }
   get tableOfContents() {
     if (this.sample?.isSampleRead && this.positions?.length > 0) {
       return this.limitedTOC();
@@ -46501,6 +46504,111 @@ var Popup = class {
       }
     }
   }
+  async hidePopover() {
+    let footnote = this.navigator.iframes[0].contentDocument?.getElementById("d2-popover");
+    if (footnote) {
+      footnote.parentElement?.removeChild(footnote);
+    }
+    const wrapper = findRequiredElement(document, "#iframe-wrapper");
+    wrapper.style.overflow = "auto";
+  }
+  async showPopover(link, event) {
+    const href = link.getAttribute("href");
+    const src = link.getAttribute("src");
+    function getAbsoluteHref(href2) {
+      const currentUrl = document.location.href;
+      return new URL(href2, currentUrl).href;
+    }
+    if (href) {
+      let absolute = getAbsoluteHref(href);
+      if (absolute) {
+        event.preventDefault();
+        event.stopPropagation();
+        let popover = this.navigator.iframes[0].contentDocument?.getElementById("d2-popover");
+        if (popover) {
+          popover.parentElement?.removeChild(popover);
+        }
+        const d2popover = document.createElement("div");
+        d2popover.id = "d2-popover";
+        d2popover.className = "d2-popover is-active";
+        const wrapper = findRequiredElement(document, "#iframe-wrapper");
+        wrapper.style.overflow = "hidden";
+        d2popover.style.top = wrapper.scrollTop + "px";
+        d2popover.style.height = wrapper.clientHeight * 0.9 + "px";
+        const d2wrapper = document.createElement("div");
+        d2wrapper.className = "d2-popover-wrapper";
+        d2popover.appendChild(d2wrapper);
+        const d2content = document.createElement("div");
+        d2content.className = "d2-popover-content";
+        d2wrapper.appendChild(d2content);
+        await fetch(absolute).then((r) => r.text()).then(async (data) => {
+          d2content.innerHTML = data;
+          let doc = this.navigator.iframes[0].contentDocument;
+          if (doc) {
+            doc.body.appendChild(d2popover);
+          }
+        });
+        let win = this.navigator.iframes[0].contentWindow;
+        if (!win) {
+          return;
+        }
+        let self2 = this;
+        win.onclick = function(ev) {
+          if (event.target !== ev.target) {
+            if (d2popover.parentElement) {
+              self2.hidePopover();
+              if (win) {
+                win.onclick = null;
+              }
+            }
+          }
+        };
+      }
+    } else if (src) {
+      let absolute = getAbsoluteHref(src);
+      if (absolute) {
+        event.preventDefault();
+        event.stopPropagation();
+        let popover = this.navigator.iframes[0].contentDocument?.getElementById("d2-popover");
+        if (popover) {
+          popover.parentElement?.removeChild(popover);
+        }
+        const d2popover = document.createElement("div");
+        d2popover.id = "d2-popover";
+        d2popover.className = "d2-popover is-active";
+        const wrapper = findRequiredElement(document, "#iframe-wrapper");
+        wrapper.style.overflow = "hidden";
+        d2popover.style.top = wrapper.scrollTop + "px";
+        d2popover.style.height = wrapper.clientHeight * 0.9 + "px";
+        const d2wrapper = document.createElement("div");
+        d2wrapper.className = "d2-popover-wrapper";
+        d2popover.appendChild(d2wrapper);
+        const d2content = document.createElement("img");
+        d2content.className = "d2-popover-content";
+        d2wrapper.appendChild(d2content);
+        d2content.src = src;
+        let doc = this.navigator.iframes[0].contentDocument;
+        if (doc) {
+          doc.body.appendChild(d2popover);
+        }
+        let win = this.navigator.iframes[0].contentWindow;
+        if (!win) {
+          return;
+        }
+        let self2 = this;
+        win.onclick = function(ev) {
+          if (event.target !== ev.target) {
+            if (d2popover.parentElement) {
+              self2.hidePopover();
+              if (win) {
+                win.onclick = null;
+              }
+            }
+          }
+        };
+      }
+    }
+  }
   showPopup(element, event) {
     let footnote = this.navigator.iframes[0].contentDocument?.getElementById("d2-popup");
     if (footnote) {
@@ -46586,11 +46694,19 @@ var EventHandler = class {
       }
       return null;
     };
-    this.isEpubInternal = (clickedLink) => {
+    this.linkInPublication = (readingOrder, clickedHref) => readingOrder.some((link) => {
+      return !link.Rel?.includes("external") && this.navigator.publication.getRelativeHref(clickedHref).includes(link.Href);
+    });
+    this.isReadingOrderInternal = (clickedLink) => {
+      if (IS_DEV)
+        console.log("clickedLink: ", clickedLink);
+      const isEpubInternal = this.linkInPublication(this.navigator.publication.readingOrder, clickedLink.href);
+      return isEpubInternal;
+    };
+    this.isResourceInternal = (clickedLink) => {
       if (IS_DEV)
         console.log("clickedLink: ", clickedLink);
-      const linkInReadingOrder = (readingOrder, clickedPathname) => readingOrder.some((link) => !link.Rel?.includes("external") && link.Href.includes(clickedPathname));
-      const isEpubInternal = linkInReadingOrder(this.navigator.publication.readingOrder, clickedLink.pathname);
+      const isEpubInternal = this.linkInPublication(this.navigator.publication.resources, clickedLink.href);
       return isEpubInternal;
     };
     this.handleLinks = async (event) => {
@@ -46599,9 +46715,13 @@ var EventHandler = class {
       const link = this.checkForLink(event);
       if (link) {
         const isSameOrigin = window.location.protocol === link.protocol && window.location.port === link.port && window.location.hostname === link.hostname;
-        const isEpubInternal = this.isEpubInternal(link);
+        const isEpubInternal = this.isReadingOrderInternal(link);
+        const isResourceInternal = this.isResourceInternal(link);
+        if (!isResourceInternal) {
+          await this.popup.hidePopover();
+        }
         const isInternal = link.href.indexOf("#");
-        if (!isSameOrigin && !isEpubInternal) {
+        if (!isSameOrigin && !isEpubInternal && !isResourceInternal) {
           window.open(link.href, "_blank");
           event.preventDefault();
           event.stopPropagation();
@@ -46613,6 +46733,8 @@ var EventHandler = class {
               const attribute = link2.getAttribute("epub:type") === "noteref";
               if (attribute) {
                 await this.popup.handleFootnote(link2, event);
+              } else if (isResourceInternal && !isEpubInternal) {
+                await this.popup.showPopover(link2, event);
               } else {
                 this.onInternalLink(event);
               }
@@ -46632,6 +46754,12 @@ var EventHandler = class {
   }
   setupEvents(element) {
     if (element !== null) {
+      element.addEventListener("dblclick", async (event) => {
+        let htmlElement = event.target;
+        if (event.target && htmlElement.tagName.toLowerCase() === "img") {
+          await this.popup.showPopover(htmlElement, event);
+        }
+      }, true);
       element.addEventListener("click", this.handleLinks.bind(this));
     } else {
       throw "cannot setup events for null";
@@ -46808,10 +46936,9 @@ var ReflowableBookView = class {
     }
   }
   goToElement(element, relative) {
-    const wrapper = findRequiredElement(document, "#iframe-wrapper");
     if (this.scrollMode) {
       if (element) {
-        wrapper.scrollTop = element.offsetTop;
+        element.scrollIntoView({ block: "center" });
       }
     } else {
       if (element) {
@@ -46855,7 +46982,7 @@ var ReflowableBookView = class {
     const wrapper = findRequiredElement(document, "#iframe-wrapper");
     if (this.scrollMode) {
       const leftHeight = wrapper.scrollTop;
-      const height = this.getScreenHeight();
+      const height = this.getScreenHeight() - 40;
       const offset = leftHeight - height;
       if (offset >= 0) {
         wrapper.scrollTop = offset;
@@ -46881,7 +47008,7 @@ var ReflowableBookView = class {
     const wrapper = findRequiredElement(document, "#iframe-wrapper");
     if (this.scrollMode) {
       const leftHeight = wrapper.scrollTop;
-      const height = this.getScreenHeight();
+      const height = this.getScreenHeight() - 40;
       const scrollHeight = this.scrollingElement.scrollHeight;
       const offset = leftHeight + height;
       if (offset < scrollHeight) {
@@ -49069,6 +49196,10 @@ var iconTemplate = (id2, title, path, classAttr = `icon`) => `<svg xmlns="http:/
   <title id="${id2}">${title}</title>
   ${path}
 </svg>`;
+var iconTemplateWithViewBox = (id2, title, path, viewBox, classAttr = `icon`) => `<svg xmlns="http://www.w3.org/2000/svg" width="${WIDTH_ATTR}" height="${WIDTH_ATTR}" viewBox="${viewBox}" preserveAspectRatio="xMidYMid meet" role="img" class="${classAttr}" aria-labelledBy="${id2}">
+  <title id="${id2}">${title}</title>
+  ${path}
+</svg>`;
 var iconTemplateColored = (id2, title, path, classAttr = `icon`, size, fill) => `<svg xmlns="http://www.w3.org/2000/svg" width="${size}" height="${size}" viewBox="${VIEWBOX_ATTR}" style="fill:${fill}" preserveAspectRatio="xMidYMid meet" role="img" class="${classAttr}" aria-labelledBy="${id2}">
   <title id="${id2}">${title}</title>
   ${path}
@@ -49077,7 +49208,7 @@ var icons = {
   error: iconTemplate(`error-icon`, `Warning`, `<path d="M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z"/>`),
   home: `<path d="M12 5.69l5 4.5V18h-2v-6H9v6H7v-7.81l5-4.5M12 3L2 12h3v8h6v-6h2v6h6v-8h3L12 3z"/>`,
   expand: iconTemplate(`expand-icon`, `Enter fullscreen`, `<path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"/>`, `icon active-icon`),
-  loading: iconTemplate(`loading-icon`, `Loading`, `<path d="M12 6v3l4-4-4-4v3c-4.42 0-8 3.58-8 8 0 1.57.46 3.03 1.24 4.26L6.7 14.8c-.45-.83-.7-1.79-.7-2.8 0-3.31 2.69-6 6-6zm6.76 1.74L17.3 9.2c.44.84.7 1.79.7 2.8 0 3.31-2.69 6-6 6v-3l-4 4 4 4v-3c4.42 0 8-3.58 8-8 0-1.57-.46-3.03-1.24-4.26z"/>`),
+  loading: iconTemplateWithViewBox(`loading-icon`, `Loading`, `<path fill="#BBBBBB" d="M145,241.6c-53.3,0-96.6-43.2-96.6-96.6c0-53.3,43.2-96.6,96.6-96.6c53.3,0,96.6,43.2,96.6,96.6 c0,26.7-10.8,50.9-28.3,68.3l7.6,7.6c19.4-19.4,31.5-46.3,31.5-75.9c0-59.3-48-107.3-107.3-107.3S37.7,85.7,37.7,145 c0,59.3,48,107.3,107.3,107.3V241.6z"/>`, "0 0 290 290"),
   next: iconTemplate(`next-icon`, `Next Chapter`, `<path d="M6.49 20.13l1.77 1.77 9.9-9.9-9.9-9.9-1.77 1.77L14.62 12l-8.13 8.13z"/>`),
   previous: iconTemplate(`previous-icon`, `Previous Chapter`, `<path d="M17.51 3.87L15.73 2.1 5.84 12l9.9 9.9 1.77-1.77L9.38 12l8.13-8.13z"/>`),
   settings: iconTemplate(`settings-icon`, `Settings`, `<path d="M19.43 12.98c.04-.32.07-.64.07-.98 0-.34-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.09-.16-.26-.25-.44-.25-.06 0-.12.01-.17.03l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.06-.02-.12-.03-.18-.03-.17 0-.34.09-.43.25l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98 0 .33.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.09.16.26.25.44.25.06 0 .12-.01.17-.03l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.06.02.12.03.18.03.17 0 .34-.09.43-.25l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zm-1.98-1.71c.04.31.05.52.05.73 0 .21-.02.43-.05.73l-.14 1.13.89.7 1.08.84-.7 1.21-1.27-.51-1.04-.42-.9.68c-.43.32-.84.56-1.25.73l-1.06.43-.16 1.13-.2 1.35h-1.4l-.19-1.35-.16-1.13-1.06-.43c-.43-.18-.83-.41-1.23-.71l-.91-.7-1.06.43-1.27.51-.7-1.21 1.08-.84.89-.7-.14-1.13c-.03-.31-.05-.54-.05-.74s.02-.43.05-.73l.14-1.13-.89-.7-1.08-.84.7-1.21 1.27.51 1.04.42.9-.68c.43-.32.84-.56 1.25-.73l1.06-.43.16-1.13.2-1.35h1.39l.19 1.35.16 1.13 1.06.43c.43.18.83.41 1.23.71l.91.7 1.06-.43 1.27-.51.7 1.21-1.07.85-.89.7.14 1.13zM12 8c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 6c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"/>`, `icon open`),
@@ -49136,7 +49267,6 @@ var _blacklistIdClassForCssSelectors = [
 ];
 var lastMouseDownX = -1;
 var lastMouseDownY = -1;
-var bodyEventListenersSet = false;
 var TextHighlighter = class {
   constructor(delegate, layerSettings, properties, hasEventListener, options, api) {
     this.lastSelectedHighlight = void 0;
@@ -49201,7 +49331,6 @@ var TextHighlighter = class {
     this.initializeToolbox();
     lastMouseDownX = -1;
     lastMouseDownY = -1;
-    bodyEventListenersSet = false;
     let self2 = this;
     async function unselect() {
       if (self2.lastSelectedHighlight === void 0) {
@@ -49428,8 +49557,26 @@ var TextHighlighter = class {
     if (this.isAndroid()) {
       el.addEventListener("contextmenu", this.disableContext);
     }
+    el.addEventListener("mousedown", this.mousedown.bind(this));
+    el.addEventListener("mouseup", this.mouseup.bind(this));
+    el.addEventListener("mousemove", this.mousemove.bind(this));
+    el.addEventListener("touchstart", this.mousedown.bind(this));
+    el.addEventListener("touchend", this.mouseup.bind(this));
+    el.addEventListener("touchmove", this.mousemove.bind(this));
     this.hasEventListener = true;
   }
+  async mousedown(ev) {
+    lastMouseDownX = ev.clientX;
+    lastMouseDownY = ev.clientY;
+  }
+  async mouseup(ev) {
+    if (Math.abs(lastMouseDownX - ev.clientX) < 3 && Math.abs(lastMouseDownY - ev.clientY) < 3) {
+      await this.processMouseEvent(ev);
+    }
+  }
+  async mousemove(ev) {
+    await this.processMouseEvent(ev);
+  }
   unbindEvents(el, _scope) {
     let doc = el.ownerDocument;
     doc.removeEventListener("keyup", this.toolboxShowDelayed.bind(this));
@@ -49443,6 +49590,12 @@ var TextHighlighter = class {
     if (this.isAndroid()) {
       el.removeEventListener("contextmenu", this.disableContext);
     }
+    el.removeEventListener("mousedown", this.mousedown.bind(this));
+    el.removeEventListener("mouseup", this.mouseup.bind(this));
+    el.removeEventListener("mousemove", this.mousemove.bind(this));
+    el.removeEventListener("touchstart", this.mousedown.bind(this));
+    el.removeEventListener("touchend", this.mouseup.bind(this));
+    el.removeEventListener("touchmove", this.mousemove.bind(this));
     this.hasEventListener = false;
   }
   destroy() {
@@ -50219,12 +50372,12 @@ var TextHighlighter = class {
     }
     throw new Error("Bad Hex");
   }
-  resetHighlightBoundingStyle(_win, highlightBounding) {
+  resetHighlightBoundingStyle(highlightBounding) {
     highlightBounding.style.outline = "none";
     highlightBounding.style.setProperty("background-color", "transparent", "important");
   }
-  resetHighlightAreaStyle(win, highlightArea, id_container) {
-    let doc = win.document;
+  resetHighlightAreaStyle(highlightArea, id_container) {
+    let doc = this.delegate.iframes[0].contentWindow?.document;
     const id2 = highlightArea.parentNode && highlightArea.parentNode.nodeType === Node.ELEMENT_NODE && highlightArea.parentNode.getAttribute ? highlightArea.parentNode.getAttribute("id") : void 0;
     if (id2) {
       const highlight = _highlights.find((h) => {
@@ -50289,9 +50442,11 @@ var TextHighlighter = class {
           }
         }
         let highlightParent;
-        let container = doc.getElementById(id_container);
-        if (container) {
-          highlightParent = container.querySelector(`#${highlight.id}`);
+        if (doc) {
+          let container = doc.getElementById(id_container);
+          if (container) {
+            highlightParent = container.querySelector(`#${highlight.id}`);
+          }
         }
         if (highlightParent) {
           let nodeList = highlightParent.getElementsByClassName(CLASS_HIGHLIGHT_ICON);
@@ -50305,8 +50460,7 @@ var TextHighlighter = class {
       }
     }
   }
-  setHighlightAreaStyle(win, highlightAreas, highlight) {
-    let doc = win.document;
+  setHighlightAreaStyle(doc, highlightAreas, highlight) {
     for (const highlightArea of highlightAreas) {
       if (highlight.marker === AnnotationMarker.Custom || highlight.marker === AnnotationMarker.Bookmark) {
         if (highlight.style?.hover) {
@@ -50431,10 +50585,13 @@ var TextHighlighter = class {
   isAndroid() {
     return navigator.userAgent.match(/Android/i) != null;
   }
-  async processMouseEvent(win, ev) {
-    const doc = win.document;
+  async processMouseEvent(ev) {
+    const doc = this.delegate.iframes[0].contentWindow?.document;
     const x = ev.clientX;
     const y = ev.clientY;
+    if (!doc) {
+      return;
+    }
     if (!doc.getElementById(HighlightContainer.R2_ID_HIGHLIGHTS_CONTAINER) && !doc.getElementById(HighlightContainer.R2_ID_SEARCH_CONTAINER) && !doc.getElementById(HighlightContainer.R2_ID_PAGEBREAK_CONTAINER) && !doc.getElementById(HighlightContainer.R2_ID_READALOUD_CONTAINER) && !doc.getElementById(HighlightContainer.R2_ID_DEFINITIONS_CONTAINER)) {
       return;
     }
@@ -50450,7 +50607,9 @@ var TextHighlighter = class {
       let highlightParent = doc.getElementById(`${highlight.id}`);
       if (!highlightParent) {
         let container = doc.getElementById(HighlightContainer.R2_ID_HIGHLIGHTS_CONTAINER);
-        highlightParent = container.querySelector(`#${highlight.id}`);
+        if (container) {
+          highlightParent = container.querySelector(`#${highlight.id}`);
+        }
       }
       if (!highlightParent) {
         continue;
@@ -50478,11 +50637,11 @@ var TextHighlighter = class {
         if (container) {
           const highlightBoundings = container.querySelectorAll(`.${CLASS_HIGHLIGHT_BOUNDING_AREA}`);
           for (const highlightBounding of highlightBoundings) {
-            this.resetHighlightBoundingStyle(win, highlightBounding);
+            this.resetHighlightBoundingStyle(highlightBounding);
           }
           const allHighlightAreas = Array.from(container.querySelectorAll(`.${CLASS_HIGHLIGHT_AREA}`));
           for (const highlightArea of allHighlightAreas) {
-            this.resetHighlightAreaStyle(win, highlightArea, id2);
+            this.resetHighlightAreaStyle(highlightArea, id2);
           }
         }
       }
@@ -50497,12 +50656,12 @@ var TextHighlighter = class {
             const allHighlightAreas = container.querySelectorAll(`.${CLASS_HIGHLIGHT_AREA}`);
             for (const highlightArea of allHighlightAreas) {
               if (foundElementHighlightAreas.indexOf(highlightArea) < 0) {
-                this.resetHighlightAreaStyle(win, highlightArea, id2);
+                this.resetHighlightAreaStyle(highlightArea, id2);
               }
             }
           }
         }
-        this.setHighlightAreaStyle(win, foundElementHighlightAreas, foundHighlight);
+        this.setHighlightAreaStyle(doc, foundElementHighlightAreas, foundHighlight);
         const foundElementHighlightBounding = foundElement.querySelector(`.${CLASS_HIGHLIGHT_BOUNDING_AREA}`);
         for (let id2 in HighlightContainer) {
           let container = doc.getElementById(id2);
@@ -50510,7 +50669,7 @@ var TextHighlighter = class {
             const allHighlightBoundings = container.querySelectorAll(`.${CLASS_HIGHLIGHT_BOUNDING_AREA}`);
             for (const highlightBounding of allHighlightBoundings) {
               if (!foundElementHighlightBounding || highlightBounding !== foundElementHighlightBounding) {
-                this.resetHighlightBoundingStyle(win, highlightBounding);
+                this.resetHighlightBoundingStyle(highlightBounding);
               }
             }
           }
@@ -50643,6 +50802,7 @@ var TextHighlighter = class {
             popup.showPopup(foundElement.dataset.definition, ev);
           }
           let result = this.delegate.definitionsModule?.properties?.definitions?.filter((el) => el.order === Number(foundElement?.dataset.order))[0];
+          console.log(result);
           if (this.delegate.definitionsModule?.api?.click) {
             this.delegate.definitionsModule.api?.click(lodash.omit(result, "callbacks"), lodash.omit(foundHighlight, "definition"));
             this.delegate.emit("definition.click", result, foundHighlight);
@@ -50658,31 +50818,7 @@ var TextHighlighter = class {
   }
   async ensureHighlightsContainer(win, id2) {
     const doc = win.document;
-    let self2 = this;
     if (!doc.getElementById(id2)) {
-      if (!bodyEventListenersSet) {
-        bodyEventListenersSet = true;
-        async function mousedown(ev) {
-          lastMouseDownX = ev.clientX;
-          lastMouseDownY = ev.clientY;
-        }
-        async function mouseup(ev) {
-          if (Math.abs(lastMouseDownX - ev.clientX) < 3 && Math.abs(lastMouseDownY - ev.clientY) < 3) {
-            self2.processMouseEvent(win, ev);
-          }
-        }
-        async function mousemove(ev) {
-          self2.processMouseEvent(win, ev);
-        }
-        if (doc.body) {
-          doc.body.addEventListener("mousedown", mousedown, false);
-          doc.body.addEventListener("mouseup", mouseup, false);
-          doc.body.addEventListener("mousemove", mousemove, false);
-          doc.body.addEventListener("touchstart", mousedown, false);
-          doc.body.addEventListener("touchend", mouseup, false);
-          doc.body.addEventListener("touchmove", mousemove, false);
-        }
-      }
       let container = doc.createElement("div");
       container.setAttribute("id", id2);
       container.style.setProperty("pointer-events", "none");
@@ -51131,7 +51267,7 @@ var TextHighlighter = class {
           }
         }
         const foundElementHighlightAreas = Array.from(highlightParent.querySelectorAll(`.${CLASS_HIGHLIGHT_AREA}`));
-        self2.setHighlightAreaStyle(win, foundElementHighlightAreas, highlight);
+        self2.setHighlightAreaStyle(doc, foundElementHighlightAreas, highlight);
       });
     }
     if (highlight.note) {
@@ -52390,6 +52526,7 @@ var MediaOverlaySettings = class {
     this.volume = 1;
     this.rate = 1;
     this.playing = false;
+    this.resourceReady = false;
     this.wait = 1;
     this.settingsChangeCallback = () => {
     };
@@ -52687,7 +52824,7 @@ var MediaOverlayModule = class {
         console.log("ontimeupdate");
       this.trackCurrentTime();
     };
-    this.ensureOnTimeUpdate = (remove) => {
+    this.ensureOnTimeUpdate = (remove, replace) => {
       if (this.audioElement) {
         if (remove) {
           if (this.__ontimeupdate) {
@@ -52696,8 +52833,11 @@ var MediaOverlayModule = class {
             cancelAnimationFrame(this.myReq);
           }
         } else {
-          if (!this.__ontimeupdate) {
+          if (!this.__ontimeupdate || replace) {
             this.__ontimeupdate = true;
+            if (replace) {
+              this.audioElement.removeEventListener("timeupdate", this.ontimeupdate);
+            }
             this.audioElement.addEventListener("timeupdate", this.ontimeupdate);
           }
         }
@@ -52741,7 +52881,7 @@ var MediaOverlayModule = class {
   async playLink() {
     let link = this.currentLinks[this.currentLinkIndex];
     if (link?.Properties?.MediaOverlay) {
-      this.ensureOnTimeUpdate(false);
+      this.ensureOnTimeUpdate(false, false);
       const moUrl = link.Properties?.MediaOverlay;
       const moUrlObjFull = new URL(moUrl, this.publication.manifestUrl);
       const moUrlFull = moUrlObjFull.toString();
@@ -52781,6 +52921,7 @@ var MediaOverlayModule = class {
         await this.playLink();
       } else {
         if (this.settings.autoTurn && this.settings.playing) {
+          this.audioElement.pause();
           this.delegate.nextResource();
         } else {
           this.stopReadAloud();
@@ -52795,6 +52936,7 @@ var MediaOverlayModule = class {
         const timeToSeekTo = this.currentAudioBegin ? this.currentAudioBegin : 0;
         this.audioElement.currentTime = timeToSeekTo;
         await this.audioElement.play();
+        this.ensureOnTimeUpdate(false, true);
         this.audioElement.volume = this.settings.volume;
         this.audioElement.playbackRate = this.settings.rate;
       } else {
@@ -52962,6 +53104,7 @@ var MediaOverlayModule = class {
         } else {
           this.audioElement.pause();
           if (this.settings.autoTurn && this.settings.playing) {
+            this.audioElement.pause();
             this.delegate.nextResource();
           } else {
             this.stopReadAloud();
@@ -52999,6 +53142,7 @@ var MediaOverlayModule = class {
       } else {
         this.audioElement.pause();
         if (this.settings.autoTurn && this.settings.playing) {
+          this.audioElement.pause();
           this.delegate.nextResource();
         } else {
           this.stopReadAloud();
@@ -53106,17 +53250,22 @@ var MediaOverlayModule = class {
           if (IS_DEV) {
             console.log("playMediaOverlaysAudio() - playClip() - _currentAudioElement.play()");
           }
-          this.ensureOnTimeUpdate(false);
+          this.ensureOnTimeUpdate(false, false);
           this.audioElement.playbackRate = this.settings.rate;
           this.audioElement.volume = this.settings.volume;
           if (this.settings.playing) {
-            if (!initial) {
-              setTimeout(async () => {
-                await this.audioElement.play();
-              }, this.settings.wait);
-            } else {
-              await this.audioElement.play();
-            }
+            let checkReady = function() {
+              if (!self2.settings.resourceReady) {
+                setTimeout(checkReady, 200);
+              } else {
+                setTimeout(async () => {
+                  await self2.audioElement.play();
+                  self2.ensureOnTimeUpdate(false, true);
+                }, self2.settings.wait * 1e3);
+              }
+            };
+            let self2 = this;
+            checkReady();
           }
         } else {
           if (IS_DEV) {
@@ -53127,18 +53276,23 @@ var MediaOverlayModule = class {
             if (IS_DEV) {
               console.log("playMediaOverlaysAudio() - playClip() - ontimeupdateSeeked - .play()");
             }
-            this.ensureOnTimeUpdate(false);
+            this.ensureOnTimeUpdate(false, false);
             if (this.audioElement) {
               this.audioElement.playbackRate = this.settings.rate;
               this.audioElement.volume = this.settings.volume;
               if (this.settings.playing) {
-                if (!initial) {
-                  setTimeout(async () => {
-                    await this.audioElement.play();
-                  }, this.settings.wait);
-                } else {
-                  await this.audioElement.play();
-                }
+                let checkReady = function() {
+                  if (!self2.settings.resourceReady) {
+                    setTimeout(checkReady, 200);
+                  } else {
+                    setTimeout(async () => {
+                      await self2.audioElement.play();
+                      self2.ensureOnTimeUpdate(false, true);
+                    }, self2.settings.wait * 1e3);
+                  }
+                };
+                let self2 = this;
+                checkReady();
               }
             }
           };
@@ -53147,7 +53301,7 @@ var MediaOverlayModule = class {
         }
       } else {
         const contiguous = this.previousAudioUrl === this.currentAudioUrl && typeof this.previousAudioEnd !== "undefined" && this.previousAudioEnd > timeToSeekTo - 0.02 && this.previousAudioEnd <= timeToSeekTo && this.audioElement.currentTime >= timeToSeekTo - 0.1;
-        this.ensureOnTimeUpdate(false);
+        this.ensureOnTimeUpdate(false, false);
         if (contiguous) {
           if (IS_DEV) {
             console.log("playMediaOverlaysAudio() - playClip() - ensureOnTimeUpdate");
@@ -53204,6 +53358,7 @@ var MediaOverlayModule = class {
           await this.playLink();
         } else {
           if (this.settings.autoTurn && this.settings.playing) {
+            this.audioElement.pause();
             this.delegate.nextResource();
           } else {
             this.stopReadAloud();
@@ -53315,7 +53470,7 @@ var TimelineModule = class {
     if (this.delegate.rights.enableMaterial) {
       this.positionSlider = findElement(document, "#positionSlider");
     }
-    if (this.delegate.rights.autoGeneratePositions && this.publication.positions) {
+    if (this.publication.positions) {
       if (this.positionSlider)
         this.positionSlider.style.display = "block";
     } else {
@@ -53795,18 +53950,25 @@ var ContentProtectionModule = class {
     }
   }
   recalculate(delay2 = 0) {
-    if (this.properties?.enableObfuscation) {
-      const onDoResize = (0, import_debounce3.debounce)(() => {
-        this.calcRects(this.rects);
-        if (this.rects !== void 0) {
-          this.rects.forEach((rect) => this.toggleRect(rect, this.securityContainer, this.isHacked));
+    return new Promise((resolve) => {
+      if (this.properties?.enableObfuscation) {
+        const onDoResize = (0, import_debounce3.debounce)(() => {
+          this.calcRects(this.rects);
+          if (this.rects !== void 0) {
+            this.rects.forEach((rect) => this.toggleRect(rect, this.securityContainer, this.isHacked));
+          }
+          resolve(true);
+        }, delay2);
+        if (this.rects) {
+          this.observe();
+          onDoResize();
+        } else {
+          resolve(false);
         }
-      }, delay2);
-      if (this.rects) {
-        this.observe();
-        onDoResize();
+      } else {
+        resolve(false);
       }
-    }
+    });
   }
   calcRects(rects) {
     if (rects !== void 0) {
@@ -55617,6 +55779,14 @@ var IFrameNavigator = class extends import_events.default {
         this.nextChapterBottomAnchorElement.style.display = "none";
       if (this.previousChapterTopAnchorElement)
         this.previousChapterTopAnchorElement.style.display = "none";
+      if (this.keyboardEventHandler) {
+        this.keyboardEventHandler.onBackwardSwipe = this.handlePreviousChapterClick.bind(this);
+        this.keyboardEventHandler.onForwardSwipe = this.handleNextChapterClick.bind(this);
+      }
+      if (this.touchEventHandler) {
+        this.touchEventHandler.onBackwardSwipe = this.handlePreviousPageClick.bind(this);
+        this.touchEventHandler.onForwardSwipe = this.handleNextPageClick.bind(this);
+      }
     } else {
       this.settings.isPaginated().then((paginated) => {
         if (paginated) {
@@ -56089,6 +56259,11 @@ var IFrameNavigator = class extends import_events.default {
           this.view?.goToProgression(bookViewPosition);
         }
         this.newPosition = void 0;
+        if (this.rights?.enableContentProtection) {
+          if (this.contentProtectionModule !== void 0) {
+            await this.contentProtectionModule.recalculate(10);
+          }
+        }
         this.hideLoadingMessage();
         this.showIframeContents();
         if (this.rights.enableMediaOverlays && this.mediaOverlayModule !== void 0 && this.hasMediaOverlays) {
@@ -56097,6 +56272,11 @@ var IFrameNavigator = class extends import_events.default {
         }
         await this.updatePositionInfo();
         await this.view?.setSize();
+        setTimeout(() => {
+          if (this.mediaOverlayModule !== void 0) {
+            this.mediaOverlayModule.settings.resourceReady = true;
+          }
+        }, 300);
       }, 200);
       return new Promise((resolve) => resolve());
     } catch (err) {
@@ -57401,6 +57581,9 @@ var IFrameNavigator = class extends import_events.default {
       this.loadingMessage.style.display = "block";
       this.loadingMessage.classList.add("is-loading");
     }
+    if (this.mediaOverlayModule !== void 0) {
+      this.mediaOverlayModule.settings.resourceReady = false;
+    }
   }
   hideIframeContents() {
     this.isBeingStyled = true;
@@ -58265,9 +58448,12 @@ var TTSModule = class {
       }
     });
   }
-  cancel() {
-    if (this.api?.stopped)
-      this.api?.stopped();
+  cancel(api = true) {
+    if (api) {
+      if (this.api?.stopped)
+        this.api?.stopped();
+      this.delegate.emit("readaloud.stopped", "stopped");
+    }
     this.userScrolled = false;
     window.speechSynthesis.cancel();
     if (this.splittingResult && this.delegate.tts?.enableSplitter) {
@@ -58296,7 +58482,7 @@ var TTSModule = class {
       this.api?.started();
     var self2 = this;
     this.userScrolled = false;
-    this.cancel();
+    this.cancel(false);
     if (this.delegate.tts?.enableSplitter) {
       if (partial) {
         var allWords = self2.body.querySelectorAll("[data-word]");
@@ -58710,10 +58896,12 @@ var TTSModule2 = class {
       }
     });
   }
-  cancel() {
-    if (this.api?.stopped)
-      this.api?.stopped();
-    this.delegate.emit("readaloud.stopped", "stopped");
+  cancel(api = true) {
+    if (api) {
+      if (this.api?.stopped)
+        this.api?.stopped();
+      this.delegate.emit("readaloud.stopped", "stopped");
+    }
     this.userScrolled = false;
     this.speaking = false;
     setTimeout(() => {
@@ -58730,7 +58918,7 @@ var TTSModule2 = class {
     this.delegate.emit("readaloud.started", "started");
     const self2 = this;
     this.userScrolled = false;
-    this.cancel();
+    this.cancel(false);
     let utterance;
     if (partial) {
       let iframe = document.querySelector("main#iframe-wrapper iframe");
@@ -58870,7 +59058,9 @@ var TTSModule2 = class {
     callback();
   }
   speakPlay() {
-    this.cancel();
+    this.cancel(false);
+    if (this.api?.started)
+      this.api?.started();
     this.delegate.emit("readaloud.started", "started");
     let self2 = this;
     let iframe = document.querySelector("main#iframe-wrapper iframe");
@@ -58880,47 +59070,27 @@ var TTSModule2 = class {
         let node = self2.highlighter.visibleTextRects[0];
         let doc = self2.delegate.iframes[0].contentDocument;
         if (doc) {
-          let isOutsideViewport = function(rect) {
-            const windowLeft = window.scrollX;
-            const windowRight = windowLeft + window.innerWidth;
-            const right = rect.left + rect.width;
-            const bottom = rect.top + rect.height;
-            const windowTop = window.scrollY;
-            const windowBottom = windowTop + window.innerHeight;
-            const isAbove = bottom < windowTop;
-            const isBelow = rect.top > windowBottom;
-            const isLeft = right < windowLeft;
-            const isRight = rect.left > windowRight;
-            return isAbove || isBelow || isLeft || isRight;
-          };
           const range = self2.highlighter.dom(doc.body).getWindow().document.createRange();
           const selection = self2.highlighter.dom(self2.delegate.iframes[0].contentDocument?.body).getSelection();
           selection.removeAllRanges();
           range.selectNodeContents(node.node);
           selection.addRange(range);
-          const clientRects = getClientRectsNoOverlap(range, false);
           let index2 = 0;
-          for (const rect of clientRects) {
-            if (!isOutsideViewport(rect)) {
-              const endNode = selection.focusNode;
-              const endOffset = selection.focusOffset;
-              selection.collapse(selection.anchorNode, selection.anchorOffset);
-              for (let i = 0; i < index2; i++) {
-                selection.modify("move", "forward", "line");
-              }
-              selection.extend(endNode, endOffset);
-              selection.collapse(selection.anchorNode, selection.anchorOffset);
-              if (rootEl) {
-                const idx = self2.findTtsQueueItemIndex(ttsQueue, selection.anchorNode, selection.focusNode, selection.focusOffset, rootEl);
-                if (idx >= 0) {
-                  ttsQueueIndex = idx;
-                }
-              }
-              selection.removeAllRanges();
-              break;
+          const endNode = selection.focusNode;
+          const endOffset = selection.focusOffset;
+          selection.collapse(selection.anchorNode, selection.anchorOffset);
+          for (let i = 0; i < index2; i++) {
+            selection.modify("move", "forward", "line");
+          }
+          selection.extend(endNode, endOffset);
+          selection.collapse(selection.anchorNode, selection.anchorOffset);
+          if (rootEl) {
+            const idx = self2.findTtsQueueItemIndex(ttsQueue, selection.anchorNode, selection.focusNode, selection.focusOffset, rootEl);
+            if (idx >= 0) {
+              ttsQueueIndex = idx;
             }
-            index2++;
           }
+          selection.removeAllRanges();
         }
       };
       const ttsQueue = this.generateTtsQueue(rootEl, true);
@@ -58934,7 +59104,7 @@ var TTSModule2 = class {
       }
       setTimeout(() => {
         this.startTTSSession(ttsQueue, ttsQueueIndex);
-      }, 100);
+      }, 200);
     }
   }
   speakPause() {
@@ -59622,7 +59792,7 @@ var DefinitionsModule = class {
                 }
               });
             }, { threshold: 1 });
-            if (highlightFragments) {
+            if (highlightFragments && highlightFragments.length > 0) {
               observer.observe(highlightFragments[0]);
             }
           });
@@ -59684,11 +59854,13 @@ init_polyfills();
 var DEFAULT_BACKGROUND_COLOR_OPACITY2 = 0.5;
 var LineFocusModule = class {
   constructor(delegate, properties, highlighter, api) {
+    this.hasEventListener = false;
     this.lines = [];
     this.index = 0;
     this.isActive = false;
     this.isDebug = false;
     this.lineFocusContainer = document.getElementById(`lineFocusContainer`);
+    this.readerContainer = document.getElementById(`D2Reader-Container`);
     this.lineFocusTopBlinder = document.getElementById(`lineFocusTopBlinder`);
     this.lineFocusBottomBlinder = document.getElementById(`lineFocusBottomBlinder`);
     this.wrapperHeight = void 0;
@@ -59706,9 +59878,59 @@ var LineFocusModule = class {
     if (IS_DEV) {
       console.log("Definitions module stop");
     }
+    this.hasEventListener = false;
+    removeEventListenerOptional(document, "keydown", this.keydown.bind(this));
+    removeEventListenerOptional(document, "keyup", this.keyup.bind(this));
+    removeEventListenerOptional(this.delegate.iframes[0].contentDocument, "keydown", this.keydown.bind(this));
+    removeEventListenerOptional(this.delegate.iframes[0].contentDocument, "keyup", this.keyup.bind(this));
   }
   async start() {
     this.delegate.lineFocusModule = this;
+    const wrapper = findRequiredElement(document, "#iframe-wrapper");
+    if (wrapper.style.height.length > 0) {
+      this.wrapperHeight = wrapper.style.height;
+      if (this.lineFocusContainer && this.lineFocusContainer.style.height.length == 0)
+        this.lineFocusContainer.style.height = this.wrapperHeight;
+      if (this.readerContainer && this.readerContainer.style.height.length == 0) {
+        this.readerContainer.style.height = this.wrapperHeight;
+      }
+      if (this.readerContainer) {
+        this.readerContainer.style.overflow = "hidden";
+      }
+    }
+    if (!this.hasEventListener) {
+      this.hasEventListener = true;
+      addEventListenerOptional(document, "keydown", this.keydown.bind(this));
+      addEventListenerOptional(document, "keyup", this.keyup.bind(this));
+      addEventListenerOptional(this.delegate.iframes[0].contentDocument, "keydown", this.keydown.bind(this));
+      addEventListenerOptional(this.delegate.iframes[0].contentDocument, "keyup", this.keyup.bind(this));
+    }
+  }
+  keydown(event) {
+    if (event instanceof KeyboardEvent && this.isActive) {
+      const key = event.key;
+      switch (key) {
+        case "ArrowUp":
+          event.stopPropagation();
+          break;
+        case "ArrowDown":
+          event.stopPropagation();
+          break;
+      }
+    }
+  }
+  keyup(event) {
+    if (event instanceof KeyboardEvent && this.isActive) {
+      const key = event.key;
+      switch (key) {
+        case "ArrowUp":
+          this.lineUp();
+          break;
+        case "ArrowDown":
+          this.lineDown();
+          break;
+      }
+    }
   }
   handleResize() {
     if (this.isActive) {
@@ -59716,14 +59938,6 @@ var LineFocusModule = class {
     }
   }
   async enableLineFocus() {
-    if (!this.isActive) {
-      const wrapper = findRequiredElement(document, "#iframe-wrapper");
-      wrapper.style.overflow = "hidden";
-      if (wrapper.style.height.length > 0) {
-        this.wrapperHeight = wrapper.style.height;
-      }
-      wrapper.style.height = "100vh";
-    }
     this.isActive = true;
     await this.delegate.settings.scroll(true);
     this.lineFocus();
@@ -59731,12 +59945,15 @@ var LineFocusModule = class {
   disableLineFocus(resetHeight = true) {
     this.isActive = false;
     const wrapper = findRequiredElement(document, "#iframe-wrapper");
-    wrapper.style.overflow = "auto";
     if (this.wrapperHeight) {
       wrapper.style.height = this.wrapperHeight;
-    } else if (resetHeight) {
-      wrapper.style.removeProperty("height");
     }
+    if (!resetHeight) {
+      this.index = 0;
+    }
+    const doc = this.delegate.iframes[0].contentDocument;
+    const html = findIframeElement(doc, "html");
+    html.style.removeProperty("--USER__maxMediaHeight");
     this.wrapperHeight = void 0;
     if (this.lineFocusContainer)
       this.lineFocusContainer.style.display = "none";
@@ -59756,6 +59973,10 @@ var LineFocusModule = class {
   }
   lineFocus() {
     const wrapper = findRequiredElement(document, "#iframe-wrapper");
+    const doc = this.delegate.iframes[0].contentDocument;
+    const html = findIframeElement(doc, "html");
+    let maxHeight = this.properties.maxHeight ? getHeight() * this.properties.maxHeight / 100 : getHeight() / 2;
+    html.style.setProperty("--USER__maxMediaHeight", maxHeight + "px");
     function insertAfter(referenceNode, newNode) {
       referenceNode.parentNode.insertBefore(newNode, referenceNode.nextSibling);
     }
@@ -59787,8 +60008,6 @@ var LineFocusModule = class {
       insertAfter(wrapper, divAfter2);
     }
     this.lines = [];
-    const self2 = this;
-    const doc = self2.delegate.iframes[0].contentDocument;
     if (doc) {
       let random_rgba = function() {
         const o = Math.round, r = Math.random, s = 255;
@@ -59951,10 +60170,8 @@ var LineFocusModule = class {
   }
   currentLine() {
     let current = this.lines[this.index];
-    let previous = this.lines[this.index];
-    let next = this.lines[this.index];
-    let top = previous.style.top;
-    let bottom = parseInt(next.style.top.replace("px", "")) + parseInt(next.style.height.replace("px", ""));
+    let top = current.style.top;
+    let bottom = parseInt(current.style.top.replace("px", "")) + parseInt(current.style.height.replace("px", ""));
     let height = bottom - parseInt(top.replace("px", ""));
     if (this.lineFocusContainer) {
       let lineFocusHeight = parseInt(getComputedStyle(this.lineFocusContainer).height.replace("px", ""));
@@ -59964,7 +60181,6 @@ var LineFocusModule = class {
       if (this.lineFocusBottomBlinder)
         this.lineFocusBottomBlinder.style.height = blindersHeight + "px";
     }
-    current.focus();
     current.scrollIntoView({
       block: "center",
       behavior: "smooth"
@@ -59977,10 +60193,8 @@ var LineFocusModule = class {
         this.index = this.lines.length - 1;
       }
       let current = this.lines[this.index];
-      let previous = this.lines[this.index];
-      let next = this.lines[this.index];
-      let top = previous.style.top;
-      let bottom = parseInt(next.style.top.replace("px", "")) + parseInt(next.style.height.replace("px", ""));
+      let top = current.style.top;
+      let bottom = parseInt(current.style.top.replace("px", "")) + parseInt(current.style.height.replace("px", ""));
       let height = bottom - parseInt(top.replace("px", ""));
       if (this.lineFocusContainer) {
         let lineFocusHeight = parseInt(getComputedStyle(this.lineFocusContainer).height.replace("px", ""));
@@ -59990,7 +60204,6 @@ var LineFocusModule = class {
         if (this.lineFocusBottomBlinder)
           this.lineFocusBottomBlinder.style.height = blindersHeight + "px";
       }
-      current.focus();
       current.scrollIntoView({
         block: "center",
         behavior: "smooth"
@@ -60004,10 +60217,8 @@ var LineFocusModule = class {
         this.index = 0;
       }
       let current = this.lines[this.index];
-      let previous = this.lines[this.index];
-      let next = this.lines[this.index];
-      let top = previous.style.top;
-      let bottom = parseInt(next.style.top.replace("px", "")) + parseInt(next.style.height.replace("px", ""));
+      let top = current.style.top;
+      let bottom = parseInt(current.style.top.replace("px", "")) + parseInt(current.style.height.replace("px", ""));
       let height = bottom - parseInt(top.replace("px", ""));
       if (this.lineFocusContainer) {
         let lineFocusHeight = parseInt(getComputedStyle(this.lineFocusContainer).height.replace("px", ""));
@@ -60017,7 +60228,6 @@ var LineFocusModule = class {
         if (this.lineFocusBottomBlinder)
           this.lineFocusBottomBlinder.style.height = blindersHeight + "px";
       }
-      current.focus();
       current.scrollIntoView({
         block: "center",
         behavior: "smooth"
@@ -60029,10 +60239,14 @@ var LineFocusModule = class {
   }
   findRects(parent) {
     const textNodes = this.findTextNodes(parent);
+    const imageNodes = Array.from(parent.getElementsByTagName("img"));
     let newNodes = [];
     textNodes.forEach((node) => {
       newNodes.push(...this.measureTextNodes(node));
     });
+    imageNodes.forEach((node) => {
+      newNodes.push(...this.measureImageNodes(node));
+    });
     return newNodes;
   }
   findTextNodes(parentElement, nodes = []) {
@@ -60065,6 +60279,21 @@ var LineFocusModule = class {
       }
     }
   }
+  measureImageNodes(node) {
+    try {
+      const range = document.createRange();
+      range.selectNode(node);
+      const rect = Array.from(range.getClientRects());
+      range.detach();
+      return rect;
+    } catch (error) {
+      if (IS_DEV) {
+        console.log("measureTextNode " + error);
+        console.log("measureTextNode " + node);
+        console.log(node.textContent);
+      }
+    }
+  }
 };
 
 // src/reader.ts
@@ -60444,6 +60673,9 @@ var D2Reader = class {
     }, initialConfig.lineFocus)) : void 0;
     return new D2Reader(settings, navigator2, highlighter, bookmarkModule, annotationModule, ttsSettings, ttsModule, searchModule, definitionsModule, contentProtectionModule, timelineModule, mediaOverlaySettings, mediaOverlayModule, pageBreakModule, lineFocusModule);
   }
+  get hasMediaOverlays() {
+    return this.navigator.hasMediaOverlays;
+  }
   get tableOfContents() {
     return convertAndCamel(this.navigator.tableOfContents()) ?? [];
   }
@@ -60491,14 +60723,23 @@ var D2Reader = class {
   }
   async applyLineFocusSettings(userSettings) {
     if (userSettings.lines) {
-      if (this.lineFocusModule)
+      if (this.lineFocusModule) {
+        const lines = this.lineFocusModule.properties.lines ?? 1;
+        this.lineFocusModule.index = this.lineFocusModule.index * lines / parseInt(userSettings.lines);
+        this.lineFocusModule.index = Math.abs(parseInt(this.lineFocusModule.index.toFixed()));
         this.lineFocusModule.properties.lines = parseInt(userSettings.lines);
-      await this.lineFocusModule?.enableLineFocus();
+        if (this.lineFocusModule.isActive) {
+          await this.lineFocusModule.enableLineFocus();
+        }
+      }
     }
     if (userSettings.debug !== void 0) {
-      if (this.lineFocusModule)
+      if (this.lineFocusModule) {
         this.lineFocusModule.isDebug = userSettings.debug;
-      await this.lineFocusModule?.enableLineFocus();
+        if (this.lineFocusModule.isActive) {
+          await this.lineFocusModule.enableLineFocus();
+        }
+      }
     }
   }
   lineUp() {
@@ -60530,7 +60771,7 @@ function updateConfig(rights, publication) {
     rights.enablePageBreaks = false;
     rights.enableLineFocus = false;
   }
-  if (publication.sample) {
+  if (publication.sample?.isSampleRead) {
     rights.enableAnnotations = false;
     rights.enableSearch = false;
     rights.enableTTS = false;