gbs-add-block 0.0.87 → 0.0.88

package/README.md

@@ -1,4 +1,4 @@
-# GBS Building Blocks 2.0 (v0.0.87)
+# GBS Building Blocks 2.0 (v0.0.88)
 
 Latest and upgraded version of GBS building blocks with headless UI and removed dependencies.
 
@@ -6,7 +6,7 @@ Latest and upgraded version of GBS building blocks with headless UI and removed
 
 For detailed documentation on usage and props, Please visit: [Building Block Documentation v2.0](https://blackmax-designs.gitbook.io/building-block-v2.0)
 
-## What's New 🎉 (Ver 0.0.87)
+## What's New 🎉 (Ver 0.0.88)
 
 - Updated for bug fixes.
 

package/package.json

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

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

@@ -92,6 +92,7 @@ export const GridProvider: React.FC<{
     gridColumnStyle = "p-2 text-xs",
     rowChange = () => {},
     pageStatus = () => {},
+    activeFilterArrayValue = [],
   } = props;
 
   // States Handling Grid
@@ -133,9 +134,13 @@ export const GridProvider: React.FC<{
     const handleDataSource = async () => {
       if (Array.isArray(dataSource) && dataSource.length > 0) {
         setWorkingDataSource(dataSource);
-        const totalPages = Math.ceil(
-          dataSource.length / pageSettings.pageNumber
-        );
+
+        // if lazy is true, then totalPages will be taken from pageSettings
+        const totalPages =
+          lazy && pageSettings.totalPages
+            ? pageSettings.totalPages
+            : Math.ceil(dataSource.length / pageSettings.pageNumber);
+
         setTotalPages(totalPages);
         setPageEnd(Math.min(10, totalPages));
       } else if (typeof dataSource === "string") {
@@ -289,6 +294,8 @@ export const GridProvider: React.FC<{
     setWorkingColumns(updatedColumns);
     setWorkingDataSource(updatedFullDataSource);
     setActiveFilterArray(updatedActiveFilterArray);
+    if (activeFilterArrayValue)
+      activeFilterArrayValue(updatedActiveFilterArray);
     resetPage(updatedFullDataSource);
   }
 
@@ -305,6 +312,8 @@ export const GridProvider: React.FC<{
     setWorkingColumns(updatedColumns);
     setWorkingDataSource(updatedDataSource);
     setActiveFilterArray(updatedActiveFilterArray);
+    if (activeFilterArrayValue)
+      activeFilterArrayValue(updatedActiveFilterArray);
     resetPage(updatedDataSource);
   }
 

package/source/components/datagrid/layout/index.tsx

@@ -26,6 +26,7 @@ const GridContent = forwardRef((_, ref) => {
     prevPage,
     goToFirstPage,
     goToEndPage,
+    activeFilterArray,
   } = useGridContext();
 
   // Making Grid Functions Accessible in Parent
@@ -41,6 +42,7 @@ const GridContent = forwardRef((_, ref) => {
         handleSearch,
         handleApplyFilter,
         clearFilter,
+        getActiveFilters: () => activeFilterArray,
       };
     },
     [
@@ -52,6 +54,7 @@ const GridContent = forwardRef((_, ref) => {
       handleSearch,
       handleApplyFilter,
       clearFilter,
+      activeFilterArray,
     ]
   );
 

package/source/components/datagrid/type.ts

@@ -2,6 +2,13 @@ import { ChangeEvent } from "react";
 
 interface PageSettingsProps {
   pageNumber: number;
+  totalPages?: number;
+}
+
+interface ActiveFilterArrayValue {
+  filterColumn: string;
+  filterCondition: string;
+  filterValue: string;
 }
 
 export type GridProps = {
@@ -29,6 +36,7 @@ export type GridProps = {
   gridColumnStyle?: string;
   rowChange?: any;
   pageStatus?: any;
+  activeFilterArrayValue?: ActiveFilterArrayValue[] | any;
 };
 
 interface GridColumn {