@syncfusion/ej2-treegrid 20.2.36 → 20.2.38

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

@@ -1043,7 +1043,12 @@ class Selection {
             if (indeter > 0 || (checkChildRecords > 0 && checkChildRecords !== length)) {
                 record.checkboxState = 'indeterminate';
             }
-            else if (checkChildRecords === 0 && indeter === 0) {
+            else if (checkChildRecords === 0 && (!record.hasFilteredChildRecords || isNullOrUndefined(record.hasFilteredChildRecords)) && !isNullOrUndefined(this.parent['dataResults']['actionArgs']) &&
+                (this.parent['dataResults']['actionArgs'].requestType === 'searching' || this.parent['dataResults']['actionArgs'].requestType === 'filtering') && record.checkboxState === 'check') {
+                record.checkboxState = 'check';
+            }
+            else if ((checkChildRecords === 0 && indeter === 0) || (checkChildRecords === 0 && record.hasFilteredChildRecords && !isNullOrUndefined(this.parent['dataResults']['actionArgs']) &&
+                (this.parent['dataResults']['actionArgs'].requestType === 'searching' || this.parent['dataResults']['actionArgs'].requestType === 'filtering') && record.checkboxState === 'check')) {
                 record.checkboxState = 'uncheck';
             }
             else {
@@ -1432,7 +1437,7 @@ class Render {
             const parentrec = this.parent.getCurrentViewRecords().filter((rec) => {
                 return getValue(proxy.idMapping, rec) === getValue(proxy.parentIdMapping, data);
             });
-            if (parentrec.length > 0) {
+            if (parentrec.length > 0 && !parentrec[0].isSummaryRow) {
                 const display = parentrec[0].expanded ? 'table-row' : 'none';
                 args.row.setAttribute('style', 'display: ' + display + ';');
             }
@@ -2072,8 +2077,8 @@ class DataManipulation {
             if (!Object.prototype.hasOwnProperty.call(currentData, 'index')) {
                 currentData.index = this.storedIndex;
             }
-            if (!isNullOrUndefined(currentData[this.parent.childMapping]) ||
-                (currentData[this.parent.hasChildMapping] && isCountRequired(this.parent))) {
+            if ((!isNullOrUndefined(currentData[this.parent.childMapping]) && !isCountRequired(this.parent)) ||
+                ((currentData[this.parent.hasChildMapping]) && isCountRequired(this.parent) && this.parent.initialRender)) {
                 currentData.hasChildRecords = true;
                 if (this.parent.enableCollapseAll || !isNullOrUndefined(this.parent.dataStateChange)
                     && isNullOrUndefined(currentData[this.parent.childMapping])) {
@@ -2227,9 +2232,9 @@ class DataManipulation {
             const modifiedData = new DataManager(parentData).executeLocal(srtQry);
             if (this.parent.allowRowDragAndDrop && !isNullOrUndefined(this.parent.rowDragAndDropModule['draggedRecord']) &&
                 this.parent.rowDragAndDropModule['droppedRecord'].hasChildRecords && this.parent.rowDragAndDropModule['dropPosition'] !== 'middleSegment') {
-                var dragdIndex = modifiedData.indexOf(this.parent.rowDragAndDropModule['draggedRecord']);
+                const dragdIndex = modifiedData.indexOf(this.parent.rowDragAndDropModule['draggedRecord']);
                 modifiedData.splice(dragdIndex, 1);
-                var dropdIndex = modifiedData.indexOf(this.parent.rowDragAndDropModule['droppedRecord']);
+                const dropdIndex = modifiedData.indexOf(this.parent.rowDragAndDropModule['droppedRecord']);
                 if (this.parent.rowDragAndDropModule['droppedRecord'].hasChildRecords && this.parent.rowDragAndDropModule['dropPosition'] === 'topSegment') {
                     modifiedData.splice(dropdIndex, 0, this.parent.rowDragAndDropModule['draggedRecord']);
                 }
@@ -5874,7 +5879,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         }
         const args = { data: record, row: row };
         let rows = [];
-        rows = gridRows.filter((r) => r.querySelector('.e-gridrowindex' + record.index + 'level' + (record.level + 1)));
+        rows = gridRows.filter((r) => ((r.querySelector('.e-gridrowindex' + record.index + 'level' + (record.level + 1))) || (r.querySelector('.e-gridrowindex' + record.index + 'level0' + '.e-summarycell'))));
         if (action === 'expand') {
             this.notify(remoteExpand, { record: record, rows: rows, parentRow: row });
             const args = { row: row, data: record };
@@ -7372,7 +7377,7 @@ class RowDD$1 {
         }
     }
     updateIcon(row, index, args) {
-        let rowEle = args.target ? closest(args.target, 'tr') : null;
+        const rowEle = args.target ? closest(args.target, 'tr') : null;
         this.dropPosition = undefined;
         let rowPositionHeight = 0;
         this.removeFirstrowBorder(rowEle);
@@ -9624,11 +9629,11 @@ class Sort$1 {
                 this.flatSortedData[this.storedIndex] = data[d];
             }
             if (data[d].hasChildRecords) {
-                let childSort = (new DataManager(data[d].childRecords).executeLocal(srtQry));
+                const childSort = (new DataManager(data[d].childRecords).executeLocal(srtQry));
                 if (this.parent.allowRowDragAndDrop && data[d].childRecords.indexOf(this.parent.rowDragAndDropModule['draggedRecord']) !== -1 && this.parent.rowDragAndDropModule['dropPosition'] !== 'middleSegment') {
-                    var dragdIndex = childSort.indexOf(this.parent.rowDragAndDropModule['draggedRecord']);
+                    const dragdIndex = childSort.indexOf(this.parent.rowDragAndDropModule['draggedRecord']);
                     childSort.splice(dragdIndex, 1);
-                    var dropdIndex = childSort.indexOf(this.parent.rowDragAndDropModule['droppedRecord']);
+                    const dropdIndex = childSort.indexOf(this.parent.rowDragAndDropModule['droppedRecord']);
                     if (this.parent.rowDragAndDropModule['dropPosition'] === 'topSegment') {
                         childSort.splice(dropdIndex, 0, this.parent.rowDragAndDropModule['draggedRecord']);
                     }
@@ -10984,9 +10989,11 @@ class Edit$1 {
                 this.parent.parentData.push(data[i]);
             }
         }
-        if (details.action === 'add' && this.previousNewRowPosition != null) {
-            this.parent.setProperties({ editSettings: { newRowPosition: this.previousNewRowPosition } }, true);
-            this.previousNewRowPosition = null;
+        if (!this.parent.enableInfiniteScrolling) {
+            if (details.action === 'add' && this.previousNewRowPosition != null) {
+                this.parent.setProperties({ editSettings: { newRowPosition: this.previousNewRowPosition } }, true);
+                this.previousNewRowPosition = null;
+            }
         }
     }
     updateIndex(data, rows, records) {
@@ -11230,14 +11237,19 @@ class Edit$1 {
             }
             else {
                 if (this.isAddedRowByMethod && (this.parent.enableVirtualization || this.parent.enableInfiniteScrolling)) {
-                    this.addRowIndex = args.index;
+                    if (args.index !== 0) {
+                        this.addRowIndex = args.index;
+                    }
+                    else {
+                        this.addRowIndex = this.parent.grid.selectedRowIndex;
+                    }
                 }
                 else {
                     this.addRowIndex = this.parent.grid.selectedRowIndex > -1 ? this.parent.grid.selectedRowIndex : 0;
                 }
             }
             if (this.isAddedRowByMethod && (this.parent.enableVirtualization || this.parent.enableInfiniteScrolling)) {
-                this.addRowRecord = this.parent.flatData[args.index];
+                this.addRowRecord = this.parent.flatData[this.parent.grid.selectedRowIndex];
             }
             else {
                 this.addRowRecord = this.parent.getSelectedRecords()[0];
@@ -11720,7 +11732,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                     getValue('virtualEle', this).setVirtualHeight(this.parent.getRowHeight() * e.count, '100%');
                 }
             }
-            if ((!isNullOrUndefined(e.requestType) && e.requestType.toString() === 'collapseAll') || (this.isDataSourceChanged && this.startIndex === -1)) {
+            if ((!isNullOrUndefined(e.requestType) && e.requestType.toString() === 'collapseAll') || (this.isDataSourceChanged && (this.startIndex === -1 || this.startIndex === 0 && this['preStartIndex'] === 0))) {
                 this.contents.scrollTop = 0;
                 this.isDataSourceChanged = false;
             }