@syncfusion/ej2-treegrid 26.1.42 → 26.2.5

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 26.1.42
+*  version : 26.2.5
 *  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/hotfix/26.1.35_Vol2.txt

@@ -0,0 +1 @@
+hotfix/26.1.35_Vol2

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-treegrid@*",
-  "_id": "@syncfusion/ej2-treegrid@26.1.41",
+  "_id": "@syncfusion/ej2-treegrid@26.1.42",
   "_inBundle": false,
-  "_integrity": "sha512-bEdBHXZDiDR2JGPI2rITLmXKpMDRRvVllnYUfcv3BangX4MF/JeFtegtHGa2XzX675KPpsyOe9SvwMjzaoEKKQ==",
+  "_integrity": "sha512-UGPp38yDOArNOTGVss2EU+BoYFDbtuX7AQPGwepSDA/IvJZqVuuhzIbORFGAovtVu/49UWanMWu9ci47SKkjxw==",
   "_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.41.tgz",
-  "_shasum": "02a9f34ad00196ced1088eb5838061448392009e",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-26.1.42.tgz",
+  "_shasum": "ac8621c6da11adaeb47f35a1b10f2e94520bea34",
   "_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.42",
-    "@syncfusion/ej2-data": "~26.1.42",
-    "@syncfusion/ej2-grids": "~26.1.42",
-    "@syncfusion/ej2-popups": "~26.1.42"
+    "@syncfusion/ej2-base": "~26.2.5",
+    "@syncfusion/ej2-data": "~26.2.5",
+    "@syncfusion/ej2-grids": "~26.2.5",
+    "@syncfusion/ej2-popups": "~26.2.5"
   },
   "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.42",
+  "version": "26.2.5",
   "sideEffects": false
 }

package/src/treegrid/actions/selection.js

