@syncfusion/ej2-treegrid 20.2.36 → 20.2.40

package/src/treegrid/renderer/virtual-tree-content-render.js

@@ -41,7 +41,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
         return new TreeVirtualRowModelGenerator(this.parent);
     };
     VirtualTreeContentRenderer.prototype.getRowByIndex = function (index) {
-        return this.parent.getDataRows().filter(function (e) { return parseInt(e.getAttribute('aria-rowindex'), 10) === index; })[0];
+        return this.parent.getDataRows().filter(function (e) { return parseInt(e.getAttribute('data-rowindex'), 10) === index; })[0];
     };
     VirtualTreeContentRenderer.prototype.addEventListener = function () {
         this.parent.on(events.virtualActionArgs, this.virtualOtherAction, this);
@@ -126,7 +126,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                     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;
             }
@@ -220,7 +220,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
         return new Cell(opt);
     };
     VirtualTreeContentRenderer.prototype.beginEdit = function (e) {
-        var selector = '.e-row[aria-rowindex="' + e.index + '"]';
+        var selector = '.e-row[data-rowindex="' + e.index + '"]';
         var index = this.parent.getContent().querySelector(selector).rowIndex;
         var rowData = this.parent.getCurrentViewRecords()[index];
         e.data = rowData;
@@ -228,14 +228,14 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
     VirtualTreeContentRenderer.prototype.beginAdd = function (args) {
         var addAction = 'addActionBegin';
         var isAdd = 'isAdd';
-        var addArgs = { newRowPosition: this.rowPosition, addRowIndex: this.addRowIndex, ariaRowIndex: this.ariaRowIndex };
+        var addArgs = { newRowPosition: this.rowPosition, addRowIndex: this.addRowIndex, dataRowIndex: this.dataRowIndex };
         this.parent.notify('get-row-position', addArgs);
         this.rowPosition = addArgs.newRowPosition;
         this.addRowIndex = addArgs.addRowIndex;
-        this.ariaRowIndex = addArgs.ariaRowIndex;
+        this.dataRowIndex = addArgs.dataRowIndex;
         var rows = this.parent.getRows();
-        var firstAriaIndex = rows.length ? +rows[0].getAttribute('aria-rowindex') : 0;
-        var lastAriaIndex = rows.length ? +rows[rows.length - 1].getAttribute('aria-rowindex') : 0;
+        var firstAriaIndex = rows.length ? +rows[0].getAttribute('data-rowindex') : 0;
+        var lastAriaIndex = rows.length ? +rows[rows.length - 1].getAttribute('data-rowindex') : 0;
         var withInRange = this.parent.selectedRowIndex >= firstAriaIndex && this.parent.selectedRowIndex <= lastAriaIndex;
         if (!(this.rowPosition === 'Top' || this.rowPosition === 'Bottom')) {
             this[isAdd] = true;
@@ -286,11 +286,11 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
     };
     VirtualTreeContentRenderer.prototype.onActionComplete = function (args) {
         if (args.requestType === 'add') {
-            var addArgs = { newRowPosition: this.rowPosition, addRowIndex: this.addRowIndex, ariaRowIndex: this.ariaRowIndex };
+            var addArgs = { newRowPosition: this.rowPosition, addRowIndex: this.addRowIndex, dataRowIndex: this.dataRowIndex };
             this.parent.notify('get-row-position', addArgs);
             this.rowPosition = addArgs.newRowPosition;
             this.addRowIndex = addArgs.addRowIndex;
-            this.ariaRowIndex = addArgs.ariaRowIndex;
+            this.dataRowIndex = addArgs.dataRowIndex;
         }
         var actionComplete = 'actionComplete';
         _super.prototype[actionComplete].call(this, args);
@@ -353,7 +353,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                 !isNullOrUndefined(this.parent.getContent().querySelectorAll('.e-content tr')[rowPt])) {
                 var attr = this.parent.getContent().querySelectorAll('.e-content tr')[rowPt]
                     .querySelector('td').getAttribute('index');
-                firsttdinx = +attr; // this.parent.getContent().querySelector('.e-content tr').getAttribute('aria-rowindex');
+                firsttdinx = +attr; // this.parent.getContent().querySelector('.e-content tr').getAttribute('data-rowindex');
             }
             if (firsttdinx === 0) {
                 if (this.parent.allowRowDragAndDrop) {
@@ -452,7 +452,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
             var isAdd = 'isAdd';
             if (this[isAdd] && !this.parent.getContent().querySelector('.e-content').querySelector('.e-addedrow')) {
                 if (!(this.rowPosition === 'Top' || this.rowPosition === 'Bottom')) {
-                    if (this.ariaRowIndex >= this.startIndex) {
+                    if (this.dataRowIndex >= this.startIndex) {
                         this.restoreNewRow();
                     }
                     else if (this.addRowIndex && this.addRowIndex > -1) {

package/src/treegrid/utils.js

@@ -121,7 +121,7 @@ export function findChildrenRecords(records) {
         return [];
     }
     if (!isNullOrUndefined(records.childRecords)) {
-        var childRecords = records.childRecords;
+        var childRecords = records.childRecords.filter(function (items) { return !items.isSummaryRow; });
         var keys = Object.keys(childRecords);
         for (var i = 0, len = keys.length; i < len; i++) {
             datas.push(childRecords[i]);