ods-component-lib 1.18.132 → 1.18.134

package/dist/index.js

@@ -35083,34 +35083,27 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
   }, [props.columns, filterApplied]);
   var handleOptionChanged = React.useCallback(function (e) {
     var dataGrid = props.dataGridRef.current.instance;
-    var updateFilterStatus = function updateFilterStatus(value) {
-      var active = value !== "" && value !== null && value !== undefined && !(Array.isArray(value) && value.length === 0);
+    var updateFilterStatus = function updateFilterStatus() {
+      var filters = dataGrid.getCombinedFilter(true);
+      var active = filters && filters.length > 0;
       setFilterApplied(active);
       return active;
     };
     if (e.fullName.includes("sortOrder")) {
       dataGrid.getScrollable().scrollTo(0);
     }
-    var filterActive = false;
-    if (e.name === "filterValue") {
-      filterActive = updateFilterStatus(e.value);
-    } else if (e.name === "columns" && e.fullName.includes("filterValue")) {
-      filterActive = updateFilterStatus(e.value);
-    } else if (e.name === "filterPanel" && e.fullName.includes("filterPanel.filterEnabled")) {
-      setFilterApplied(e.value);
-      filterActive = e.value;
-    } else if (e.fullName.includes("searchPanel.text")) {
-      filterActive = updateFilterStatus(e.value);
-    }
-    if (filterActive) {
-      setTimeout(function () {
-        dataGrid.refresh().done(function () {
-          totalFilteredCount.current = dataGrid.totalCount();
-          setUpdateTrigger(function (prev) {
-            return !prev;
+    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 () {
+          dataGrid.refresh().done(function () {
+            totalFilteredCount.current = dataGrid.totalCount();
+            setUpdateTrigger(function (prev) {
+              return !prev;
+            });
           });
-        });
-      }, 0);
+        }, 0);
+      }
     }
   }, [props.dataGridRef]);
   React.useEffect(function () {}, [updateTrigger]);