@d-i-t-a/reader 2.1.0-beta.6 → 2.1.0-beta.9

package/dist/esm/index.js

@@ -35079,8 +35079,8 @@ var EventHandler = class {
           await this.popup.hidePopover();
         }
         const isInternal = link.href.indexOf("#");
-        if (!isSameOrigin && !isEpubInternal && !isResourceInternal) {
-          window.open(link.href, "_blank");
+        if (!isEpubInternal && !isResourceInternal) {
+          window.open(link.href, link.target ?? "_blank");
           event.preventDefault();
           event.stopPropagation();
         } else {
@@ -38052,7 +38052,7 @@ var TextHighlighter = class {
     let self2 = this;
     let doc = this.delegate.iframes[0].contentDocument;
     if (doc) {
-      let selection = self2.dom(doc.body)?.getWindow()?.getSelection();
+      let selection = self2.dom(doc.body)?.getSelection();
       if (self2.dom(doc.body)) {
         if (selection && !selection?.isCollapsed) {
           let removeTrailingPunctuation = function(text2) {
@@ -38121,7 +38121,6 @@ var TextHighlighter = class {
         return;
       }
       if (this.isIOS()) {
-        this.delegate.iframes[0].contentDocument?.body.removeEventListener("selectionchange", this.toolboxPlacement.bind(this));
         setTimeout(function() {
           let doc = self2.delegate.iframes[0].contentDocument;
           if (doc) {
@@ -38129,6 +38128,25 @@ var TextHighlighter = class {
             selection.removeAllRanges();
             setTimeout(function() {
               selection.addRange(range);
+              function getCssSelector(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, doc2, options);
+                } else {
+                  return void 0;
+                }
+              }
+              let win = self2.delegate.iframes[0].contentWindow;
+              const selectionInfo = getCurrentSelectionInfo(win, getCssSelector);
+              self2.delegate.annotationModule?.annotator?.saveTemporarySelectionInfo(selectionInfo);
             }, 5);
           }
         }, 100);
@@ -38201,7 +38219,10 @@ var TextHighlighter = class {
               self2.toolboxHide();
               highlightIcon?.removeEventListener("click", highlightEvent);
             };
-            highlightIcon.addEventListener("click", highlightEvent);
+            const clone = highlightIcon.cloneNode(true);
+            highlightIcon?.parentNode?.replaceChild(clone, highlightIcon);
+            highlightIcon = document.getElementById("highlightIcon");
+            highlightIcon?.addEventListener("click", highlightEvent);
           }
           if (underlineIcon) {
             let commentEvent = function() {
@@ -38209,7 +38230,10 @@ var TextHighlighter = class {
               self2.toolboxHide();
               underlineIcon?.removeEventListener("click", commentEvent);
             };
-            underlineIcon.addEventListener("click", commentEvent);
+            const clone = underlineIcon.cloneNode(true);
+            underlineIcon?.parentNode?.replaceChild(clone, underlineIcon);
+            underlineIcon = document.getElementById("underlineIcon");
+            underlineIcon?.addEventListener("click", commentEvent);
           }
         } else {
           if (highlightIcon) {
@@ -38231,7 +38255,10 @@ var TextHighlighter = class {
               speakIcon?.removeEventListener("click", speakEvent);
               self2.speak();
             };
-            speakIcon.addEventListener("click", speakEvent);
+            const clone = speakIcon.cloneNode(true);
+            speakIcon?.parentNode?.replaceChild(clone, speakIcon);
+            speakIcon = document.getElementById("speakIcon");
+            speakIcon?.addEventListener("click", speakEvent);
           }
         } else {
           if (speakIcon) {
@@ -38265,7 +38292,11 @@ var TextHighlighter = class {
               }
               let win = self3.delegate.iframes[0].contentWindow;
               if (win) {
-                const selectionInfo = getCurrentSelectionInfo(win, getCssSelector);
+                let selectionInfo = getCurrentSelectionInfo(win, getCssSelector);
+                if (selectionInfo === void 0) {
+                  let doc = self3.delegate.iframes[0].contentDocument;
+                  selectionInfo = self3.delegate.annotationModule?.annotator?.getTemporarySelectionInfo(doc);
+                }
                 if (selectionInfo !== void 0) {
                   if (menuItem.callback) {
                     menuItem.callback(selectionInfo.cleanText, selectionInfo.range?.startContainer.parentElement);
@@ -38326,7 +38357,11 @@ var TextHighlighter = class {
     }
     let win = self2.delegate.iframes[0].contentWindow;
     if (win) {
-      const selectionInfo = getCurrentSelectionInfo(win, getCssSelector);
+      let selectionInfo = getCurrentSelectionInfo(win, getCssSelector);
+      if (selectionInfo === void 0) {
+        let doc = self2.delegate.iframes[0].contentDocument;
+        selectionInfo = this.delegate.annotationModule?.annotator?.getTemporarySelectionInfo(doc);
+      }
       if (selectionInfo) {
         if (this.options.onBeforeHighlight(selectionInfo) === true) {
           let createColor;
@@ -38376,7 +38411,11 @@ var TextHighlighter = class {
       let self2 = this;
       let win = self2.delegate.iframes[0].contentWindow;
       if (win) {
-        const selectionInfo = getCurrentSelectionInfo(win, getCssSelector);
+        let selectionInfo = getCurrentSelectionInfo(win, getCssSelector);
+        if (selectionInfo === void 0) {
+          let doc2 = self2.delegate.iframes[0].contentDocument;
+          selectionInfo = self2.delegate.annotationModule?.annotator?.getTemporarySelectionInfo(doc2);
+        }
         if (selectionInfo !== void 0) {
           this.delegate.ttsModule.speak(selectionInfo, true, () => {
           });
@@ -40343,7 +40382,11 @@ var BookmarkModule = class {
       }
     };
     if (win !== null) {
-      const selectionInfo = getCurrentSelectionInfo(win, getCssSelector);
+      let selectionInfo = getCurrentSelectionInfo(win, getCssSelector);
+      if (selectionInfo === void 0) {
+        let doc3 = self2.delegate.iframes[0].contentDocument;
+        selectionInfo = this.delegate.annotationModule?.annotator?.getTemporarySelectionInfo(doc3);
+      }
       let doc2 = self2.delegate.iframes[0].contentDocument;
       if (selectionInfo && doc2) {
         let book = this.delegate.highlighter?.createHighlight(this.delegate.highlighter?.dom(doc2.body).getWindow(), selectionInfo, menuItem.highlight?.color, true, AnnotationMarker.Bookmark, menuItem.icon, menuItem.popup, menuItem.highlight?.style);
@@ -41690,7 +41733,7 @@ var ContentProtectionModule = class {
           window.sessionStorage.clear();
           window.location.replace(window.location.origin);
         }
-        if (typeof config2.api?.inspectDetected === "function") {
+        if (config2.detectInspect && typeof config2.api?.inspectDetected === "function") {
           config2.api.inspectDetected();
         }
       }
@@ -42301,7 +42344,7 @@ async function searchDocDomSeek(searchInput, doc, href, title, fullWordSearch =
 // src/modules/search/SearchModule.ts
 var import_loglevel14 = __toModule(require_loglevel());
 var SearchModule = class {
-  constructor(delegate, publication, properties, highlighter, requestConfig, api, headerMenu) {
+  constructor(delegate, publication, properties, highlighter, api, headerMenu) {
     this.currentChapterSearchResult = [];
     this.bookSearchResult = [];
     this.currentSearchHighlights = [];
@@ -42311,10 +42354,9 @@ var SearchModule = class {
     this.properties = properties;
     this.api = api;
     this.highlighter = highlighter;
-    this.requestConfig = requestConfig;
   }
   static async create(config2) {
-    const search = new this(config2.delegate, config2.publication, config2, config2.highlighter, config2.requestConfig, config2.api, config2.headerMenu);
+    const search = new this(config2.delegate, config2.publication, config2, config2.highlighter, config2.api, config2.headerMenu);
     await search.start();
     return search;
   }
@@ -42738,9 +42780,9 @@ var SearchModule = class {
       }
       if (tocItem) {
         let href = this.publication.getAbsoluteHref(tocItem.Href);
-        await fetch(href, this.requestConfig).then((r) => r.text()).then(async (data) => {
+        await fetch(href, this.delegate.requestConfig).then((r) => r.text()).then(async (data) => {
           let parser = new DOMParser();
-          let doc = parser.parseFromString(this.requestConfig?.encoded ? this.decodeBase64(data) : data, "application/xhtml+xml");
+          let doc = parser.parseFromString(this.delegate.requestConfig?.encoded ? this.decodeBase64(data) : data, "application/xhtml+xml");
           if (tocItem) {
             searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
               result.forEach((searchItem) => {
@@ -42775,9 +42817,9 @@ var SearchModule = class {
     }
     if (tocItem) {
       let href = this.publication.getAbsoluteHref(tocItem.Href);
-      await fetch(href, this.requestConfig).then((r) => r.text()).then(async (data) => {
+      await fetch(href, this.delegate.requestConfig).then((r) => r.text()).then(async (data) => {
         let parser = new DOMParser();
-        let doc = parser.parseFromString(this.requestConfig?.encoded ? this.decodeBase64(data) : data, "application/xhtml+xml");
+        let doc = parser.parseFromString(this.delegate.requestConfig?.encoded ? this.decodeBase64(data) : data, "application/xhtml+xml");
         if (tocItem) {
           searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
             result.forEach((searchItem) => {
@@ -43522,7 +43564,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
     this.sampleReadEventHandler = new SampleReadEventHandler(this);
   }
   static async create(config2) {
-    const navigator2 = new this(config2.settings, config2.annotator || void 0, config2.initialLastReadingPosition || void 0, config2.publication, config2.api, config2.rights, config2.tts, config2.injectables, config2.attributes || { margin: 0 }, config2.services, config2.sample);
+    const navigator2 = new this(config2.settings, config2.annotator || void 0, config2.initialLastReadingPosition || void 0, config2.publication, config2.api, config2.rights, config2.tts, config2.injectables, config2.attributes || { margin: 0 }, config2.services, config2.sample, config2.requestConfig);
     await navigator2.start(config2.mainElement, config2.headerMenu, config2.footerMenu);
     return new Promise((resolve) => resolve(navigator2));
   }
@@ -45752,8 +45794,12 @@ var _LocalAnnotator = class {
       const uniqueStr = `${rangeRepresentation.highlight.selectionInfo.rangeInfo.startContainerElementCssSelector}${rangeRepresentation.highlight.selectionInfo.rangeInfo.startContainerChildTextNodeIndex}${rangeRepresentation.highlight.selectionInfo.rangeInfo.startOffset}${rangeRepresentation.highlight.selectionInfo.rangeInfo.endContainerElementCssSelector}${rangeRepresentation.highlight.selectionInfo.rangeInfo.endContainerChildTextNodeIndex}${rangeRepresentation.highlight.selectionInfo.rangeInfo.endOffset}`;
       const sha256Hex = SHA256.hash(uniqueStr);
       rangeRepresentation.highlight.id = "R2_HIGHLIGHT_" + sha256Hex;
-      var rangeColor;
-      rangeColor = rangeRepresentation.color;
+      let rangeColor;
+      if (rangeRepresentation.highlight.color) {
+        rangeColor = rangeRepresentation.highlight.color;
+      } else if (rangeRepresentation.color) {
+        rangeColor = rangeRepresentation.color;
+      }
       if (TextHighlighter.isHexColor(rangeColor)) {
         rangeColor = TextHighlighter.hexToRgbString(rangeColor);
       }
@@ -45765,6 +45811,21 @@ var _LocalAnnotator = class {
     this.store.set(_LocalAnnotator.ANNOTATIONS, JSON.stringify(annotationsToStore));
     return annotationsToStore;
   }
+  saveTemporarySelectionInfo(selectionInfo) {
+    this.store.set(_LocalAnnotator.SELECTIONINFO, JSON.stringify(selectionInfo));
+  }
+  getTemporarySelectionInfo(doc) {
+    const selectionInfos = this.store.get(_LocalAnnotator.SELECTIONINFO);
+    if (selectionInfos) {
+      let selectionInfo = JSON.parse(selectionInfos);
+      selectionInfo.range = convertRangeInfo(doc, selectionInfo.rangeInfo);
+      return selectionInfo;
+    }
+    return [];
+  }
+  deleteTemporarySelectionInfo() {
+    this.store.remove(_LocalAnnotator.SELECTIONINFO);
+  }
   saveAnnotation(annotation) {
     let savedAnnotations = this.store.get(_LocalAnnotator.ANNOTATIONS);
     if (savedAnnotations) {
@@ -45815,7 +45876,7 @@ var _LocalAnnotator = class {
     const savedAnnotations = this.store.get(_LocalAnnotator.ANNOTATIONS);
     if (savedAnnotations) {
       const annotations = JSON.parse(savedAnnotations);
-      const filtered = annotations.filter((el) => el.id === id2);
+      const filtered = annotations.filter((el) => el.highlight?.id === id2 || el.id === id2);
       if (filtered.length > 0) {
         let foundElement = iframeWin.document.getElementById(`${filtered[0].highlight.id}`);
         if (foundElement) {
@@ -45864,6 +45925,7 @@ var LocalAnnotator = _LocalAnnotator;
 LocalAnnotator.LAST_READING_POSITION = "last-reading-position";
 LocalAnnotator.BOOKMARKS = "bookmarks";
 LocalAnnotator.ANNOTATIONS = "annotations";
+LocalAnnotator.SELECTIONINFO = "selectionInfo";
 
 // src/store/LocalStorageStore.ts
 init_polyfills();
@@ -46278,7 +46340,12 @@ var TTSModule2 = class {
     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();
+        let selection = this.highlighter.dom(doc.body).getSelection();
+        if (selection.isCollapsed) {
+          let doc2 = this.delegate.iframes[0].contentDocument;
+          const selectionInfo = this.delegate.annotationModule?.annotator?.getTemporarySelectionInfo(doc2);
+          selection.addRange(selectionInfo.range);
+        }
         let range = selection.getRangeAt(0);
         let node = selection.anchorNode;
         while (range.toString().indexOf(" ") !== 0) {
@@ -46373,15 +46440,20 @@ var TTSModule2 = class {
       let rootEl = iframe.contentWindow?.document.body;
       let doc = this.delegate.iframes[0].contentDocument;
       if (doc) {
-        const selection = this.highlighter.dom(doc.body).getSelection();
+        let selection = this.highlighter.dom(doc.body).getSelection();
+        if (selection.isCollapsed) {
+          let doc2 = self2.delegate.iframes[0].contentDocument;
+          const selectionInfo2 = self2.delegate.annotationModule?.annotator?.getTemporarySelectionInfo(doc2);
+          selection.addRange(selectionInfo2.range);
+        }
         if (rootEl) {
           var ttsQueue = this.generateTtsQueue(rootEl);
           if (!ttsQueue.length) {
             return;
           }
           var idx = this.findTtsQueueItemIndex(ttsQueue, selection.anchorNode, selection.anchorNode, selection.anchorOffset, rootEl);
-          const ttsQueueItem = getTtsQueueItemRef(ttsQueue, idx);
           var idxEnd = this.findTtsQueueItemIndex(ttsQueue, selection.focusNode, selection.focusNode, selection.focusOffset, rootEl);
+          const ttsQueueItem = getTtsQueueItemRef(ttsQueue, idx);
           const ttsQueueItemEnd = getTtsQueueItemRef(ttsQueue, idxEnd);
           var restOfTheText;
           if (ttsQueueItem && selectionInfo && selectionInfo.cleanText) {
@@ -46412,8 +46484,18 @@ var TTSModule2 = class {
               restOfTheText = restOfTheText.replace(textToBeSpoken, "").trim();
             }
             utterance = new SpeechSynthesisUtterance(textToBeSpoken);
+            import_loglevel19.default.log(selectionInfo);
+            import_loglevel19.default.log(textToBeSpoken, selectionInfo.range?.commonAncestorContainer.textContent);
+            import_loglevel19.default.log(ttsQueueItem);
+            import_loglevel19.default.log(ttsQueueItem.item.textNodes);
+            import_loglevel19.default.log(startIndex);
+            import_loglevel19.default.log(ttsQueueItem.item.combinedText);
+            let node = ttsQueueItem.item.textNodes.filter((node2) => {
+              return node2 === selectionInfo.range?.commonAncestorContainer;
+            })[0];
+            import_loglevel19.default.log(node);
             utterance.onboundary = (ev) => {
-              this.updateTTSInfo(ttsQueueItem, ev.charIndex + startIndex, ev.charLength, utterance.text);
+              this.updateTTSInfo(ttsQueueItem, ev.charIndex, ev.charLength, startIndex, utterance.text);
             };
           }
         }
@@ -46518,7 +46600,7 @@ var TTSModule2 = class {
               const sentence = getTtsQueueItemRefText(ttsQueueItem);
               utterance = new SpeechSynthesisUtterance(sentence);
               utterance.onboundary = (ev) => {
-                self2.updateTTSInfo(ttsQueueItem, ev.charIndex, ev.charLength, utterance.text);
+                self2.updateTTSInfo(ttsQueueItem, ev.charIndex, ev.charLength, 0, utterance.text);
               };
               setTimeout(() => {
                 window.speechSynthesis.speak(utterance);
@@ -46530,7 +46612,7 @@ var TTSModule2 = class {
             if (ttsQueueItem) {
               utterance = new SpeechSynthesisUtterance(restOfTheText);
               utterance.onboundary = (ev) => {
-                self2.updateTTSInfo(ttsQueueItem, ev.charIndex, ev.charLength, utterance.text);
+                self2.updateTTSInfo(ttsQueueItem, ev.charIndex, ev.charLength, 0, utterance.text);
               };
               setTimeout(() => {
                 window.speechSynthesis.speak(utterance);
@@ -46903,7 +46985,7 @@ var TTSModule2 = class {
     import_loglevel19.default.log("navigator.language", navigator.language);
     utterance.onboundary = (ev) => {
       import_loglevel19.default.log(ev.name);
-      this.updateTTSInfo(ttsQueueItem, ev.charIndex, ev.charLength, utterance.text);
+      this.updateTTSInfo(ttsQueueItem, ev.charIndex, ev.charLength, 0, utterance.text);
     };
     setTimeout(() => {
       window.speechSynthesis.speak(utterance);
@@ -46917,42 +46999,40 @@ var TTSModule2 = class {
       }
     };
   }
-  updateTTSInfo(ttsQueueItem, charIndex, charLength, utteranceText) {
+  updateTTSInfo(ttsQueueItem, charIndex, charLength, startIndex, utteranceText) {
     if (!ttsQueueItem) {
       return void 0;
     }
+    import_loglevel19.default.log(ttsQueueItem, charIndex, charLength, utteranceText);
     const ttsQueueItemText = utteranceText ? utteranceText : getTtsQueueItemRefText(ttsQueueItem);
     if (charIndex >= 0 && utteranceText) {
       const start = utteranceText.slice(0, charIndex + 1).search(/\S+$/);
       const right = utteranceText.slice(charIndex).search(/\s/);
       const word = right < 0 ? utteranceText.slice(start) : utteranceText.slice(start, right + charIndex);
       const end = start + word.length;
-      let useStart = false;
-      if (!charLength) {
+      if (charLength === void 0) {
+        const match = utteranceText.substring(charIndex).match(/^[a-z\d']*/i);
+        if (match) {
+          charLength = match[0].length;
+        }
+      }
+      if (charLength === void 0) {
         charLength = word.length;
-        useStart = true;
-      } else {
-        useStart = false;
       }
-      this.wrapHighlightWord(ttsQueueItem, utteranceText, useStart ? start : charIndex, charLength, word, start, end);
+      this.wrapHighlightWord(ttsQueueItem, utteranceText, charIndex + startIndex, charLength, word, start, end);
     }
     return ttsQueueItemText;
   }
   wrapHighlightWord(ttsQueueItemRef, utteranceText, charIndex, charLength, word, start, end) {
+    import_loglevel19.default.log(ttsQueueItemRef);
+    import_loglevel19.default.log(utteranceText);
+    import_loglevel19.default.log(charIndex, charLength, word, start, end);
     if (this._ttsQueueItemHighlightsWord) {
       this.delegate.highlighter?.destroyHighlights(HighlightType.ReadAloud);
       this._ttsQueueItemHighlightsWord = void 0;
     }
     const ttsQueueItem = ttsQueueItemRef.item;
-    let txtToCheck = ttsQueueItemRef.item.combinedText;
     let charIndexAdjusted = charIndex;
-    if (utteranceText !== txtToCheck) {
-      import_loglevel19.default.log("TTS utteranceText DIFF?? ", `[[${utteranceText}]]`, `[[${txtToCheck}]]`);
-    }
-    const ttsWord = utteranceText.substr(charIndex, charLength);
-    if (ttsWord !== word) {
-      import_loglevel19.default.log("TTS word DIFF?? ", `[[${ttsWord}]]`, `[[${word}]]`, `${charIndex}--${charLength}`, `${start}--${end - start}`);
-    }
     let acc = 0;
     let rangeStartNode;
     let rangeStartOffset = -1;
@@ -48333,8 +48413,7 @@ var D2Reader = class {
       headerMenu,
       delegate: navigator2,
       publication,
-      highlighter,
-      requestConfig: initialConfig.requestConfig
+      highlighter
     }, initialConfig.search)) : void 0;
     const definitionsModule = rights.enableDefinitions ? await DefinitionsModule.create(__spreadValues({
       delegate: navigator2,