@syncfusion/ej2-treegrid 28.1.37 → 28.1.39

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

@@ -2208,6 +2208,7 @@ class DataManipulation {
                     this.parent.grid.detailRowModule.expand(expandingTd);
                 }
             }
+            this.parent.grid.pageSettings.totalRecordsCount += rowDetails.rows.length;
         }
         else {
             this.fetchRemoteChildData({ action: rowDetails[`${name}`], record: rowDetails.record, rows: rowDetails.rows, parentRow: rowDetails.parentRow });
@@ -6417,18 +6418,6 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 this.trigger(expanded, expandArgs);
             }
         }
-        if (this.enableVirtualization) {
-            const index = this.grid.currentViewData.indexOf(record);
-            const expandedRow = isNullOrUndefined(row) ? this.getRows()[parseInt(index.toString(), 10)] : row;
-            if (!isNullOrUndefined(expandedRow)) {
-                const rowIndex = +expandedRow.getAttribute('data-rowindex');
-                const outBuffer = this.grid.pageSettings.pageSize - Math.ceil(this.grid.pageSettings.pageSize / 2);
-                const lastBlockIdx = initialTotalRecordsCount - outBuffer;
-                if (rowIndex > lastBlockIdx) {
-                    this.grid.getContent().firstElementChild.scrollTop = rowIndex * this.grid.getRowHeight();
-                }
-            }
-        }
     }
     expandCollapseAllChildren(record, action, key, level) {
         if ((!isNullOrUndefined(key) && record[this.getPrimaryKeyFieldNames()[0]] !== key) ||
@@ -6543,18 +6532,6 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                     this.grid.getContent().firstElementChild.scrollBy(0, this.grid.getRowHeight());
                 }
             }
-            if (this.enableVirtualization) {
-                const index = this.grid.currentViewData.indexOf(record);
-                const collapsedRow = isNullOrUndefined(row) ? this.getRows()[parseInt(index.toString(), 10)] : row;
-                if (!isNullOrUndefined(collapsedRow)) {
-                    const rowIndex = +collapsedRow.getAttribute('data-rowindex');
-                    const outBuffer = this.grid.pageSettings.pageSize - Math.ceil(this.grid.pageSettings.pageSize / 2);
-                    const lastBlockIdx = this.grid.totalDataRecordsCount - outBuffer;
-                    if (rowIndex > lastBlockIdx) {
-                        this.grid.getContent().firstElementChild.scrollBy(0, (rowIndex - lastBlockIdx) * this.grid.getRowHeight());
-                    }
-                }
-            }
         }
     }
     updateExpandStateMapping(record, state) {
@@ -7205,6 +7182,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 }
             }
         }
+        this.grid.pageSettings.totalRecordsCount -= rows.length;
     }
     /**
      * Method to sanitize html element
@@ -14096,14 +14074,22 @@ class VirtualScroll {
                 endIndex = startIndex + this.parent.grid.pageSettings.pageSize;
             }
             if (!isNullOrUndefined(this.expandCollapseRec)) {
-                const resourceCount = this.parent.getRows();
+                const resourceCount = this.parent.grid.pageSettings.pageSize;
                 let sIndex = visualData.indexOf(this.expandCollapseRec);
-                const tempdata = visualData.slice(sIndex, sIndex + resourceCount.length);
-                if (tempdata.length < resourceCount.length && sIndex >= 0 && startIndex !== 0) {
-                    sIndex = visualData.length - resourceCount.length;
+                const tempdata = visualData.slice(sIndex, sIndex + resourceCount);
+                if (tempdata.length < resourceCount && sIndex >= 0 && startIndex !== 0) {
+                    sIndex = visualData.length - resourceCount;
                     sIndex = sIndex > 0 ? sIndex : 0;
-                    startIndex = sIndex;
                     endIndex = visualData.length;
+                    if (endIndex - startIndex < resourceCount) {
+                        const newRowsCount = sIndex - startIndex;
+                        startIndex = sIndex;
+                        if (visualData.indexOf(this.expandCollapseRec) > visualData.length - resourceCount / 2) {
+                            const newTranslateY = translateY + (newRowsCount * this.parent.grid.getRowHeight());
+                            this.parent.grid.contentModule['translateY'] = newTranslateY;
+                            this.parent.grid.contentModule.virtualEle.adjustTable(0, newTranslateY);
+                        }
+                    }
                 }
                 else if (getValue('isCollapseAll', this.parent)) {
                     startIndex = 0;