fix bug

package.json

@@ -21,7 +21,7 @@
     "@vitalets/google-translate-api": "^8.0.0",
     "adm-zip": "^0.5.2",
     "axios": "^0.19.2",
-    "bing-translate-api": "^2.7.0",
+    "bing-translate-api": "^2.10.0",
     "buffer": "^6.0.3",
     "copy-text-to-clipboard": "^2.2.0",
     "dompurify": "^3.0.1",

src/components/background/component.tsx

@@ -87,7 +87,7 @@ class Background extends React.Component<BackgroundProps, BackgroundState> {
             <div
               className="spine-shadow-left"
               style={
-                this.state.isSingle ? { display: "none" } : { opacity: "0.2" }
+                this.state.isSingle ? { display: "none" } : { opacity: "0.15" }
               }
             ></div>
           )}
@@ -120,9 +120,9 @@ class Background extends React.Component<BackgroundProps, BackgroundState> {
                   ? {
                       position: "relative",
                       right: 0,
-                      opacity: 0.2,
+                      opacity: 0.15,
                     }
-                  : { opacity: 0.2 }
+                  : { opacity: 0.15 }
               }
             ></div>
           )}

src/components/bookCardItem/component.tsx

@@ -215,7 +215,13 @@ class BookCardItem extends React.Component<BookCardProps, BookCardState> {
                 this.setState({ isHover: false });
                 event?.stopPropagation();
               }}
-              style={this.props.isSelected ? { opacity: 1 } : { color: "#eee" }}
+              style={
+                this.props.isSelected
+                  ? { opacity: 1 }
+                  : {
+                      color: "#eee",
+                    }
+              }
             ></span>
           ) : null}
 

src/components/popups/popupNote/component.tsx

@@ -14,18 +14,13 @@ import {
   removePDFHighlight,
 } from "../../../utils/fileUtils/pdfUtil";
 import { getIframeDoc } from "../../../utils/serviceUtils/docUtil";
-import { renderHighlighters } from "../../../utils/serviceUtils/noteUtil";
+import {
+  createOneNote,
+  removeOneNote,
+} from "../../../utils/serviceUtils/noteUtil";
+import { classes } from "../../../constants/themeList";
 declare var window: any;
-let classes = [
-  "color-0",
-  "color-1",
-  "color-2",
-  "color-3",
-  "line-0",
-  "line-1",
-  "line-2",
-  "line-3",
-];
+
 class PopupNote extends React.Component<PopupNoteProps, PopupNoteState> {
   constructor(props: PopupNoteProps) {
     super(props);
@@ -62,38 +57,11 @@ class PopupNote extends React.Component<PopupNoteProps, PopupNoteState> {
   handleTag = (tag: string[]) => {
     this.setState({ tag });
   };
-  handleHighlight = () => {
-    let highlighters: any = this.props.notes;
-    if (!highlighters) return;
-    let highlightersByChapter = highlighters.filter((item: Note) => {
-      if (this.props.currentBook.format !== "PDF") {
-        return (
-          (item.chapter ===
-            this.props.htmlBook.rendition.getChapterDoc()[
-              this.props.chapterDocIndex
-            ].label ||
-            item.chapterIndex === this.props.chapterDocIndex) &&
-          item.bookKey === this.props.currentBook.key
-        );
-      } else {
-        return (
-          item.chapterIndex === this.props.chapterDocIndex &&
-          item.bookKey === this.props.currentBook.key
-        );
-      }
-    });
-    renderHighlighters(
-      highlightersByChapter,
-      this.props.currentBook.format,
-      this.handleNoteClick
-    );
-  };
+
   handleNoteClick = (event: Event) => {
-    if (event && event.target) {
-      this.props.handleNoteKey((event.target as any).dataset.key);
-      this.props.handleMenuMode("note");
-      this.props.handleOpenMenu(true);
-    }
+    this.props.handleNoteKey((event.target as any).dataset.key);
+    this.props.handleMenuMode("note");
+    this.props.handleOpenMenu(true);
   };
   createNote() {
     let notes = (document.querySelector(".editor-box") as HTMLInputElement)
@@ -123,7 +91,6 @@ class PopupNote extends React.Component<PopupNoteProps, PopupNoteState> {
         this.props.handleFetchNotes();
         this.props.handleMenuMode("");
         this.props.handleNoteKey("");
-        this.handleHighlight();
       });
     } else {
       //创建笔记
@@ -174,7 +141,7 @@ class PopupNote extends React.Component<PopupNoteProps, PopupNoteState> {
         toast.success(this.props.t("Add Successfully"));
         this.props.handleFetchNotes();
         this.props.handleMenuMode("");
-        this.handleHighlight();
+        createOneNote(note, this.handleNoteClick);
       });
     }
   }
@@ -203,15 +170,14 @@ class PopupNote extends React.Component<PopupNoteProps, PopupNoteState> {
           this.props.handleMenuMode("");
           this.props.handleFetchNotes();
           this.props.handleNoteKey("");
-          this.handleHighlight();
+          removeOneNote(note.key);
           this.props.handleOpenMenu(false);
         });
       }
     } else {
       this.props.handleOpenMenu(false);
       this.props.handleMenuMode("");
       this.props.handleNoteKey("");
-      this.handleHighlight();
     }
   };
 

src/components/popups/popupOption/component.tsx

