@syncfusion/ej2-treegrid 20.3.52 → 20.3.57

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

@@ -849,6 +849,7 @@ class Selection {
         this.selectedItems = [];
         this.selectedIndexes = [];
         this.filteredList = [];
+        this.searchingRecords = [];
         this.addEventListener();
     }
     /**
@@ -1101,6 +1102,9 @@ class Selection {
             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;
@@ -1112,13 +1116,22 @@ class Selection {
             }
         }
         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;
+            }
+        }
+        let 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;
         }
-        let 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 (let i = 0; i < data.length; i++) {
@@ -5450,7 +5463,8 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             const obj = 'dialogObj';
             const 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) {
                 const dialogObj = this.grid.editModule[obj];
                 this.grid.editModule[showDialog]('CancelEdit', dialogObj);
                 this.targetElement = target;
@@ -5881,6 +5895,10 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                     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')) {
                 let totalRows = this.getRows();
                 const rows = this.getContentTable().rows;
@@ -5897,20 +5915,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             }
             this.notify('rowExpandCollapse', { detailrows: detailrows, action: displayAction, record: record, row: row });
             this.updateAltRow(gridRows);
-            this.updateGridRowsVisible();
-        }
-    }
-    updateGridRowsVisible() {
-        const rowsToRefresh = this.grid.getRowsObject();
-        const rows = this.getRows();
-        for (let i = 0; i < rows.length; i++) {
-            for (let 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 });
     }
     updateChildOnDemand(expandingArgs) {
         if (expandingArgs.requestType === 'collapse' && isCountRequired(this)) {
@@ -9219,6 +9224,8 @@ class Page$1 {
      */
     collapseExpandPagedchilds(rowDetails) {
         rowDetails.record.expanded = rowDetails.action === 'collapse' ? false : true;
+        this.parent.flatData.map((e) => e.expanded = e.uniqueID === rowDetails.record.uniqueID &&
+            e.expanded !== rowDetails.record.expanded ? rowDetails.record.expanded : e.expanded);
         if (this.parent.enableImmutableMode) {
             const primaryKeyField = this.parent.getPrimaryKeyFieldNames()[0];
             const record = this.parent.flatData.filter((e) => {