ods-component-lib 1.18.133 → 1.18.135

package/dist/index.js

@@ -33528,6 +33528,9 @@ var OdsBasicDataGrid = function OdsBasicDataGrid(props) {
   var _useState11 = React.useState(0),
     scrollPosition = _useState11[0],
     setScrollPosition = _useState11[1];
+  var _useState12 = React.useState(false),
+    filteredButtonCheck = _useState12[0],
+    setFilteredButtonCheck = _useState12[1];
   var _useStyles = useStyles(),
     gridStyle = _useStyles.styles;
   React.useEffect(function () {
@@ -33826,7 +33829,7 @@ var OdsBasicDataGrid = function OdsBasicDataGrid(props) {
     }
   }, []);
   var renderTotal = React.useCallback(function () {
-    var _props$customSummary3;
+    var _props$customSummary;
     var result = "";
     var totalloaded = 0;
     if (data.length < 50 || !props.isServerSide || constants.loadedPageCount == constants.totalPageCount) {
@@ -33834,18 +33837,13 @@ var OdsBasicDataGrid = function OdsBasicDataGrid(props) {
     } else {
       totalloaded = constants.loadedPageCount * props.pageSize;
     }
-    if (props.isServerSide) {
-      var _props$customSummary, _props$customSummary2;
-      result = constants.totalRecordCount > 0 ? totalloaded + " " + ((_props$customSummary = props.customSummary) === null || _props$customSummary === void 0 ? void 0 : _props$customSummary.summaryLoadedDataLabel) + ("- " + constants.totalRecordCount) + ((_props$customSummary2 = props.customSummary) === null || _props$customSummary2 === void 0 ? void 0 : _props$customSummary2.summaryTotalDataLabel) : "";
-      result = concatFilteredLabel(result, totalloaded, filteredRowCount, filterApplied.current, props);
-    }
-    if (((_props$customSummary3 = props.customSummary) === null || _props$customSummary3 === void 0 ? void 0 : _props$customSummary3.summaryTotalCount) !== undefined && !props.isServerSide) {
+    if (((_props$customSummary = props.customSummary) === null || _props$customSummary === void 0 ? void 0 : _props$customSummary.summaryTotalCount) !== undefined && !props.isServerSide) {
       result = props.customSummary.summaryTotalDataLabel + " : " + props.customSummary.summaryTotalCount;
       result = concatFilteredLabel(result, totalloaded, filteredRowCount, filterApplied.current, props);
     }
     if (constants.totalPageCount > 1) {
-      var _props$customSummary4;
-      result = result + " - " + ((_props$customSummary4 = props.customSummary) === null || _props$customSummary4 === void 0 ? void 0 : _props$customSummary4.summaryTotalPageCountLabel) + "  " + constants.loadedPageCount + " / " + constants.totalPageCount;
+      var _props$customSummary2;
+      result = result + " - " + ((_props$customSummary2 = props.customSummary) === null || _props$customSummary2 === void 0 ? void 0 : _props$customSummary2.summaryTotalPageCountLabel) + "  " + constants.loadedPageCount + " / " + constants.totalPageCount;
     }
     return result;
   }, [data, filteredRowCount, constants.loadedPageCount, props.pageSize, constants.totalRecordCount, filterApplied.current]);
@@ -33954,10 +33952,16 @@ var OdsBasicDataGrid = function OdsBasicDataGrid(props) {
     }, 200);
     run(e);
   };
+  var onCustomOptionChanged = function onCustomOptionChanged(e) {
+    if (e.name === 'filterPanel') {
+      var filteredCheckedValue = e.value;
+      setFilteredButtonCheck(filteredCheckedValue);
+    }
+  };
   var handleContentReady = function handleContentReady(e) {
     var dataGridInstance = e.component;
     var filteredDataCount = dataGridInstance.totalCount();
-    if (filterApplied.current && filteredDataCount > 0) {
+    if (filterApplied.current && filteredButtonCheck && filteredDataCount > 0) {
       setFilteredRowCount(filteredDataCount);
     } else {
       setFilteredRowCount(0);
@@ -34199,7 +34203,7 @@ var OdsBasicDataGrid = function OdsBasicDataGrid(props) {
     onCellClick: onCustomCellClick,
     onCellHoverChanged: onCustomCellHoverChanged,
     onCellPrepared: onCustomCellPrepared,
-    onOptionChanged: props.onOptionChanged,
+    onOptionChanged: props.onOptionChanged || onCustomOptionChanged,
     onToolbarPreparing: props.onToolbarPreparing || onToolbarPreparing
   }, gridColumns.map(function (col) {
     return React__default.createElement(DataGrid.Column, Object.assign({
@@ -35092,7 +35096,7 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
     if (e.fullName.includes("sortOrder")) {
       dataGrid.getScrollable().scrollTo(0);
     }
-    if (e.fullName.includes("filterValue") || e.fullName.includes("filter")) {
+    if (e.fullName.includes("filterValue") || e.fullName.includes("filter") || e.fullName.includes("columns") || e.fullName.includes("searchPanel.text")) {
       var active = updateFilterStatus();
       if (active) {
         setTimeout(function () {