@ackplus/react-tanstack-data-table 1.0.19-beta-0.10 → 1.0.19-beta-0.13

package/src/lib/features/{custom-selection.feature.js → selection.feature.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomSelectionFeature = void 0;
+exports.SelectionFeature = void 0;
 const react_table_1 = require("@tanstack/react-table");
-exports.CustomSelectionFeature = {
+exports.SelectionFeature = {
     getInitialState: (state) => {
         return Object.assign({ selectionState: {
                 ids: [],
@@ -12,7 +12,7 @@ exports.CustomSelectionFeature = {
     },
     getDefaultOptions: (table) => {
         return {
-            enableCustomSelection: true,
+            enableAdvanceSelection: true,
             selectMode: 'page',
             onSelectionStateChange: (0, react_table_1.makeStateUpdater)('selectionState', table),
         };
@@ -20,6 +20,8 @@ exports.CustomSelectionFeature = {
     createTable: (table) => {
         table.setSelectionState = (updater) => {
             var _a, _b;
+            if (!table.options.enableAdvanceSelection)
+                return;
             const safeUpdater = (old) => {
                 const newState = (0, react_table_1.functionalUpdate)(updater, old);
                 return newState;
@@ -27,6 +29,8 @@ exports.CustomSelectionFeature = {
             return (_b = (_a = table.options).onSelectionStateChange) === null || _b === void 0 ? void 0 : _b.call(_a, safeUpdater);
         };
         table.selectRow = (rowId) => {
+            if (!table.options.enableAdvanceSelection)
+                return;
             if (!table.canSelectRow(rowId))
                 return;
             table.setSelectionState((old) => {
@@ -40,6 +44,8 @@ exports.CustomSelectionFeature = {
             });
         };
         table.deselectRow = (rowId) => {
+            if (!table.options.enableAdvanceSelection)
+                return;
             table.setSelectionState((old) => {
                 if (old.type === 'exclude') {
                     const newIds = old.ids.includes(rowId) ? old.ids : [...old.ids, rowId];
@@ -51,6 +57,8 @@ exports.CustomSelectionFeature = {
             });
         };
         table.toggleRowSelected = (rowId) => {
+            if (!table.options.enableAdvanceSelection)
+                return;
             if (table.getIsRowSelected(rowId)) {
                 table.deselectRow(rowId);
             }
@@ -59,6 +67,8 @@ exports.CustomSelectionFeature = {
             }
         };
         table.selectAll = () => {
+            if (!table.options.enableAdvanceSelection)
+                return;
             const selectMode = table.options.selectMode || 'page';
             if (selectMode === 'all') {
                 table.setSelectionState((old) => (Object.assign(Object.assign({}, old), { ids: [], type: 'exclude' })));
@@ -72,9 +82,13 @@ exports.CustomSelectionFeature = {
             }
         };
         table.deselectAll = () => {
+            if (!table.options.enableAdvanceSelection)
+                return;
             table.setSelectionState((old) => (Object.assign(Object.assign({}, old), { ids: [], type: 'include' })));
         };
         table.toggleAllRowsSelected = () => {
+            if (!table.options.enableAdvanceSelection)
+                return;
             if (table.getIsAllRowsSelected()) {
                 table.deselectAll();
             }
@@ -143,12 +157,10 @@ exports.CustomSelectionFeature = {
         table.getSelectedRowIds = () => {
             const state = table.getSelectionState();
             if (state.type === 'exclude') {
-                console.warn('getSelectedRowIds() in exclude mode returns exclude list. Use getSelectionState() instead.');
-                return state.ids;
-            }
-            else {
-                return state.ids;
+                console.warn('[SelectionFeature] getSelectedRowIds() is not accurate in exclude mode. Use getSelectionState() to interpret selection properly.');
+                return [];
             }
+            return state.ids;
         };
         table.getSelectedRows = () => {
             const state = table.getSelectionState();

package/src/lib/hooks/use-data-table-api.d.ts

@@ -1,38 +1,26 @@
-import { ColumnOrderState, ColumnPinningState, SortingState, Table } from '@tanstack/react-table';
+import { Table } from '@tanstack/react-table';
 import { Ref } from 'react';
-import { CustomColumnFilterState, TableFilters, TableState } from '../types';
+import { ColumnFilterState, TableFilters, TableState } from '../types';
 import { DataTableApi } from '../types/data-table-api';
 import { SelectionState } from '../features';
 interface UseDataTableApiProps<T> {
     table: Table<T>;
-    data: T[];
     idKey: keyof T;
-    globalFilter: string;
-    customColumnsFilter: CustomColumnFilterState;
-    sorting: SortingState;
-    pagination: {
-        pageIndex: number;
-        pageSize: number;
-    };
-    columnOrder: ColumnOrderState;
-    columnPinning: ColumnPinningState;
     enhancedColumns: any[];
     enablePagination: boolean;
     enableColumnPinning: boolean;
-    initialPageIndex: number;
-    initialPageSize?: number;
-    pageSize: number;
+    initialStateConfig: Partial<TableState>;
     selectMode?: 'page' | 'all';
     onSelectionChange?: (state: SelectionState) => void;
-    handleColumnFilterStateChange: (filterState: CustomColumnFilterState) => void;
+    handleColumnFilterStateChange: (filterState: ColumnFilterState) => void;
     onDataStateChange?: (state: Partial<TableState>) => void;
     onFetchData?: (filters: Partial<TableFilters>) => void;
     onDataChange?: (newData: T[]) => void;
     exportFilename?: string;
     onExportProgress?: (progress: {
-        processedRows: number;
-        totalRows: number;
-        percentage: number;
+        processedRows?: number;
+        totalRows?: number;
+        percentage?: number;
     }) => void;
     onExportComplete?: (result: {
         success: boolean;

package/src/lib/hooks/use-data-table-api.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const react_1 = require("react");
 const export_utils_1 = require("../utils/export-utils");
 function useDataTableApi(props, ref) {
-    const { table, data, idKey, globalFilter, customColumnsFilter, sorting, pagination, columnOrder, columnPinning, enhancedColumns, enablePagination, enableColumnPinning, initialPageIndex, initialPageSize, pageSize, selectMode = 'page', onSelectionChange, handleColumnFilterStateChange, onDataStateChange, onFetchData, onDataChange, exportFilename = 'export', onExportProgress, onExportComplete, onExportError, onServerExport, exportController, setExportController, isExporting, dataMode = 'client', } = props;
+    const { table, idKey, enhancedColumns, enablePagination, enableColumnPinning, initialStateConfig, selectMode = 'page', onSelectionChange, handleColumnFilterStateChange, onDataStateChange, onFetchData, onDataChange, exportFilename = 'export', onExportProgress, onExportComplete, onExportError, onServerExport, exportController, setExportController, isExporting, dataMode = 'client', } = props;
     (0, react_1.useImperativeHandle)(ref, () => ({
         table: {
             getTable: () => table,
@@ -113,7 +113,7 @@ function useDataTableApi(props, ref) {
             clearGlobalFilter: () => {
                 table.setGlobalFilter('');
             },
-            setCustomColumnFilters: (filters) => {
+            setColumnFilters: (filters) => {
                 handleColumnFilterStateChange(filters);
             },
             addColumnFilter: (columnId, operator, value) => {
@@ -123,23 +123,25 @@ function useDataTableApi(props, ref) {
                     operator,
                     value,
                 };
-                const currentFilters = customColumnsFilter.filters || [];
+                const columnFilter = table.getState().columnFilter;
+                const currentFilters = columnFilter.filters || [];
                 const newFilters = [...currentFilters, newFilter];
                 handleColumnFilterStateChange({
                     filters: newFilters,
-                    logic: customColumnsFilter.logic,
-                    pendingFilters: customColumnsFilter.pendingFilters || [],
-                    pendingLogic: customColumnsFilter.pendingLogic || 'AND',
+                    logic: columnFilter.logic,
+                    pendingFilters: columnFilter.pendingFilters || [],
+                    pendingLogic: columnFilter.pendingLogic || 'AND',
                 });
             },
             removeColumnFilter: (filterId) => {
-                const currentFilters = customColumnsFilter.filters || [];
+                const columnFilter = table.getState().columnFilter;
+                const currentFilters = columnFilter.filters || [];
                 const newFilters = currentFilters.filter((f) => f.id !== filterId);
                 handleColumnFilterStateChange({
                     filters: newFilters,
-                    logic: customColumnsFilter.logic,
-                    pendingFilters: customColumnsFilter.pendingFilters || [],
-                    pendingLogic: customColumnsFilter.pendingLogic || 'AND',
+                    logic: columnFilter.logic,
+                    pendingFilters: columnFilter.pendingFilters || [],
+                    pendingLogic: columnFilter.pendingLogic || 'AND',
                 });
             },
             clearAllFilters: () => {
@@ -220,98 +222,95 @@ function useDataTableApi(props, ref) {
         },
         data: {
             refresh: () => {
-                const currentFilters = {
-                    globalFilter,
-                    customColumnsFilter: customColumnsFilter,
-                    sorting,
-                    pagination,
-                };
+                const pagination = table.getState().pagination;
                 if (onDataStateChange) {
-                    const currentState = Object.assign(Object.assign({}, currentFilters), { columnOrder,
-                        columnPinning });
-                    onDataStateChange(currentState);
+                    onDataStateChange({ pagination: { pageIndex: 0, pageSize: pagination.pageSize } });
                 }
                 if (onFetchData) {
-                    onFetchData(currentFilters);
+                    onFetchData({ pagination: { pageIndex: 0, pageSize: pagination.pageSize } });
                 }
             },
             reload: () => {
-                const currentFilters = {
-                    globalFilter,
-                    customColumnsFilter: customColumnsFilter,
-                    sorting,
-                    pagination,
-                };
+                const pagination = table.getState().pagination;
                 if (onDataStateChange) {
-                    const currentState = Object.assign(Object.assign({}, currentFilters), { columnOrder,
-                        columnPinning });
-                    onDataStateChange(Object.assign({}, currentState));
+                    onDataStateChange({ pagination: { pageIndex: 0, pageSize: pagination.pageSize } });
                 }
                 if (onFetchData) {
-                    onFetchData(Object.assign({}, currentFilters));
+                    onFetchData({ pagination: { pageIndex: 0, pageSize: pagination.pageSize } });
                 }
             },
             getAllData: () => {
-                return [...data];
+                var _a;
+                return ((_a = table.getRowModel().rows) === null || _a === void 0 ? void 0 : _a.map(row => row.original)) || [];
             },
             getRowData: (rowId) => {
-                return data.find(row => String(row[idKey]) === rowId);
+                var _a, _b;
+                return (_b = (_a = table.getRowModel().rows) === null || _a === void 0 ? void 0 : _a.find(row => String(row.original[idKey]) === rowId)) === null || _b === void 0 ? void 0 : _b.original;
             },
             getRowByIndex: (index) => {
-                return data[index];
+                var _a, _b;
+                return (_b = (_a = table.getRowModel().rows) === null || _a === void 0 ? void 0 : _a[index]) === null || _b === void 0 ? void 0 : _b.original;
             },
             updateRow: (rowId, updates) => {
-                const newData = data.map(row => String(row[idKey]) === rowId
-                    ? Object.assign(Object.assign({}, row), updates) : row);
-                onDataChange === null || onDataChange === void 0 ? void 0 : onDataChange(newData);
+                var _a;
+                const newData = (_a = table.getRowModel().rows) === null || _a === void 0 ? void 0 : _a.map(row => String(row.original[idKey]) === rowId
+                    ? Object.assign(Object.assign({}, row.original), updates) : row.original);
+                onDataChange === null || onDataChange === void 0 ? void 0 : onDataChange(newData || []);
             },
             updateRowByIndex: (index, updates) => {
-                const newData = [...data];
-                if (newData[index]) {
+                var _a;
+                const newData = (_a = table.getRowModel().rows) === null || _a === void 0 ? void 0 : _a.map(row => row.original);
+                if (newData === null || newData === void 0 ? void 0 : newData[index]) {
                     newData[index] = Object.assign(Object.assign({}, newData[index]), updates);
-                    onDataChange === null || onDataChange === void 0 ? void 0 : onDataChange(newData);
+                    onDataChange(newData);
                 }
             },
             insertRow: (newRow, index) => {
-                const newData = [...data];
+                var _a;
+                const newData = ((_a = table.getRowModel().rows) === null || _a === void 0 ? void 0 : _a.map(row => row.original)) || [];
                 if (index !== undefined) {
                     newData.splice(index, 0, newRow);
                 }
                 else {
                     newData.push(newRow);
                 }
-                onDataChange === null || onDataChange === void 0 ? void 0 : onDataChange(newData);
+                onDataChange(newData || []);
             },
             deleteRow: (rowId) => {
-                const newData = data.filter(row => String(row[idKey]) !== rowId);
-                onDataChange === null || onDataChange === void 0 ? void 0 : onDataChange(newData);
+                var _a;
+                const newData = (_a = (table.getRowModel().rows || [])) === null || _a === void 0 ? void 0 : _a.filter(row => String(row.original[idKey]) !== rowId);
+                onDataChange === null || onDataChange === void 0 ? void 0 : onDataChange((newData === null || newData === void 0 ? void 0 : newData.map(row => row.original)) || []);
             },
             deleteRowByIndex: (index) => {
-                const newData = [...data];
+                var _a;
+                const newData = (_a = (table.getRowModel().rows || [])) === null || _a === void 0 ? void 0 : _a.map(row => row.original);
                 newData.splice(index, 1);
-                onDataChange === null || onDataChange === void 0 ? void 0 : onDataChange(newData);
+                onDataChange(newData);
             },
             deleteSelectedRows: () => {
+                var _a;
                 const selectedRowIds = Object.keys(table.getState().rowSelection)
                     .filter(key => table.getState().rowSelection[key]);
-                const newData = data.filter(row => !selectedRowIds.includes(String(row[idKey])));
-                onDataChange === null || onDataChange === void 0 ? void 0 : onDataChange(newData);
+                const newData = (_a = (table.getRowModel().rows || [])) === null || _a === void 0 ? void 0 : _a.filter(row => !selectedRowIds.includes(String(row.original[idKey])));
+                onDataChange((newData === null || newData === void 0 ? void 0 : newData.map(row => row.original)) || []);
                 table.resetRowSelection();
             },
             replaceAllData: (newData) => {
                 onDataChange === null || onDataChange === void 0 ? void 0 : onDataChange(newData);
             },
             updateMultipleRows: (updates) => {
+                var _a;
                 const updateMap = new Map(updates.map(u => [u.rowId, u.data]));
-                const newData = data.map(row => {
-                    const rowId = String(row[idKey]);
+                const newData = (_a = (table.getRowModel().rows || [])) === null || _a === void 0 ? void 0 : _a.map(row => {
+                    const rowId = String(row.original[idKey]);
                     const updateData = updateMap.get(rowId);
-                    return updateData ? Object.assign(Object.assign({}, row), updateData) : row;
+                    return updateData ? Object.assign(Object.assign({}, row.original), updateData) : row.original;
                 });
-                onDataChange === null || onDataChange === void 0 ? void 0 : onDataChange(newData);
+                onDataChange(newData || []);
             },
             insertMultipleRows: (newRows, startIndex) => {
-                const newData = [...data];
+                var _a;
+                const newData = (_a = (table.getRowModel().rows || [])) === null || _a === void 0 ? void 0 : _a.map(row => row.original);
                 if (startIndex !== undefined) {
                     newData.splice(startIndex, 0, ...newRows);
                 }
@@ -321,30 +320,36 @@ function useDataTableApi(props, ref) {
                 onDataChange === null || onDataChange === void 0 ? void 0 : onDataChange(newData);
             },
             deleteMultipleRows: (rowIds) => {
+                var _a, _b;
                 const idsToDelete = new Set(rowIds);
-                const newData = data.filter(row => !idsToDelete.has(String(row[idKey])));
-                onDataChange === null || onDataChange === void 0 ? void 0 : onDataChange(newData);
+                const newData = (_b = (_a = (table.getRowModel().rows || [])) === null || _a === void 0 ? void 0 : _a.filter(row => !idsToDelete.has(String(row.original[idKey])))) === null || _b === void 0 ? void 0 : _b.map(row => row.original);
+                onDataChange(newData);
             },
             updateField: (rowId, fieldName, value) => {
-                const newData = data.map(row => String(row[idKey]) === rowId
-                    ? Object.assign(Object.assign({}, row), { [fieldName]: value }) : row);
+                var _a;
+                const newData = (_a = (table.getRowModel().rows || [])) === null || _a === void 0 ? void 0 : _a.map(row => String(row.original[idKey]) === rowId
+                    ? Object.assign(Object.assign({}, row.original), { [fieldName]: value }) : row.original);
                 onDataChange === null || onDataChange === void 0 ? void 0 : onDataChange(newData);
             },
             updateFieldByIndex: (index, fieldName, value) => {
-                const newData = [...data];
+                var _a;
+                const newData = (_a = (table.getRowModel().rows || [])) === null || _a === void 0 ? void 0 : _a.map(row => row.original);
                 if (newData[index]) {
                     newData[index] = Object.assign(Object.assign({}, newData[index]), { [fieldName]: value });
                     onDataChange === null || onDataChange === void 0 ? void 0 : onDataChange(newData);
                 }
             },
             findRows: (predicate) => {
-                return data.filter(predicate);
+                var _a, _b;
+                return (_b = (_a = (table.getRowModel().rows || [])) === null || _a === void 0 ? void 0 : _a.filter(row => predicate(row.original))) === null || _b === void 0 ? void 0 : _b.map(row => row.original);
             },
             findRowIndex: (predicate) => {
-                return data.findIndex(predicate);
+                var _a;
+                return (_a = (table.getRowModel().rows || [])) === null || _a === void 0 ? void 0 : _a.findIndex(row => predicate(row.original));
             },
             getDataCount: () => {
-                return data.length;
+                var _a;
+                return ((_a = (table.getRowModel().rows || [])) === null || _a === void 0 ? void 0 : _a.length) || 0;
             },
             getFilteredDataCount: () => {
                 return table.getFilteredRowModel().rows.length;
@@ -366,21 +371,12 @@ function useDataTableApi(props, ref) {
                 table.resetExpanded();
                 table.resetRowSelection();
                 table.resetColumnPinning();
-                handleColumnFilterStateChange({
-                    filters: [],
-                    logic: 'AND',
-                    pendingFilters: [],
-                    pendingLogic: 'AND',
-                });
+                handleColumnFilterStateChange(initialStateConfig.columnFilter || { filters: [], logic: 'AND', pendingFilters: [], pendingLogic: 'AND' });
                 if (enablePagination) {
-                    table.setPageIndex(initialPageIndex);
-                    table.setPageSize(initialPageSize || pageSize);
+                    table.setPagination(initialStateConfig.pagination || { pageIndex: 0, pageSize: 10 });
                 }
                 if (enableColumnPinning) {
-                    table.setColumnPinning({
-                        left: [],
-                        right: [],
-                    });
+                    table.setColumnPinning(initialStateConfig.columnPinning || { left: [], right: [] });
                 }
             },
             saveLayout: () => {
@@ -392,7 +388,7 @@ function useDataTableApi(props, ref) {
                     sorting: table.getState().sorting,
                     pagination: table.getState().pagination,
                     globalFilter: table.getState().globalFilter,
-                    customColumnsFilter: customColumnsFilter,
+                    columnFilter: table.getState().columnFilter,
                 };
             },
             restoreLayout: (layout) => {
@@ -417,8 +413,8 @@ function useDataTableApi(props, ref) {
                 if (layout.globalFilter !== undefined) {
                     table.setGlobalFilter(layout.globalFilter);
                 }
-                if (layout.customColumnsFilter) {
-                    handleColumnFilterStateChange(layout.customColumnsFilter);
+                if (layout.columnFilter) {
+                    handleColumnFilterStateChange(layout.columnFilter);
                 }
             },
         },
@@ -427,7 +423,7 @@ function useDataTableApi(props, ref) {
                 return table.getState();
             },
             getCurrentFilters: () => {
-                return customColumnsFilter;
+                return table.getState().columnFilter;
             },
             getCurrentSorting: () => {
                 return table.getState().sorting;
@@ -449,12 +445,10 @@ function useDataTableApi(props, ref) {
                     setExportController === null || setExportController === void 0 ? void 0 : setExportController(controller);
                     if (dataMode === 'server' && onServerExport) {
                         const currentFilters = {
-                            globalFilter,
-                            customColumnsFilter,
-                            sorting,
-                            pagination,
-                            columnOrder,
-                            columnPinning,
+                            globalFilter: table.getState().globalFilter,
+                            columnFilter: table.getState().columnFilter,
+                            sorting: table.getState().sorting,
+                            pagination: table.getState().pagination,
                         };
                         yield (0, export_utils_1.exportServerData)(table, {
                             format: 'csv',
@@ -495,12 +489,10 @@ function useDataTableApi(props, ref) {
                     setExportController === null || setExportController === void 0 ? void 0 : setExportController(controller);
                     if (dataMode === 'server' && onServerExport) {
                         const currentFilters = {
-                            globalFilter,
-                            customColumnsFilter,
-                            sorting,
-                            pagination,
-                            columnOrder,
-                            columnPinning,
+                            globalFilter: table.getState().globalFilter,
+                            columnFilter: table.getState().columnFilter,
+                            sorting: table.getState().sorting,
+                            pagination: table.getState().pagination,
                         };
                         yield (0, export_utils_1.exportServerData)(table, {
                             format: 'excel',
@@ -547,12 +539,10 @@ function useDataTableApi(props, ref) {
                     const controller = new AbortController();
                     setExportController === null || setExportController === void 0 ? void 0 : setExportController(controller);
                     const currentFilters = {
-                        globalFilter,
-                        customColumnsFilter,
-                        sorting,
-                        pagination,
-                        columnOrder,
-                        columnPinning,
+                        globalFilter: table.getState().globalFilter,
+                        columnFilter: table.getState().columnFilter,
+                        sorting: table.getState().sorting,
+                        pagination: table.getState().pagination,
                     };
                     yield (0, export_utils_1.exportServerData)(table, {
                         format,
@@ -585,22 +575,12 @@ function useDataTableApi(props, ref) {
         table,
         enhancedColumns,
         handleColumnFilterStateChange,
-        customColumnsFilter,
-        data,
         idKey,
         onDataStateChange,
         onFetchData,
-        globalFilter,
-        sorting,
-        pagination,
-        columnOrder,
-        columnPinning,
         onDataChange,
         enableColumnPinning,
         enablePagination,
-        initialPageIndex,
-        initialPageSize,
-        pageSize,
         exportFilename,
         onExportProgress,
         onExportComplete,

package/src/lib/types/data-table-api.d.ts

@@ -1,6 +1,6 @@
 import { ColumnPinningState, SortingState, ColumnOrderState, TableState, Row } from '@tanstack/react-table';
-import { CustomColumnFilterState } from './table.types';
-import { SelectionState } from '../features/custom-selection.feature';
+import { ColumnFilterState } from './table.types';
+import { SelectionState } from '../features';
 export interface DataTableApi<T = any> {
     columnVisibility: {
         showColumn: (columnId: string) => void;
@@ -31,7 +31,7 @@ export interface DataTableApi<T = any> {
     filtering: {
         setGlobalFilter: (filter: string) => void;
         clearGlobalFilter: () => void;
-        setCustomColumnFilters: (filters: CustomColumnFilterState) => void;
+        setColumnFilters: (filters: ColumnFilterState) => void;
         addColumnFilter: (columnId: string, operator: string, value: any) => void;
         removeColumnFilter: (filterId: string) => void;
         clearAllFilters: () => void;
@@ -97,7 +97,7 @@ export interface DataTableApi<T = any> {
     };
     state: {
         getTableState: () => any;
-        getCurrentFilters: () => CustomColumnFilterState;
+        getCurrentFilters: () => ColumnFilterState;
         getCurrentSorting: () => SortingState;
         getCurrentPagination: () => {
             pageIndex: number;

package/src/lib/types/table.types.d.ts

@@ -2,7 +2,7 @@ import { SortingState } from '@tanstack/react-table';
 import { ColumnFilterRule, SelectionState } from '../features';
 export type TableSize = 'small' | 'medium';
 export interface TableState {
-    customColumnsFilter: CustomColumnFilterState;
+    columnFilter: ColumnFilterState;
     selectionState?: SelectionState;
     globalFilter?: string;
     sorting?: SortingState;
@@ -20,7 +20,7 @@ export interface TableState {
 }
 export interface TableFilters {
     globalFilter: string;
-    customColumnsFilter: CustomColumnFilterState;
+    columnFilter: ColumnFilterState;
     sorting: SortingState;
     pagination: {
         pageIndex: number;
@@ -37,9 +37,9 @@ export interface TableFiltersForFetch {
     page?: number;
     pageSize?: number;
     sorting?: SortingState;
-    customColumnsFilter?: CustomColumnFilterState;
+    columnFilter?: ColumnFilterState;
 }
-export interface CustomColumnFilterState {
+export interface ColumnFilterState {
     filters: ColumnFilterRule[];
     logic: 'AND' | 'OR';
     pendingFilters: ColumnFilterRule[];

package/src/lib/utils/column-helpers.d.ts

@@ -1,7 +1,6 @@
-import { DataTableColumn } from '../types';
 import { Column } from "@tanstack/react-table";
 export type ColumnType = 'text' | 'number' | 'date' | 'boolean' | 'select' | 'actions';
 export declare function getColumnType(column: Column<any, unknown>): ColumnType;
 export declare function getCustomFilterComponent(column: Column<any, unknown>): any;
 export declare function getColumnOptions(column: Column<any, unknown>): any[];
-export declare function isColumnFilterable(column: DataTableColumn<any, unknown>): boolean;
+export declare function isColumnFilterable(column: Column<any, unknown>): boolean;

package/src/lib/utils/column-helpers.js

@@ -36,8 +36,9 @@ function getColumnOptions(column) {
     return [];
 }
 function isColumnFilterable(column) {
-    if ((column === null || column === void 0 ? void 0 : column.filterable) !== undefined) {
-        return column === null || column === void 0 ? void 0 : column.filterable;
+    var _a, _b;
+    if (((_a = column === null || column === void 0 ? void 0 : column.columnDef) === null || _a === void 0 ? void 0 : _a.filterable) !== undefined) {
+        return (_b = column === null || column === void 0 ? void 0 : column.columnDef) === null || _b === void 0 ? void 0 : _b.filterable;
     }
     return true;
 }

package/src/lib/utils/export-utils.d.ts

@@ -1,12 +1,12 @@
 import { Table } from '@tanstack/react-table';
-import { SelectionState } from '../features/custom-selection.feature';
+import { SelectionState } from '../features';
 export interface ExportOptions {
     format: 'csv' | 'excel';
     filename: string;
     onProgress?: (progress: {
-        processedRows: number;
-        totalRows: number;
-        percentage: number;
+        processedRows?: number;
+        totalRows?: number;
+        percentage?: number;
     }) => void;
     onComplete?: (result: {
         success: boolean;