@syncfusion/ej2-treegrid 20.2.46 → 20.2.49

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.2.46
+*  version : 20.2.49
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-treegrid@*",
-  "_id": "@syncfusion/ej2-treegrid@20.2.45",
+  "_id": "@syncfusion/ej2-treegrid@20.2.46",
   "_inBundle": false,
-  "_integrity": "sha512-DHlvVmftx1FJ8oOvYex8mPsEs5UaO1OOLy3HBjPD7VzRakVp0MXfuuL1fjGxdIBgfgxnm2BdZbpoaMKBpocj4w==",
+  "_integrity": "sha512-0SyT77dBgVOM2dMvYAZTKTa1lbiUkc2eAQXOWT+BUE0AS5gJZu2W7kNchvvayJVtor/3u3SkoUVg8lOsDy3eUw==",
   "_location": "/@syncfusion/ej2-treegrid",
   "_phantomChildren": {},
   "_requested": {
@@ -24,8 +24,8 @@
     "/@syncfusion/ej2-react-treegrid",
     "/@syncfusion/ej2-vue-treegrid"
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-20.2.45.tgz",
-  "_shasum": "51398d20b4de093ab6ff0a38f58fd0d30db95247",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-20.2.46.tgz",
+  "_shasum": "f7e5f74d66bffde32c3c7b995b213375cc3773c9",
   "_spec": "@syncfusion/ej2-treegrid@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -36,10 +36,10 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.2.46",
+    "@syncfusion/ej2-base": "~20.2.48",
     "@syncfusion/ej2-data": "~20.2.45",
-    "@syncfusion/ej2-grids": "~20.2.46",
-    "@syncfusion/ej2-popups": "~20.2.45"
+    "@syncfusion/ej2-grids": "~20.2.49",
+    "@syncfusion/ej2-popups": "~20.2.49"
   },
   "deprecated": false,
   "description": "Essential JS 2 TreeGrid Component",
@@ -60,6 +60,6 @@
     "url": "git+https://github.com/syncfusion/ej2-treegrid.git"
   },
   "typings": "index.d.ts",
-  "version": "20.2.46",
+  "version": "20.2.49",
   "sideEffects": false
 }

package/src/treegrid/actions/filter.js

@@ -155,10 +155,6 @@ var Filter = /** @class */ (function () {
                     }
                 }
                 else {
-                    if ((!this.parent.enableCollapseAll || !this.parent.initialRender && isNullOrUndefined(this.parent['dataResults']['result']))
-                        && parent['expanded'] === false && this.parent.getVisibleRecords().indexOf(record) === -1) {
-                        this.parent.expandRow(this.parent.getRows()[parent['index']], parent);
-                    }
                     this.addParentRecord(parent);
                 }
             }

package/src/treegrid/actions/selection.js

