ods-component-lib 1.18.143 → 1.18.145

package/dist/components/devextreme/OdsInlineEditDataGrid/OdsInlineEditDataGrid.d.ts

@@ -3,7 +3,7 @@ import { IInlineEditDataGridProps } from "./types";
 import * as InlineEditDataGridTypes from "./types";
 /**
  * OdsInlineEditDataGrid component.
- * @param {IVirtualDataGridProps} props - The component props.
+ * @param {IInlineEditDataGridProps} props - The component props.
  * @returns {React.FC} - The rendered component.
  */
 declare const OdsInlineEditDataGrid: React.FC<IInlineEditDataGridProps>;

package/dist/components/devextreme/OdsInlineEditDataGrid/handlers/OnContentReadyHandler.d.ts

@@ -1,14 +1,18 @@
+import { MutableRefObject } from "react";
 import { ContentReadyEvent } from "devextreme/ui/data_grid";
 import { IColumnOptions } from "../types";
 /**
  * Custom hook to handle content ready events for the data grid.
- * @param {React.MutableRefObject<any>} lastPageIndexRef - Reference to the last page index.
- * @param {boolean} contentReady - Boolean indicating if the content is ready.
- * @param {Function} setRowCount - Function to set the row count state
- * @param {Function} setContentReady - Function to set the content ready state.
- * @param {Function} setCurrentPage - Function to set the current page state.
- * @param {Function} setCurrentPageSize - Function to set the current page size state.
+ * @param {IColumnOptions[]} columns - The column options for the data grid.
+ * @param {MutableRefObject<any>} lastPageIndexRef - Reference to the last page index.
+ * @param {boolean} filterApplied - Boolean indicating if a filter is applied.
+ * @param {MutableRefObject<number>} totalFilteredCount - Reference to the total filtered count.
+ * @param {MutableRefObject<number>} totalUnfilteredCount - Reference to the total unfiltered count.
+ * @param {Function} setUpdateTrigger - Function to set the update trigger.
+ * @param {Function} setCurrentPage - Function to set the current page.
+ * @param {Function} setCurrentPageSize - Function to set the current page size.
+ * @param {Function} setHeaderFilterData - Function to set the header filter data.
  * @param {Function} [callback] - Optional callback function.
  * @returns {(e: ContentReadyEvent<any, any>) => void} handleContentReady - Handler for content ready event.
  */
-export declare const useOnContentReadyHandler: (lastPageIndexRef: React.MutableRefObject<any>, contentReady: boolean, columns: IColumnOptions[], setRowCount: Function, setContentReady: Function, setCurrentPage: Function, setCurrentPageSize: Function, setHeaderFilterData: Function, callback?: Function) => (e: ContentReadyEvent<any, any>) => void;
+export declare const useOnContentReadyHandler: (columns: IColumnOptions[], lastPageIndexRef: MutableRefObject<number>, filterApplied: boolean, totalFilteredCount: MutableRefObject<number>, totalUnfilteredCount: MutableRefObject<number>, setUpdateTrigger: Function, setCurrentPage: Function, setCurrentPageSize: Function, setHeaderFilterData: Function, callback: Function) => (e: ContentReadyEvent<any, any>) => void;

package/dist/components/devextreme/OdsInlineEditDataGrid/handlers/OnExportingHandler.d.ts

@@ -4,7 +4,7 @@ import { IExportOptions } from "../types";
  *
  * @param {IExportOptions} exportProps - The export options for the data grid.
  * @param {Function} callback - The callback function to be executed after exporting.
- * @param {() => string} getSummary - The callback function to get the summary.
+ * @param {() => string} getSummary - The callback function to get the summary info.
  * @returns {Function} - The onExporting event handler function.
  */
 export declare const useOnExportingHandler: (exportProps: IExportOptions, getSummary: () => string, callback: Function) => (e: any) => void;

package/dist/components/devextreme/OdsInlineEditDataGrid/handlers/OnOptionChangedHandler.d.ts

