@d-i-t-a/reader 2.3.16 → 2.3.17

package/dist/esm/index.js

@@ -55193,10 +55193,8 @@ var TextHighlighter = class _TextHighlighter {
     }
     el.addEventListener("mousedown", this.mousedown.bind(this));
     el.addEventListener("mouseup", this.mouseup.bind(this));
-    el.addEventListener("mousemove", this.mousemove.bind(this));
     el.addEventListener("touchstart", this.mousedown.bind(this));
     el.addEventListener("touchend", this.mouseup.bind(this));
-    el.addEventListener("touchmove", this.mousemove.bind(this));
     this.hasEventListener = true;
   }
   async mousedown(ev) {
@@ -56529,56 +56527,21 @@ var TextHighlighter = class _TextHighlighter {
     return navigator.userAgent.match(/Android/i) != null;
   }
   async processMouseEvent(ev) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
     const doc = (_a = this.navigator.iframes[0].contentWindow) == null ? void 0 : _a.document;
-    const x = ev.clientX;
-    const y = ev.clientY;
-    if (!doc) {
+    if (!doc || !(ev.type === "mouseup" || ev.type === "click" || ev.type === "touchup")) {
       return;
     }
     if (!doc.getElementById("R2_ID_HIGHLIGHTS_CONTAINER" /* R2_ID_HIGHLIGHTS_CONTAINER */) && !doc.getElementById("R2_ID_SEARCH_CONTAINER" /* R2_ID_SEARCH_CONTAINER */) && !doc.getElementById("R2_ID_PAGEBREAK_CONTAINER" /* R2_ID_PAGEBREAK_CONTAINER */) && !doc.getElementById("R2_ID_READALOUD_CONTAINER" /* R2_ID_READALOUD_CONTAINER */) && !doc.getElementById("R2_ID_DEFINITIONS_CONTAINER" /* R2_ID_DEFINITIONS_CONTAINER */)) {
       return;
     }
-    const paginated = (_b = this.navigator.view) == null ? void 0 : _b.isPaginated();
-    const bodyRect = doc.body.getBoundingClientRect();
-    const scrollElement = this.getScrollingElement(doc);
-    const xOffset = paginated ? -scrollElement.scrollLeft : bodyRect.left;
-    const yOffset = paginated ? -scrollElement.scrollTop : bodyRect.top;
-    let foundHighlight;
-    let foundElement;
-    for (let i = _highlights.length - 1; i >= 0; i--) {
-      const highlight = _highlights[i];
-      let highlightParent = doc.getElementById(`${highlight.id}`);
-      if (!highlightParent) {
-        let container = doc.getElementById(
-          "R2_ID_HIGHLIGHTS_CONTAINER" /* R2_ID_HIGHLIGHTS_CONTAINER */
-        );
-        if (container) {
-          highlightParent = container.querySelector(`#${highlight.id}`);
-        }
-      }
-      if (!highlightParent) {
-        continue;
-      }
-      let hit = false;
-      const highlightFragments = highlightParent.querySelectorAll(
-        `.${CLASS_HIGHLIGHT_AREA}`
-      );
-      for (const highlightFragment of highlightFragments) {
-        const withRect = highlightFragment;
-        const left = withRect.rect.left + xOffset;
-        const top = withRect.rect.top + yOffset;
-        if (x >= left && x < left + withRect.rect.width && y >= top && y < top + withRect.rect.height) {
-          hit = true;
-          break;
-        }
-      }
-      if (hit) {
-        foundHighlight = highlight;
-        foundElement = highlightParent;
-        break;
+    const foundElement = ev.target;
+    const foundHighlight = _highlights.find(
+      (el) => {
+        var _a2;
+        return el.id === ((_a2 = ev.target.parentElement) == null ? void 0 : _a2.id);
       }
-    }
+    );
     if (!foundHighlight || !foundElement) {
       for (let id2 in HighlightContainer) {
         let container = doc.getElementById(id2);
@@ -56600,47 +56563,7 @@ var TextHighlighter = class _TextHighlighter {
       return;
     }
     if (foundElement.getAttribute("data-click")) {
-      if ((ev.type === "mousemove" || ev.type === "touchmove") && ((_c = foundElement.parentElement) == null ? void 0 : _c.style.display) !== "none") {
-        const foundElementHighlightAreas = Array.from(
-          foundElement.querySelectorAll(`.${CLASS_HIGHLIGHT_AREA}`)
-        );
-        for (let id2 in HighlightContainer) {
-          let container = doc.getElementById(id2);
-          if (container) {
-            const allHighlightAreas = container.querySelectorAll(
-              `.${CLASS_HIGHLIGHT_AREA}`
-            );
-            for (const highlightArea of allHighlightAreas) {
-              if (foundElementHighlightAreas.indexOf(highlightArea) < 0) {
-                this.resetHighlightAreaStyle(highlightArea, id2);
-              }
-            }
-          }
-        }
-        this.setHighlightAreaStyle(
-          doc,
-          foundElementHighlightAreas,
-          foundHighlight
-        );
-        const foundElementHighlightBounding = foundElement.querySelector(
-          `.${CLASS_HIGHLIGHT_BOUNDING_AREA}`
-        );
-        for (let id2 in HighlightContainer) {
-          let container = doc.getElementById(id2);
-          if (container) {
-            const allHighlightBoundings = container.querySelectorAll(
-              `.${CLASS_HIGHLIGHT_BOUNDING_AREA}`
-            );
-            for (const highlightBounding of allHighlightBoundings) {
-              if (!foundElementHighlightBounding || highlightBounding !== foundElementHighlightBounding) {
-                this.resetHighlightBoundingStyle(
-                  highlightBounding
-                );
-              }
-            }
-          }
-        }
-      } else if ((ev.type === "mouseup" || ev.type === "click" || ev.type === "touchup") && ((_d = foundElement.parentElement) == null ? void 0 : _d.style.display) !== "none") {
+      if ((ev.type === "mouseup" || ev.type === "click" || ev.type === "touchup") && ((_b = foundElement.parentElement) == null ? void 0 : _b.style.display) !== "none") {
         const payload = {
           highlight: foundHighlight
         };
@@ -56648,16 +56571,16 @@ var TextHighlighter = class _TextHighlighter {
         let self2 = this;
         let anno;
         if (self2.navigator.rights.enableAnnotations) {
-          anno = await ((_e = this.navigator.annotationModule) == null ? void 0 : _e.getAnnotation(
+          anno = await ((_c = this.navigator.annotationModule) == null ? void 0 : _c.getAnnotation(
             payload.highlight
           ));
         } else if (self2.navigator.rights.enableBookmarks) {
-          anno = await ((_f = this.navigator.bookmarkModule) == null ? void 0 : _f.getAnnotation(
+          anno = await ((_d = this.navigator.bookmarkModule) == null ? void 0 : _d.getAnnotation(
             payload.highlight
           ));
         }
         if (payload.highlight.type === 0 /* Annotation */) {
-          (_h = (_g = this.navigator.annotationModule) == null ? void 0 : _g.api) == null ? void 0 : _h.selectedAnnotation(anno).then(async () => {
+          (_f = (_e = this.navigator.annotationModule) == null ? void 0 : _e.api) == null ? void 0 : _f.selectedAnnotation(anno).then(async () => {
           });
         }
         if (anno == null ? void 0 : anno.id) {
@@ -56665,7 +56588,7 @@ var TextHighlighter = class _TextHighlighter {
           self2.lastSelectedHighlight = anno.id;
           let toolbox = document.getElementById("highlight-toolbox");
           if (toolbox) {
-            toolbox.style.top = ev.clientY + (((_i = this.navigator.attributes) == null ? void 0 : _i.navHeight) ?? 0) + "px";
+            toolbox.style.top = ev.clientY + (((_g = this.navigator.attributes) == null ? void 0 : _g.navHeight) ?? 0) + "px";
             toolbox.style.left = ev.clientX + "px";
             if (getComputedStyle(toolbox).display === "none") {
               let noteH = function() {
@@ -56765,12 +56688,12 @@ var TextHighlighter = class _TextHighlighter {
             const popup = new Popup(this.navigator);
             popup.showPopup(foundElement.dataset.definition, ev);
           }
-          let result = (_l = (_k = (_j = this.navigator.definitionsModule) == null ? void 0 : _j.properties) == null ? void 0 : _k.definitions) == null ? void 0 : _l.filter(
+          let result = (_j = (_i = (_h = this.navigator.definitionsModule) == null ? void 0 : _h.properties) == null ? void 0 : _i.definitions) == null ? void 0 : _j.filter(
             (el) => el.order === Number(foundElement == null ? void 0 : foundElement.dataset.order)
           )[0];
           import_loglevel5.default.log(result);
-          if ((_n = (_m = this.navigator.definitionsModule) == null ? void 0 : _m.api) == null ? void 0 : _n.click) {
-            (_o = this.navigator.definitionsModule.api) == null ? void 0 : _o.click(
+          if ((_l = (_k = this.navigator.definitionsModule) == null ? void 0 : _k.api) == null ? void 0 : _l.click) {
+            (_m = this.navigator.definitionsModule.api) == null ? void 0 : _m.click(
               lodash.omit(result, "callbacks"),
               lodash.omit(foundHighlight, "definition")
             );
@@ -56963,6 +56886,50 @@ var TextHighlighter = class _TextHighlighter {
     highlightParent.style.setProperty("pointer-events", "none");
     if (highlight.pointerInteraction) {
       highlightParent.setAttribute("data-click", "1");
+      highlightParent.addEventListener("mouseover", (ev) => {
+        var _a2;
+        if (ev.target.classList.contains(
+          "R2_CLASS_HIGHLIGHT_AREA"
+        )) {
+          const foundElement = ev.currentTarget;
+          const foundHighlight = _highlights.find(
+            (el) => el.id === ev.currentTarget.id
+          );
+          if (ev.type === "mouseover" && ((_a2 = foundElement.parentElement) == null ? void 0 : _a2.style.display) !== "none" && foundHighlight) {
+            const foundElementHighlightAreas = Array.from(
+              foundElement.querySelectorAll(`.${CLASS_HIGHLIGHT_AREA}`)
+            );
+            this.setHighlightAreaStyle(
+              doc,
+              foundElementHighlightAreas,
+              foundHighlight
+            );
+          }
+        }
+      });
+      highlightParent.addEventListener("mouseleave", (ev) => {
+        const foundElement = ev.currentTarget;
+        const foundElementHighlightAreas = Array.from(
+          foundElement.querySelectorAll(`.${CLASS_HIGHLIGHT_AREA}`)
+        );
+        for (const highlightArea of foundElementHighlightAreas) {
+          this.resetHighlightAreaStyle(
+            highlightArea,
+            foundElement.id
+          );
+        }
+        const foundElementHighlightBounding = foundElement.querySelector(
+          `.${CLASS_HIGHLIGHT_BOUNDING_AREA}`
+        );
+        const allHighlightBoundings = foundElement.querySelectorAll(
+          `.${CLASS_HIGHLIGHT_BOUNDING_AREA}`
+        );
+        for (const highlightBounding2 of allHighlightBoundings) {
+          if (!foundElementHighlightBounding || highlightBounding2 !== foundElementHighlightBounding) {
+            this.resetHighlightBoundingStyle(highlightBounding2);
+          }
+        }
+      });
     }
     const paginated = (_a = this.navigator.view) == null ? void 0 : _a.isPaginated();
     if (paginated) {
@@ -57069,7 +57036,12 @@ var TextHighlighter = class _TextHighlighter {
           );
         }
       }
-      highlightArea.style.setProperty("pointer-events", "none");
+      if (highlight.type === 1 /* Search */ || highlight.type === 2 /* ReadAloud */ || highlight.type === 5 /* LineFocus */ || highlight.type === 3 /* PageBreak */) {
+        highlightArea.style.setProperty("pointer-events", "none");
+      } else {
+        highlightArea.style.setProperty("pointer-events", "all");
+        highlightArea.style.setProperty("cursor", "hand");
+      }
       highlightArea.style.position = "absolute";
       highlightArea.scale = scale;
       highlightArea.rect = {
@@ -57105,7 +57077,12 @@ var TextHighlighter = class _TextHighlighter {
           "style",
           `background-color: rgba(${color.red}, ${color.green}, ${color.blue}, ${DEFAULT_BACKGROUND_COLOR_OPACITY}) !important;`
         );
-        highlightAreaLine.style.setProperty("pointer-events", "none");
+        if (highlight.type === 1 /* Search */ || highlight.type === 2 /* ReadAloud */ || highlight.type === 5 /* LineFocus */ || highlight.type === 3 /* PageBreak */) {
+          highlightAreaLine.style.setProperty("pointer-events", "none");
+        } else {
+          highlightAreaLine.style.setProperty("pointer-events", "all");
+          highlightAreaLine.style.setProperty("cursor", "hand");
+        }
         highlightAreaLine.style.position = "absolute";
         highlightAreaLine.scale = scale;
         highlightAreaLine.rect = {
@@ -57275,7 +57252,12 @@ var TextHighlighter = class _TextHighlighter {
         }
       }
     }
-    highlightAreaIcon.style.setProperty("pointer-events", "all");
+    if (highlight.type === 1 /* Search */ || highlight.type === 2 /* ReadAloud */ || highlight.type === 5 /* LineFocus */ || highlight.type === 3 /* PageBreak */) {
+      highlightAreaIcon.style.setProperty("pointer-events", "none");
+    } else {
+      highlightAreaIcon.style.setProperty("pointer-events", "all");
+      highlightAreaIcon.style.setProperty("cursor", "hand");
+    }
     let self2 = this;
     if (highlight.type !== 3 /* PageBreak */ && highlight.type !== 4 /* Definition */) {
       highlightAreaIcon.addEventListener("click", async function(ev) {