ods-component-lib 1.18.145 → 1.18.147

package/dist/index.modern.js

@@ -35017,7 +35017,7 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
   var renderTotal = useCallback(function () {
     var _props$customSummary, _props$customSummary2, _props$customSummary3, _props$customSummary4;
     var totalLoaded = filterApplied ? totalFilteredCount.current : totalUnfilteredCount.current;
-    var loadedPage = currentPage + 1;
+    var loadedPage = currentPage;
     var totalRecords = props.totalRecordCount;
     var totalPageCount = Math.ceil(totalRecords / currentPageSize);
     if (totalLoaded === 0 || totalLoaded === -1) {
@@ -35028,12 +35028,12 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
     var result = "" + filteredDisplayText + loadedDisplayText + totalRecords + " " + ((_props$customSummary3 = props.customSummary) === null || _props$customSummary3 === void 0 ? void 0 : _props$customSummary3.summaryTotalDataLabel);
     result += " - " + ((_props$customSummary4 = props.customSummary) === null || _props$customSummary4 === void 0 ? void 0 : _props$customSummary4.summaryTotalPageCountLabel) + " " + loadedPage + " / " + totalPageCount;
     return result;
-  }, [currentPage, currentPageSize, filterApplied, props.customSummary, props.totalRecordCount, totalUnfilteredCount]);
+  }, [currentPage, currentPageSize, filterApplied, props.customSummary, props.totalRecordCount, totalUnfilteredCount, props.dataSource]);
   var handleContentReady = useCallback(function (e) {
     var _dataGridInstance$get;
     var dataGridInstance = e.component;
-    var currentPageIndex = dataGridInstance.pageIndex();
-    var currentTotalCount = dataGridInstance.totalCount();
+    var currentPageIndex = dataGridInstance.pageCount();
+    var currentTotalCount = currentPageIndex == 0 ? 50 : dataGridInstance.totalCount();
     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) {
@@ -35065,6 +35065,12 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
       setCurrentPage(currentPageIndex);
       setCurrentPageSize(dataGridInstance.pageSize());
       rowCount.current = currentTotalCount;
+      setUpdateTrigger(function (prev) {
+        return !prev;
+      });
+      lastPageIndexRef.current = currentPageIndex;
+    }
+    if (currentTotalCount > 0) {
       if (filterApplied) {
         totalFilteredCount.current = currentTotalCount;
       } else {
@@ -35073,10 +35079,6 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
       if (!filterApplied && totalFilteredCount.current === 0) {
         totalFilteredCount.current = totalUnfilteredCount.current;
       }
-      setUpdateTrigger(function (prev) {
-        return !prev;
-      });
-      lastPageIndexRef.current = currentPageIndex;
     }
   }, [props.columns, filterApplied]);
   var handleOptionChanged = useCallback(function (e) {
@@ -35089,6 +35091,7 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
     };
     if (e.fullName.includes("sortOrder")) {
       dataGrid.getScrollable().scrollTo(0);
+      setHeaderFilterData([]);
     }
     if (e.fullName.includes("filterValue") || e.fullName.includes("filter") || e.fullName === "searchPanel.text") {
       var active = updateFilterStatus();
@@ -35338,7 +35341,8 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
     onToolbarPreparing: props.onToolbarPreparing,
     ref: props.dataGridRef
   }), React.createElement(Scrolling, {
-    mode: "infinite"
+    mode: "infinite",
+    preloadEnabled: true
   }), React.createElement(Paging, {
     enabled: true,
     defaultPageSize: props.pageSize
@@ -35362,7 +35366,6 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
         value: false
       }]
     }), React.createElement(HeaderFilter, {
-      allowSearch: true,
       dataSource: [].concat(filterOptions[col.dataField] || [])
     }), col.multiLevelColumns && col.multiLevelColumns.map(function (multiLevelColItem) {
       return React.createElement(Column, {
@@ -35506,7 +35509,7 @@ var useOnActionCellRenderHandler = function useOnActionCellRenderHandler(visible
   return onActionCellRender;
 };
 
-var useOnContentReadyHandler = function useOnContentReadyHandler(columns, lastPageIndexRef, filterApplied, totalFilteredCount, totalUnfilteredCount, setUpdateTrigger, setCurrentPage, setCurrentPageSize, setHeaderFilterData, callback) {
+var useOnContentReadyHandler = function useOnContentReadyHandler(columns, lastPageIndexRef, filterApplied, totalFilteredCount, totalUnfilteredCount, setUpdateTrigger, setCurrentPage, setCurrentPageSize, callback) {
   var onContentReady = useCallback(function (e) {
     var _dataGridInstance$get;
     var dataGridInstance = e.component;
@@ -35514,32 +35517,6 @@ var useOnContentReadyHandler = function useOnContentReadyHandler(columns, lastPa
     var currentTotalCount = dataGridInstance.totalCount();
     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) {
-        var uniqueValuesByColumn = {};
-        columns.forEach(function (col) {
-          uniqueValuesByColumn[col.dataField] = new Set(prevData.map(function (item) {
-            return item[col.dataField];
-          }).filter(function (val) {
-            return val !== null && val !== "";
-          }));
-        });
-        var newItems = [];
-        newData.forEach(function (item) {
-          var addItem = {};
-          columns.forEach(function (col) {
-            var _item$col$dataField;
-            var colValue = (_item$col$dataField = item[col.dataField]) === null || _item$col$dataField === void 0 ? void 0 : _item$col$dataField.toString();
-            if (colValue && !uniqueValuesByColumn[col.dataField].has(colValue)) {
-              uniqueValuesByColumn[col.dataField].add(colValue);
-              addItem[col.dataField] = colValue;
-            }
-          });
-          if (Object.keys(addItem).length > 0) {
-            newItems.push(addItem);
-          }
-        });
-        return [].concat(prevData, newItems);
-      });
       setCurrentPage(currentPageIndex);
       setCurrentPageSize(dataGridInstance.pageSize());
       if (filterApplied) {
@@ -35691,7 +35668,7 @@ var PageTitleAndToolbar = function PageTitleAndToolbar(_ref) {
 };
 var MemoizedPageTitleAndToolbar = React.memo(PageTitleAndToolbar);
 
-var _excluded$5 = ["dataGridRef", "actionColumnEnable", "actionButtonGroup", "gridColumns", "columnResizingMode", "customSummary", "dataSource", "editProps", "exportProps", "isFilterPanel", "isFilterRow", "pageTitle", "pagerProps", "pageSize", "scrollingProps", "sortingProps", "toolbarButtonGroup", "totalRecordCount", "width", "height", "className", "onCellClick", "onContentReady", "onEditorPrepared", "onOptionChanged", "onExporting"];
+var _excluded$5 = ["dataGridRef", "actionColumnEnable", "actionButtonGroup", "gridColumns", "columnResizingMode", "customSummary", "dataSource", "editProps", "exportProps", "headerFilter", "isFilterPanel", "isFilterRow", "pageTitle", "pagerProps", "pageSize", "scrollingProps", "sortingProps", "toolbarButtonGroup", "totalRecordCount", "width", "height", "className", "onCellClick", "onContentReady", "onEditorPrepared", "onOptionChanged", "onExporting"];
 var DefaultDataGridOptions = {
   allowColumnReordering: true,
   allowColumnResizing: true,
@@ -35715,6 +35692,7 @@ var OdsInlineEditDataGrid = function OdsInlineEditDataGrid(props) {
     dataSourceFromProps = props.dataSource,
     editPropsFromProps = props.editProps,
     exportPropsFromProps = props.exportProps,
+    headerFilterFromProps = props.headerFilter,
     isFilterPanelFromProps = props.isFilterPanel,
     isFilterRowFromProps = props.isFilterRow,
     pageTitleFromProps = props.pageTitle,
@@ -35739,22 +35717,16 @@ var OdsInlineEditDataGrid = function OdsInlineEditDataGrid(props) {
   var _useState2 = useState(pageSizeFromProps != null ? pageSizeFromProps : 50),
     currentPageSize = _useState2[0],
     setCurrentPageSize = _useState2[1];
-  var _useState3 = useState({}),
-    filterOptions = _useState3[0],
-    setFilterOptions = _useState3[1];
+  var _useState3 = useState(false),
+    filterApplied = _useState3[0],
+    setFilterApplied = _useState3[1];
   var _useState4 = useState(false),
-    filterApplied = _useState4[0],
-    setFilterApplied = _useState4[1];
-  var _useState5 = useState([]),
-    headerFilterData = _useState5[0],
-    setHeaderFilterData = _useState5[1];
-  var _useState6 = useState(false),
-    updateTrigger = _useState6[0],
-    setUpdateTrigger = _useState6[1];
+    updateTrigger = _useState4[0],
+    setUpdateTrigger = _useState4[1];
   var lastPageIndexRef = useRef(null);
   var totalUnfilteredCount = useRef(0);
   var totalFilteredCount = useRef(0);
-  var handleContentReady = useOnContentReadyHandler(gridColumnsFromProps, lastPageIndexRef, filterApplied, totalFilteredCount, totalUnfilteredCount, setUpdateTrigger, setCurrentPage, setCurrentPageSize, setHeaderFilterData, onContentReadyFromProps);
+  var handleContentReady = useOnContentReadyHandler(gridColumnsFromProps, lastPageIndexRef, filterApplied, totalFilteredCount, totalUnfilteredCount, setUpdateTrigger, setCurrentPage, setCurrentPageSize, onContentReadyFromProps);
   var _useOnSummaryHandler = useOnSummaryHandler({
       customSummary: customSummaryFromProps,
       totalRecordCount: totalRecordCountFromProps,
@@ -35767,45 +35739,6 @@ var OdsInlineEditDataGrid = function OdsInlineEditDataGrid(props) {
     renderTotal = _useOnSummaryHandler.renderTotal;
   var handleOptionChanged = useOnOptionChangedHandler(dataGridRefFromProps, totalFilteredCount, sortingPropsFromProps, setFilterApplied, setUpdateTrigger, onOptionChangedFromProps);
   useEffect(function () {}, [updateTrigger]);
-  useEffect(function () {
-    var loadFilterData = function loadFilterData() {
-      try {
-        var newFilterOptions = {};
-        var _loop = function _loop() {
-          var col = _step.value;
-          try {
-            if (headerFilterData.length > 0) {
-              var newData = headerFilterData.filter(function (item) {
-                return item[col.dataField] != null && item[col.dataField] !== "";
-              }).map(function (item) {
-                return item[col.dataField].toString();
-              });
-              var values = newData.map(function (group) {
-                return {
-                  text: group,
-                  value: group
-                };
-              });
-              newFilterOptions[col.dataField] = values;
-            }
-          } catch (error) {
-            console.error("Error loading data for header filter:", error);
-          }
-        };
-        for (var _iterator = _createForOfIteratorHelperLoose(gridColumnsFromProps), _step; !(_step = _iterator()).done;) {
-          _loop();
-        }
-        setFilterOptions(newFilterOptions);
-        return Promise.resolve();
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    };
-    loadFilterData();
-  }, [headerFilterData, gridColumnsFromProps]);
-  useEffect(function () {
-    setHeaderFilterData([]);
-  }, []);
   var handleEditorPrepared = useOnEditorPreparedHandler(onEditorPreparedFromProps);
   var handleExporting = useOnExportingHandler(exportPropsFromProps, renderTotal, onExportingFromProps);
   var handleCellClick = useCallback(function (e) {
@@ -35816,7 +35749,7 @@ var OdsInlineEditDataGrid = function OdsInlineEditDataGrid(props) {
       onCellClickFromProps(e);
     }
   }, []);
-  var visibleActionButtons = useMemo(function () {
+  var VisibleActionButtons = useMemo(function () {
     if (actionButtonGroupFromProps) {
       if (actionButtonGroupFromProps.length >= 2 && !editPropsFromProps) {
         return actionButtonGroupFromProps.slice(0, 2);
@@ -35825,29 +35758,26 @@ var OdsInlineEditDataGrid = function OdsInlineEditDataGrid(props) {
     }
     return [];
   }, []);
-  var ActionCellRenderPartial = useOnActionCellRenderHandler(visibleActionButtons, actionButtonGroupFromProps, editPropsFromProps);
+  var ActionCellRenderPartial = useOnActionCellRenderHandler(VisibleActionButtons, actionButtonGroupFromProps, editPropsFromProps);
   var DataGridOptionsFromProps = useMemo(function () {
     return _extends({}, AllGridOptions, DefaultDataGridOptions, {
       columnResizingMode: columnResizingModeFromProps != null ? columnResizingModeFromProps : "nextColumn"
     });
   }, []);
-  var MemoizedDataGridHeight = useMemo(function () {
+  var DataGridHeight = useMemo(function () {
     return heightFromProps != null ? heightFromProps : window.innerHeight > 164 ? window.innerHeight - 164 : window.innerHeight;
   }, []);
-  var rederedGridColumns = useMemo(function () {
+  var RederedGridColumns = useMemo(function () {
     return gridColumnsFromProps.map(function (col) {
-      var _col$headerFilter, _col$multiLevelColumn;
+      var _col$multiLevelColumn;
       return React.createElement(Column, Object.assign({
         key: col.dataField
       }, col, {
         minWidth: 10
-      }), col.lookup && React.createElement(Lookup$1, Object.assign({}, col.lookup)), ((_col$headerFilter = col.headerFilter) === null || _col$headerFilter === void 0 ? void 0 : _col$headerFilter.dataSource) && React.createElement(HeaderFilter, {
-        dataSource: col.headerFilter.dataSource,
-        visible: true
-      }), col.headerFilter && !col.headerFilter.dataSource && React.createElement(HeaderFilter, {
-        allowSearch: true,
-        dataSource: [].concat(filterOptions[col.dataField] || [])
-      }), (_col$multiLevelColumn = col.multiLevelColumns) === null || _col$multiLevelColumn === void 0 ? void 0 : _col$multiLevelColumn.map(function (multiLevelColItem) {
+      }), col.lookup && React.createElement(Lookup$1, Object.assign({}, col.lookup)), col.headerFilter && React.createElement(HeaderFilter, Object.assign({}, col.headerFilter, {
+        visible: true,
+        allowSearch: true
+      })), (_col$multiLevelColumn = col.multiLevelColumns) === null || _col$multiLevelColumn === void 0 ? void 0 : _col$multiLevelColumn.map(function (multiLevelColItem) {
         return React.createElement(Column, {
           key: multiLevelColItem.dataField,
           dataField: multiLevelColItem.dataField,
@@ -35857,6 +35787,11 @@ var OdsInlineEditDataGrid = function OdsInlineEditDataGrid(props) {
       }));
     });
   }, [gridColumnsFromProps]);
+  var isHeaderFilterEnabledInAnyColumn = useMemo(function () {
+    return gridColumnsFromProps.some(function (col) {
+      return col.headerFilter;
+    });
+  }, [gridColumnsFromProps]);
   return React.createElement("div", null, pageTitleFromProps && React.createElement(MemoizedPageTitleAndToolbar, {
     pageTitle: pageTitleFromProps,
     toolbarButtonGroup: toolbarButtonGroupFromProps
@@ -35864,7 +35799,7 @@ var OdsInlineEditDataGrid = function OdsInlineEditDataGrid(props) {
     ref: dataGridRefFromProps,
     dataSource: dataSourceFromProps,
     width: "100%",
-    height: MemoizedDataGridHeight,
+    height: DataGridHeight,
     className: gridStyle.grid
   }, DataGridOptionsFromProps, {
     onCellClick: handleCellClick,
@@ -35872,7 +35807,7 @@ var OdsInlineEditDataGrid = function OdsInlineEditDataGrid(props) {
     onEditorPrepared: handleEditorPrepared,
     onExporting: handleExporting,
     onOptionChanged: handleOptionChanged
-  }), rederedGridColumns, React.createElement(ColumnChooser, {
+  }), RederedGridColumns, React.createElement(ColumnChooser, {
     enabled: true,
     mode: "select"
   }, !props.columnChooserPositionDisabled && React.createElement(Position, {
@@ -35892,9 +35827,9 @@ var OdsInlineEditDataGrid = function OdsInlineEditDataGrid(props) {
     useIcons: true
   })), (exportPropsFromProps === null || exportPropsFromProps === void 0 ? void 0 : exportPropsFromProps.enabled) && React.createElement(Export, Object.assign({}, exportPropsFromProps)), isFilterPanelFromProps && React.createElement(FilterPanel, {
     visible: isFilterPanelFromProps
-  }), React.createElement(HeaderFilter, {
+  }), ((headerFilterFromProps === null || headerFilterFromProps === void 0 ? void 0 : headerFilterFromProps.visible) || isHeaderFilterEnabledInAnyColumn) && React.createElement(HeaderFilter, Object.assign({}, headerFilterFromProps, {
     visible: true
-  }), isFilterRowFromProps && React.createElement(FilterRow, {
+  })), isFilterRowFromProps && React.createElement(FilterRow, {
     visible: isFilterRowFromProps
   }), actionColumnEnableFromProps && actionButtonGroupFromProps && React.createElement(Column, {
     dataField: "Actions",