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

package/dist/esm/index.js

@@ -44034,14 +44034,14 @@ function findElement(parentElement, selector2) {
 function findRequiredElement(parentElement, selector2) {
   const element = findElement(parentElement, selector2);
   if (!element) {
-    throw "required element " + selector2 + " not found";
+    throw new Error("required element " + selector2 + " not found");
   } else {
     return element;
   }
 }
 function findIframeElement(parentElement, selector2) {
   if (parentElement === null) {
-    throw "parent element is null";
+    throw new Error("parent element is null");
   } else {
     return parentElement.querySelector(selector2);
   }
@@ -44049,7 +44049,7 @@ function findIframeElement(parentElement, selector2) {
 function findRequiredIframeElement(parentElement, selector2) {
   const element = findIframeElement(parentElement, selector2);
   if (!element) {
-    throw "required element " + selector2 + " not found in iframe";
+    throw new Error("required element " + selector2 + " not found in iframe");
   } else {
     return element;
   }
@@ -44198,7 +44198,7 @@ var EventHandler = class {
           event.stopPropagation();
         } else {
           event.target.href = link.href;
-          if (isSameOrigin && isInternal !== -1) {
+          if ((isSameOrigin || isEpubInternal) && isInternal !== -1) {
             const link2 = event.target;
             if (link2) {
               const attribute = link2.getAttribute("epub:type") === "noteref";
@@ -44210,7 +44210,7 @@ var EventHandler = class {
             } else {
               this.onInternalLink(event);
             }
-          } else if (isSameOrigin && isInternal === -1) {
+          } else if ((isSameOrigin || isEpubInternal) && isInternal === -1) {
             this.onInternalLink(event);
           }
         }
@@ -44523,12 +44523,10 @@ var ReflowableBookView = class {
   setIframeHeight(iframe) {
     let d = (0, import_debounce.debounce)((iframe2) => {
       if (iframe2) {
-        let iframeWin = iframe2.contentWindow || iframe2.contentDocument.parentWindow;
-        if (iframeWin.document.body) {
-          const minHeight = getHeight() - this.attributes.margin;
-          const bodyHeight = iframeWin.document.documentElement.scrollHeight || iframeWin.document.body.scrollHeight;
-          iframe2.height = Math.max(minHeight, bodyHeight);
-        }
+        let body = iframe2.contentWindow.document.body, html = iframe2.contentWindow.document.documentElement;
+        let height = Math.max(body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight);
+        const minHeight = getHeight() - this.attributes.margin;
+        iframe2.height = Math.max(minHeight, height) + "px";
       }
     }, 200);
     d(iframe);
@@ -44544,10 +44542,8 @@ var ReflowableBookView = class {
       this.iframe.contentDocument.documentElement.style.height = this.height + "px";
       this.iframe.height = this.height + "px";
     } else {
-      let body = this.iframe.contentWindow.document.body;
-      if (body) {
-        this.iframe.height = parseInt(getComputedStyle(body).height) + "px";
-      }
+      let html = this.iframe.contentWindow.document.documentElement;
+      this.iframe.height = html.offsetHeight + "px";
     }
   }
   getLeftColumnsWidth() {
@@ -52670,7 +52666,7 @@ var IFrameNavigator = class {
     this.mainElement = mainElement;
     try {
       const wrapper = findRequiredElement(mainElement, "main#iframe-wrapper");
-      wrapper.style.overflow = "overlay";
+      wrapper.style.overflow = "auto";
       let iframe = findElement(mainElement, "main#iframe-wrapper iframe");
       let iframe2 = findElement(mainElement, "#second");
       if (iframe) {
@@ -52683,7 +52679,7 @@ var IFrameNavigator = class {
         this.settings.columnCount = 1;
       }
       if (this.iframes.length === 0) {
-        wrapper.style.overflow = "overlay";
+        wrapper.style.overflow = "auto";
         let iframe3 = document.createElement("iframe");
         iframe3.setAttribute("SCROLLING", "no");
         iframe3.setAttribute("allowtransparency", "true");
@@ -52897,7 +52893,7 @@ var IFrameNavigator = class {
       return await this.loadManifest();
     } catch (err) {
       console.error(err);
-      this.abortOnError();
+      this.abortOnError(err);
       return Promise.reject(err);
     }
   }
@@ -53258,7 +53254,7 @@ var IFrameNavigator = class {
       return new Promise((resolve) => resolve());
     } catch (err) {
       console.error(err);
-      this.abortOnError();
+      this.abortOnError(err);
       return new Promise((_, reject) => reject(err)).catch(() => {
       });
     }
@@ -53419,7 +53415,7 @@ var IFrameNavigator = class {
           this.newElementId = null;
         } else if (this.newPosition && this.newPosition.highlight) {
           this.view.goToCssSelector(this.newPosition.highlight.selectionInfo.rangeInfo.startContainerElementCssSelector);
-        } else if (bookViewPosition > 0) {
+        } else if (bookViewPosition >= 0) {
           this.view.goToProgression(bookViewPosition);
         }
         this.newPosition = null;
@@ -53438,17 +53434,21 @@ var IFrameNavigator = class {
       return new Promise((resolve) => resolve());
     } catch (err) {
       console.error(err);
-      this.abortOnError();
+      this.abortOnError(err);
       return Promise.reject(err);
     }
   }
   async injectInjectablesIntoIframeHead() {
     const injectablesToLoad = [];
     const addLoadingInjectable = (injectable) => {
-      const loadPromise = new Promise((resolve) => {
+      const loadPromise = new Promise((resolve, reject) => {
         injectable.onload = () => {
           resolve(true);
         };
+        injectable.onerror = (e) => {
+          const message = typeof e === "string" ? e : `Injectable failed to load at: ${"href" in injectable ? injectable.href : injectable.src}`;
+          reject(new Error(message));
+        };
       });
       injectablesToLoad.push(loadPromise);
     };
@@ -53498,11 +53498,16 @@ var IFrameNavigator = class {
     }
     await Promise.all(injectablesToLoad);
   }
-  abortOnError() {
-    if (this.errorMessage)
-      this.errorMessage.style.display = "block";
-    if (this.isLoading) {
-      this.hideLoadingMessage();
+  abortOnError(e) {
+    if (this.api.onError) {
+      const trueError = e instanceof Error ? e : typeof e === "string" ? new Error(e) : new Error("An unknown error occurred in the IFrameNavigator.");
+      this.api.onError(trueError);
+    } else {
+      if (this.errorMessage)
+        this.errorMessage.style.display = "block";
+      if (this.isLoading) {
+        this.hideLoadingMessage();
+      }
     }
   }
   tryAgain() {