@syncfusion/ej2-treegrid 26.1.41 → 26.2.4

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

@@ -1042,6 +1042,7 @@ var Selection = /** @__PURE__ @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;
@@ -1059,6 +1060,14 @@ var Selection = /** @__PURE__ @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];
@@ -2585,6 +2594,9 @@ var DataManipulation = /** @__PURE__ @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);
@@ -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))) ||
@@ -4691,10 +4703,24 @@ var TreeGrid = /** @__PURE__ @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(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(rowDeselecting, args);
         };
         this.grid.rowSelected = function (args) {
@@ -5447,7 +5473,8 @@ var TreeGrid = /** @__PURE__ @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;
@@ -6659,13 +6686,13 @@ var TreeGrid = /** @__PURE__ @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 {
@@ -7018,9 +7045,12 @@ var TreeGrid = /** @__PURE__ @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);
@@ -7049,7 +7079,7 @@ var TreeGrid = /** @__PURE__ @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;
                 }
@@ -7070,7 +7100,7 @@ var TreeGrid = /** @__PURE__ @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;
                 }
@@ -13764,7 +13794,7 @@ var VirtualTreeContentRenderer = /** @__PURE__ @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;
             }
@@ -14054,7 +14084,7 @@ var VirtualScroll = /** @__PURE__ @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;
@@ -14095,7 +14125,7 @@ var VirtualScroll = /** @__PURE__ @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(virtualActionArgs, { setTop: true });