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

package/dist/esm/index.js

@@ -35020,7 +35020,7 @@ var Publication = class extends import_publication.Publication {
     }
     for (const locator of positions) {
       const resource = positions.filter((el) => el.href === decodeURI(locator.href));
-      const positionIndex = Math.ceil(locator.locations.progression ? locator.locations.progression : 0 * (resource.length - 1));
+      const positionIndex = Math.ceil((locator.locations.progression ? locator.locations.progression : 0) * (resource.length - 1));
       if (locator.locations.position) {
         locator.locations.totalProgression = (locator.locations.position - 1) / positions.length;
       }
@@ -38342,7 +38342,6 @@ var TextHighlighter = class {
     let doc = el.ownerDocument;
     el.addEventListener("mouseup", this.toolboxShowDelayed.bind(this));
     el.addEventListener("touchend", this.toolboxShowDelayed.bind(this));
-    doc.addEventListener("selectstart", this.toolboxShowDelayed.bind(this));
     if (!hasEventListener) {
       window.addEventListener("resize", this.toolboxPlacement.bind(this));
     }
@@ -38376,7 +38375,6 @@ var TextHighlighter = class {
     let doc = el.ownerDocument;
     el.removeEventListener("mouseup", this.toolboxShowDelayed.bind(this));
     el.removeEventListener("touchend", this.toolboxShowDelayed.bind(this));
-    doc.removeEventListener("selectstart", this.toolboxShowDelayed.bind(this));
     window.removeEventListener("resize", this.toolboxPlacement.bind(this));
     doc.removeEventListener("selectionchange", this.toolboxPlacement.bind(this));
     el.removeEventListener("mousedown", this.toolboxHide.bind(this));
@@ -38555,41 +38553,70 @@ var TextHighlighter = class {
       toolbox.style.display = "none";
     this.selectionMenuClosed();
   }
-  toolboxShowDelayed() {
+  toolboxShowDelayed(ev) {
     let self2 = this;
     setTimeout(function() {
       if (!self2.isAndroid()) {
-        self2.snapSelectionToWord();
+        self2.snapSelectionToWord(ev.detail === 1);
       }
       self2.toolboxShow();
     }, 100);
   }
-  snapSelectionToWord() {
+  snapSelectionToWord(trimmed = false) {
     let self2 = this;
     let doc = this.delegate.iframes[0].contentDocument;
     if (doc) {
       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 removeTrailingPunctuation = function(text2) {
+            const match = text2.match(new RegExp(`[^a-zA-Z0-9]+$`));
+            if (!match || !match.index) {
+              return text2;
+            }
+            return text2.slice(0, match.index);
+          };
+          let text = selection.toString();
+          let startOffsetTemp = text.length - text.trimStart().length;
+          let endOffsetTemp = text.length - text.trimEnd().length;
+          let length = text.length;
+          var regex_symbols = /[-!$%^&*()_+|~=`{}\[\]:\/;<>?,.@#]/;
+          text = text.replace(regex_symbols, "");
+          startOffsetTemp = length - text.trimStart().length;
+          text = removeTrailingPunctuation(text);
+          endOffsetTemp = length - text.trimEnd().length;
           let range = document.createRange();
-          range.setStart(selection.anchorNode, selection.anchorOffset + startOffsetTemp);
-          range.setEnd(selection.focusNode, selection.focusOffset - endOffsetTemp);
+          if (trimmed) {
+            range.setStart(selection.anchorNode, selection.anchorOffset + startOffsetTemp);
+            range.setEnd(selection.focusNode, selection.focusOffset - endOffsetTemp);
+          } else {
+            range.setStart(selection.anchorNode, selection.anchorOffset);
+            range.setEnd(selection.focusNode, selection.focusOffset);
+          }
           let backwards = range.collapsed;
           range.detach();
-          let endNode = selection.focusNode, endOffset = selection.focusOffset - endOffsetTemp;
-          selection.collapse(selection.anchorNode, selection.anchorOffset + startOffsetTemp);
+          let endNode = selection.focusNode;
+          let endOffset;
+          if (trimmed) {
+            endOffset = selection.focusOffset - endOffsetTemp;
+            selection.collapse(selection.anchorNode, selection.anchorOffset + startOffsetTemp);
+          } else {
+            endOffset = selection.focusOffset;
+            selection.collapse(selection.anchorNode, selection.anchorOffset);
+          }
           let direction = ["forward", "backward"];
           if (backwards) {
             direction = ["backward", "forward"];
           }
-          selection.modify("move", direction[0], "character");
-          selection.modify("move", direction[1], "word");
-          selection.extend(endNode, endOffset);
-          selection.modify("extend", direction[1], "character");
-          selection.modify("extend", direction[0], "word");
+          if (trimmed) {
+            selection.modify("move", direction[0], "character");
+            selection.modify("move", direction[1], "word");
+            selection.extend(endNode, endOffset);
+            selection.modify("extend", direction[1], "character");
+            selection.modify("extend", direction[0], "word");
+          } else {
+            selection.extend(endNode, endOffset);
+          }
           this.selection(selection.toString(), selection);
         }
       }
@@ -46896,6 +46923,7 @@ var TTSModule2 = class {
         allowedTags: [],
         allowedAttributes: {}
       });
+      this.wrapper = findRequiredElement(document, "#iframe-wrapper");
       window.speechSynthesis.getVoices();
       this.initVoices(true);
       if (!this.hasEventListener) {
@@ -47704,7 +47732,10 @@ var TTSModule2 = class {
       }, HighlightType.ReadAloud, "R2_READALOUD_");
       if (result) {
         this._ttsQueueItemHighlightsWord = result[0];
-        if (this.delegate.view?.isScrollMode() && this.tts.autoScroll && !this.userScrolled && this.scrollPartial) {
+        const viewportOffset = result[1]?.firstChild?.getBoundingClientRect();
+        const top = viewportOffset.top - this.wrapper.scrollTop;
+        const shouldScroll = top > window.innerHeight / 2 - 65;
+        if (this.delegate.view?.isScrollMode() && this.tts.autoScroll && !this.userScrolled && this.scrollPartial && shouldScroll) {
           result[1]?.firstChild?.scrollIntoView({
             block: "center",
             behavior: "smooth"