@@ -58,6 +58,7 @@ var Selection = /** @class */ (function () {
         this.removeEventListener();
     };
     Selection.prototype.checkboxSelection = function (args) {
+        var _a;
         var target = getObject('target', args);
         var checkWrap = parentsUntil(target, 'e-checkbox-wrapper');
         var checkBox;
@@ -75,6 +76,14 @@ var Selection = /** @class */ (function () {
             checkBox = checkWrap.querySelector('input[type="checkbox"]');
             this.triggerChkChangeEvent(checkBox, checkBoxvalue, target.closest('tr'));
         }
+        if (!isNullOrUndefined(this.parent['parentQuery']) && this.parent.selectionSettings.persistSelection
+            && this.parent['columnModel'].filter(function (col) { return col.type === 'checkbox'; }).length > 0
+            && isRemoteData(this.parent)) {
+            if (this.parent['parentQuery'].length > 0) {
+                (_a = this.parent.query.queries).push.apply(_a, this.parent['parentQuery']);
+                this.parent['parentQuery'] = [];
+            }
+        }
     };
     Selection.prototype.triggerChkChangeEvent = function (checkBox, checkState, rowElement) {
         var data = this.parent.getCurrentViewRecords()[rowElement.rowIndex];

package/src/treegrid/actions/virtual-scroll.js

@@ -118,7 +118,7 @@ var VirtualScroll = /** @class */ (function () {
         }
         else {
             var requestType = pageingDetails.actionArgs.requestType;
-            if (requestType === 'filtering' || requestType === 'collapseAll' || requestType === 'searching' ||
+            if (requestType === 'filtering' || requestType === 'collapseAll' || requestType === 'searching' || (requestType === 'refresh' && getValue('isExpandAll', this.parent)) ||
                 (requestType === 'refresh' && this.parent.enableCollapseAll && endIndex > visualData.length && isNullOrUndefined(this.expandCollapseRec))) {
                 startIndex = 0;
                 endIndex = this.parent.grid.pageSettings.pageSize - 1;
@@ -159,7 +159,7 @@ var VirtualScroll = /** @class */ (function () {
                 }
             }
             //}
-            if (this.prevrequestType === 'collapseAll' && pageingDetails.actionArgs.requestType === 'virtualscroll') {
+            if (this.prevrequestType === 'collapseAll' && pageingDetails.actionArgs.requestType === 'virtualscroll' && !isNullOrUndefined(this.parent.idMapping)) {
                 startIndex = 0;
                 endIndex = this.parent.grid.pageSettings.pageSize - 1;
                 this.parent.grid.notify(events.virtualActionArgs, { setTop: true });

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

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

package/src/treegrid/base/data.js

@@ -18,7 +18,6 @@ var DataManipulation = /** @class */ (function () {
         this.hierarchyData = [];
         this.storedIndex = -1;
         this.sortedData = [];
-        this.preCurrentPage = -1;
         this.isSortAction = false;
         this.addEventListener();
         this.dataResults = {};
@@ -350,7 +349,7 @@ var DataManipulation = /** @class */ (function () {
             idMappingValue = rowDetails.record[this.parent.idMapping].toString();
         }
         if (this.parent.enableVirtualization && rowDetails.action === 'remoteExpand') {
-            qry.take(this.parent.grid.pageSettings.pageSize);
+            qry.take(this.parent.pageSettings.pageSize);
             var expandDetail = [];
             expandDetail.push('ExpandingAction', idMappingValue.toString());
             qry.expand(expandDetail);
@@ -538,17 +537,6 @@ 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);
@@ -568,6 +556,9 @@ var DataManipulation = /** @class */ (function () {
                 _this.parent.grid.pageSettings.totalRecordsCount = e.count;
             }
             e.count = _this.parent.grid.pageSettings.totalRecordsCount;
+            if (rowDetails.action === 'remoteExpand' && _this.parent.allowPaging) {
+                _this.parent.grid.pageSettings.totalRecordsCount = _this.parent.grid.currentViewData.length + result.length;
+            }
             var virtualArgs = {};
             if (_this.parent.enableVirtualization) {
                 _this.remoteVirtualAction(virtualArgs);

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

@@ -86,6 +86,7 @@ export declare class TreeGrid extends Component<HTMLElement> implements INotifyP
     private isAddedFromGantt;
     private isIndentEnabled;
     private indentOutdentAction;
+    private parentQuery;
     private isCollapsedEventTriggered;
     private isCollapsingEventTriggered;
     private isExpandedEventTriggered;

package/src/treegrid/base/treegrid.js

@@ -1048,10 +1048,24 @@ var TreeGrid = /** @class */ (function (_super) {
         var _this = this;
         this.grid.rowSelecting = function (args) {
             _this.IsExpandCollapseClicked(args);
+            if (!isNullOrUndefined(args.data) && _this.selectionSettings.persistSelection
+                && _this.columnModel.filter(function (col) { return col.type === 'checkbox'; }).length > 0 && isRemoteData(_this)) {
+                if (!isNullOrUndefined(args.data.parentItem)) {
+                    _this.parentQuery = _this.query.queries.filter(function (q) { return q.e.field === _this.parentIdMapping; });
+                    _this.query.queries = _this.query.queries.slice(0, 0);
+                }
+            }
             _this.trigger(events.rowSelecting, args);
         };
         this.grid.rowDeselecting = function (args) {
             _this.IsExpandCollapseClicked(args);
+            if (isNullOrUndefined(args.data) && _this.selectionSettings.persistSelection
+                && _this.columnModel.filter(function (col) { return col.type === 'checkbox'; }).length > 0 && isRemoteData(_this)) {
+                if (isNullOrUndefined(args.data.parentItem)) {
+                    _this.parentQuery = _this.query.queries.filter(function (q) { return q.e.field === _this.parentIdMapping; });
+                    _this.query.queries = _this.query.queries.slice(0, 0);
+                }
+            }
             _this.trigger(events.rowDeselecting, args);
         };
         this.grid.rowSelected = function (args) {
@@ -1804,7 +1818,8 @@ var TreeGrid = /** @class */ (function (_super) {
     TreeGrid.prototype.onPropertyChanged = function (newProp) {
         var properties = Object.keys(newProp);
         var requireRefresh = false;
-        if (properties.indexOf('columns') > -1 && !isNullOrUndefined(newProp.columns)) {
+        if (properties.indexOf('columns') > -1 && !isNullOrUndefined(newProp.columns) && this.frozenColumns === 0
+            && this.frozenRows === 0 && !this.columnModel.some(function (col) { return col.isFrozen || col.freeze; })) {
             this.grid.columns = this.getGridColumns(newProp.columns);
             this.grid['updateColumnObject']();
             requireRefresh = true;
@@ -3016,13 +3031,13 @@ var TreeGrid = /** @class */ (function (_super) {
                 return e.hasChildRecords;
             });
         }
-        else if (isNullOrUndefined(record)) {
+        else if (isNullOrUndefined(record) && !isNullOrUndefined(row)) {
             if (this.detailTemplate) {
                 record = this.grid.getCurrentViewRecords()[row.getAttribute('data-rowindex')];
             }
             else {
-                if (this.enableVirtualization && this.isCollapseAll) {
-                    if (this.isExpandAll && row.rowIndex === -1) {
+                if (this.enableVirtualization && (this.isCollapseAll || this.isExpandAll)) {
+                    if (row.rowIndex === -1) {
                         record = this.grid.getCurrentViewRecords()[parseInt(row.getAttribute('data-rowindex'), 10)];
                     }
                     else {
@@ -3375,9 +3390,12 @@ var TreeGrid = /** @class */ (function (_super) {
     TreeGrid.prototype.expandCollapse = function (action, row, record, isChild) {
         var _this = this;
         var expandingArgs = { row: row, data: record, childData: [], requestType: action };
-        var childRecords = this.grid.currentViewData.filter(function (e) {
-            return e.parentUniqueID === record.uniqueID;
-        });
+        var childRecords;
+        if (!isNullOrUndefined(record)) {
+            childRecords = this.grid.currentViewData.filter(function (e) {
+                return e.parentUniqueID === record.uniqueID;
+            });
+        }
         var targetEle;
         if ((!isRemoteData(this) && action === 'expand' && this.isSelfReference && isCountRequired(this) && !childRecords.length) || (action === 'collapse' || (this.isExpandAll && this.loadChildOnDemand) && !isRemoteData(this) && this.isSelfReference && isCountRequired(this))) {
             this.updateChildOnDemand(expandingArgs);
@@ -3406,7 +3424,7 @@ var TreeGrid = /** @class */ (function (_super) {
             var displayAction = void 0;
             if (action === 'expand') {
                 displayAction = 'table-row';
-                if (!isChild) {
+                if (!isChild && !isNullOrUndefined(record)) {
                     record.expanded = true;
                     this.uniqueIDCollection[record.uniqueID].expanded = record.expanded;
                 }
@@ -3427,7 +3445,7 @@ var TreeGrid = /** @class */ (function (_super) {
             }
             else {
                 displayAction = 'none';
-                if (!isChild || isCountRequired(this)) {
+                if ((!isChild || isCountRequired(this)) && !isNullOrUndefined(row)) {
                     record.expanded = false;
                     this.uniqueIDCollection[record.uniqueID].expanded = record.expanded;
                 }

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

@@ -94,13 +94,7 @@ 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()) {
-                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)];
-                }
+                delete this.cache[parseInt(currentPage.toString(), 10)];
             }
         }
         else {

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

@@ -516,7 +516,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
     };
     VirtualTreeContentRenderer.prototype.appendContent = function (target, newChild, e) {
         if ((this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
-            && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent) || this.parent.isFrozenGrid()) {
+            && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent)) {
             if (getValue('isExpandCollapse', e)) {
                 this.isRemoteExpand = true;
             }

package/styles/fluent2.css

@@ -47,7 +47,7 @@
   --color-sf-flyout-bg-color-pressed: #e0e0e0;
   --color-sf-flyout-bg-color-selected: #ebebeb;
   --color-sf-flyout-bg-color-focus: #f5f5f5;
-  --color-sf-overlay-bg-color: #000;
+  --color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
   --color-sf-table-bg-color-hover: #f5f5f5;
   --color-sf-table-bg-color-pressed: #e0e0e0;
   --color-sf-table-bg-color-selected: #ebf3fc;
@@ -369,7 +369,7 @@
   --color-sf-flyout-bg-color-pressed: var(--color-sf-black);
   --color-sf-flyout-bg-color-selected: #383838;
   --color-sf-flyout-bg-color-focus: var(--color-sf-flyout-bg-color-hover);
-  --color-sf-overlay-bg-color: rgba($black, .4);
+  --color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
   --color-sf-table-bg-color-hover: #383838;
   --color-sf-table-bg-color-pressed: #2e2e2e;
   --color-sf-table-bg-color-selected: #082338;
@@ -711,9 +711,9 @@
   --color-sf-flyout-bg-color-pressed: var(--color-sf-content-bg-color-hover);
   --color-sf-flyout-bg-color-selected: var(--color-sf-content-bg-color-hover);
   --color-sf-flyout-bg-color-focus: var(--color-sf-content-bg-color-hover);
-  --color-sf-overlay-bg-color: rgba($black, .4);
-  --color-sf-table-bg-color-hover: var(--color-sf-black);
-  --color-sf-table-bg-color-pressed: var(--color-sf-black);
+  --color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
+  --color-sf-table-bg-color-hover: #1a3bff;
+  --color-sf-table-bg-color-pressed: #1a3bff;
   --color-sf-table-bg-color-selected: #1a3bff;
   --color-sf-content-text-color: #fff;
   --color-sf-content-text-color-alt1: var(--color-sf-content-text-color);
@@ -732,12 +732,12 @@
   --color-sf-flyout-text-color-selected: var(--color-sf-content-text-color-hover);
   --color-sf-flyout-text-color-focus: var(--color-sf-content-text-color-hover);
   --color-sf-flyout-text-color-disabled: var(--color-sf-content-text-color-disabled);
-  --color-sf-table-text-color-hover: var(--color-sf-content-text-color-hover);
-  --color-sf-table-text-color-pressed: var(--color-sf-content-text-color-hover);
-  --color-sf-table-text-color-selected: var(--color-sf-content-text-color-hover);
+  --color-sf-table-text-color-hover: #000;
+  --color-sf-table-text-color-pressed: #000;
+  --color-sf-table-text-color-selected: #000;
   --color-sf-icon-color: #fff;
-  --color-sf-icon-color-hover: var(--color-sf-content-text-color-hover);
-  --color-sf-icon-color-pressed: var(--color-sf-content-text-color-hover);
+  --color-sf-icon-color-hover: #000;
+  --color-sf-icon-color-pressed: #000;
   --color-sf-icon-color-disabled: var(--color-sf-content-text-color-disabled);
   --color-sf-border-light: #fff;
   --color-sf-border: var(--color-sf-border-light);

package/styles/treegrid/fluent2.css

@@ -47,7 +47,7 @@
   --color-sf-flyout-bg-color-pressed: #e0e0e0;
   --color-sf-flyout-bg-color-selected: #ebebeb;
   --color-sf-flyout-bg-color-focus: #f5f5f5;
-  --color-sf-overlay-bg-color: #000;
+  --color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
   --color-sf-table-bg-color-hover: #f5f5f5;
   --color-sf-table-bg-color-pressed: #e0e0e0;
   --color-sf-table-bg-color-selected: #ebf3fc;
@@ -369,7 +369,7 @@
   --color-sf-flyout-bg-color-pressed: var(--color-sf-black);
   --color-sf-flyout-bg-color-selected: #383838;
   --color-sf-flyout-bg-color-focus: var(--color-sf-flyout-bg-color-hover);
-  --color-sf-overlay-bg-color: rgba($black, .4);
+  --color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
   --color-sf-table-bg-color-hover: #383838;
   --color-sf-table-bg-color-pressed: #2e2e2e;
   --color-sf-table-bg-color-selected: #082338;
@@ -711,9 +711,9 @@
   --color-sf-flyout-bg-color-pressed: var(--color-sf-content-bg-color-hover);
   --color-sf-flyout-bg-color-selected: var(--color-sf-content-bg-color-hover);
   --color-sf-flyout-bg-color-focus: var(--color-sf-content-bg-color-hover);
-  --color-sf-overlay-bg-color: rgba($black, .4);
-  --color-sf-table-bg-color-hover: var(--color-sf-black);
-  --color-sf-table-bg-color-pressed: var(--color-sf-black);
+  --color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
+  --color-sf-table-bg-color-hover: #1a3bff;
+  --color-sf-table-bg-color-pressed: #1a3bff;
   --color-sf-table-bg-color-selected: #1a3bff;
   --color-sf-content-text-color: #fff;
   --color-sf-content-text-color-alt1: var(--color-sf-content-text-color);
@@ -732,12 +732,12 @@
   --color-sf-flyout-text-color-selected: var(--color-sf-content-text-color-hover);
   --color-sf-flyout-text-color-focus: var(--color-sf-content-text-color-hover);
   --color-sf-flyout-text-color-disabled: var(--color-sf-content-text-color-disabled);
-  --color-sf-table-text-color-hover: var(--color-sf-content-text-color-hover);
-  --color-sf-table-text-color-pressed: var(--color-sf-content-text-color-hover);
-  --color-sf-table-text-color-selected: var(--color-sf-content-text-color-hover);
+  --color-sf-table-text-color-hover: #000;
+  --color-sf-table-text-color-pressed: #000;
+  --color-sf-table-text-color-selected: #000;
   --color-sf-icon-color: #fff;
-  --color-sf-icon-color-hover: var(--color-sf-content-text-color-hover);
-  --color-sf-icon-color-pressed: var(--color-sf-content-text-color-hover);
+  --color-sf-icon-color-hover: #000;
+  --color-sf-icon-color-pressed: #000;
   --color-sf-icon-color-disabled: var(--color-sf-content-text-color-disabled);
   --color-sf-border-light: #fff;
   --color-sf-border: var(--color-sf-border-light);