@ackplus/react-tanstack-data-table 1.0.19-beta-0.9 → 1.0.19-beta-0.12

package/src/lib/features/{custom-column-filter.feature.d.ts → column-filter.feature.d.ts}

@@ -1,5 +1,5 @@
 import { Table, TableFeature, RowData, Updater, RowModel } from '@tanstack/react-table';
-import type { CustomColumnFilterState } from '../types/table.types';
+import type { ColumnFilterState } from '../types/table.types';
 export interface ColumnFilterRule {
     id: string;
     columnId: string;
@@ -7,24 +7,24 @@ export interface ColumnFilterRule {
     value: any;
     columnType?: string;
 }
-export interface CustomColumnFilterOptions {
-    enableCustomColumnFilter?: boolean;
-    onCustomColumnFilterChange?: (updater: Updater<CustomColumnFilterState>) => void;
-    onCustomColumnFilterApply?: (state: CustomColumnFilterState) => void;
+export interface ColumnFilterOptions {
+    enableAdvanceColumnFilter?: boolean;
+    onColumnFilterChange?: (updater: Updater<ColumnFilterState>) => void;
+    onColumnFilterApply?: (state: ColumnFilterState) => void;
 }
-export interface CustomColumnFilterTableState {
-    customColumnFilter: CustomColumnFilterState;
+export interface ColumnFilterTableState {
+    columnFilter: ColumnFilterState;
 }
 declare module '@tanstack/table-core' {
-    interface TableState extends CustomColumnFilterTableState {
+    interface TableState extends ColumnFilterTableState {
     }
-    interface TableOptionsResolved<TData extends RowData> extends CustomColumnFilterOptions {
+    interface TableOptionsResolved<TData extends RowData> extends ColumnFilterOptions {
     }
-    interface Table<TData extends RowData> extends CustomColumnFilterInstance<TData> {
+    interface Table<TData extends RowData> extends ColumnFilterInstance<TData> {
     }
 }
-export interface CustomColumnFilterInstance<TData extends RowData> {
-    setCustomColumnFilter: (updater: Updater<CustomColumnFilterState>) => void;
+export interface ColumnFilterInstance<TData extends RowData> {
+    setColumnFilterState: (updater: Updater<ColumnFilterState>) => void;
     addPendingColumnFilter: (columnId: string, operator: string, value: any) => void;
     updatePendingColumnFilter: (filterId: string, updates: Partial<ColumnFilterRule>) => void;
     removePendingColumnFilter: (filterId: string) => void;
@@ -38,8 +38,8 @@ export interface CustomColumnFilterInstance<TData extends RowData> {
     setFilterLogic: (logic: 'AND' | 'OR') => void;
     getActiveColumnFilters: () => ColumnFilterRule[];
     getPendingColumnFilters: () => ColumnFilterRule[];
-    getCustomColumnFilterState: () => CustomColumnFilterState;
+    getColumnFilterState: () => ColumnFilterState;
 }
-export declare const CustomColumnFilterFeature: TableFeature<any>;
+export declare const ColumnFilterFeature: TableFeature<any>;
 export declare function matchesCustomColumnFilters<TData extends RowData>(row: any, filters: ColumnFilterRule[], logic?: 'AND' | 'OR'): boolean;
 export declare const getCombinedFilteredRowModel: <TData>() => (table: Table<TData>) => () => RowModel<TData>;

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

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCombinedFilteredRowModel = exports.CustomColumnFilterFeature = void 0;
+exports.getCombinedFilteredRowModel = exports.ColumnFilterFeature = void 0;
 exports.matchesCustomColumnFilters = matchesCustomColumnFilters;
 const tslib_1 = require("tslib");
 const react_table_1 = require("@tanstack/react-table");
 const moment_1 = tslib_1.__importDefault(require("moment"));
-exports.CustomColumnFilterFeature = {
+exports.ColumnFilterFeature = {
     getInitialState: (state) => {
-        return Object.assign({ customColumnFilter: {
+        return Object.assign({ columnFilter: {
                 filters: [],
                 logic: 'AND',
                 pendingFilters: [],
@@ -16,23 +16,28 @@ exports.CustomColumnFilterFeature = {
     },
     getDefaultOptions: (table) => {
         return {
-            enableCustomColumnFilter: true,
-            onCustomColumnFilterChange: (0, react_table_1.makeStateUpdater)('customColumnFilter', table),
-            onCustomColumnFilterApply: (state) => {
+            enableAdvanceColumnFilter: true,
+            onColumnFilterChange: (0, react_table_1.makeStateUpdater)('columnFilter', table),
+            onColumnFilterApply: (state) => {
             },
         };
     },
     createTable: (table) => {
-        table.setCustomColumnFilter = (updater) => {
+        table.setColumnFilterState = (updater) => {
             var _a, _b;
+            if (!table.options.enableAdvanceColumnFilter)
+                return;
             const safeUpdater = (old) => {
                 const newState = (0, react_table_1.functionalUpdate)(updater, old);
                 return newState;
             };
-            return (_b = (_a = table.options).onCustomColumnFilterChange) === null || _b === void 0 ? void 0 : _b.call(_a, safeUpdater);
+            return (_b = (_a = table.options).onColumnFilterChange) === null || _b === void 0 ? void 0 : _b.call(_a, safeUpdater);
         };
         table.addPendingColumnFilter = (columnId, operator, value) => {
-            table.setCustomColumnFilter((old) => {
+            if (!table.options.enableAdvanceColumnFilter)
+                return;
+            console.log('addPendingColumnFilter', columnId, operator, value);
+            table.setColumnFilterState((old) => {
                 const newFilter = {
                     id: `filter_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`,
                     columnId,
@@ -43,32 +48,44 @@ exports.CustomColumnFilterFeature = {
             });
         };
         table.updatePendingColumnFilter = (filterId, updates) => {
-            table.setCustomColumnFilter((old) => {
+            if (!table.options.enableAdvanceColumnFilter)
+                return;
+            table.setColumnFilterState((old) => {
                 const updatedFilters = old.pendingFilters.map((filter) => filter.id === filterId ? Object.assign(Object.assign({}, filter), updates) : filter);
                 return Object.assign(Object.assign({}, old), { pendingFilters: updatedFilters });
             });
         };
         table.removePendingColumnFilter = (filterId) => {
-            table.setCustomColumnFilter((old) => (Object.assign(Object.assign({}, old), { pendingFilters: old.pendingFilters.filter((filter) => filter.id !== filterId) })));
+            if (!table.options.enableAdvanceColumnFilter)
+                return;
+            table.setColumnFilterState((old) => (Object.assign(Object.assign({}, old), { pendingFilters: old.pendingFilters.filter((filter) => filter.id !== filterId) })));
         };
         table.clearAllPendingColumnFilters = () => {
-            table.setCustomColumnFilter((old) => (Object.assign(Object.assign({}, old), { pendingFilters: [] })));
+            if (!table.options.enableAdvanceColumnFilter)
+                return;
+            table.setColumnFilterState((old) => (Object.assign(Object.assign({}, old), { pendingFilters: [] })));
         };
         table.setPendingFilterLogic = (logic) => {
-            table.setCustomColumnFilter((old) => (Object.assign(Object.assign({}, old), { pendingLogic: logic })));
+            if (!table.options.enableAdvanceColumnFilter)
+                return;
+            table.setColumnFilterState((old) => (Object.assign(Object.assign({}, old), { pendingLogic: logic })));
         };
         table.applyPendingColumnFilters = () => {
-            table.setCustomColumnFilter((old) => {
+            if (!table.options.enableAdvanceColumnFilter)
+                return;
+            table.setColumnFilterState((old) => {
                 const newState = Object.assign(Object.assign({}, old), { filters: [...old.pendingFilters], logic: old.pendingLogic });
                 setTimeout(() => {
                     var _a, _b;
-                    (_b = (_a = table.options).onCustomColumnFilterApply) === null || _b === void 0 ? void 0 : _b.call(_a, newState);
+                    (_b = (_a = table.options).onColumnFilterApply) === null || _b === void 0 ? void 0 : _b.call(_a, newState);
                 }, 0);
                 return newState;
             });
         };
         table.addColumnFilter = (columnId, operator, value) => {
-            table.setCustomColumnFilter((old) => {
+            if (!table.options.enableAdvanceColumnFilter)
+                return;
+            table.setColumnFilterState((old) => {
                 const newFilter = {
                     id: `filter_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`,
                     columnId,
@@ -79,30 +96,38 @@ exports.CustomColumnFilterFeature = {
             });
         };
         table.updateColumnFilter = (filterId, updates) => {
-            table.setCustomColumnFilter((old) => {
+            if (!table.options.enableAdvanceColumnFilter)
+                return;
+            table.setColumnFilterState((old) => {
                 const updatedFilters = old.filters.map((filter) => filter.id === filterId ? Object.assign(Object.assign({}, filter), updates) : filter);
                 return Object.assign(Object.assign({}, old), { filters: updatedFilters });
             });
         };
         table.removeColumnFilter = (filterId) => {
-            table.setCustomColumnFilter((old) => (Object.assign(Object.assign({}, old), { filters: old.filters.filter((filter) => filter.id !== filterId) })));
+            if (!table.options.enableAdvanceColumnFilter)
+                return;
+            table.setColumnFilterState((old) => (Object.assign(Object.assign({}, old), { filters: old.filters.filter((filter) => filter.id !== filterId) })));
         };
         table.clearAllColumnFilters = () => {
-            table.setCustomColumnFilter((old) => (Object.assign(Object.assign({}, old), { filters: [] })));
+            if (!table.options.enableAdvanceColumnFilter)
+                return;
+            table.setColumnFilterState((old) => (Object.assign(Object.assign({}, old), { filters: [] })));
         };
         table.setFilterLogic = (logic) => {
-            table.setCustomColumnFilter((old) => (Object.assign(Object.assign({}, old), { logic })));
+            if (!table.options.enableAdvanceColumnFilter)
+                return;
+            table.setColumnFilterState((old) => (Object.assign(Object.assign({}, old), { logic })));
         };
         table.getActiveColumnFilters = () => {
-            const state = table.getState().customColumnFilter;
+            const state = table.getState().columnFilter;
             return state.filters.filter((f) => f.columnId && f.operator);
         };
         table.getPendingColumnFilters = () => {
-            const state = table.getState().customColumnFilter;
+            const state = table.getState().columnFilter;
             return state.pendingFilters.filter((f) => f.columnId && f.operator);
         };
-        table.getCustomColumnFilterState = () => {
-            return table.getState().customColumnFilter;
+        table.getColumnFilterState = () => {
+            return table.getState().columnFilter;
         };
     },
 };
@@ -137,11 +162,11 @@ const getCombinedFilteredRowModel = () => {
     return (table) => () => {
         var _a;
         const baseFilteredModel = (0, react_table_1.getFilteredRowModel)()(table)();
-        const { filters, logic } = (_a = table.getState().customColumnFilter) !== null && _a !== void 0 ? _a : {
+        const { filters, logic } = (_a = table.getState().columnFilter) !== null && _a !== void 0 ? _a : {
             filters: [],
             logic: 'AND',
         };
-        if (!filters.length)
+        if (!filters.length || !table.options.enableAdvanceColumnFilter)
             return baseFilteredModel;
         const filteredRows = baseFilteredModel.rows.filter(row => matchesCustomColumnFilters(row, filters, logic));
         const flatRows = [];

package/src/lib/features/index.d.ts

@@ -1,2 +1,2 @@
-export { CustomColumnFilterFeature, matchesCustomColumnFilters, type ColumnFilterRule, type CustomColumnFilterOptions, type CustomColumnFilterTableState, type CustomColumnFilterInstance, } from './custom-column-filter.feature';
-export { CustomSelectionFeature, type SelectionState, type SelectMode, type CustomSelectionOptions, type CustomSelectionTableState, type CustomSelectionInstance, } from './custom-selection.feature';
+export { ColumnFilterFeature, matchesCustomColumnFilters, type ColumnFilterRule, type ColumnFilterOptions, type ColumnFilterTableState, type ColumnFilterInstance, } from './column-filter.feature';
+export { SelectionFeature, type SelectionState, type SelectMode, type SelectionOptions, type SelectionTableState, type SelectionInstance, } from './selection.feature';

package/src/lib/features/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomSelectionFeature = exports.matchesCustomColumnFilters = exports.CustomColumnFilterFeature = void 0;
-var custom_column_filter_feature_1 = require("./custom-column-filter.feature");
-Object.defineProperty(exports, "CustomColumnFilterFeature", { enumerable: true, get: function () { return custom_column_filter_feature_1.CustomColumnFilterFeature; } });
-Object.defineProperty(exports, "matchesCustomColumnFilters", { enumerable: true, get: function () { return custom_column_filter_feature_1.matchesCustomColumnFilters; } });
-var custom_selection_feature_1 = require("./custom-selection.feature");
-Object.defineProperty(exports, "CustomSelectionFeature", { enumerable: true, get: function () { return custom_selection_feature_1.CustomSelectionFeature; } });
+exports.SelectionFeature = exports.matchesCustomColumnFilters = exports.ColumnFilterFeature = void 0;
+var column_filter_feature_1 = require("./column-filter.feature");
+Object.defineProperty(exports, "ColumnFilterFeature", { enumerable: true, get: function () { return column_filter_feature_1.ColumnFilterFeature; } });
+Object.defineProperty(exports, "matchesCustomColumnFilters", { enumerable: true, get: function () { return column_filter_feature_1.matchesCustomColumnFilters; } });
+var selection_feature_1 = require("./selection.feature");
+Object.defineProperty(exports, "SelectionFeature", { enumerable: true, get: function () { return selection_feature_1.SelectionFeature; } });

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

@@ -9,24 +9,24 @@ export type IsRowSelectableFunction<T = any> = (params: {
     id: string;
 }) => boolean;
 export type SelectMode = 'page' | 'all';
-export interface CustomSelectionOptions {
-    enableCustomSelection?: boolean;
+export interface SelectionOptions {
+    enableAdvanceSelection?: boolean;
     selectMode?: SelectMode;
     isRowSelectable?: IsRowSelectableFunction;
     onSelectionStateChange?: (updater: Updater<SelectionState>) => void;
 }
-export interface CustomSelectionTableState {
+export interface SelectionTableState {
     selectionState: SelectionState;
 }
 declare module '@tanstack/table-core' {
-    interface TableState extends CustomSelectionTableState {
+    interface TableState extends SelectionTableState {
     }
-    interface TableOptionsResolved<TData extends RowData> extends CustomSelectionOptions {
+    interface TableOptionsResolved<TData extends RowData> extends SelectionOptions {
     }
-    interface Table<TData extends RowData> extends CustomSelectionInstance<TData> {
+    interface Table<TData extends RowData> extends SelectionInstance<TData> {
     }
 }
-export interface CustomSelectionInstance<TData extends RowData> {
+export interface SelectionInstance<TData extends RowData> {
     setSelectionState: (updater: Updater<SelectionState>) => void;
     toggleAllRowsSelected: () => void;
     toggleRowSelected: (rowId: string) => void;
@@ -43,4 +43,4 @@ export interface CustomSelectionInstance<TData extends RowData> {
     getSelectedRowIds: () => string[];
     canSelectRow: (rowId: string) => boolean;
 }
-export declare const CustomSelectionFeature: TableFeature<any>;
+export declare const SelectionFeature: TableFeature<any>;

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();
             }
@@ -116,7 +130,7 @@ exports.CustomSelectionFeature = {
             const selectMode = table.options.selectMode || 'page';
             if (selectMode === 'all' && state.type === 'exclude') {
                 const totalCount = table.getRowCount();
-                return state.ids.length < totalCount;
+                return state.ids.length < totalCount && totalCount > 0;
             }
             else {
                 return state.ids.length > 0;
@@ -134,7 +148,7 @@ exports.CustomSelectionFeature = {
             const selectMode = table.options.selectMode || 'page';
             if (selectMode === 'all' && state.type === 'exclude') {
                 const totalCount = table.getRowCount();
-                return totalCount - state.ids.length;
+                return Math.max(0, totalCount - state.ids.length);
             }
             else {
                 return state.ids.length;
@@ -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,6 +1,6 @@
 import { ColumnOrderState, ColumnPinningState, SortingState, 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> {
@@ -8,7 +8,7 @@ interface UseDataTableApiProps<T> {
     data: T[];
     idKey: keyof T;
     globalFilter: string;
-    customColumnsFilter: CustomColumnFilterState;
+    columnFilter: ColumnFilterState;
     sorting: SortingState;
     pagination: {
         pageIndex: number;
@@ -24,15 +24,15 @@ interface UseDataTableApiProps<T> {
     pageSize: number;
     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, data, idKey, globalFilter, columnFilter, 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;
     (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,23 @@ function useDataTableApi(props, ref) {
                     operator,
                     value,
                 };
-                const currentFilters = customColumnsFilter.filters || [];
+                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 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: () => {
@@ -222,7 +222,7 @@ function useDataTableApi(props, ref) {
             refresh: () => {
                 const currentFilters = {
                     globalFilter,
-                    customColumnsFilter: customColumnsFilter,
+                    columnFilter: columnFilter,
                     sorting,
                     pagination,
                 };
@@ -238,7 +238,7 @@ function useDataTableApi(props, ref) {
             reload: () => {
                 const currentFilters = {
                     globalFilter,
-                    customColumnsFilter: customColumnsFilter,
+                    columnFilter: columnFilter,
                     sorting,
                     pagination,
                 };
@@ -392,7 +392,7 @@ function useDataTableApi(props, ref) {
                     sorting: table.getState().sorting,
                     pagination: table.getState().pagination,
                     globalFilter: table.getState().globalFilter,
-                    customColumnsFilter: customColumnsFilter,
+                    columnFilter: columnFilter,
                 };
             },
             restoreLayout: (layout) => {
@@ -417,8 +417,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 +427,7 @@ function useDataTableApi(props, ref) {
                 return table.getState();
             },
             getCurrentFilters: () => {
-                return customColumnsFilter;
+                return columnFilter;
             },
             getCurrentSorting: () => {
                 return table.getState().sorting;
@@ -450,7 +450,7 @@ function useDataTableApi(props, ref) {
                     if (dataMode === 'server' && onServerExport) {
                         const currentFilters = {
                             globalFilter,
-                            customColumnsFilter,
+                            columnFilter,
                             sorting,
                             pagination,
                             columnOrder,
@@ -496,7 +496,7 @@ function useDataTableApi(props, ref) {
                     if (dataMode === 'server' && onServerExport) {
                         const currentFilters = {
                             globalFilter,
-                            customColumnsFilter,
+                            columnFilter,
                             sorting,
                             pagination,
                             columnOrder,
@@ -548,7 +548,7 @@ function useDataTableApi(props, ref) {
                     setExportController === null || setExportController === void 0 ? void 0 : setExportController(controller);
                     const currentFilters = {
                         globalFilter,
-                        customColumnsFilter,
+                        columnFilter,
                         sorting,
                         pagination,
                         columnOrder,
@@ -585,7 +585,7 @@ function useDataTableApi(props, ref) {
         table,
         enhancedColumns,
         handleColumnFilterStateChange,
-        customColumnsFilter,
+        columnFilter,
         data,
         idKey,
         onDataStateChange,

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;
 }