@@ -1,7 +1,12 @@
+import { MutableRefObject } from "react";
 /**
  * Custom hook to handle option change events for the data grid.
- * @param {React.RefObject} dataGridRef - The ref object for the data grid.
+ * @param {MutableRefObject<any>} dataGridRef - The ref object for the data grid.
+ * @param {MutableRefObject<number>} totalFilteredCount - The ref object for the total filtered count.
+ * @param {any} sortingProps - The sorting properties.
  * @param {Function} setFilterApplied - Function to set the filter applied state.
+ * @param {Function} setUpdateTrigger - Function to set the update trigger state.
+ * @param {Function} callback - The callback function to be called.
  * @returns {Function} - Handler function for option changed event.
  */
-export declare const useOnOptionChangedHandler: (dataGridRef: any, setFilterApplied: any, callback: any) => (e: any) => void;
+export declare const useOnOptionChangedHandler: (dataGridRef: MutableRefObject<any>, totalFilteredCount: MutableRefObject<number>, sortingProps: any, setFilterApplied: Function, setUpdateTrigger: Function, callback: Function) => (e: any) => void;

package/dist/components/devextreme/OdsInlineEditDataGrid/handlers/OnSummaryHandler.d.ts

@@ -1,13 +1,16 @@
+import { MutableRefObject } from "react";
 import type { ISummaryRowOptions } from "../types";
+/**
+ * Props interface for the useOnSummaryHandler hook.
+ */
 interface IUseSummaryHandlersProps {
     customSummary?: ISummaryRowOptions;
     totalRecordCount: number;
     currentPageSize: number;
     currentPage: number;
     filterApplied: boolean;
-    rowCount: number;
-    filteredRowCount: number;
-    isServerSide?: boolean;
+    totalFilteredCount: MutableRefObject<number>;
+    totalUnfilteredCount: MutableRefObject<number>;
 }
 /**
  * Custom hook that provides summary handler for a data grid.
@@ -15,7 +18,7 @@ interface IUseSummaryHandlersProps {
  * @param {IUseSummaryHandlersProps} props - The props object containing necessary parameters.
  * @returns {Object} - An object containing the renderTotal function.
  */
