pagination comment fixes

DeXter-on-Radix · Aug 14, 2024 · 9f3ca64 · 9f3ca64
1 parent ec8a7b9
commit 9f3ca64
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/src/app/components/AccountHistory.tsx b/src/app/components/AccountHistory.tsx
@@ -262,15 +262,17 @@ function DisplayTable() {
     }
   }, [
     openOrders,
-    orderHistory,
     selectedTable,
     hideOtherPairs,
     filteredRowsForOrderHistory,
+    combinedOpenOrders,
   ]);
 
   useEffect(() => {
+    const tableRefNode = tableContainerRef.current;
+
     function calcPaginationLeftOffset() {
-      if (tableContainerRef.current !== null) {
+      if (tableRefNode !== null) {
         if (timeoutRef.current !== null) {
           clearTimeout(timeoutRef.current);
         }
@@ -288,20 +290,14 @@ function DisplayTable() {
     }
 
     calcPaginationLeftOffset();
-    if (tableContainerRef.current) {
-      tableContainerRef.current.addEventListener(
-        "scroll",
-        calcPaginationLeftOffset
-      );
+    if (tableRefNode) {
+      tableRefNode.addEventListener("scroll", calcPaginationLeftOffset);
     }
 
     window.addEventListener("resize", calcPaginationLeftOffset);
     return () => {
-      if (tableContainerRef.current) {
-        tableContainerRef.current.removeEventListener(
-          "scroll",
-          calcPaginationLeftOffset
-        );
+      if (tableRefNode) {
+        tableRefNode.removeEventListener("scroll", calcPaginationLeftOffset);
       }
 
       window.removeEventListener("resize", calcPaginationLeftOffset);

diff --git a/src/app/components/Pagination.tsx b/src/app/components/Pagination.tsx
@@ -47,8 +47,8 @@ const Pagination: React.FC<PaginationProps> = ({
         onClick={() => setCurrentPage(idx)}
         role="button"
         className={`${
-          currentPage === idx ? "bg-dexter-green rounded-full" : ""
-        } text-white hover:bg-dexter-green p-1 hover:rounded-full h-6 w-6 text-center opacity-90 hover:opacity-100`}
+          currentPage === idx ? "bg-dexter-green rounded-full text-black" : ""
+        }  hover:bg-dexter-green hover:text-black p-1 hover:rounded-full h-6 w-6 text-center opacity-90 hover:opacity-100`}
       >
         {idx + 1}
       </div>

diff --git a/src/app/hooks.ts b/src/app/hooks.ts
@@ -51,7 +51,7 @@ export function usePagination<T>(data: T[], paginationId?: string) {
 
   const paginatedData = useMemo(
     () => data.slice(startIndex, endIndex),
-    [data, currentPage]
+    [data, startIndex, endIndex]
   );
 
   const updatePsize = useCallback(