@syncfusion/ej2-treegrid 28.1.36 → 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
@@ -9857,8 +9835,7 @@ class TreeVirtualRowModelGenerator extends VirtualRowModelGenerator {
         if (!isNullOrUndefined(notifyArgs.virtualInfo)) {
             if (notifyArgs.virtualInfo.direction !== 'right' && notifyArgs.virtualInfo.direction !== 'left') {
                 if (!((this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
-                    && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent))
-                    || notifyArgs.virtualInfo.blockIndexes.length === 1) {
+                    && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent) || isRemoteData(this.parent))) {
                     notifyArgs.virtualInfo.blockIndexes = info.blockIndexes;
                 }
             }
@@ -9867,7 +9844,7 @@ class TreeVirtualRowModelGenerator extends VirtualRowModelGenerator {
             }
         }
         if ((this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
-            && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent)) {
+            && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent) || isRemoteData(this.parent)) {
             return super.generateRows(data, notifyArgs);
         }
         else {
@@ -9888,7 +9865,7 @@ class TreeVirtualRowModelGenerator extends VirtualRowModelGenerator {
         const clear = ['paging', 'refresh', 'sorting', 'filtering', 'searching', 'reorder',
             'save', 'delete'].some((value) => action === value);
         if ((this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
-            && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent)) {
+            && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent) || isRemoteData(this.parent)) {
             const model = 'model';
             const currentPage = this[`${model}`].currentPage;
             if (clear) {
@@ -13733,12 +13710,27 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                 }
             }
         }
-        if (((downScroll && (scrollArgs.offset.top < (rowHeight * this.totalRecords)))
+        if (isRemoteData(this.parent) || ((downScroll && (scrollArgs.offset.top < (rowHeight * this.totalRecords)))
             || (upScroll)) || (scrollArgs.direction === 'right' || scrollArgs.direction === 'left') ||
             ((this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
                 && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') && (downScroll || upScroll) || isCountRequired(this.parent))) {
             const viewInfo = this.currentInfo = getValue('getInfoFromView', this).apply(this, [scrollArgs.direction, info, scrollArgs.offset]);
             this.previousInfo = viewInfo;
+            if (this.prevInfo && ((info.axis === 'Y' && this.prevInfo.blockIndexes.toString() === viewInfo.blockIndexes.toString())
+                || ((info.axis === 'X' && this.prevInfo.columnIndexes.toString() === viewInfo.columnIndexes.toString())
+                    || (this.parent.isFrozenGrid() && this.parent.getVisibleFrozenLeftCount() >= viewInfo.columnIndexes[0]
+                        && this.prevInfo.columnIndexes.toString().includes(viewInfo.columnIndexes.toString()))))) {
+                this.parent.removeMaskRow();
+                this.parent.notify('removeGanttShimmer', { requestType: 'hideShimmer' });
+                if (Browser.isIE) {
+                    this.parent.hideSpinner();
+                }
+                this.requestType = this.requestType === 'virtualscroll' ? this['empty'] : this.requestType;
+                if (info.axis === 'Y') {
+                    this['restoreEdit']();
+                }
+                return;
+            }
             this.parent.setColumnIndexesInView(this.parent.enableColumnVirtualization ? viewInfo.columnIndexes : []);
             const page = viewInfo.loadNext && !viewInfo.loadSelf ? viewInfo.nextInfo.page : viewInfo.page;
             this.parent.setProperties({ pageSettings: { currentPage: page } }, true);
@@ -13765,7 +13757,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
     }
     appendContent(target, newChild, e) {
         if ((this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
-            && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent)) {
+            && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent) || isRemoteData(this.parent)) {
             if (getValue('isExpandCollapse', e)) {
                 this.isRemoteExpand = true;
             }
@@ -14082,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;