@syncfusion/ej2-treegrid 21.2.5 → 21.2.8

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

@@ -2190,7 +2190,18 @@ class DataManipulation {
                 }
                 result = resultChildData;
             }
-            rowDetails.record.childRecords = result;
+            if (this.parent.enableVirtualization && rowDetails.action === 'remoteExpand') {
+                rowDetails.record.childRecords = [];
+                for (let i = 0; i < result.length; i++) {
+                    if (rowDetails.record['' + this.parent.idMapping] !== result[parseInt(i.toString(), 10)]['' + this.parent.idMapping] &&
+                        rowDetails.record['' + this.parent.idMapping] === result[parseInt(i.toString(), 10)]['' + this.parent.parentIdMapping] && Object.prototype.hasOwnProperty.call(result, i)) {
+                        rowDetails.record.childRecords.push(result[parseInt(i.toString(), 10)]);
+                    }
+                }
+            }
+            else {
+                rowDetails.record.childRecords = result;
+            }
             for (let r = 0; r < result.length; r++) {
                 if (this.parent.enableVirtualization && result[parseInt(r.toString(), 10)][`${this.parent.idMapping}`] === rowDetails.record[`${this.parent.idMapping}`] && rowDetails.action === 'remoteExpand') {
                     this.parent[`${remoteExpandedData}`].push(rowDetails.record);
@@ -2208,6 +2219,7 @@ class DataManipulation {
                         if (result[parseInt(r.toString(), 10)][`${this.parent.parentIdMapping}`] === this.parent[`${remoteExpandedData}`][parseInt(i.toString(), 10)][`${this.parent.idMapping}`]) {
                             result[parseInt(r.toString(), 10)].level = this.parent[`${remoteExpandedData}`][parseInt(i.toString(), 10)][`${level}`] + 1;
                             const parentData = this.parent[`${remoteExpandedData}`][parseInt(i.toString(), 10)];
+                            delete parentData.childRecords;
                             result[parseInt(r.toString(), 10)].parentItem = parentData;
                             result[parseInt(r.toString(), 10)].parentUniqueID = rowDetails.record.uniqueID;
                         }
@@ -2219,6 +2231,10 @@ class DataManipulation {
                         && !(haveChild && !haveChild[parseInt(r.toString(), 10)])) {
                         if (isNullOrUndefined(result[parseInt(r.toString(), 10)][`${this.parent.parentIdMapping}`])) {
                             result[parseInt(r.toString(), 10)].level = 0;
+                            if (rowDetails.action === 'remoteExpand') {
+                                result[parseInt(r.toString(), 10)].childRecords = [];
+                                result[parseInt(r.toString(), 10)].childRecords = rowDetails.record.childRecords;
+                            }
                         }
                         else {
                             result[parseInt(r.toString(), 10)].level = rowDetails.record.level;
@@ -5890,7 +5906,12 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 record = this.grid.getCurrentViewRecords()[row.getAttribute('data-rowindex')];
             }
             else {
-                record = this.grid.getCurrentViewRecords()[parseInt(row.getAttribute('data-rowindex'), 10)];
+                if (this.enableVirtualization && this.isCollapseAll) {
+                    record = this.grid.getCurrentViewRecords()[row.rowIndex];
+                }
+                else {
+                    record = this.grid.getCurrentViewRecords()[parseInt(row.getAttribute('data-rowindex'), 10)];
+                }
             }
         }
         return record;
@@ -6113,7 +6134,9 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             if (rows.length) {
                 for (let i = 0; i < rows.length; i++) {
                     if (action === 'collapse') {
-                        this.collapseRow(rows[parseInt(i.toString(), 10)]);
+                        if (!isNullOrUndefined(this.getCurrentViewRecords()[rows[parseInt(i.toString(), 10)].rowIndex])) {
+                            this.collapseRow(rows[parseInt(i.toString(), 10)]);
+                        }
                     }
                     else {
                         this.expandRow(rows[parseInt(i.toString(), 10)]);
@@ -6543,7 +6566,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                     }
                 }
                 if (cRow.length && childRecord.expanded) {
-                    this.collapseRemoteChild({ record: childRecord, rows: cRow }, true);
+                    this.collapseRemoteChild({ record: childRecord, rows: cRow }, false);
                 }
             }
         }
@@ -11695,7 +11718,7 @@ class Edit$1 {
                             index = index + batchChildCount;
                         }
                     }
-                    else {
+                    else if (!this.parent.enableVirtualization) {
                         index += findChildrenRecords(records[parseInt(index.toString(), 10)]).length;
                     }
                 }
@@ -12642,7 +12665,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                 this.startIndex = (this.startIndex - remains) < 0 ? 0 : (this.startIndex - remains);
             }
             if (currentViewData.length && (currentViewData[0][`${indexValue}`] >= this.parent.pageSettings.pageSize / 2) &&
-                ((currentViewData[0][`${indexValue}`] - this.startIndex) < (this.parent.pageSettings.pageSize / 2))) {
+                ((currentViewData[0][`${indexValue}`] - this.startIndex) < (this.parent.pageSettings.pageSize / 2)) && this.parent.selectionModule.isRowSelected) {
                 this.startIndex = currentViewData[0][`${indexValue}`] - (this.parent.pageSettings.pageSize / 2);
                 this.endIndex = this.startIndex + this.parent.pageSettings.pageSize;
             }
@@ -12683,8 +12706,11 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             }
             this.startIndex = !isLastBlock ? lastIndex - this.parent.pageSettings.pageSize : nextSetResIndex;
             this.endIndex = lastIndex;
+            if ((nextSetResIndex + this.parent.pageSettings.pageSize) > this.totalRecords && (this.endIndex - this.startIndex) < (this.parent.pageSettings.pageSize / 2) && (this.endIndex - nextSetResIndex) < (this.parent.pageSettings.pageSize / 2)) {
+                this.startIndex = lastIndex - (this.parent.pageSettings.pageSize / 2);
+            }
             if (currentViewData.length && this.startIndex > currentViewData[0][`${indexValue}`] &&
-                ((this.startIndex - currentViewData[0][`${indexValue}`]) < (this.parent.pageSettings.pageSize / 2))) {
+                ((this.startIndex - currentViewData[0][`${indexValue}`]) < (this.parent.pageSettings.pageSize / 2)) && this.parent.selectionModule.isRowSelected) {
                 this.startIndex = currentViewData[0][`${indexValue}`] + (this.parent.pageSettings.pageSize / 2);
             }
             if (scrollArgs.offset.top > (rowHeight * this.totalRecords)) {
@@ -13016,7 +13042,7 @@ class VirtualScroll$1 {
                 this.parent.grid.getContent().firstElementChild.scrollTop = 0;
                 this.parent.grid.notify(virtualActionArgs, { setTop: true });
             }
-            if (requestType === 'save' && this.parent.editSettings.newRowPosition === 'Bottom') {
+            if (requestType === 'save') {
                 endIndex = counts.count;
             }
             //if ((this.prevendIndex !== -1 && this.prevstartIndex !== -1) &&