ods-component-lib 1.18.146 → 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, {