@syncfusion/ej2-treegrid 26.1.41 → 26.1.42

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 26.1.41
+*  version : 26.1.42
 *  Copyright Syncfusion Inc. 2001 - 2023. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-treegrid@*",
-  "_id": "@syncfusion/ej2-treegrid@26.1.40",
+  "_id": "@syncfusion/ej2-treegrid@26.1.41",
   "_inBundle": false,
-  "_integrity": "sha512-FLSDQfoQPPsupYO9MJXtMfWLY77d98nS3kGQxBRoMIkotzYme8lIBz/YMXQA+h+owNWyryNZloaJaTx6Owt4Xg==",
+  "_integrity": "sha512-bEdBHXZDiDR2JGPI2rITLmXKpMDRRvVllnYUfcv3BangX4MF/JeFtegtHGa2XzX675KPpsyOe9SvwMjzaoEKKQ==",
   "_location": "/@syncfusion/ej2-treegrid",
   "_phantomChildren": {},
   "_requested": {
@@ -24,8 +24,8 @@
     "/@syncfusion/ej2-react-treegrid",
     "/@syncfusion/ej2-vue-treegrid"
   ],
-  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-26.1.40.tgz",
-  "_shasum": "1604c276e7bfbbb1c64993484869265e35ab082f",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-26.1.41.tgz",
+  "_shasum": "02a9f34ad00196ced1088eb5838061448392009e",
   "_spec": "@syncfusion/ej2-treegrid@*",
   "_where": "/jenkins/workspace/elease-automation_release_26.1.1/packages/included",
   "author": {
@@ -36,10 +36,10 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~26.1.37",
-    "@syncfusion/ej2-data": "~26.1.41",
-    "@syncfusion/ej2-grids": "~26.1.41",
-    "@syncfusion/ej2-popups": "~26.1.41"
+    "@syncfusion/ej2-base": "~26.1.42",
+    "@syncfusion/ej2-data": "~26.1.42",
+    "@syncfusion/ej2-grids": "~26.1.42",
+    "@syncfusion/ej2-popups": "~26.1.42"
   },
   "deprecated": false,
   "description": "Essential JS 2 TreeGrid Component",
@@ -76,6 +76,6 @@
     "url": "git+https://github.com/syncfusion/ej2-treegrid.git"
   },
   "typings": "index.d.ts",
-  "version": "26.1.41",
+  "version": "26.1.42",
   "sideEffects": false
 }

package/src/treegrid/base/data.d.ts

@@ -19,6 +19,7 @@ export declare class DataManipulation {
     private isSelfReference;
     private isSortAction;
     private infiniteScrollData;
+    private preCurrentPage;
     constructor(grid: TreeGrid);
     /**
      * @hidden

package/src/treegrid/base/data.js

@@ -18,6 +18,7 @@ var DataManipulation = /** @class */ (function () {
         this.hierarchyData = [];
         this.storedIndex = -1;
         this.sortedData = [];
+        this.preCurrentPage = -1;
         this.isSortAction = false;
         this.addEventListener();
         this.dataResults = {};
@@ -349,7 +350,7 @@ var DataManipulation = /** @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);
@@ -537,6 +538,17 @@ var DataManipulation = /** @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(events.actionComplete, e);

package/src/treegrid/base/treegrid.js

@@ -883,7 +883,7 @@ var TreeGrid = /** @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))) ||

package/src/treegrid/renderer/virtual-row-model-generator.js

@@ -94,7 +94,13 @@ var TreeVirtualRowModelGenerator = /** @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 {