@syncfusion/ej2-treegrid 20.3.52 → 20.3.57

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.3.52
+*  version : 20.3.57
 *  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.3.50",
+  "_id": "@syncfusion/ej2-treegrid@20.3.56",
   "_inBundle": false,
-  "_integrity": "sha512-Czg+JqgGD4Buu5k2IzxuXFUL29KqXlIQSzp+GWsKzdH8YwZWamw//cbn+eZrLtUp3MAYPb7OoL0mUqTNWNtRPA==",
+  "_integrity": "sha512-ZAWBrlsjksXEtMMIovA/Ap7hmnBH2KBvWv4wira+Ecus1mosr3hioA6+cJTNti6pG3E8PPWg2wYtoEOKq4COPw==",
   "_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.3.50.tgz",
-  "_shasum": "17e0647238a4c1c168824e7c379eb122dbbfe7e1",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-20.3.56.tgz",
+  "_shasum": "3bfc176798654d335c51e97f970768de16b77547",
   "_spec": "@syncfusion/ej2-treegrid@*",
   "_where": "/jenkins/workspace/ease-automation_release_19.1.0.1/packages/included",
   "author": {
@@ -36,10 +36,10 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.3.50",
-    "@syncfusion/ej2-data": "~20.3.50",
-    "@syncfusion/ej2-grids": "~20.3.52",
-    "@syncfusion/ej2-popups": "~20.3.50"
+    "@syncfusion/ej2-base": "~20.3.56",
+    "@syncfusion/ej2-data": "~20.3.56",
+    "@syncfusion/ej2-grids": "~20.3.57",
+    "@syncfusion/ej2-popups": "~20.3.57"
   },
   "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.3.52",
+  "version": "20.3.57",
   "sideEffects": false
 }

package/src/treegrid/actions/page.js

@@ -89,6 +89,8 @@ var Page = /** @class */ (function () {
      */
     Page.prototype.collapseExpandPagedchilds = function (rowDetails) {
         rowDetails.record.expanded = rowDetails.action === 'collapse' ? false : true;
+        this.parent.flatData.map(function (e) { return e.expanded = e.uniqueID === rowDetails.record.uniqueID &&
+            e.expanded !== rowDetails.record.expanded ? rowDetails.record.expanded : e.expanded; });
         if (this.parent.enableImmutableMode) {
             var primaryKeyField_1 = this.parent.getPrimaryKeyFieldNames()[0];
             var record = this.parent.flatData.filter(function (e) {

package/src/treegrid/actions/selection.d.ts

@@ -10,6 +10,7 @@ export declare class Selection {
     private selectedItems;
     private selectedIndexes;
     private filteredList;
+    private searchingRecords;
     /**
      * Constructor for Selection module
      *

package/src/treegrid/actions/selection.js

@@ -19,6 +19,7 @@ var Selection = /** @class */ (function () {
         this.selectedItems = [];
         this.selectedIndexes = [];
         this.filteredList = [];
+        this.searchingRecords = [];
         this.addEventListener();
     }
     /**
@@ -273,6 +274,9 @@ var Selection = /** @class */ (function () {
             if (this.filteredList.length === 0) {
                 this.filteredList = filterResult;
             }
+            if (this.parent.grid.searchSettings.key.length) {
+                this.searchingRecords = filterResult;
+            }
             else {
                 if (this.filteredList !== filterResult) {
                     this.filteredList = filterResult;
@@ -284,13 +288,22 @@ var Selection = /** @class */ (function () {
             }
         }
         if (this.filteredList.length > 0) {
-            if (!this.parent.filterSettings.columns.length && this.filteredList.length) {
+            if (!this.parent.filterSettings.columns.length && this.filteredList.length && !this.parent.grid.searchSettings.key.length) {
                 this.filteredList = [];
             }
+            if (this.searchingRecords.length && !isNullOrUndefined(checkAll)) {
+                this.filteredList = this.searchingRecords;
+            }
+        }
+        var data;
+        if (this.parent.filterModule.filteredResult.length === 0 && this.parent.getCurrentViewRecords().length === 0 &&
+            this.parent.filterSettings.columns.length > 0) {
+            data = this.filteredList;
+        }
+        else {
+            data = (!isNullOrUndefined(this.parent.filterModule) &&
+                (this.filteredList.length > 0)) ? this.filteredList : this.parent.flatData;
         }
-        var data = (!isNullOrUndefined(this.parent.filterModule) &&
-            (this.filteredList.length > 0)) ? this.filteredList :
-            this.parent.flatData;
         data = isRemoteData(this.parent) ? this.parent.getCurrentViewRecords() : data;
         if (!isNullOrUndefined(checkAll)) {
             for (var i = 0; i < data.length; i++) {

package/src/treegrid/base/treegrid.d.ts

@@ -1752,7 +1752,6 @@ export declare class TreeGrid extends Component<HTMLElement> implements INotifyP
     collapseAll(): void;
     private expandCollapseAll;
     private expandCollapse;
-    private updateGridRowsVisible;
     private updateChildOnDemand;
     private remoteExpand;
     private localExpand;

package/src/treegrid/base/treegrid.js

@@ -2479,7 +2479,8 @@ var TreeGrid = /** @class */ (function (_super) {
             var obj = 'dialogObj';
             var showDialog = 'showDialog';
             if ((this.getBatchChanges()[this.changedRecords].length ||
-                this.getBatchChanges()[this.deletedRecords].length || this.getBatchChanges()[this.addedRecords].length) && this.editSettings.showConfirmDialog) {
+                this.getBatchChanges()[this.deletedRecords].length || this.getBatchChanges()[this.addedRecords].length)
+                && this.editSettings.showConfirmDialog) {
                 var dialogObj = this.grid.editModule[obj];
                 this.grid.editModule[showDialog]('CancelEdit', dialogObj);
                 this.targetElement = target;
@@ -2920,6 +2921,10 @@ var TreeGrid = /** @class */ (function (_super) {
                     this.localExpand(action, row, record);
                 }
             }
+            if (!isNullOrUndefined(targetEle) && targetEle.closest('.e-treerowcell').classList.contains('e-cellselectionbackground')) {
+                targetEle.closest('.e-treerowcell').classList.remove('e-cellselectionbackground');
+                targetEle.closest('.e-treerowcell').removeAttribute('aria-selected');
+            }
             if (this.isPixelHeight() && !row.cells[0].classList.contains('e-lastrowcell')) {
                 var totalRows = this.getRows();
                 var rows = this.getContentTable().rows;
@@ -2936,20 +2941,7 @@ var TreeGrid = /** @class */ (function (_super) {
             }
             this.notify('rowExpandCollapse', { detailrows: detailrows, action: displayAction, record: record, row: row });
             this.updateAltRow(gridRows);
-            this.updateGridRowsVisible();
-        }
-    };
-    TreeGrid.prototype.updateGridRowsVisible = function () {
-        var rowsToRefresh = this.grid.getRowsObject();
-        var rows = this.getRows();
-        for (var i = 0; i < rows.length; i++) {
-            for (var j = 0; j < rowsToRefresh.length; j++) {
-                if (rows[i].dataset.uid === rowsToRefresh[j].uid) {
-                    rowsToRefresh[j].visible = rows[i].style.display === 'none' ? false : true;
-                }
-            }
         }
-        this.grid.notify('refresh-Expand-and-Collapse', { rows: rowsToRefresh });
     };
     TreeGrid.prototype.updateChildOnDemand = function (expandingArgs) {
         var _this = this;