gbs-add-block 1.0.30 → 1.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gbs-add-block",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "description": "React Component Library",
   "type": "module",
   "files": [

package/source/components/datagrid/context/GridContext.tsx

@@ -7,7 +7,6 @@ import {
   useSearch,
   useFiltering,
   useRowSelection,
-  usePageStatus,
 } from "../hooks";
 
 const GridContext = createContext<GridContextType | undefined>(undefined);
@@ -70,7 +69,13 @@ export const GridProvider: React.FC<{
     goToFirstPage,
     goToPage,
     resetPage,
-  } = usePagination(totalPages, lazy, workingDataSource, pageSettings);
+  } = usePagination(
+    totalPages,
+    lazy,
+    workingDataSource,
+    pageSettings,
+    pageStatus
+  );
 
   // Search functionality
   const { searchParam, handleSearchInput, handleSearch } = useSearch({
@@ -110,9 +115,6 @@ export const GridProvider: React.FC<{
   const { selectedRows, handleSelectAll, handleSelect, isRowSelected } =
     useRowSelection(workingDataSource, onSelectRow);
 
-  // Page status reporting - Bug Report - causes re-rendering when currentPage or totalPages change
-  // usePageStatus(currentPage, totalPages, pageStatus);
-
   // Context value
   const contextValue: GridContextType = {
     // State

package/source/components/datagrid/hooks/usePagination.ts

@@ -4,13 +4,15 @@ export const usePagination = (
   totalPages: number,
   lazy: boolean,
   dataSource?: any[],
-  pageSettings?: { pageNumber: number }
+  pageSettings?: { pageNumber: number },
+  pageStatus?: ({ currentPage }: { currentPage: number }) => void
 ) => {
   const [currentPage, setCurrentPage] = useState(0);
   const [pageStart, setPageStart] = useState(0);
   const [pageEnd, setPageEnd] = useState(10);
   const [prevDataLength, setPrevDataLength] = useState(0);
 
+  // Update page range based on current page
   const updatePageRange = useCallback(
     (page: number) => {
       const start = Math.floor(page / 10) * 10;
@@ -20,6 +22,7 @@ export const usePagination = (
     [totalPages]
   );
 
+  // Initialize page range based on total pages
   useEffect(() => {
     if (!lazy) {
       setPageEnd(Math.min(10, totalPages));
@@ -28,6 +31,13 @@ export const usePagination = (
     }
   }, [totalPages, lazy, pageStart]);
 
+  // Update page status if provided
+  useEffect(() => {
+    if (pageStatus) {
+      pageStatus({ currentPage });
+    }
+  }, [currentPage, pageStatus]);
+
   // This will handle the case when dataSource changes
   // and adjust the current page accordingly in managed workflow
   useEffect(() => {

package/source/components/datagrid/type.ts

@@ -35,7 +35,7 @@ export type GridProps = {
   gridColumnStyleSelectAll?: string;
   gridColumnStyle?: string;
   rowChange?: any;
-  pageStatus?: any;
+  pageStatus?: ({ currentPage }: { currentPage: number }) => void;
   activeFilterArrayValue?: ActiveFilterArrayValue[] | any;
   searchParamValue?: (value: string) => void;
   showTotalPages?: boolean;

package/source/components/datagrid/hooks/usePageStatus.ts

@@ -1,13 +0,0 @@
-import { useEffect } from "react";
-
-export const usePageStatus = (
-  currentPage: number,
-  totalPages: number,
-  pageStatus?: (status: any) => void
-) => {
-  useEffect(() => {
-    if (pageStatus) {
-      pageStatus({ currentPage, totalPages });
-    }
-  }, [pageStatus, currentPage, totalPages]);
-};