fix bug

koodo-reader · Mar 19, 2023 · e964079 · e964079
1 parent 8a44e2d
commit e964079
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
     # Platforms to build on/for
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-latest, ubuntu-latest]
 
     steps:
       - name: Check out Git repository

diff --git a/src/components/popups/popupMenu/component.tsx b/src/components/popups/popupMenu/component.tsx
@@ -31,7 +31,6 @@ class PopupMenu extends React.Component<PopupMenuProps, PopupMenuStates> {
     this.state = {
       deleteKey: "",
       rect: this.props.rect,
-      isDisablePopup: StorageUtil.getReaderConfig("isDisablePopup") === "yes",
     };
   }
 

diff --git a/src/components/popups/popupMenu/interface.tsx b/src/components/popups/popupMenu/interface.tsx
@@ -26,7 +26,6 @@ export interface PopupMenuProps {
 }
 export interface PopupMenuStates {
   deleteKey: string;
-  isDisablePopup: boolean;
   // cfiRange: string;
   rect: DOMRect | null;
 }
diff --git a/src/containers/htmlViewer/component.tsx b/src/containers/htmlViewer/component.tsx
@@ -39,6 +39,8 @@ class Viewer extends React.Component<ViewerProps, ViewerState> {
         RecordLocation.getHtmlLocation(this.props.currentBook.key)
           .chapterTitle || "",
       readerMode: StorageUtil.getReaderConfig("readerMode") || "double",
+      isDisablePopup: StorageUtil.getReaderConfig("isDisablePopup") === "yes",
+
       margin: parseInt(StorageUtil.getReaderConfig("margin")) || 30,
       extraMargin: 0,
       chapterDocIndex: parseInt(
@@ -317,6 +319,13 @@ class Viewer extends React.Component<ViewerProps, ViewerState> {
       this.props.handleLeaveReader("bottom");
     });
     doc.addEventListener("mouseup", () => {
+      if (this.state.isDisablePopup) return;
+      if (!doc!.getSelection() || doc!.getSelection()!.rangeCount === 0) return;
+      var rect = doc!.getSelection()!.getRangeAt(0).getBoundingClientRect();
+      this.setState({ rect });
+    });
+    doc.addEventListener("dblclick", (event) => {
+      event.preventDefault();
       if (!doc!.getSelection() || doc!.getSelection()!.rangeCount === 0) return;
       var rect = doc!.getSelection()!.getRangeAt(0).getBoundingClientRect();
       this.setState({ rect });

diff --git a/src/containers/htmlViewer/interface.tsx b/src/containers/htmlViewer/interface.tsx
@@ -30,6 +30,7 @@ export interface ViewerState {
   scale: string;
   isFirst: boolean;
   chapterTitle: string;
+  isDisablePopup: boolean;
   margin: number;
   extraMargin: number;
   readerMode: string;

diff --git a/src/utils/readUtils/linkUtil.tsx b/src/utils/readUtils/linkUtil.tsx
@@ -27,7 +27,7 @@ export const handleLinkJump = async (event: any, rendition: any = {}) => {
     }
     let id = href.split("#").reverse()[0];
     await rendition.goToNode(doc.body.querySelector("#" + id) || doc.body);
-  } else if (rendition.resolveChapter(href)) {
+  } else if (href && rendition.resolveChapter(href)) {
     let chapterInfo = rendition.resolveChapter(href);
     rendition.goToChapter(
       chapterInfo.index,