@@ -266,6 +266,8 @@ var Selection = /** @class */ (function () {
         var _this = this;
         var index = -1;
         var length = 0;
+        //This property used to maintain the check state of the currentview data after clear filtering
+        var multiFilterCheckState = false;
         if (!isNullOrUndefined(this.parent.filterModule) && this.parent.filterModule.filteredResult.length > 0) {
             var filterResult = this.parent.filterModule.filteredResult;
             if (this.filteredList.length === 0) {
@@ -274,6 +276,10 @@ var Selection = /** @class */ (function () {
             else {
                 if (this.filteredList !== filterResult) {
                     this.filteredList = filterResult;
+                    multiFilterCheckState = true;
+                }
+                else {
+                    multiFilterCheckState = false;
                 }
             }
         }
@@ -292,6 +298,9 @@ var Selection = /** @class */ (function () {
                     if (data[i].checkboxState === 'check') {
                         continue;
                     }
+                    if (multiFilterCheckState) {
+                        continue;
+                    }
                     data[i].checkboxState = 'check';
                     this.updateSelectedItems(data[i], data[i].checkboxState);
                 }

package/src/treegrid/actions/toolbar.js

@@ -43,53 +43,55 @@ var Toolbar = /** @class */ (function () {
         this.parent.off(events.toolbarClick, this.toolbarClickHandler);
     };
     Toolbar.prototype.refreshToolbar = function (args) {
-        var tObj = this.parent;
-        var indentElement;
-        var outdentElement;
-        var indentID = tObj.element.id + '_gridcontrol_indent';
-        var outdentID = tObj.element.id + '_gridcontrol_outdent';
         var toolbarElement = this.parent.grid.toolbarModule.getToolbar();
-        var indentEle = toolbarElement.querySelector('#' + indentID);
-        var outdentEle = toolbarElement.querySelector('#' + outdentID);
-        var row = args.row;
-        var selectedrow = tObj.getSelectedRows()[0];
-        if (!isNullOrUndefined(row[0])) {
-            row = row[0];
-        }
-        row = (!isNullOrUndefined(selectedrow) && selectedrow.rowIndex !== row.rowIndex) ? selectedrow : row;
-        if (indentEle !== null && outdentEle !== null) {
-            indentElement = toolbarElement.querySelector('#' + indentID).parentElement;
-            outdentElement = toolbarElement.querySelector('#' + outdentID).parentElement;
-            if (row.rowIndex === 0 || tObj.getSelectedRowIndexes().length > 1) {
-                indentElement.classList.add('e-hidden');
-                outdentElement.classList.add('e-hidden');
+        if (!isNullOrUndefined(toolbarElement)) {
+            var tObj = this.parent;
+            var indentElement = void 0;
+            var outdentElement = void 0;
+            var indentID = tObj.element.id + '_gridcontrol_indent';
+            var outdentID = tObj.element.id + '_gridcontrol_outdent';
+            var indentEle = toolbarElement.querySelector('#' + indentID);
+            var outdentEle = toolbarElement.querySelector('#' + outdentID);
+            var row = args.row;
+            var selectedrow = tObj.getSelectedRows()[0];
+            if (!isNullOrUndefined(row[0])) {
+                row = row[0];
             }
-            else if (args['name'] !== 'rowDeselected' || (!isNullOrUndefined(selectedrow) && tObj.grid.isCheckBoxSelection)) {
-                var selectedItem = tObj.getCurrentViewRecords()[row.rowIndex];
-                if (!isNullOrUndefined(selectedItem)) {
-                    if ((selectedItem.level > tObj.getCurrentViewRecords()[row.rowIndex - 1].level)) {
-                        indentElement.classList.add('e-hidden');
-                    }
-                    else {
-                        indentElement.classList.remove('e-hidden');
+            row = (!isNullOrUndefined(selectedrow) && selectedrow.rowIndex !== row.rowIndex) ? selectedrow : row;
+            if (indentEle !== null && outdentEle !== null) {
+                indentElement = toolbarElement.querySelector('#' + indentID).parentElement;
+                outdentElement = toolbarElement.querySelector('#' + outdentID).parentElement;
+                if (row.rowIndex === 0 || tObj.getSelectedRowIndexes().length > 1) {
+                    indentElement.classList.add('e-hidden');
+                    outdentElement.classList.add('e-hidden');
+                }
+                else if (args['name'] !== 'rowDeselected' || (!isNullOrUndefined(selectedrow) && tObj.grid.isCheckBoxSelection)) {
+                    var selectedItem = tObj.getCurrentViewRecords()[row.rowIndex];
+                    if (!isNullOrUndefined(selectedItem)) {
+                        if ((selectedItem.level > tObj.getCurrentViewRecords()[row.rowIndex - 1].level)) {
+                            indentElement.classList.add('e-hidden');
+                        }
+                        else {
+                            indentElement.classList.remove('e-hidden');
+                        }
+                        if (selectedItem.level === tObj.getCurrentViewRecords()[row.rowIndex - 1].level) {
+                            indentElement.classList.remove('e-hidden');
+                        }
+                        if (selectedItem.level === 0) {
+                            outdentElement.classList.add('e-hidden');
+                        }
+                        if (selectedItem.level !== 0) {
+                            outdentElement.classList.remove('e-hidden');
+                        }
                     }
-                    if (selectedItem.level === tObj.getCurrentViewRecords()[row.rowIndex - 1].level) {
-                        indentElement.classList.remove('e-hidden');
+                }
+                if (args['name'] === 'rowDeselected' && isNullOrUndefined(selectedrow) && !tObj.grid.isCheckBoxSelection) {
+                    if (this.parent.toolbar['includes']('Indent')) {
+                        indentElement.classList.add('e-hidden');
                     }
-                    if (selectedItem.level === 0) {
+                    if (this.parent.toolbar['includes']('Outdent')) {
                         outdentElement.classList.add('e-hidden');
                     }
-                    if (selectedItem.level !== 0) {
-                        outdentElement.classList.remove('e-hidden');
-                    }
-                }
-            }
-            if (args['name'] === 'rowDeselected' && isNullOrUndefined(selectedrow) && !tObj.grid.isCheckBoxSelection) {
-                if (this.parent.toolbar['includes']('Indent')) {
-                    indentElement.classList.add('e-hidden');
-                }
-                if (this.parent.toolbar['includes']('Outdent')) {
-                    outdentElement.classList.add('e-hidden');
                 }
             }
         }

package/src/treegrid/base/treegrid.js

@@ -1126,6 +1126,19 @@ var TreeGrid = /** @class */ (function (_super) {
             if (args.requestType === 'save' && _this.aggregates.map(function (ag) { return ag.showChildSummary === true; }).length) {
                 _this.grid.refresh();
             }
+            if (args.action === 'filter') {
+                if (_this.filterModule['currentFilterObject'] !== '' && _this.enableVirtualization && !_this.initialRender) {
+                    _this.expandAll();
+                }
+            }
+            if (args.requestType === 'searching') {
+                if (_this.searchSettings.key !== '' && _this.enableVirtualization && !_this.initialRender) {
+                    _this.expandAll();
+                }
+            }
+            if (args.action === 'clearFilter' && _this.enableCollapseAll) {
+                _this.collapseAll();
+            }
             if (_this.action === 'indenting' || _this.action === 'outdenting') {
                 _this.action = _this.action === 'indenting' ? 'indented' : 'outdented';
                 var selectedItem_1 = [_this.selectedRecords];