@syncfusion/ej2-treegrid 26.1.40 → 26.1.42

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

@@ -2047,6 +2047,7 @@ var DataManipulation = /** @__PURE__ @class */ (function () {
         this.hierarchyData = [];
         this.storedIndex = -1;
         this.sortedData = [];
+        this.preCurrentPage = -1;
         this.isSortAction = false;
         this.addEventListener();
         this.dataResults = {};
@@ -2378,7 +2379,7 @@ var DataManipulation = /** @__PURE__ @class */ (function () {
             idMappingValue = rowDetails.record[this.parent.idMapping].toString();
         }
         if (this.parent.enableVirtualization && rowDetails.action === 'remoteExpand') {
-            qry.take(this.parent.pageSettings.pageSize);
+            qry.take(this.parent.grid.pageSettings.pageSize);
             var expandDetail = [];
             expandDetail.push('ExpandingAction', idMappingValue.toString());
             qry.expand(expandDetail);
@@ -2566,6 +2567,17 @@ var DataManipulation = /** @__PURE__ @class */ (function () {
                 }
                 datas.splice(inx + r + 1, 0, result[parseInt(r.toString(), 10)]);
             }
+            if (datas.length > result.length &&
+                datas.length !== _this.parent.grid.pageSettings.pageSize + (_this.parent.grid.contentModule).getBlockSize() &&
+                _this.parent.enableVirtualization && rowDetails.action === 'remoteExpand') {
+                if ((_this.preCurrentPage > 1 || _this.parent.grid.pageSettings.currentPage > 1)) {
+                    datas = datas.slice(0, _this.parent.grid.pageSettings.pageSize + (_this.parent.grid.contentModule).getBlockSize());
+                }
+                else {
+                    datas = datas.slice(0, _this.parent.grid.pageSettings.pageSize);
+                }
+                _this.preCurrentPage = _this.parent.grid.pageSettings.currentPage;
+            }
             setValue('result', datas, e);
             setValue('action', 'beforecontentrender', e);
             _this.parent.trigger(actionComplete, e);
@@ -3467,7 +3479,7 @@ function removeChildRecords(childRecords, modifiedData, action, key, control, is
                             editedData.taskData[keys[parseInt(i.toString(), 10)]] =
                                 childRecords[parseInt(j.toString(), 10)][keys[parseInt(i.toString(), 10)]] =
                                     modifiedData[keys[parseInt(i.toString(), 10)]];
-                        if (control.grid.editSettings.mode === 'Normal' && control.editSettings.mode === 'Cell') {
+                        if (control.grid.editSettings.mode === 'Normal' && control.editSettings.mode === 'Cell' && !isNullOrUndefined(control.grid.editModule)) {
                             var editModule = 'editModule';
                             control.grid.editModule["" + editModule].editRowIndex = modifiedData.index;
                             control.grid.editModule["" + editModule].updateCurrentViewData(modifiedData);
@@ -4526,7 +4538,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             || (/[0-9]$/.test(this.height.toString()) && /[px]$/.test(this.height.toString()))) {
             failureCases.push('column width and height should be in pixels');
         }
-        if (!isNullOrUndefined(this.childMapping) && !isNullOrUndefined(this.idMapping)) {
+        if ((this.childMapping !== 'Children') && !isNullOrUndefined(this.idMapping)) {
             failureCases.push('Both IdMapping and ChildMapping should not be used together for tree grid rendering.');
         }
         if ((!isNullOrUndefined(this.idMapping) && (isNullOrUndefined(this.parentIdMapping))) ||
@@ -9349,7 +9361,7 @@ var RowDD = /** @__PURE__ @class */ (function () {
             var _loop_1 = function (i) {
                 draggedRecord_2 = dragRecords[parseInt(i.toString(), 10)];
                 this_1.draggedRecord = draggedRecord_2;
-                if (this_1.dropPosition !== 'Invalid') {
+                if (this_1.dropPosition !== 'Invalid' && !isNullOrUndefined(this_1.droppedRecord)) {
                     if (!tObj.rowDropSettings.targetID || isByMethod) {
                         this_1.deleteDragRow();
                     }
@@ -9914,7 +9926,13 @@ var TreeVirtualRowModelGenerator = /** @__PURE__ @class */ (function (_super) {
             else if (action === 'virtualscroll' && this.cache[parseInt(currentPage.toString(), 10)] &&
                 this.cache[parseInt(currentPage.toString(), 10)].length >
                     (this.parent.contentModule).getBlockSize()) {
-                delete this.cache[parseInt(currentPage.toString(), 10)];
+                if (this.cache[parseInt(currentPage.toString(), 10)].length > (this.parent.contentModule).getBlockSize()) {
+                    this.cache[parseInt(currentPage.toString(), 10)] =
+                        this.cache[parseInt(currentPage.toString(), 10)].slice(0, (this.parent.contentModule).getBlockSize());
+                }
+                else {
+                    delete this.cache[parseInt(currentPage.toString(), 10)];
+                }
             }
         }
         else {