@monolith-forensics/monolith-ui 1.8.1-dev.4 → 1.8.1

package/dist/Table/TableHeader.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useRef, useState } from "react";
+import { useState } from "react";
 import ColumnResizer from "./ColumnResizer";
 import { InnerCellContent, TH, THead, THR } from "./TableComponents";
 import { resolveColumnResize } from "./Utils";
@@ -16,61 +16,45 @@ const StyledCaption = styled.span `
 `;
 const TableHeader = ({ headerRowElm }) => {
     var _a;
-    const { columnState, sortState, setColumnState: updateColumnState, onColumnResize, handleColumnReorder, enableColumnReorder, handleColumnHeaderClick, enableColumnResize, headerRowHeight, enableActionButton, enableSelection, selectionState, disableSelectAll, selectAllRows, clearSelections, compactState, tableLayout, setResizeColumnWidths, } = useTable();
+    const { columnState, sortState, setColumnState: updateColumnState, onColumnResize, handleColumnReorder, enableColumnReorder, handleColumnHeaderClick, enableColumnResize, headerRowHeight, enableActionButton, enableSelection, selectionState, disableSelectAll, selectAllRows, clearSelections, compactState, } = useTable();
     const [dragColumn, setDragColumn] = useState(null);
     const [dropColumn, setDropColumn] = useState(null);
-    const resizeStartWidths = useRef(null);
-    const getResizeWidths = (column, newWidth) => (Object.assign(Object.assign({}, (resizeStartWidths.current || tableLayout.columnWidths)), { [column.columnId]: newWidth }));
-    const handleResizeStart = () => {
-        resizeStartWidths.current = tableLayout.columnWidths;
-        setResizeColumnWidths(tableLayout.columnWidths);
-    };
-    const handleResize = (column, newWidth) => {
-        setResizeColumnWidths(getResizeWidths(column, newWidth));
-    };
-    const handleResizeEnd = (column, newWidth) => {
-        const nextWidths = getResizeWidths(column, newWidth);
+    const handleResize = (e) => {
+        const columnId = e.column.columnId;
+        const newWidth = Number(e.newWidth);
         updateColumnState((prevColumnState) => {
             const nextColumnState = prevColumnState.map((col) => {
-                if (col.columnId === column.columnId) {
+                if (col.columnId === columnId) {
                     return Object.assign(Object.assign({}, col), { width: newWidth });
                 }
                 return col;
             });
             onColumnResize === null || onColumnResize === void 0 ? void 0 : onColumnResize({
-                column: Object.assign(Object.assign({}, column), { width: newWidth }),
+                column: Object.assign(Object.assign({}, e.column), { width: newWidth }),
                 columnState: nextColumnState,
             });
             return nextColumnState;
         });
-        resizeStartWidths.current = null;
-        setResizeColumnWidths(null);
     };
     const handleChangeSelection = (e) => {
         e ? selectAllRows() : clearSelections();
     };
-    return (_jsx(THead, { className: "mfui-thead", children: _jsxs(THR, { className: "mfui-thr", ref: headerRowElm, height: headerRowHeight, "data-compact": compactState, style: { width: tableLayout.contentWidth }, children: [enableSelection && (_jsx(TH, { className: `mfui-th column-action`, style: {
+    return (_jsx(THead, { className: "mfui-thead", children: _jsxs(THR, { className: "mfui-thr", ref: headerRowElm, height: headerRowHeight, "data-compact": compactState, children: [enableSelection && (_jsx(TH, { className: `mfui-th column-action`, style: {
                         width: TableDefaults.actionCell.width,
                         minWidth: TableDefaults.actionCell.minWidth,
                         maxWidth: TableDefaults.actionCell.maxWidth,
-                        flexBasis: TableDefaults.actionCell.width,
-                        flexGrow: 0,
-                        flexShrink: 0,
+                        display: "flex",
                         justifyContent: "center",
                         alignItems: "center",
                     }, children: _jsx(InnerCellContent, { className: "mfui inner-cell-content", children: disableSelectAll !== true && (_jsx(CheckBox, { value: selectionState.selectionStatus === "all", partialCheck: (_a = selectionState.selectionStatus) === null || _a === void 0 ? void 0 : _a.includes("some"), onChange: handleChangeSelection })) }) })), enableActionButton && (_jsx(TH, { className: `mfui-th column-action`, style: {
                         width: TableDefaults.actionCell.width,
                         minWidth: TableDefaults.actionCell.minWidth,
                         maxWidth: TableDefaults.actionCell.maxWidth,
-                        flexBasis: TableDefaults.actionCell.width,
-                        flexGrow: 0,
-                        flexShrink: 0,
                     }, children: _jsx(InnerCellContent, { className: "mfui inner-cell-content" }) })), columnState.map((column) => {
                     if (column.visible === false)
                         return null;
                     const canReorder = resolveColumnReorder(column, enableColumnReorder);
                     const canResize = resolveColumnResize(column, enableColumnResize);
-                    const columnWidth = tableLayout.columnWidths[column.columnId] || column.minWidth;
                     const dndEvents = canReorder
                         ? {
                             onDragOver: (e) => {
@@ -102,13 +86,14 @@ const TableHeader = ({ headerRowElm }) => {
                         }
                         : {};
                     return (_jsxs(TH, Object.assign({ className: `mfui-th column-${column.columnId}`, "data-field": column.dataField, draggable: canReorder, onClick: () => handleColumnHeaderClick(column) }, dndEvents, { style: {
-                            width: columnWidth,
+                            width: column.width,
                             minWidth: column.minWidth,
-                            maxWidth: column.maxWidth,
-                            flexBasis: columnWidth,
-                            flexGrow: 0,
-                            flexShrink: 0,
-                        }, children: [canResize && (_jsx(ColumnResizer, { column: column, currentWidth: columnWidth, showOnHover: true, onResizeStart: handleResizeStart, onResize: (width) => handleResize(column, width), onResizeEnd: (width) => handleResizeEnd(column, width) })), _jsxs(InnerCellContent, { className: "mfui inner-cell-content", children: [_jsx(StyledCaption, { style: { flex: 1 }, children: column.caption }), _jsx(StyledCaption, { children: (sortState === null || sortState === void 0 ? void 0 : sortState.dataField) === column.dataField &&
+                            flex: column.width ? "0 0 auto" : "1",
+                        }, children: [canResize && (_jsx(ColumnResizer, { column: column, showOnHover: true, onResize: (e) => {
+                                    // console.log("onResize", e);
+                                }, onResizeFinished: (e) => {
+                                    handleResize(e);
+                                } })), _jsxs(InnerCellContent, { className: "mfui inner-cell-content", children: [_jsx(StyledCaption, { style: { flex: 1 }, children: column.caption }), _jsx(StyledCaption, { children: (sortState === null || sortState === void 0 ? void 0 : sortState.dataField) === column.dataField &&
                                             (sortState.dir === "asc" ? (_jsx(ArrowUpIcon, { size: 14 })) : (_jsx(ArrowDownIcon, { size: 14 }))) })] })] }), column.columnId));
                 })] }) }));
 };

package/dist/Table/TableMenu/TableMenu.js

@@ -36,7 +36,7 @@ const TableMenu = () => {
         return null;
     const { addButtonOptions, filterOptions, tableCountOptions, exportOptions, compactOptions, columnSelectorOptions, searchOptions, children, customMenuItems, } = tableMenuOptions;
     const queryFilter = useQueryFilter({
-        value: filterState,
+        defaultFilter: filterState,
         filterDefinitions: (filterOptions === null || filterOptions === void 0 ? void 0 : filterOptions.filterDefinitions) || [],
         showCombinator: (_a = filterOptions === null || filterOptions === void 0 ? void 0 : filterOptions.showCombinator) !== null && _a !== void 0 ? _a : true,
         onFilterChange: (q) => {

package/dist/Table/TableProvider.js

@@ -29,27 +29,6 @@ import { SelectionStatus } from "./enums";
 import moment from "moment";
 import { useControlled } from "../Utilities";
 import { exportTableToExcel } from "./Utils";
-const RESERVED_FIELDS = [
-    "__key",
-    "__index",
-    "__level",
-    "__parentKey",
-    "__hasChildren",
-    "__childKeys",
-];
-const EMPTY_TREE_META = {
-    parentKeyMap: new Map(),
-    childrenKeyMap: new Map(),
-    expandableKeys: [],
-};
-const DEFAULT_TREE_OPTIONS = {
-    enabled: false,
-    mode: "nested",
-    childrenField: "children",
-    parentIdField: "parentId",
-    indentPx: 16,
-    autoExpandOnMatch: true,
-};
 const calculateSelectionTotal = (selectionState, totalRecords, dataLength = 0) => {
     if (!selectionState) {
         return 0;
@@ -68,85 +47,12 @@ const calculateSelectionTotal = (selectionState, totalRecords, dataLength = 0) =
     }
 };
 export const TableContext = createContext(null);
-const expandColumnWidthsToTable = ({ columnWidths, columns, expansionColumns, tableWidth, fixedCellWidth, }) => {
-    const availableWidth = Math.max(tableWidth - fixedCellWidth, 0);
-    const columnWidthTotal = columns.reduce((sum, column) => {
-        return sum + (columnWidths[column.columnId] || 0);
-    }, 0);
-    const remainingWidth = availableWidth - columnWidthTotal;
-    if (remainingWidth <= 0 || columns.length === 0) {
-        return columnWidths;
-    }
-    const targetColumns = expansionColumns.length > 0
-        ? expansionColumns
-        : [columns[columns.length - 1]].filter(Boolean);
-    const widthToAdd = remainingWidth / targetColumns.length;
-    return targetColumns.reduce((widths, column) => (Object.assign(Object.assign({}, widths), { [column.columnId]: (widths[column.columnId] || column.minWidth) + widthToAdd })), columnWidths);
-};
-const getVisibleColumnLayout = ({ columns, tableWidth, fixedCellWidth, resizeColumnWidths, }) => {
-    const visibleColumns = columns.filter((column) => column.visible !== false);
-    const fluidColumns = visibleColumns.filter((column) => typeof column.width !== "number" || column.width <= 0);
-    if (resizeColumnWidths) {
-        const columnWidths = expandColumnWidthsToTable({
-            columnWidths: resizeColumnWidths,
-            columns: visibleColumns,
-            expansionColumns: fluidColumns,
-            tableWidth,
-            fixedCellWidth,
-        });
-        const contentWidth = fixedCellWidth +
-            visibleColumns.reduce((sum, column) => {
-                return sum + (columnWidths[column.columnId] || column.minWidth);
-            }, 0);
-        return {
-            contentWidth: Math.max(tableWidth, contentWidth),
-            columnWidths,
-        };
-    }
-    const fixedColumns = visibleColumns.filter((column) => typeof column.width === "number" && column.width > 0);
-    const fixedWidth = fixedColumns.reduce((sum, column) => sum + column.width, 0);
-    const fluidMinWidth = fluidColumns.reduce((sum, column) => sum + column.minWidth, 0);
-    const availableFluidWidth = Math.max(tableWidth - fixedCellWidth - fixedWidth, fluidMinWidth);
-    const fluidWidth = fluidColumns.length > 0 ? availableFluidWidth / fluidColumns.length : 0;
-    const baseColumnWidths = visibleColumns.reduce((widths, column) => {
-        widths[column.columnId] =
-            typeof column.width === "number" && column.width > 0
-                ? column.width
-                : Math.max(column.minWidth, fluidWidth);
-        return widths;
-    }, {});
-    const columnWidths = expandColumnWidthsToTable({
-        columnWidths: baseColumnWidths,
-        columns: visibleColumns,
-        expansionColumns: fluidColumns,
-        tableWidth,
-        fixedCellWidth,
-    });
-    const contentWidth = fixedCellWidth +
-        visibleColumns.reduce((sum, column) => {
-            return sum + columnWidths[column.columnId];
-        }, 0);
-    return {
-        contentWidth: Math.max(tableWidth, contentWidth),
-        columnWidths,
-    };
-};
 const TableProvider = (_a) => {
-    var { children, columns, data, keyField, tableInstanceRef, stateStorage, tableMenuOptions, manualSorting, manualFiltering, manualSearch, manualExport, height, maxHeight, minHeight, focusedRowId, enableColumnResize, enableSorting, compact, totalRecords, onColumnStateChange, onColumnReorder, onColumnHeaderClick, onSort, onRowUpdated, tableElement, headerRowElm, tableDimensions, targetElm, listElm, defaultSelectionState, selectionState, onSelectionChange, defaultFilterState, filterState, onFilterChange, treeOptions, treeMeta, defaultExpandedKeys, expandedKeys, onExpandedChange } = _a, props = __rest(_a, ["children", "columns", "data", "keyField", "tableInstanceRef", "stateStorage", "tableMenuOptions", "manualSorting", "manualFiltering", "manualSearch", "manualExport", "height", "maxHeight", "minHeight", "focusedRowId", "enableColumnResize", "enableSorting", "compact", "totalRecords", "onColumnStateChange", "onColumnReorder", "onColumnHeaderClick", "onSort", "onRowUpdated", "tableElement", "headerRowElm", "tableDimensions", "targetElm", "listElm", "defaultSelectionState", "selectionState", "onSelectionChange", "defaultFilterState", "filterState", "onFilterChange", "treeOptions", "treeMeta", "defaultExpandedKeys", "expandedKeys", "onExpandedChange"]);
-    const _treeOptions = treeOptions || DEFAULT_TREE_OPTIONS;
-    const _treeMeta = treeMeta || EMPTY_TREE_META;
-    if (_treeOptions.enabled) {
-        if (RESERVED_FIELDS.includes(_treeOptions.childrenField)) {
-            throw new Error(`treeOptions.childrenField cannot be a reserved internal field: "${_treeOptions.childrenField}".`);
-        }
-        if (RESERVED_FIELDS.includes(_treeOptions.parentIdField)) {
-            throw new Error(`treeOptions.parentIdField cannot be a reserved internal field: "${_treeOptions.parentIdField}".`);
-        }
-    }
+    var { children, columns, data, keyField, tableInstanceRef, stateStorage, tableMenuOptions, manualSorting, manualFiltering, manualSearch, manualExport, height, maxHeight, minHeight, focusedRowId, enableColumnResize, enableSorting, compact, totalRecords, onColumnStateChange, onColumnReorder, onColumnHeaderClick, onSort, onRowUpdated, tableElement, headerRowElm, tableDimensions, targetElm, listElm, defaultSelectionState, selectionState, onSelectionChange, defaultFilterState, filterState, onFilterChange } = _a, props = __rest(_a, ["children", "columns", "data", "keyField", "tableInstanceRef", "stateStorage", "tableMenuOptions", "manualSorting", "manualFiltering", "manualSearch", "manualExport", "height", "maxHeight", "minHeight", "focusedRowId", "enableColumnResize", "enableSorting", "compact", "totalRecords", "onColumnStateChange", "onColumnReorder", "onColumnHeaderClick", "onSort", "onRowUpdated", "tableElement", "headerRowElm", "tableDimensions", "targetElm", "listElm", "defaultSelectionState", "selectionState", "onSelectionChange", "defaultFilterState", "filterState", "onFilterChange"]);
     const _columns = useMemo(() => columns
         .map((child, index) => {
-        if (RESERVED_FIELDS.includes(child.dataField)) {
-            throw new Error(`dataField cannot be a reserved internal field: "${child.dataField}". Reserved: ${RESERVED_FIELDS.join(", ")}`);
+        if (child.dataField === "__key") {
+            throw new Error("dataField cannot be __key");
         }
         // check for duplicate dataFields
         const dataFieldCount = columns.filter((col) => col.dataField === child.dataField).length;
@@ -165,10 +71,9 @@ const TableProvider = (_a) => {
             ? StateStorage.getTableState(stateStorage.key)
             : undefined;
     }, [stateStorage === null || stateStorage === void 0 ? void 0 : stateStorage.key]);
-    const { columnState: savedColumnState, selectionState: savedSelectionState, sortState: savedSortState, searchState: savedSearchState, filterState: savedFilterState, expandedKeys: savedExpandedKeys, } = savedTableState || {};
+    const { columnState: savedColumnState, selectionState: savedSelectionState, sortState: savedSortState, searchState: savedSearchState, filterState: savedFilterState, } = savedTableState || {};
     const [compactState, setCompactState] = useState(compact || false);
     const [columnState, _setColumnState] = useState(syncColumnState(_columns, savedColumnState));
-    const [resizeColumnWidths, setResizeColumnWidths] = useState(null);
     const columnStateRef = useRef(columnState);
     useEffect(() => {
         columnStateRef.current = columnState;
@@ -180,8 +85,6 @@ const TableProvider = (_a) => {
         rules: [],
     });
     const [sortState, setSortState] = useState(savedSortState);
-    const [_expandedKeys, _setExpandedKeys] = useControlled(expandedKeys, defaultExpandedKeys || savedExpandedKeys || []);
-    const expandedKeysSet = useMemo(() => new Set(_expandedKeys), [_expandedKeys]);
     const [_selectionState, _setSelectionState] = useControlled(selectionState, defaultSelectionState || {
         selectedRowKeys: (savedSelectionState === null || savedSelectionState === void 0 ? void 0 : savedSelectionState.selectedRowKeys) || [],
         excludedRowKeys: (savedSelectionState === null || savedSelectionState === void 0 ? void 0 : savedSelectionState.excludedRowKeys) || [],
@@ -206,19 +109,6 @@ const TableProvider = (_a) => {
             return Object.assign(Object.assign({}, prev), { selectedRowKeys });
         });
     };
-    const tableLayout = useMemo(() => getVisibleColumnLayout({
-        columns: columnState,
-        tableWidth: tableDimensions.width,
-        fixedCellWidth: (props.enableSelection ? TableDefaults.actionCell.width : 0) +
-            (props.enableActionButton ? TableDefaults.actionCell.width : 0),
-        resizeColumnWidths,
-    }), [
-        columnState,
-        tableDimensions.width,
-        props.enableSelection,
-        props.enableActionButton,
-        resizeColumnWidths,
-    ]);
     const getCalculatedSelectionTotal = () => {
         return calculateSelectionTotal({
             selectedRowKeys,
@@ -348,99 +238,58 @@ const TableProvider = (_a) => {
             }
         }
     };
-    const compareRows = (a, b, sortState) => {
-        if (sortState) {
-            const aValue = a[sortState.dataField];
-            const bValue = b[sortState.dataField];
-            const aIsEmpty = aValue === null || aValue === undefined;
-            const bIsEmpty = bValue === null || bValue === undefined;
-            // Treat empty values as the smallest values.
-            if (aIsEmpty && bIsEmpty) {
-                return 0;
-            }
-            if (aIsEmpty || bIsEmpty) {
+    const sortData = (sortState) => {
+        // sort data
+        return data.sort((a, b) => {
+            if (sortState) {
+                const aValue = a[sortState.dataField];
+                const bValue = b[sortState.dataField];
+                const aIsEmpty = aValue === null || aValue === undefined;
+                const bIsEmpty = bValue === null || bValue === undefined;
+                // Treat empty values as the smallest values.
+                if (aIsEmpty && bIsEmpty) {
+                    return 0;
+                }
+                if (aIsEmpty || bIsEmpty) {
+                    if (sortState.dir === "asc") {
+                        return aIsEmpty ? -1 : 1;
+                    }
+                    if (sortState.dir === "desc") {
+                        return aIsEmpty ? 1 : -1;
+                    }
+                }
                 if (sortState.dir === "asc") {
-                    return aIsEmpty ? -1 : 1;
+                    if (aValue < bValue) {
+                        return -1;
+                    }
+                    if (aValue > bValue) {
+                        return 1;
+                    }
+                    return 0;
                 }
-                if (sortState.dir === "desc") {
-                    return aIsEmpty ? 1 : -1;
+                else if (sortState.dir === "desc") {
+                    if (aValue > bValue) {
+                        return -1;
+                    }
+                    if (aValue < bValue) {
+                        return 1;
+                    }
+                    return 0;
                 }
             }
-            if (sortState.dir === "asc") {
-                if (aValue < bValue)
-                    return -1;
-                if (aValue > bValue)
-                    return 1;
-                return 0;
+            // sort by __index
+            if (a.__index < b.__index) {
+                return -1;
             }
-            else if (sortState.dir === "desc") {
-                if (aValue > bValue)
-                    return -1;
-                if (aValue < bValue)
-                    return 1;
-                return 0;
-            }
-        }
-        // sort by __index
-        if (a.__index < b.__index)
-            return -1;
-        if (a.__index > b.__index)
-            return 1;
-        return 0;
-    };
-    const sortData = (sortState) => {
-        if (!_treeOptions.enabled) {
-            // Flat data — sort in-place (preserves existing behavior).
-            return data.sort((a, b) => compareRows(a, b, sortState));
-        }
-        // Tree-aware sort: sort siblings only, then re-DFS to rebuild the
-        // flat order. Cross-parent sorting is never allowed in tree mode.
-        const byKey = new Map();
-        const childrenByParent = new Map();
-        for (const row of data) {
-            byKey.set(row.__key, row);
-            const pk = row.__parentKey;
-            if (!childrenByParent.has(pk))
-                childrenByParent.set(pk, []);
-            childrenByParent.get(pk).push(row);
-        }
-        for (const [, siblings] of childrenByParent) {
-            siblings.sort((a, b) => compareRows(a, b, sortState));
-        }
-        const result = [];
-        const walk = (parentKey) => {
-            const siblings = childrenByParent.get(parentKey);
-            if (!siblings)
-                return;
-            for (const row of siblings) {
-                result.push(row);
-                if (row.__hasChildren)
-                    walk(row.__key);
+            if (a.__index > b.__index) {
+                return 1;
             }
-        };
-        walk(undefined);
-        return result;
-    };
-    const collectAncestors = (rows) => {
-        const ancestorSet = new Set();
-        const byKey = new Map();
-        for (const r of data)
-            byKey.set(r.__key, r);
-        for (const row of rows) {
-            let parentKey = row.__parentKey;
-            while (parentKey) {
-                if (ancestorSet.has(parentKey))
-                    break;
-                ancestorSet.add(parentKey);
-                const parent = byKey.get(parentKey);
-                parentKey = parent === null || parent === void 0 ? void 0 : parent.__parentKey;
-            }
-        }
-        return ancestorSet;
+            return 0;
+        });
     };
-    const searchData = (rows, searchText) => {
+    const searchData = (searchText) => {
         const columnKeys = columnState.map((col) => col.dataField);
-        const matched = rows.filter((row) => {
+        return data.filter((row) => {
             return columnKeys.some((key) => {
                 if (typeof row[key] === "string") {
                     return row[key].toLowerCase().includes(searchText.toLowerCase());
@@ -448,18 +297,9 @@ const TableProvider = (_a) => {
                 return false;
             });
         });
-        if (!_treeOptions.enabled) {
-            return { rows: matched, ancestorKeys: new Set() };
-        }
-        const ancestorKeys = collectAncestors(matched);
-        const visibleSet = new Set(matched.map((r) => r.__key));
-        ancestorKeys.forEach((k) => visibleSet.add(k));
-        return {
-            rows: rows.filter((r) => visibleSet.has(r.__key)),
-            ancestorKeys,
-        };
     };
     const rowMatchesRule = (row, rule) => {
+        var _a, _b, _c, _d;
         const column = columnState.find((col) => col.dataField === rule.dataField);
         const { value, operator, dataField } = rule;
         if (operator.value === "isEmpty") {
@@ -471,15 +311,6 @@ const TableProvider = (_a) => {
         if (!value || value.length === 0) {
             return true;
         }
-        if ((operator.value === "between" || operator.value === "notBetween") &&
-            (value[0] == null ||
-                value[0] === "" ||
-                value[1] == null ||
-                value[1] === "")) {
-            return true;
-        }
-        const fieldText = row[dataField] == null ? "" : row[dataField].toString().toLowerCase();
-        const ruleText = value[0] == null ? "" : value[0].toString().toLowerCase();
         switch (operator.value) {
             case "=":
                 if ((column === null || column === void 0 ? void 0 : column.dataType) === "date") {
@@ -548,9 +379,9 @@ const TableProvider = (_a) => {
                 return (row[dataField] < value[0] ||
                     row[dataField] > value[1]);
             case "contains":
-                return fieldText.includes(ruleText);
+                return (_a = row[dataField]) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes((_b = value[0]) === null || _b === void 0 ? void 0 : _b.toString().toLowerCase());
             case "doesNotContain":
-                return !fieldText.includes(ruleText);
+                return !((_c = row[dataField]) === null || _c === void 0 ? void 0 : _c.toLowerCase().includes((_d = value[0]) === null || _d === void 0 ? void 0 : _d.toString().toLowerCase()));
             case "in":
                 if (!Array.isArray(value) || value.length === 0) {
                     return true;
@@ -565,26 +396,16 @@ const TableProvider = (_a) => {
                 return true;
         }
     };
-    const filterData = (rows, filter) => {
-        if (!rows)
-            return { rows: [], ancestorKeys: new Set() };
+    const filterData = (filter) => {
+        if (!data)
+            return [];
         const { combinator, rules } = filter;
-        if (!combinator || !rules || rules.length === 0) {
-            return { rows, ancestorKeys: new Set() };
-        }
-        const matched = combinator === "or"
-            ? rows.filter((row) => rules.some((rule) => rowMatchesRule(row, rule)))
-            : rows.filter((row) => rules.every((rule) => rowMatchesRule(row, rule)));
-        if (!_treeOptions.enabled) {
-            return { rows: matched, ancestorKeys: new Set() };
+        if (!combinator || !rules)
+            return data;
+        if (combinator === "or") {
+            return data.filter((row) => rules.some((rule) => rowMatchesRule(row, rule)));
         }
-        const ancestorKeys = collectAncestors(matched);
-        const visibleSet = new Set(matched.map((r) => r.__key));
-        ancestorKeys.forEach((k) => visibleSet.add(k));
-        return {
-            rows: rows.filter((r) => visibleSet.has(r.__key)),
-            ancestorKeys,
-        };
+        return data.filter((row) => rules.every((rule) => rowMatchesRule(row, rule)));
     };
     const toggleColumnVisibility = (dataField) => {
         const newColumnState = columnState.map((col) => {
@@ -613,47 +434,6 @@ const TableProvider = (_a) => {
         const key = !!keyField ? row[keyField] : row.__key;
         return String(key);
     };
-    const firstVisibleDataField = useMemo(() => { var _a; return (_a = columnState.find((c) => c.visible !== false)) === null || _a === void 0 ? void 0 : _a.dataField; }, [columnState]);
-    const persistExpandedKeys = (next) => {
-        if ((stateStorage === null || stateStorage === void 0 ? void 0 : stateStorage.enabled) && (stateStorage === null || stateStorage === void 0 ? void 0 : stateStorage.type) === "localStorage") {
-            StateStorage.setExpandedKeys(stateStorage.key, next);
-        }
-    };
-    const updateExpandedKeys = (next) => {
-        _setExpandedKeys(next);
-        onExpandedChange === null || onExpandedChange === void 0 ? void 0 : onExpandedChange(next);
-        persistExpandedKeys(next);
-    };
-    const expandRow = (row) => {
-        var _a;
-        const key = (_a = row === null || row === void 0 ? void 0 : row.__key) !== null && _a !== void 0 ? _a : getRowKey(row);
-        if (expandedKeysSet.has(key))
-            return;
-        updateExpandedKeys([..._expandedKeys, key]);
-    };
-    const collapseRow = (row) => {
-        var _a;
-        const key = (_a = row === null || row === void 0 ? void 0 : row.__key) !== null && _a !== void 0 ? _a : getRowKey(row);
-        if (!expandedKeysSet.has(key))
-            return;
-        updateExpandedKeys(_expandedKeys.filter((k) => k !== key));
-    };
-    const toggleRowExpanded = (row) => {
-        var _a;
-        const key = (_a = row === null || row === void 0 ? void 0 : row.__key) !== null && _a !== void 0 ? _a : getRowKey(row);
-        if (expandedKeysSet.has(key)) {
-            updateExpandedKeys(_expandedKeys.filter((k) => k !== key));
-        }
-        else {
-            updateExpandedKeys([..._expandedKeys, key]);
-        }
-    };
-    const expandAllRows = () => {
-        updateExpandedKeys([..._treeMeta.expandableKeys]);
-    };
-    const collapseAllRows = () => {
-        updateExpandedKeys([]);
-    };
     const selectRow = (row) => {
         const key = getRowKey(row);
         const newSelectionState = {
@@ -791,61 +571,6 @@ const TableProvider = (_a) => {
         const key = getRowKey(row);
         return focusedRowId === key;
     };
-    const { _data, effectiveExpandedKeys } = useMemo(() => {
-        let processedData = data || [];
-        if (manualSorting !== true) {
-            processedData = sortData(sortState);
-        }
-        const autoExpandedSet = new Set();
-        if (manualFiltering !== true && _filterState) {
-            const result = filterData(processedData, _filterState);
-            processedData = result.rows;
-            if (_treeOptions.enabled && _treeOptions.autoExpandOnMatch) {
-                result.ancestorKeys.forEach((k) => autoExpandedSet.add(k));
-            }
-        }
-        if (manualSearch !== true && search) {
-            const result = searchData(processedData, search);
-            processedData = result.rows;
-            if (_treeOptions.enabled && _treeOptions.autoExpandOnMatch) {
-                result.ancestorKeys.forEach((k) => autoExpandedSet.add(k));
-            }
-        }
-        // Compute the effective expanded set: user expansion ∪ auto-expanded ancestors.
-        // Never mutates user's _expandedKeys.
-        const effective = new Set(expandedKeysSet);
-        autoExpandedSet.forEach((k) => effective.add(k));
-        // Final pass: drop rows whose ancestors are not in the effective set.
-        if (_treeOptions.enabled) {
-            const byKey = new Map();
-            for (const r of processedData)
-                byKey.set(r.__key, r);
-            processedData = processedData.filter((row) => {
-                let pk = row.__parentKey;
-                while (pk) {
-                    if (!effective.has(pk))
-                        return false;
-                    const parent = byKey.get(pk);
-                    pk = parent === null || parent === void 0 ? void 0 : parent.__parentKey;
-                }
-                return true;
-            });
-        }
-        return { _data: processedData, effectiveExpandedKeys: effective };
-    }, [
-        data,
-        columnState,
-        search,
-        sortState,
-        _filterState,
-        expandedKeysSet,
-        _treeOptions,
-    ]);
-    const isRowExpanded = (row) => {
-        var _a;
-        const key = (_a = row === null || row === void 0 ? void 0 : row.__key) !== null && _a !== void 0 ? _a : getRowKey(row);
-        return effectiveExpandedKeys.has(key);
-    };
     if (tableInstanceRef) {
         tableInstanceRef.current = {
             columnState,
@@ -862,13 +587,6 @@ const TableProvider = (_a) => {
             clearSelections,
             runSearch,
             clearSearch,
-            expandRow,
-            collapseRow,
-            toggleRowExpanded,
-            isRowExpanded,
-            expandAllRows,
-            collapseAllRows,
-            getExpandedRowKeys: () => [..._expandedKeys],
             getTableState: () => {
                 return {
                     columnState,
@@ -880,15 +598,25 @@ const TableProvider = (_a) => {
                     },
                     sortState,
                     searchState: search,
-                    filterState: _filterState,
-                    expandedKeys: [..._expandedKeys],
+                    _filterState,
                 };
             },
         };
     }
-    return (_jsx(TableContext.Provider, { value: Object.assign({ columnState, setColumnState: updateColumnState, tableLayout,
-            setResizeColumnWidths,
-            sortState, searchState: search, totalRecords,
+    const _data = useMemo(() => {
+        let processedData = data; // create a new array to avoid mutating the original data
+        if (manualSorting !== true) {
+            processedData = sortData(sortState);
+        }
+        if (manualFiltering !== true && _filterState) {
+            processedData = filterData(_filterState);
+        }
+        if (manualSearch !== true && search) {
+            processedData = searchData(search);
+        }
+        return processedData;
+    }, [data, columnState, search, sortState, _filterState]);
+    return (_jsx(TableContext.Provider, { value: Object.assign({ columnState, setColumnState: updateColumnState, sortState, searchState: search, totalRecords,
             keyField,
             handleColumnReorder,
             handleColumnHeaderClick, selectionState: _selectionState, selectRow,
@@ -912,13 +640,6 @@ const TableProvider = (_a) => {
             stateStorage, tableHeight: height, tableMaxHeight: maxHeight, tableMinHeight: minHeight, compact, tableElement: tableElement, headerRowElm: headerRowElm, tableDimensions: tableDimensions, targetElm: targetElm, listElm: listElm, enableColumnResize,
             onSelectionChange,
             onColumnStateChange,
-            onColumnReorder, onRowUpdated: onRowUpdated || (() => { }), tableMenuOptions, data: _data, treeOptions: _treeOptions, firstVisibleDataField, expandedKeys: _expandedKeys, effectiveExpandedKeys,
-            isRowExpanded,
-            toggleRowExpanded,
-            expandRow,
-            collapseRow,
-            expandAllRows,
-            collapseAllRows,
-            onExpandedChange }, props), children: children }));
+            onColumnReorder, onRowUpdated: onRowUpdated || (() => { }), tableMenuOptions, data: _data }, props), children: children }));
 };
 export default TableProvider;