Merge pull request #590 from d-i-t-a/bugfix/pointer-events

updated pointer events and pointer
d-i-t-a · Oct 20, 2023 · 80f28e6 · 80f28e6
2 parents 5577a68 + b31db1c
commit 80f28e6
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@d-i-t-a/reader",
-  "version": "2.3.16",
+  "version": "2.3.17",
   "description": "A viewer application for EPUB files.",
   "repository": "https://github.com/d-i-t-a/R2D2BC",
   "license": "Apache-2.0",

diff --git a/src/modules/highlight/TextHighlighter.ts b/src/modules/highlight/TextHighlighter.ts
@@ -2903,7 +2903,18 @@ export class TextHighlighter {
         }
       }
 
-      highlightArea.style.setProperty("pointer-events", "all");
+      if (
+        highlight.type === HighlightType.Search ||
+        highlight.type === HighlightType.ReadAloud ||
+        highlight.type === HighlightType.LineFocus ||
+        highlight.type === HighlightType.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 = {
@@ -2943,7 +2954,19 @@ export class TextHighlighter {
           "style",
           `background-color: rgba(${color.red}, ${color.green}, ${color.blue}, ${DEFAULT_BACKGROUND_COLOR_OPACITY}) !important;`
         );
-        highlightAreaLine.style.setProperty("pointer-events", "all");
+
+        if (
+          highlight.type === HighlightType.Search ||
+          highlight.type === HighlightType.ReadAloud ||
+          highlight.type === HighlightType.LineFocus ||
+          highlight.type === HighlightType.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 = {
@@ -3195,7 +3218,18 @@ export class TextHighlighter {
       }
     }
 
-    highlightAreaIcon.style.setProperty("pointer-events", "all");
+    if (
+      highlight.type === HighlightType.Search ||
+      highlight.type === HighlightType.ReadAloud ||
+      highlight.type === HighlightType.LineFocus ||
+      highlight.type === HighlightType.PageBreak
+    ) {
+      highlightAreaIcon.style.setProperty("pointer-events", "none");
+    } else {
+      highlightAreaIcon.style.setProperty("pointer-events", "all");
+      highlightAreaIcon.style.setProperty("cursor", "hand");
+    }
+
     let self = this;
     if (
       highlight.type !== HighlightType.PageBreak &&