fix bug

koodo-reader · Oct 29, 2023 · 77c9070 · 77c9070
1 parent 767e37d
commit 77c9070
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 15 deletions.
diff --git a/public/lib/kookit/kookit.min.js b/public/lib/kookit/kookit.min.js
diff --git a/src/components/dialogs/actionDialog/actionDialog.css b/src/components/dialogs/actionDialog/actionDialog.css
@@ -8,15 +8,14 @@
   border-radius: 5px;
   overflow: hidden;
   overflow-x: hidden;
-  padding-bottom: 5px;
 }
 
 .action-dialog-actions-container {
   font-size: 15px;
   text-align: center;
   line-height: 14px;
   opacity: 1;
-  margin-top: 5px;
+  padding: 5px;
   /* position: absolute;
   top: 83px;
   left: 29px; */
@@ -31,6 +30,7 @@
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  padding-left: 10px;
 }
 
 .action-name {

diff --git a/src/components/dialogs/sortDialog/sortDialog.css b/src/components/dialogs/sortDialog/sortDialog.css
@@ -3,17 +3,15 @@
   opacity: 1;
   position: absolute;
   left: 425px;
-  padding-bottom: 5px;
+  padding: 5px;
   top: 65px;
   z-index: 5;
   border-radius: 5px;
   transition: all 0.1s ease;
   overflow: hidden;
   animation: popup 0.1s ease-in-out 0s 1;
 }
-.sort-by-category {
-  margin-top: 4px;
-}
+
 .sort-by-category-list,
 .sort-by-order-list {
   font-size: 15px;

diff --git a/src/components/popups/popupMenu/component.tsx b/src/components/popups/popupMenu/component.tsx
@@ -62,8 +62,16 @@ class PopupMenu extends React.Component<PopupMenuProps, PopupMenuStates> {
     document
       .querySelector(".ebook-viewer")
       ?.setAttribute("style", "height:100%; overflow: hidden;");
+
     let doc: any = getPDFIframeDoc();
-    if (rect.bottom < doc.document.body.scrollHeight - 188) {
+    console.log(rect, doc.document.body, doc.document.body.scrollHeight);
+    if (
+      doc.document.body.scrollHeight - rect.top - rect.height < 188 &&
+      rect.top < 188
+    ) {
+      this.props.handleChangeDirection(true);
+      posY = rect.top + 16;
+    } else if (rect.bottom < doc.document.body.scrollHeight - 188) {
       this.props.handleChangeDirection(true);
       posY = posY + 16;
     } else {
@@ -75,7 +83,10 @@ class PopupMenu extends React.Component<PopupMenuProps, PopupMenuStates> {
   getHtmlPosition(rect: any) {
     let posY = rect.bottom - this.props.rendition.getPageSize().scrollTop;
     let posX = rect.left + rect.width / 2;
-    if (
+    if (this.props.rendition.getPageSize().height - rect.height < 188) {
+      this.props.handleChangeDirection(true);
+      posY = rect.top + 16 + this.props.rendition.getPageSize().top;
+    } else if (
       posY <
       this.props.rendition.getPageSize().height -
         188 +

diff --git a/src/containers/htmlViewer/component.tsx b/src/containers/htmlViewer/component.tsx
@@ -62,7 +62,11 @@ class Viewer extends React.Component<ViewerProps, ViewerState> {
     this.props.handleRenderBookFunc(this.handleRenderBook);
 
     window.addEventListener("resize", () => {
-      BookUtil.reloadBooks();
+      if (StorageUtil.getReaderConfig("isFullscreen") === "yes") {
+        this.handleRenderBook();
+      } else {
+        BookUtil.reloadBooks();
+      }
     });
   }
   handlePageWidth = () => {

diff --git a/src/containers/sidebar/component.tsx b/src/containers/sidebar/component.tsx
@@ -92,7 +92,7 @@ class Sidebar extends React.Component<SidebarProps, SidebarState> {
             {this.state.index === index && this.props.mode !== "shelf" ? (
               <div className="side-menu-selector-container"></div>
             ) : null}
-            {this.state.hoverIndex === index && this.props.mode !== "shelf" ? (
+            {this.state.hoverIndex === index ? (
               <div className="side-menu-hover-container"></div>
             ) : null}
             <div