-export declare const useOnSummaryHandler: ({ customSummary, totalRecordCount, currentPageSize, currentPage, filterApplied, rowCount, filteredRowCount, }: IUseSummaryHandlersProps) => {
+export declare const useOnSummaryHandler: ({ customSummary, totalRecordCount, currentPageSize, currentPage, filterApplied, totalFilteredCount, totalUnfilteredCount, }: IUseSummaryHandlersProps) => {
     renderTotal: () => string | null;
 };
 export {};

package/dist/components/devextreme/OdsInlineEditDataGrid/types.d.ts

@@ -26,6 +26,8 @@ export interface IExportOptions extends Partial<IExportProps> {
     allowExportSelectedData?: boolean;
     fileName?: string;
     selectedText?: string;
+    activeText?: string;
+    passiveText?: string;
 }
 /**
  * Represents the configuration for a toolbar button.

package/dist/index.js

@@ -33748,8 +33748,8 @@ var OdsBasicDataGrid = function OdsBasicDataGrid(props) {
   };
   var actionButtons = React.useMemo(function () {
     if (props.actionButtonGroup) {
-      if (props.actionButtonGroup.length >= 3 && !props.edit) {
-        return props.actionButtonGroup.slice(0, 3);
+      if (props.actionButtonGroup.length > 3 && !props.edit) {
+        return props.actionButtonGroup.slice(0, 2);
       } else {
         return props.actionButtonGroup;
       }
@@ -33830,7 +33830,7 @@ var OdsBasicDataGrid = function OdsBasicDataGrid(props) {
     return result;
   }, [data, filteredRowCount, constants.loadedPageCount, props.pageSize, constants.totalRecordCount, filterApplied.current]);
   function actionCellRender(cellData, props) {
-    var kebabMenuButtons = props.actionButtonGroup && props.actionButtonGroup.length >= 3 && !props.edit ? props.actionButtonGroup.slice(3).map(function (button) {
+    var kebabMenuButtons = props.actionButtonGroup && props.actionButtonGroup.length > 3 && !props.edit ? props.actionButtonGroup.slice(2).map(function (button) {
       return {
         icon: button.icon,
         onClick: function onClick(event) {
@@ -35154,8 +35154,8 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
   }, []);
   var actionButtons = React.useMemo(function () {
     if (props.actionButtonGroup) {
-      if (props.actionButtonGroup.length >= 3 && !props.edit) {
-        return props.actionButtonGroup.slice(0, 3);
+      if (props.actionButtonGroup.length > 3 && !props.edit) {
+        return props.actionButtonGroup.slice(0, 2);
       } else {
         return props.actionButtonGroup;
       }
@@ -35179,7 +35179,7 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
     }
   }, []);
   function actionCellRender(cellData, props) {
-    var kebabMenuButtons = props.actionButtonGroup && props.actionButtonGroup.length >= 3 && !props.edit ? props.actionButtonGroup.slice(3).map(function (button) {
+    var kebabMenuButtons = props.actionButtonGroup && props.actionButtonGroup.length > 3 && !props.edit ? props.actionButtonGroup.slice(2).map(function (button) {
       return {
         icon: button.icon,
         onClick: function onClick(event) {
@@ -35511,13 +35511,12 @@ var useOnActionCellRenderHandler = function useOnActionCellRenderHandler(visible
   return onActionCellRender;
 };
 
-var useOnContentReadyHandler = function useOnContentReadyHandler(lastPageIndexRef, contentReady, columns, setRowCount, setContentReady, setCurrentPage, setCurrentPageSize, setHeaderFilterData, callback) {
+var useOnContentReadyHandler = function useOnContentReadyHandler(columns, lastPageIndexRef, filterApplied, totalFilteredCount, totalUnfilteredCount, setUpdateTrigger, setCurrentPage, setCurrentPageSize, setHeaderFilterData, callback) {
   var onContentReady = React.useCallback(function (e) {
     var _dataGridInstance$get;
     var dataGridInstance = e.component;
     var currentPageIndex = dataGridInstance.pageIndex();
     var currentTotalCount = dataGridInstance.totalCount();
-    var currentPageSizeValue = dataGridInstance.pageSize();
     var newData = dataGridInstance === null || dataGridInstance === void 0 ? void 0 : (_dataGridInstance$get = dataGridInstance.getDataSource()) === null || _dataGridInstance$get === void 0 ? void 0 : _dataGridInstance$get.items();
     if (lastPageIndexRef.current !== currentPageIndex && newData && newData.length > 0) {
       setHeaderFilterData(function (prevData) {
@@ -35546,18 +35545,25 @@ var useOnContentReadyHandler = function useOnContentReadyHandler(lastPageIndexRe
         });
         return [].concat(prevData, newItems);
       });
+      setCurrentPage(currentPageIndex);
+      setCurrentPageSize(dataGridInstance.pageSize());
+      if (filterApplied) {
+        totalFilteredCount.current = currentTotalCount;
+      } else {
+        totalUnfilteredCount.current = currentTotalCount;
+      }
+      if (!filterApplied && totalFilteredCount.current === 0) {
+        totalFilteredCount.current = totalUnfilteredCount.current;
+      }
+      setUpdateTrigger(function (prev) {
+        return !prev;
+      });
       lastPageIndexRef.current = currentPageIndex;
-      if (!contentReady) setContentReady(true);
-    }
-    setCurrentPage(currentPageIndex);
-    setCurrentPageSize(currentPageSizeValue);
-    if (currentTotalCount > -1) {
-      setRowCount(currentTotalCount);
     }
     if (callback) {
       callback(e);
     }
-  }, []);
+  }, [columns, filterApplied]);
   return onContentReady;
 };
 
@@ -35586,33 +35592,51 @@ var useOnEditorPreparedHandler = function useOnEditorPreparedHandler(callback) {
 var useOnExportingHandler = function useOnExportingHandler(exportProps, getSummary, callback) {
   var onExporting = React.useCallback(function (e) {
     if (exportProps) {
-      var _exportProps$fileName;
+      var _exportProps$fileName, _exportProps$activeTe, _exportProps$passiveT;
       ExportDataGridToExcel({
         gridComponent: e.component,
         baseFileName: (_exportProps$fileName = exportProps.fileName) != null ? _exportProps$fileName : "DataGrid",
         selectedText: exportProps.selectedText,
         getSummary: getSummary,
-        selectedRowsOnly: e.selectedRowsOnly
+        selectedRowsOnly: e.selectedRowsOnly,
+        activeText: (_exportProps$activeTe = exportProps.activeText) != null ? _exportProps$activeTe : "Active",
+        passiveText: (_exportProps$passiveT = exportProps.passiveText) != null ? _exportProps$passiveT : "Passive"
       });
     }
     if (callback) {
       callback(e);
     }
-  }, []);
+  }, [getSummary]);
   return onExporting;
 };
 
-var useOnOptionChangedHandler = function useOnOptionChangedHandler(dataGridRef, setFilterApplied, callback) {
+var useOnOptionChangedHandler = function useOnOptionChangedHandler(dataGridRef, totalFilteredCount, sortingProps, setFilterApplied, setUpdateTrigger, callback) {
   var onOptionChanged = React.useCallback(function (e) {
+    var dataGrid = dataGridRef.current.instance;
+    var updateFilterStatus = function updateFilterStatus() {
+      var filters = dataGrid.getCombinedFilter(true);
+      var active = filters && filters.length > 0;
+      setFilterApplied(active);
+      return active;
+    };
     if (e.fullName.includes("sortOrder")) {
-      dataGridRef.current.instance.getScrollable().scrollTo(0);
+      dataGrid.getScrollable().scrollTo(0);
     }
-    if (e.name === "filterValue") {
-      setFilterApplied(!!(e.value && e.value.length > 0));
-    } else if (e.name === "columns" && e.fullName.includes("filterValue")) {
-      setFilterApplied(!!e.value);
-    } else if (e.name === "filterPanel" && e.fullName === "filterPanel.filterEnabled") {
-      setFilterApplied(e.value);
+    if (e.fullName.includes("filterValue") || e.fullName.includes("filter") || e.fullName === "searchPanel.text") {
+      var active = updateFilterStatus();
+      if (active) {
+        setTimeout(function () {
+          dataGrid.refresh().done(function () {
+            totalFilteredCount.current = dataGrid.totalCount();
+            setUpdateTrigger(function (prev) {
+              return !prev;
+            });
+          });
+        }, 0);
+      }
+    }
+    if (sortingProps !== null && sortingProps !== void 0 && sortingProps.onOptionChanged) {
+      sortingProps.onOptionChanged(e);
     }
     if (callback) {
       callback(e);
@@ -35627,26 +35651,24 @@ var useOnSummaryHandler = function useOnSummaryHandler(_ref) {
     currentPageSize = _ref.currentPageSize,
     currentPage = _ref.currentPage,
     filterApplied = _ref.filterApplied,
-    rowCount = _ref.rowCount,
-    filteredRowCount = _ref.filteredRowCount;
+    totalFilteredCount = _ref.totalFilteredCount,
+    totalUnfilteredCount = _ref.totalUnfilteredCount;
   var renderTotal = React.useCallback(function () {
     if (!customSummary) return null;
-    var totalLoaded = rowCount;
+    var totalLoaded = filterApplied ? totalFilteredCount.current : totalUnfilteredCount.current;
     var loadedPage = currentPage + 1;
     var totalRecords = totalRecordCount;
-    var totalPageCount = currentPageSize > 0 ? Math.ceil(totalRecords / currentPageSize) : 1;
-    var result = totalRecords + " " + (customSummary === null || customSummary === void 0 ? void 0 : customSummary.summaryTotalDataLabel);
-    if (filterApplied) {
-      result = totalLoaded + " " + (customSummary === null || customSummary === void 0 ? void 0 : customSummary.summaryFilteredDataLabel) + " - " + result;
-    }
-    if (customSummary !== null && customSummary !== void 0 && customSummary.showSumInSummary) {
-      result += " - " + (customSummary === null || customSummary === void 0 ? void 0 : customSummary.summarySumLabel) + " " + rowCount;
-    }
-    if (totalPageCount > 1) {
-      result += " - " + (customSummary === null || customSummary === void 0 ? void 0 : customSummary.summaryTotalPageCountLabel) + " " + loadedPage + " / " + totalPageCount;
+    var totalPageCount = Math.ceil(totalRecords / currentPageSize);
+    if (totalLoaded === 0 || totalLoaded === -1) {
+      return "";
     }
+    var filteredDisplayText = filterApplied ? totalLoaded + " " + (customSummary === null || customSummary === void 0 ? void 0 : customSummary.summaryFilteredDataLabel) + " - " : "";
+    var loadedDisplayText = totalUnfilteredCount.current < totalRecords ? totalUnfilteredCount.current + " " + (customSummary === null || customSummary === void 0 ? void 0 : customSummary.summaryLoadedDataLabel) + " - " : "";
+    var totalRecordsDisplayText = totalRecords + " " + (customSummary === null || customSummary === void 0 ? void 0 : customSummary.summaryTotalDataLabel);
+    var paginationDisplayText = loadedPage < totalPageCount ? " - " + (customSummary === null || customSummary === void 0 ? void 0 : customSummary.summaryTotalPageCountLabel) + " " + loadedPage + " / " + totalPageCount : "";
+    var result = "" + filteredDisplayText + loadedDisplayText + totalRecordsDisplayText + paginationDisplayText;
     return result;
-  }, [totalRecordCount, currentPageSize, customSummary, currentPage, rowCount, filteredRowCount, filterApplied]);
+  }, [currentPage, currentPageSize, filterApplied, customSummary, totalRecordCount, totalUnfilteredCount]);
   return {
     renderTotal: renderTotal
   };
@@ -35703,6 +35725,8 @@ var OdsInlineEditDataGrid = function OdsInlineEditDataGrid(props) {
     pageTitleFromProps = props.pageTitle,
     pagerPropsFromProps = props.pagerProps,
     pageSizeFromProps = props.pageSize,
+    scrollingPropsFromProps = props.scrollingProps,
+    sortingPropsFromProps = props.sortingProps,
     toolbarButtonGroupFromProps = props.toolbarButtonGroup,
     totalRecordCountFromProps = props.totalRecordCount,
     heightFromProps = props.height,
@@ -35715,66 +35739,39 @@ var OdsInlineEditDataGrid = function OdsInlineEditDataGrid(props) {
   var _useStyles = useStyles$2(),
     gridStyle = _useStyles.styles;
   var _useState = React.useState(0),
-    rowCount = _useState[0],
-    setRowCount = _useState[1];
-  var _useState2 = React.useState(0),
-    filteredRowCount = _useState2[0];
-  var lastPageIndexRef = React.useRef(null);
-  var _useState3 = React.useState(pageSizeFromProps != null ? pageSizeFromProps : 0),
-    currentPageSize = _useState3[0],
-    setCurrentPageSize = _useState3[1];
-  var _useState4 = React.useState(0),
-    currentPage = _useState4[0],
-    setCurrentPage = _useState4[1];
-  var _useState5 = React.useState(false),
-    contentReady = _useState5[0],
-    setContentReady = _useState5[1];
+    currentPage = _useState[0],
+    setCurrentPage = _useState[1];
+  var _useState2 = React.useState(pageSizeFromProps != null ? pageSizeFromProps : 50),
+    currentPageSize = _useState2[0],
+    setCurrentPageSize = _useState2[1];
+  var _useState3 = React.useState({}),
+    filterOptions = _useState3[0],
+    setFilterOptions = _useState3[1];
+  var _useState4 = React.useState(false),
+    filterApplied = _useState4[0],
+    setFilterApplied = _useState4[1];
+  var _useState5 = React.useState([]),
+    headerFilterData = _useState5[0],
+    setHeaderFilterData = _useState5[1];
   var _useState6 = React.useState(false),
-    filterApplied = _useState6[0],
-    setFilterApplied = _useState6[1];
-  var _useState7 = React.useState([]),
-    headerFilterData = _useState7[0],
-    setHeaderFilterData = _useState7[1];
-  var handleContentReady = useOnContentReadyHandler(lastPageIndexRef, contentReady, gridColumnsFromProps, setRowCount, setContentReady, setCurrentPage, setCurrentPageSize, setHeaderFilterData, onContentReadyFromProps);
-  var handleEditorPrepared = useOnEditorPreparedHandler(onEditorPreparedFromProps);
+    updateTrigger = _useState6[0],
+    setUpdateTrigger = _useState6[1];
+  var lastPageIndexRef = React.useRef(null);
+  var totalUnfilteredCount = React.useRef(0);
+  var totalFilteredCount = React.useRef(0);
+  var handleContentReady = useOnContentReadyHandler(gridColumnsFromProps, lastPageIndexRef, filterApplied, totalFilteredCount, totalUnfilteredCount, setUpdateTrigger, setCurrentPage, setCurrentPageSize, setHeaderFilterData, onContentReadyFromProps);
   var _useOnSummaryHandler = useOnSummaryHandler({
       customSummary: customSummaryFromProps,
       totalRecordCount: totalRecordCountFromProps,
       currentPageSize: currentPageSize,
       currentPage: currentPage,
       filterApplied: filterApplied,
-      rowCount: rowCount,
-      filteredRowCount: filteredRowCount
+      totalFilteredCount: totalFilteredCount,
+      totalUnfilteredCount: totalUnfilteredCount
     }),
     renderTotal = _useOnSummaryHandler.renderTotal;
-  var handleExporting = useOnExportingHandler(exportPropsFromProps, renderTotal, onExportingFromProps);
-  var handleOptionChanged = useOnOptionChangedHandler(dataGridRefFromProps, setFilterApplied, onOptionChangedFromProps);
-  var handleCellClick = React.useCallback(function (e) {
-    if (e.rowType != "header") {
-      e.cellElement.style.backgroundColor = "transparent";
-    }
-    if (onCellClickFromProps) {
-      onCellClickFromProps(e);
-    }
-  }, []);
-  var getVisibleActionButtons = React.useMemo(function () {
-    if (actionButtonGroupFromProps) {
-      if (actionButtonGroupFromProps.length >= 2 && !editPropsFromProps) {
-        return actionButtonGroupFromProps.slice(0, 2);
-      }
-      return actionButtonGroupFromProps;
-    }
-    return [];
-  }, []);
-  var ActionCellRenderPartial = useOnActionCellRenderHandler(getVisibleActionButtons, actionButtonGroupFromProps, editPropsFromProps);
-  var DataGridOptionsFromProps = React.useMemo(function () {
-    return _extends({}, AllGridOptions, DefaultDataGridOptions, {
-      columnResizingMode: columnResizingModeFromProps != null ? columnResizingModeFromProps : "nextColumn"
-    });
-  }, []);
-  var MemoizedDataGridHeight = React.useMemo(function () {
-    return heightFromProps != null ? heightFromProps : window.innerHeight > 164 ? window.innerHeight - 164 : window.innerHeight;
-  }, []);
+  var handleOptionChanged = useOnOptionChangedHandler(dataGridRefFromProps, totalFilteredCount, sortingPropsFromProps, setFilterApplied, setUpdateTrigger, onOptionChangedFromProps);
+  React.useEffect(function () {}, [updateTrigger]);
   React.useEffect(function () {
     var loadFilterData = function loadFilterData() {
       try {
@@ -35803,39 +35800,58 @@ var OdsInlineEditDataGrid = function OdsInlineEditDataGrid(props) {
         for (var _iterator = _createForOfIteratorHelperLoose(gridColumnsFromProps), _step; !(_step = _iterator()).done;) {
           _loop();
         }
+        setFilterOptions(newFilterOptions);
         return Promise.resolve();
       } catch (e) {
         return Promise.reject(e);
       }
     };
     loadFilterData();
-  }, [headerFilterData]);
-  var _useState8 = React.useState(gridColumnsFromProps),
-    gridColumns = _useState8[0],
-    setGridColumns = _useState8[1];
+  }, [headerFilterData, gridColumnsFromProps]);
   React.useEffect(function () {
-    if (gridColumnsFromProps !== undefined && gridColumnsFromProps.length > 0) {
-      setGridColumns([].concat(gridColumnsFromProps));
+    setHeaderFilterData([]);
+  }, []);
+  var handleEditorPrepared = useOnEditorPreparedHandler(onEditorPreparedFromProps);
+  var handleExporting = useOnExportingHandler(exportPropsFromProps, renderTotal, onExportingFromProps);
+  var handleCellClick = React.useCallback(function (e) {
+    if (e.rowType != "header") {
+      e.cellElement.style.backgroundColor = "transparent";
     }
-  }, [gridColumnsFromProps]);
+    if (onCellClickFromProps) {
+      onCellClickFromProps(e);
+    }
+  }, []);
+  var visibleActionButtons = React.useMemo(function () {
+    if (actionButtonGroupFromProps) {
+      if (actionButtonGroupFromProps.length >= 2 && !editPropsFromProps) {
+        return actionButtonGroupFromProps.slice(0, 2);
+      }
+      return actionButtonGroupFromProps;
+    }
+    return [];
+  }, []);
+  var ActionCellRenderPartial = useOnActionCellRenderHandler(visibleActionButtons, actionButtonGroupFromProps, editPropsFromProps);
+  var DataGridOptionsFromProps = React.useMemo(function () {
+    return _extends({}, AllGridOptions, DefaultDataGridOptions, {
+      columnResizingMode: columnResizingModeFromProps != null ? columnResizingModeFromProps : "nextColumn"
+    });
+  }, []);
+  var MemoizedDataGridHeight = React.useMemo(function () {
+    return heightFromProps != null ? heightFromProps : window.innerHeight > 164 ? window.innerHeight - 164 : window.innerHeight;
+  }, []);
   var rederedGridColumns = React.useMemo(function () {
-    return gridColumns.map(function (col) {
-      var _col$multiLevelColumn;
+    return gridColumnsFromProps.map(function (col) {
+      var _col$headerFilter, _col$multiLevelColumn;
       return React__default.createElement(DataGrid.Column, Object.assign({
         key: col.dataField
       }, col, {
         minWidth: 10
-      }), col.lookup && React__default.createElement(DataGrid.Lookup, Object.assign({}, col.lookup)), col.dataField === "IsActive" && React__default.createElement(DataGrid.HeaderFilter, {
-        dataSource: [{
-          text: "Active",
-          value: true
-        }, {
-          text: "Passive",
-          value: false
-        }]
-      }), col.headerFilter && React__default.createElement(DataGrid.HeaderFilter, {
+      }), col.lookup && React__default.createElement(DataGrid.Lookup, Object.assign({}, col.lookup)), ((_col$headerFilter = col.headerFilter) === null || _col$headerFilter === void 0 ? void 0 : _col$headerFilter.dataSource) && React__default.createElement(DataGrid.HeaderFilter, {
         dataSource: col.headerFilter.dataSource,
         visible: true
+      }), col.headerFilter && !col.headerFilter.dataSource && React__default.createElement(DataGrid.HeaderFilter, {
+        allowSearch: true,
+        dataSource: [].concat(filterOptions[col.dataField] || [])
       }), (_col$multiLevelColumn = col.multiLevelColumns) === null || _col$multiLevelColumn === void 0 ? void 0 : _col$multiLevelColumn.map(function (multiLevelColItem) {
         return React__default.createElement(DataGrid.Column, {
           key: multiLevelColItem.dataField,
@@ -35845,7 +35861,7 @@ var OdsInlineEditDataGrid = function OdsInlineEditDataGrid(props) {
         });
       }));
     });
-  }, [gridColumns]);
+  }, [gridColumnsFromProps]);
   return React__default.createElement("div", null, pageTitleFromProps && React__default.createElement(MemoizedPageTitleAndToolbar, {
     pageTitle: pageTitleFromProps,
     toolbarButtonGroup: toolbarButtonGroupFromProps
@@ -35904,13 +35920,8 @@ var OdsInlineEditDataGrid = function OdsInlineEditDataGrid(props) {
     infoText: (_pagerPropsFromProps$5 = pagerPropsFromProps.infoText) != null ? _pagerPropsFromProps$5 : "Loaded {0} of {1} items"
   }), React__default.createElement(DataGrid.SearchPanel, {
     visible: true
-  }), React__default.createElement(DataGrid.Scrolling, {
-    showScrollbar: "always",
-    scrollByContent: true,
-    scrollByThumb: true,
-    mode: "standard",
-    rowRenderingMode: "standard",
-    useNative: true
+  }), scrollingPropsFromProps ? React__default.createElement(DataGrid.Scrolling, Object.assign({}, scrollingPropsFromProps)) : React__default.createElement(DataGrid.Scrolling, {
+    mode: "infinite"
   }), React__default.createElement(DataGrid.Toolbar, null, React__default.createElement(DataGrid.Item, {
     name: "searchPanel"
   }), React__default.createElement(DataGrid.Item, {