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

package/dist/esm/index.js

@@ -46855,7 +46855,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 +46881,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) {
@@ -52688,7 +52688,7 @@ var MediaOverlayModule = class {
         console.log("ontimeupdate");
       this.trackCurrentTime();
     };
-    this.ensureOnTimeUpdate = (remove) => {
+    this.ensureOnTimeUpdate = (remove, replace) => {
       if (this.audioElement) {
         if (remove) {
           if (this.__ontimeupdate) {
@@ -52697,8 +52697,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);
           }
         }
@@ -52742,7 +52745,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();
@@ -52797,6 +52800,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 {
@@ -53110,25 +53114,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) {
-              let checkReady = function() {
-                if (!self2.settings.resourceReady) {
-                  setTimeout(checkReady, 200);
-                } else {
-                  setTimeout(async () => {
-                    await self2.audioElement.play();
-                  }, self2.settings.wait * 1200);
-                }
-              };
-              let self2 = this;
-              checkReady();
-            } 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) {
@@ -53139,26 +53140,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) {
-                  let checkReady = function() {
-                    if (!self2.settings.resourceReady) {
-                      setTimeout(checkReady, 200);
-                    } else {
-                      setTimeout(async () => {
-                        await self2.audioElement.play();
-                      }, self2.settings.wait * 1200);
-                    }
-                  };
-                  let self2 = this;
-                  checkReady();
-                } 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();
               }
             }
           };
@@ -53167,7 +53165,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");
@@ -53816,18 +53814,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) {
@@ -56110,6 +56115,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) {
@@ -58739,10 +58749,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(() => {
@@ -58759,7 +58771,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");
@@ -58899,7 +58911,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");
@@ -58909,47 +58923,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);
@@ -58963,7 +58957,7 @@ var TTSModule2 = class {
       }
       setTimeout(() => {
         this.startTTSSession(ttsQueue, ttsQueueIndex);
-      }, 100);
+      }, 200);
     }
   }
   speakPause() {
@@ -59651,7 +59645,7 @@ var DefinitionsModule = class {
                 }
               });
             }, { threshold: 1 });
-            if (highlightFragments) {
+            if (highlightFragments && highlightFragments.length > 0) {
               observer.observe(highlightFragments[0]);
             }
           });