@d-i-t-a/reader 2.0.5 → 2.0.6-beta.1

package/dist/esm/index.js

@@ -38571,13 +38571,16 @@ var TextHighlighter = class {
       let selection = self2.dom(doc.body)?.getWindow()?.getSelection();
       if (self2.dom(doc.body)) {
         if (selection && !selection?.isCollapsed) {
+          const text = selection.toString();
+          const startOffsetTemp = text.length - text.trimStart().length;
+          const endOffsetTemp = text.length - text.trimEnd().length;
           let range = document.createRange();
-          range.setStart(selection.anchorNode, selection.anchorOffset);
-          range.setEnd(selection.focusNode, selection.focusOffset);
+          range.setStart(selection.anchorNode, selection.anchorOffset + startOffsetTemp);
+          range.setEnd(selection.focusNode, selection.focusOffset - endOffsetTemp);
           let backwards = range.collapsed;
           range.detach();
-          let endNode = selection.focusNode, endOffset = selection.focusOffset;
-          selection.collapse(selection.anchorNode, selection.anchorOffset);
+          let endNode = selection.focusNode, endOffset = selection.focusOffset - endOffsetTemp;
+          selection.collapse(selection.anchorNode, selection.anchorOffset + startOffsetTemp);
           let direction = ["forward", "backward"];
           if (backwards) {
             direction = ["backward", "forward"];
@@ -38885,59 +38888,6 @@ var TextHighlighter = class {
       this.doneSpeaking();
     }
   }
-  speakAll() {
-    if (this.delegate.rights.enableTTS) {
-      let getCssSelector = function(element) {
-        const options = {
-          className: (str) => {
-            return _blacklistIdClassForCssSelectors.indexOf(str) < 0;
-          },
-          idName: (str) => {
-            return _blacklistIdClassForCssSelectors.indexOf(str) < 0;
-          }
-        };
-        let doc2 = self2.delegate.iframes[0].contentDocument;
-        if (doc2) {
-          return uniqueCssSelector(element, self2.dom(doc2.body).getDocument(), options);
-        } else {
-          return void 0;
-        }
-      };
-      let self2 = this;
-      let doc = this.delegate.iframes[0].contentDocument;
-      if (doc) {
-        const selectionInfo = getCurrentSelectionInfo(this.dom(doc.body).getWindow(), getCssSelector);
-        if (selectionInfo !== void 0) {
-          self2.speak();
-        } else {
-          var node = this.dom(self2.delegate.iframes[0].contentDocument?.body).getWindow().document.body;
-          if (IS_DEV)
-            console.log(doc);
-          const selection = self2.dom(doc.body).getSelection();
-          const range = this.dom(doc.body).getWindow().document.createRange();
-          range.selectNodeContents(node);
-          selection.removeAllRanges();
-          selection.addRange(range);
-          let win = this.delegate.iframes[0].contentWindow;
-          if (win) {
-            const selectionInfo2 = getCurrentSelectionInfo(win, getCssSelector);
-            if (selectionInfo2 !== void 0 && selectionInfo2.cleanText) {
-              this.delegate.ttsModule.speak(selectionInfo2, false, () => {
-                if (doc) {
-                  let selection2 = self2.dom(doc.body).getSelection();
-                  selection2.removeAllRanges();
-                }
-                self2.toolboxHide();
-              });
-            } else {
-              self2.dom(doc.body).getSelection().removeAllRanges();
-              self2.toolboxHide();
-            }
-          }
-        }
-      }
-    }
-  }
   callbackComplete() {
     this.toolboxHide();
     let doc = this.delegate.iframes[0].contentDocument;
@@ -38948,7 +38898,7 @@ var TextHighlighter = class {
   isOutsideViewport(rect) {
     let wrapper = findRequiredElement(document, "#iframe-wrapper");
     const windowLeft = wrapper.scrollLeft;
-    const windowRight = windowLeft + wrapper.clientHeight;
+    const windowRight = windowLeft + wrapper.clientWidth;
     const right = rect.left + rect.width;
     const bottom = rect.top + rect.height;
     const windowTop = wrapper.scrollTop;
@@ -38959,6 +38909,19 @@ var TextHighlighter = class {
     const isRight = rect.left > windowRight;
     return isAbove || isBelow || isLeft || isRight;
   }
+  isInsideViewport(rect) {
+    let wrapper = findRequiredElement(document, "#iframe-wrapper");
+    const windowTop = wrapper.scrollTop;
+    const windowBottom = windowTop + wrapper.clientHeight;
+    const isAbove = rect.top + 20 >= windowTop;
+    const isBelow = rect.top <= windowBottom;
+    const windowLeft = wrapper.scrollLeft;
+    const windowRight = windowLeft + wrapper.clientWidth;
+    const right = rect.left + rect.width;
+    const isLeft = rect.left > windowLeft;
+    const isRight = right < windowRight;
+    return isAbove && isBelow && isLeft && isRight;
+  }
   get visibleTextRects() {
     let doc = this.delegate.iframes[0].contentDocument;
     if (doc) {
@@ -39006,7 +38969,7 @@ var TextHighlighter = class {
       };
       const body = findRequiredIframeElement(doc, "body");
       const textNodes = findRects(body);
-      return textNodes.filter((rect) => !this.isOutsideViewport(rect));
+      return textNodes.filter((rect) => this.isInsideViewport(rect));
     }
     return [];
   }
@@ -43197,11 +43160,11 @@ var SearchModule = class {
     var absolutehref = this.publication.getAbsoluteHref(href);
     let filteredIndexes = this.bookSearchResult.filter((el) => el.href === href);
     if (current) {
-      item = this.currentChapterSearchResult.filter((el) => el.uuid == index2)[0];
-      filteredIndex = this.currentChapterSearchResult.findIndex((el) => el.uuid == index2);
+      item = this.currentChapterSearchResult.filter((el) => el.uuid === index2)[0];
+      filteredIndex = this.currentChapterSearchResult.findIndex((el) => el.uuid === index2);
     } else {
-      item = filteredIndexes.filter((el) => el.uuid == index2)[0];
-      filteredIndex = filteredIndexes.findIndex((el) => el.uuid == index2);
+      item = filteredIndexes.filter((el) => el.uuid === index2)[0];
+      filteredIndex = filteredIndexes.findIndex((el) => el.uuid === index2);
     }
     if (item !== void 0) {
       if (currentLocation === absolutehref) {
@@ -46897,8 +46860,11 @@ var TTSModule2 = class {
   constructor(delegate, tts, rights, highlighter, properties, api, headerMenu) {
     this.voices = [];
     this.hasEventListener = false;
+    this.startX = 0;
+    this.startY = 0;
     this.index = 0;
     this.userScrolled = false;
+    this.scrollPartial = false;
     this.speaking = false;
     this.restartIndex = -1;
     this.ttsQueueIndex = -1;
@@ -46939,11 +46905,28 @@ var TTSModule2 = class {
         addEventListenerOptional(document, "keydown", this.wheel.bind(this));
         addEventListenerOptional(this.delegate.iframes[0].contentDocument, "keydown", this.wheel.bind(this));
       }
-      addEventListenerOptional(this.body, "click", this.click.bind(this));
+      addEventListenerOptional(this.body, "mousedown", this.clickStart.bind(this));
+      addEventListenerOptional(this.body, "mouseup", this.click.bind(this));
     }
   }
-  click(_event) {
-    if (window.speechSynthesis.speaking && this.speaking) {
+  clickStart(event) {
+    if ("clientX" in event) {
+      this.startX = event.clientX;
+    }
+    if ("clientY" in event) {
+      this.startY = event.clientY;
+    }
+  }
+  click(event) {
+    let startX = 0;
+    let startY = 0;
+    if ("clientX" in event) {
+      startX = event.clientX;
+    }
+    if ("clientY" in event) {
+      startY = event.clientY;
+    }
+    if (window.speechSynthesis.speaking && this.speaking && startX === this.startX && startY === this.startY) {
       let doc = this.delegate.iframes[0].contentDocument;
       if (doc) {
         const selection = this.highlighter.dom(doc.body).getSelection();
@@ -47176,6 +47159,7 @@ var TTSModule2 = class {
     callback();
   }
   speakPlay() {
+    this.scrollPartial = true;
     this.cancel(false);
     if (this.api?.started)
       this.api?.started();
@@ -47720,11 +47704,13 @@ var TTSModule2 = class {
       }, HighlightType.ReadAloud, "R2_READALOUD_");
       if (result) {
         this._ttsQueueItemHighlightsWord = result[0];
-        if (this.delegate.view?.isScrollMode() && this.tts.autoScroll && !this.userScrolled) {
+        if (this.delegate.view?.isScrollMode() && this.tts.autoScroll && !this.userScrolled && this.scrollPartial) {
           result[1]?.firstChild?.scrollIntoView({
             block: "center",
             behavior: "smooth"
           });
+        } else if (this.delegate.view?.isPaginated()) {
+          self2.delegate.view?.snap(result[1]?.firstChild);
         }
       }
     }