@syncfusion/ej2-treegrid 33.1.45 → 33.1.47

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

@@ -6852,7 +6852,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         let temp;
         let field;
         const 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;
@@ -8260,7 +8260,10 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     }
     partialFilterUpdate(args) {
         const 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.
@@ -11337,18 +11340,20 @@ class Filter {
         if (this.flatFilteredData.length > 0 && this.isHierarchyFilter) {
             this.updateFilterLevel();
         }
-        for (let i = 0; i < this.filteredResult.length; i++) {
-            const record = this.filteredResult[parseInt(i.toString(), 10)];
-            if (!isNullOrUndefined(record.parentItem)) {
-                const parentUID = record.parentItem.uniqueID;
-                const parentPresent = this.filteredResult.some((r) => {
-                    return !isNullOrUndefined(r.uniqueID) && r.uniqueID === parentUID;
-                });
-                if (parentPresent) {
-                    record.isCollapsedChild = !getExpandStatus(this.parent, record, this.parent.parentData);
-                }
-                else {
-                    record.isCollapsedChild = false;
+        if (hierarchyMode === 'None') {
+            for (let i = 0; i < this.filteredResult.length; i++) {
+                const record = this.filteredResult[parseInt(i.toString(), 10)];
+                if (!isNullOrUndefined(record.parentItem)) {
+                    const parentUID = record.parentItem.uniqueID;
+                    const parentPresent = this.filteredResult.some((r) => {
+                        return !isNullOrUndefined(r.uniqueID) && r.uniqueID === parentUID;
+                    });
+                    if (parentPresent) {
+                        setValue('isCollapsedChild', !getExpandStatus(this.parent, record, this.parent.parentData), record);
+                    }
+                    else {
+                        setValue('isCollapsedChild', false, record);
+                    }
                 }
             }
         }
@@ -11476,6 +11481,9 @@ class Filter {
                 currentRecord.hasFilteredChildRecords = null;
                 currentRecord.filterLevel = null;
             }
+            if (!isNullOrUndefined(currentRecord.isCollapsedChild)) {
+                currentRecord.isCollapsedChild = null;
+            }
         }
         this.filteredResult = [];
         this.parent.notify('updateResults', { result: flatData, count: flatData.length });
@@ -16038,7 +16046,7 @@ class VirtualScroll {
         const dm = new DataManager(pageingDetails.result);
         const expanded = new Predicate$1('expanded', 'notequal', null).or('expanded', 'notequal', undefined);
         const parents = dm.executeLocal(new Query().where(expanded));
-        const isFiltering = (pageingDetails.actionArgs.requestType === 'filtering' && pageingDetails.actionArgs.action !== 'clear-filter') ||
+        const 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));
         const isFlatHierarchy = this.parent.filterSettings.hierarchyMode === 'Child' ||
             this.parent.filterSettings.hierarchyMode === 'None';