@@ -15,7 +15,7 @@ import { getHightlightCoords } from "../../../utils/fileUtils/pdfUtil";
 import { getIframeDoc } from "../../../utils/serviceUtils/docUtil";
 import { openExternalUrl } from "../../../utils/serviceUtils/urlUtil";
 import { isElectron } from "react-device-detect";
-import { renderHighlighters } from "../../../utils/serviceUtils/noteUtil";
+import { createOneNote } from "../../../utils/serviceUtils/noteUtil";
 
 declare var window: any;
 
@@ -118,41 +118,14 @@ class PopupOption extends React.Component<PopupOptionProps> {
       toast.success(this.props.t("Add Successfully"));
       this.props.handleFetchNotes();
       this.props.handleMenuMode("");
-      this.handleHighlight();
+      createOneNote(digest, this.handleNoteClick);
     });
   };
-  handleHighlight = () => {
-    let highlighters: any = this.props.notes;
-    if (!highlighters) return;
-    let highlightersByChapter = highlighters.filter((item: Note) => {
-      if (this.props.currentBook.format !== "PDF") {
-        return (
-          (item.chapter ===
-            this.props.htmlBook.rendition.getChapterDoc()[
-              this.props.chapterDocIndex
-            ].label ||
-            item.chapterIndex === this.props.chapterDocIndex) &&
-          item.bookKey === this.props.currentBook.key
-        );
-      } else {
-        return (
-          item.chapterIndex === this.props.chapterDocIndex &&
-          item.bookKey === this.props.currentBook.key
-        );
-      }
-    });
-    renderHighlighters(
-      highlightersByChapter,
-      this.props.currentBook.format,
-      this.handleNoteClick
-    );
-  };
+
   handleNoteClick = (event: Event) => {
-    if (event && event.target) {
-      this.props.handleNoteKey((event.target as any).dataset.key);
-      this.props.handleMenuMode("note");
-      this.props.handleOpenMenu(true);
-    }
+    this.props.handleNoteKey((event.target as any).dataset.key);
+    this.props.handleMenuMode("note");
+    this.props.handleOpenMenu(true);
   };
   handleJump = (url: string) => {
     openExternalUrl(url);

src/components/popups/popupTrans/component.tsx

@@ -37,6 +37,7 @@ class PopupTrans extends React.Component<PopupTransProps, PopupTransState> {
           });
         })
         .catch((err) => {
+          console.log(err);
           this.setState({
             translatedText: this.props.t("Error happens"),
           });

src/constants/themeList.tsx

@@ -43,3 +43,13 @@ export const themeList = [
     title: "Purple",
   },
 ];
+export const classes = [
+  "color-0",
+  "color-1",
+  "color-2",
+  "color-3",
+  "line-0",
+  "line-1",
+  "line-2",
+  "line-3",
+];

src/containers/htmlViewer/component.tsx

@@ -110,11 +110,9 @@ class Viewer extends React.Component<ViewerProps, ViewerState> {
     );
   };
   handleNoteClick = (event: Event) => {
-    if (event && event.target) {
-      this.props.handleNoteKey((event.target as any).dataset.key);
-      this.props.handleMenuMode("note");
-      this.props.handleOpenMenu(true);
-    }
+    this.props.handleNoteKey((event.target as any).dataset.key);
+    this.props.handleMenuMode("note");
+    this.props.handleOpenMenu(true);
   };
   handleRenderBook = async () => {
     if (lock) return;
@@ -346,7 +344,7 @@ class Viewer extends React.Component<ViewerProps, ViewerState> {
           id="page-area"
           style={
             document.body.clientWidth < 570
-              ? { left: 0, right: 0 }
+              ? { left: 20, right: 20 }
               : this.state.readerMode === "scroll"
               ? {
                   marginLeft: `calc(50vw - ${

src/pages/pdfReader/component.tsx

@@ -117,11 +117,9 @@ class Viewer extends React.Component<ViewerProps, ViewerState> {
     );
   };
   handleNoteClick = (event: Event) => {
-    if (event && event.target) {
-      this.props.handleNoteKey((event.target as any).dataset.key);
-      this.props.handleMenuMode("note");
-      this.props.handleOpenMenu(true);
-    }
+    this.props.handleNoteKey((event.target as any).dataset.key);
+    this.props.handleMenuMode("note");
+    this.props.handleOpenMenu(true);
   };
   render() {
     return (

src/router/index.tsx

@@ -15,7 +15,6 @@ const Router = () => {
     if (lng) {
       //Compatile with 1.6.0 and older
       if (lng === "zh") {
-        console.log(lng);
         i18n.changeLanguage("zhCN");
       } else if (lng === "cht") {
         i18n.changeLanguage("zhTW");

src/utils/fileUtils/pdfUtil.tsx

@@ -141,7 +141,7 @@ export const showPDFHighlight = (
   selected: any,
   colorCode: string,
   noteKey: string,
-  handlePDFClick: any
+  handleNoteClick: any
 ) => {
   let iWin = getPDFIframeDoc();
   if (!iWin) return;
@@ -180,7 +180,14 @@ export const showPDFHighlight = (
       el?.setAttribute("data-key", noteKey);
       el?.setAttribute("class", "pdf-note");
       el?.addEventListener("click", (event: any) => {
-        handlePDFClick(event);
+        if (event && event.target) {
+          if (
+            (event.target as any).dataset &&
+            (event.target as any).dataset.key
+          ) {
+            handleNoteClick(event);
+          }
+        }
       });
 
       pageElement.appendChild(el);