@syncfusion/ej2-treegrid 20.4.44 → 20.4.49

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

@@ -5453,6 +5453,17 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         if (this.grid.columns.length !== this.columnModel.length) {
             this.stackedHeader = true;
         }
+        if (this.stackedHeader && this.enablePersistence && this.allowResizing) {
+            for (let i = 0; i < this.columns.length; i++) {
+                if (!isNullOrUndefined(this.columns[parseInt(i.toString(), 10)].columns)) {
+                    for (let j = 0; j < this.columns[parseInt(i.toString(), 10)].columns.length; j++) {
+                        const stackedColumn = this.columns[parseInt(i.toString(), 10)].columns[parseInt(j.toString(), 10)];
+                        const currentColumn = this.grid.getColumnByField(stackedColumn.field);
+                        stackedColumn.width = currentColumn.width;
+                    }
+                }
+            }
+        }
         if (!this.stackedHeader) {
             merge(this.columns, this.columnModel);
         }
@@ -6128,9 +6139,18 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 if ((!isCountRequired(this) || childRecords.length) || action === 'collapse') {
                     this.localExpand(action, row, record);
                 }
+                const lastrowIdx = this.getVisibleRecords()[this.getVisibleRecords().length - 1]['index'];
+                const lastRow = this.getRowByIndex(lastrowIdx);
+                if (this.grid.getContentTable().clientHeight <= this.grid.getContent().clientHeight && !isNullOrUndefined(lastRow) && !lastRow.cells[0].classList.contains('e-lastrowcell')) {
+                    this.lastRowBorder(lastRow, true);
+                }
             }
             if (isCountRequired(this) && action === 'expand') {
-                this.dataResults.result = this.getCurrentViewRecords();
+                const currentData = this.getCurrentViewRecords();
+                const visibleRecords = currentData.filter((e) => {
+                    return getExpandStatus(this, e, this.parentData);
+                });
+                this.dataResults.result = visibleRecords;
             }
             if (!isNullOrUndefined(targetEle) && targetEle.closest('.e-treerowcell').classList.contains('e-cellselectionbackground')) {
                 targetEle.closest('.e-treerowcell').classList.remove('e-cellselectionbackground');
@@ -13198,14 +13218,15 @@ class Freeze$1 {
             rows = args.detailrows;
         }
         for (let i = 0; i < rows.length; i++) {
-            const rData = this.parent.grid.getRowObjectFromUID(rows[parseInt(i.toString(), 10)].getAttribute('data-Uid')).data;
-            rows[parseInt(i.toString(), 10)].style.display = args.action;
-            if (freeze && frozenRightRows.length) {
-                frozenRightRows[parseInt(i.toString(), 10)].style.display = args.action;
+            let row = rows[parseInt(i.toString(), 10)];
+            const rData = this.parent.grid.getRowObjectFromUID(row.getAttribute('data-Uid')).data;
+            if (!isNullOrUndefined(movableRows) && row.parentElement.firstElementChild.clientHeight > 0) {
+                row.style.height = row.parentElement.firstElementChild.clientHeight + 'px';
             }
+            row.style.display = args.action;
             const queryselector = args.action === 'none' ? '.e-treecolumn-container .e-treegridcollapse'
                 : '.e-treecolumn-container .e-treegridexpand';
-            if (frozenrows[rows[parseInt(i.toString(), 10)].rowIndex].querySelector(queryselector)) {
+            if (frozenrows[row.rowIndex].querySelector(queryselector)) {
                 const cRow = [];
                 for (let i = 0; i < movableRows.length; i++) {
                     if (movableRows[parseInt(i.toString(), 10)].querySelector('.e-gridrowindex' + rData.index + 'level' + (rData.level + 1))) {