@syncfusion/ej2-treegrid 33.1.46 → 33.1.49

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

@@ -2180,16 +2180,6 @@ var Render = /** @__PURE__ @class */ (function () {
         }
         var data = args.data;
         var parentData = data.parentItem;
-        if (!isNullOrUndefined(parentData) && data.isCollapsedChild && !isNullOrUndefined(args.row)) {
-            this.parent['toggleRowVisibility'](args.row, 'e-childrow-hidden');
-            var rowsObj = this.parent.grid.getRowsObject();
-            if (!this.parent.grid.isFrozenGrid() && !isNullOrUndefined(args.row.getAttribute('data-uid'))) {
-                var row = rowsObj.filter(function (e) { return e.uid === args.row.getAttribute('data-uid'); })[0];
-                if (row) {
-                    row.visible = false;
-                }
-            }
-        }
         if (!isNullOrUndefined(data.parentItem) && !isFilterChildHierarchy(this.parent) &&
             (!(this.parent.allowPaging && !(this.parent.pageSettings.pageSizeMode === 'Root')) ||
                 (isRemoteData(this.parent) && !isOffline(this.parent)))) {
@@ -10196,7 +10186,7 @@ var RowDD = /** @__PURE__ @class */ (function () {
         this.removeLastrowBorder(rowEle);
         for (var i = 0; i < args.rows.length; i++) {
             if (!isNullOrUndefined(rowEle) && rowEle.getAttribute('data-uid') === args.rows[parseInt(i.toString(), 10)].getAttribute('data-uid')
-                || !parentsUntil(args.target, 'e-gridcontent')) {
+                || !parentsUntil(args.target, 'e-gridcontent') || rowEle.classList.contains('e-summaryrow')) {
                 this.dropPosition = 'Invalid';
                 this.addErrorElem();
                 if (isNullOrUndefined(this.parent.rowDropSettings.targetID)) {
@@ -10708,8 +10698,10 @@ var RowDD = /** @__PURE__ @class */ (function () {
     RowDD.prototype.rowDropped = function (args) {
         if (!isNullOrUndefined(this.parent.aggregates[0]) && this.parent.aggregates[0].showChildSummary) {
             var records = this.parent.grid.getCurrentViewRecords();
-            args.fromIndex = records[args.fromIndex].index;
-            args.dropIndex = records[args.dropIndex].index;
+            if (!isNullOrUndefined(records[records[args.fromIndex].index]) && !isNullOrUndefined(records[records[args.dropIndex].index])) {
+                args.fromIndex = records[args.fromIndex].index;
+                args.dropIndex = records[args.dropIndex].index;
+            }
         }
         var tObj = this.parent;
         var parentItem = 'parentItem';
@@ -11234,14 +11226,16 @@ var RowDD = /** @__PURE__ @class */ (function () {
             else {
                 currentRecord = record.childRecords[parseInt(i.toString(), 10)];
             }
-            count++;
-            tObj.flatData.splice(count, 0, currentRecord);
-            setValue('uniqueIDCollection.' + currentRecord.uniqueID, currentRecord, this.parent);
-            if (tObj.parentIdMapping) {
-                this.treeData.splice(count, 0, currentRecord.taskData);
-            }
-            if (currentRecord.hasChildRecords) {
-                count = this.updateChildRecord(currentRecord, count);
+            if (!isNullOrUndefined(currentRecord)) {
+                count++;
+                tObj.flatData.splice(count, 0, currentRecord);
+                setValue('uniqueIDCollection.' + currentRecord.uniqueID, currentRecord, this.parent);
+                if (tObj.parentIdMapping) {
+                    this.treeData.splice(count, 0, currentRecord.taskData);
+                }
+                if (currentRecord.hasChildRecords) {
+                    count = this.updateChildRecord(currentRecord, count);
+                }
             }
         }
         return count;
@@ -11268,17 +11262,19 @@ var RowDD = /** @__PURE__ @class */ (function () {
             else {
                 currentRecord = record.childRecords[parseInt(i.toString(), 10)];
             }
-            var parentData = void 0;
-            if (record.parentItem) {
-                parentData = getParentData(this.parent, record.parentItem.uniqueID);
-            }
-            if (isNullOrUndefined(parentData) && !isNullOrUndefined(record.parentItem)) {
-                parentData = record.parentItem;
-            }
-            currentRecord.level = record.parentItem ? parentData.level + level : record.level + 1;
-            if (currentRecord.hasChildRecords) {
-                level--;
-                level = this.updateChildRecordLevel(currentRecord, level);
+            if (!isNullOrUndefined(currentRecord)) {
+                var parentData = void 0;
+                if (record.parentItem) {
+                    parentData = getParentData(this.parent, record.parentItem.uniqueID);
+                }
+                if (isNullOrUndefined(parentData) && !isNullOrUndefined(record.parentItem)) {
+                    parentData = record.parentItem;
+                }
+                currentRecord.level = record.parentItem ? parentData.level + level : record.level + 1;
+                if (currentRecord.hasChildRecords) {
+                    level--;
+                    level = this.updateChildRecordLevel(currentRecord, level);
+                }
             }
         }
         return level;
@@ -11408,22 +11404,29 @@ var RowDD = /** @__PURE__ @class */ (function () {
                 treeGridData = this.parent.dataSource;
             }
             for (var i_2 = 0; i_2 < treeGridData.length; i_2++) {
-                if (treeGridData[parseInt(i_2.toString(), 10)][this.parent.idMapping] === currentRecord.taskData[this.parent.idMapping]) {
-                    idx = i_2;
+                if (!isNullOrUndefined(currentRecord.taskData)) {
+                    if (treeGridData[parseInt(i_2.toString(), 10)][this.parent.idMapping] === currentRecord.taskData[this.parent.idMapping]) {
+                        idx = i_2;
+                        break;
+                    }
                 }
             }
             for (var i_3 = 0; i_3 < this.treeGridData.length; i_3++) {
-                if (this.treeGridData[parseInt(i_3.toString(), 10)][this.parent.idMapping]
-                    === currentRecord.taskData[this.parent.idMapping]) {
-                    idz = i_3;
-                    break;
+                if (!isNullOrUndefined(currentRecord.taskData)) {
+                    if (this.treeGridData[parseInt(i_3.toString(), 10)][this.parent.idMapping]
+                        === currentRecord.taskData[this.parent.idMapping]) {
+                        idz = i_3;
+                        break;
+                    }
                 }
             }
             if (idx !== -1 && !isNullOrUndefined(idx)) {
                 dataSource.splice(idx, 1);
+                idx = -1;
             }
             if (idz !== -1 && !isNullOrUndefined(idz)) {
                 this.treeGridData.splice(idz, 1);
+                idz = -1;
             }
             if (currentRecord.hasChildRecords) {
                 this.removeChildItem(currentRecord);
@@ -11444,7 +11447,7 @@ var RowDD = /** @__PURE__ @class */ (function () {
         }
         for (var i = 0; i < record.childRecords.length; i++) {
             currentRecord = record.childRecords[parseInt(i.toString(), 10)];
-            count++;
+            count = currentRecord.isSummaryRow ? count : count + 1;
             if (currentRecord.hasChildRecords) {
                 count = this.getChildCount(currentRecord, count);
             }
@@ -11760,25 +11763,6 @@ var Filter = /** @__PURE__ @class */ (function () {
         if (this.flatFilteredData.length > 0 && this.isHierarchyFilter) {
             this.updateFilterLevel();
         }
-        var _loop_1 = function (i) {
-            var record = this_1.filteredResult[parseInt(i.toString(), 10)];
-            if (!isNullOrUndefined(record.parentItem)) {
-                var parentUID_1 = record.parentItem.uniqueID;
-                var parentPresent = this_1.filteredResult.some(function (r) {
-                    return !isNullOrUndefined(r.uniqueID) && r.uniqueID === parentUID_1;
-                });
-                if (parentPresent) {
-                    record.isCollapsedChild = !getExpandStatus(this_1.parent, record, this_1.parent.parentData);
-                }
-                else {
-                    record.isCollapsedChild = false;
-                }
-            }
-        };
-        var this_1 = this;
-        for (var i = 0; i < this.filteredResult.length; i++) {
-            _loop_1(i);
-        }
         this.parent.notify('updateAction', { result: this.filteredResult });
     };
     Filter.prototype.updateParentFilteredRecord = function (record) {
@@ -15966,7 +15950,7 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
             this.parent.root.scrollPosition = scrollArgs.offset;
         }
         var info = scrollArgs.sentinel;
-        var rowHeight = this.parent.getRowHeight();
+        var rowHeight = parseInt(this.parent.getRowHeight().toString(), 10);
         var outBuffer = this.parent.pageSettings.pageSize - Math.ceil(this.parent.pageSettings.pageSize / 2);
         var content;
         if (!isNullOrUndefined(this.parent.contentModule)) {
@@ -16564,7 +16548,13 @@ var VirtualScroll = /** @__PURE__ @class */ (function () {
         var isFlatHierarchy = this.parent.filterSettings.hierarchyMode === 'Child' ||
             this.parent.filterSettings.hierarchyMode === 'None';
         var visualData = isFiltering && isFlatHierarchy
-            ? parents
+            ? parents.filter(function (e) {
+                if (isNullOrUndefined(e.parentItem)) {
+                    return true;
+                }
+                var hasParentInFilteredList = parents.some(function (p) { return p.uniqueID === e.parentItem.uniqueID; });
+                return hasParentInFilteredList ? getExpandStatus(_this.parent, e) : true;
+            })
             : parents.filter(function (e) { return getExpandStatus(_this.parent, e); });
         this.visualData = visualData;
         pageingDetails.count = visualData.length;
@@ -16620,27 +16610,9 @@ var VirtualScroll = /** @__PURE__ @class */ (function () {
                 endIndex = startIndex + this.parent.grid.pageSettings.pageSize;
             }
             if (!isNullOrUndefined(this.expandCollapseRec)) {
-                var resourceCount = this.parent.grid.pageSettings.pageSize;
-                var sIndex = visualData.indexOf(this.expandCollapseRec);
-                var tempdata = visualData.slice(sIndex, sIndex + resourceCount);
-                if (tempdata.length < resourceCount && sIndex >= 0 && startIndex !== 0) {
-                    sIndex = visualData.length - resourceCount;
-                    sIndex = sIndex > 0 ? sIndex : 0;
-                    endIndex = visualData.length;
-                    if (endIndex - startIndex < resourceCount) {
-                        startIndex = sIndex;
-                        if (visualData.indexOf(this.expandCollapseRec) > visualData.length - resourceCount / 2) {
-                            var newTranslateY = startIndex * 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;
-                    endIndex = this.parent.grid.pageSettings.pageSize - 1;
-                    this.parent.grid.notify(virtualActionArgs, { setTop: true });
-                }
+                var result = this.adjustRangeForExpandCollapse(startIndex, endIndex, visualData);
+                startIndex = result.startIndex;
+                endIndex = result.endIndex;
             }
             //}
             if (this.prevrequestType === 'collapseAll' && pageingDetails.actionArgs.requestType === 'virtualscroll'
@@ -16671,6 +16643,30 @@ var VirtualScroll = /** @__PURE__ @class */ (function () {
         }
         this.parent.notify('updateAction', pageingDetails);
     };
+    VirtualScroll.prototype.adjustRangeForExpandCollapse = function (startIndex, endIndex, visualData) {
+        var pageSize = this.parent.grid.pageSettings.pageSize;
+        var expandedRecordIndex = visualData.indexOf(this.expandCollapseRec);
+        var pageWindowRecords = visualData.slice(expandedRecordIndex, expandedRecordIndex + pageSize);
+        if (pageWindowRecords.length < pageSize && expandedRecordIndex >= 0 && startIndex !== 0) {
+            var startForLastPage = visualData.length - pageSize;
+            startForLastPage = startForLastPage > 0 ? startForLastPage : 0;
+            endIndex = visualData.length;
+            if (endIndex - startIndex < pageSize) {
+                startIndex = startForLastPage;
+                if (expandedRecordIndex > visualData.length - pageSize / 2) {
+                    var viewportTranslateY = startIndex * this.parent.grid.getRowHeight();
+                    this.parent.grid.contentModule['translateY'] = viewportTranslateY;
+                    this.parent.grid.contentModule.virtualEle.adjustTable(0, viewportTranslateY);
+                }
+            }
+        }
+        else if (getValue('isCollapseAll', this.parent)) {
+            startIndex = 0;
+            endIndex = this.parent.grid.pageSettings.pageSize - 1;
+            this.parent.grid.notify(virtualActionArgs, { setTop: true });
+        }
+        return { startIndex: startIndex, endIndex: endIndex };
+    };
     /**
      * To destroy the virtualScroll module
      *