@syncfusion/ej2-treegrid 33.1.45 → 33.1.47

package/dist/es6/ej2-treegrid.es5.js

@@ -7190,7 +7190,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         var temp;
         var field;
         var gridColumns = isNullOrUndefined(column) ? this.grid.getColumns() : column;
-        if (this.treeColumnIndex !== -1 && this.columnModel[this.treeColumnIndex] &&
+        if (this.treeColumnIndex !== -1 && !isNullOrUndefined(this.columnModel) && this.columnModel[this.treeColumnIndex] &&
             !isNullOrUndefined(this.columnModel[this.treeColumnIndex].template)) {
             temp = this.columnModel[this.treeColumnIndex].template;
             field = this.columnModel[this.treeColumnIndex].field;
@@ -8629,7 +8629,10 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
     };
     TreeGrid.prototype.partialFilterUpdate = function (args) {
         var gridFiltered = args.gridFiltered;
-        this.notify('updateFilterRecs', { data: gridFiltered });
+        if ((this.allowFiltering && this.filterModule && this.grid.filterSettings.columns.length) ||
+            (this.grid.searchSettings.key.length > 0)) {
+            this.notify('updateFilterRecs', { data: gridFiltered });
+        }
     };
     /**
      * Filters the TreeGrid rows based on a specified column and filter criteria.
@@ -11757,24 +11760,26 @@ var Filter = /** @__PURE__ @class */ (function () {
         if (this.flatFilteredData.length > 0 && this.isHierarchyFilter) {
             this.updateFilterLevel();
         }
-        var _loop_1 = function (i) {
-            var record = this_1.filteredResult[parseInt(i.toString(), 10)];
-            if (!isNullOrUndefined(record.parentItem)) {
-                var parentUID_1 = record.parentItem.uniqueID;
-                var parentPresent = this_1.filteredResult.some(function (r) {
-                    return !isNullOrUndefined(r.uniqueID) && r.uniqueID === parentUID_1;
-                });
-                if (parentPresent) {
-                    record.isCollapsedChild = !getExpandStatus(this_1.parent, record, this_1.parent.parentData);
-                }
-                else {
-                    record.isCollapsedChild = false;
+        if (hierarchyMode === 'None') {
+            var _loop_1 = function (i) {
+                var record = this_1.filteredResult[parseInt(i.toString(), 10)];
+                if (!isNullOrUndefined(record.parentItem)) {
+                    var parentUID_1 = record.parentItem.uniqueID;
+                    var parentPresent = this_1.filteredResult.some(function (r) {
+                        return !isNullOrUndefined(r.uniqueID) && r.uniqueID === parentUID_1;
+                    });
+                    if (parentPresent) {
+                        setValue('isCollapsedChild', !getExpandStatus(this_1.parent, record, this_1.parent.parentData), record);
+                    }
+                    else {
+                        setValue('isCollapsedChild', false, record);
+                    }
                 }
+            };
+            var this_1 = this;
+            for (var i = 0; i < this.filteredResult.length; i++) {
+                _loop_1(i);
             }
-        };
-        var this_1 = this;
-        for (var i = 0; i < this.filteredResult.length; i++) {
-            _loop_1(i);
         }
         this.parent.notify('updateAction', { result: this.filteredResult });
     };
@@ -11900,6 +11905,9 @@ var Filter = /** @__PURE__ @class */ (function () {
                 currentRecord.hasFilteredChildRecords = null;
                 currentRecord.filterLevel = null;
             }
+            if (!isNullOrUndefined(currentRecord.isCollapsedChild)) {
+                currentRecord.isCollapsedChild = null;
+            }
         }
         this.filteredResult = [];
         this.parent.notify('updateResults', { result: flatData, count: flatData.length });
@@ -16556,7 +16564,7 @@ var VirtualScroll = /** @__PURE__ @class */ (function () {
         var dm = new DataManager(pageingDetails.result);
         var expanded = new Predicate$1('expanded', 'notequal', null).or('expanded', 'notequal', undefined);
         var parents = dm.executeLocal(new Query().where(expanded));
-        var isFiltering = (pageingDetails.actionArgs.requestType === 'filtering' && pageingDetails.actionArgs.action !== 'clear-filter') ||
+        var isFiltering = (pageingDetails.actionArgs.requestType === 'filtering' && (pageingDetails.actionArgs.action !== 'clear-filter' && pageingDetails.actionArgs.action !== 'clearFilter')) ||
             (!isNullOrUndefined(this.parent['filterModule']) && (this.parent['filterModule'].filteredResult && this.parent['filterModule'].filteredResult.length > 0));
         var isFlatHierarchy = this.parent.filterSettings.hierarchyMode === 'Child' ||
             this.parent.filterSettings.hierarchyMode === 'None';