@syncfusion/ej2-treegrid 26.1.42 → 26.2.4

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

@@ -943,6 +943,14 @@ class Selection {
             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((col) => { return col.type === 'checkbox'; }).length > 0
+            && isRemoteData(this.parent)) {
+            if (this.parent['parentQuery'].length > 0) {
+                this.parent.query.queries.push(...this.parent['parentQuery']);
+                this.parent['parentQuery'] = [];
+            }
+        }
     }
     triggerChkChangeEvent(checkBox, checkState, rowElement) {
         const data = this.parent.getCurrentViewRecords()[rowElement.rowIndex];
@@ -1888,7 +1896,6 @@ class DataManipulation {
         this.hierarchyData = [];
         this.storedIndex = -1;
         this.sortedData = [];
-        this.preCurrentPage = -1;
         this.isSortAction = false;
         this.addEventListener();
         this.dataResults = {};
@@ -2212,7 +2219,7 @@ class DataManipulation {
             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);
             const expandDetail = [];
             expandDetail.push('ExpandingAction', idMappingValue.toString());
             qry.expand(expandDetail);
@@ -2400,17 +2407,6 @@ class DataManipulation {
                 }
                 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);
@@ -2430,6 +2426,9 @@ class DataManipulation {
                 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;
+            }
             const virtualArgs = {};
             if (this.parent.enableVirtualization) {
                 this.remoteVirtualAction(virtualArgs);
@@ -4409,10 +4408,24 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     bindGridEvents() {
         this.grid.rowSelecting = (args) => {
             this.IsExpandCollapseClicked(args);
+            if (!isNullOrUndefined(args.data) && this.selectionSettings.persistSelection
+                && this.columnModel.filter((col) => col.type === 'checkbox').length > 0 && isRemoteData(this)) {
+                if (!isNullOrUndefined(args.data.parentItem)) {
+                    this.parentQuery = this.query.queries.filter((q) => q.e.field === this.parentIdMapping);
+                    this.query.queries = this.query.queries.slice(0, 0);
+                }
+            }
             this.trigger(rowSelecting, args);
         };
         this.grid.rowDeselecting = (args) => {
             this.IsExpandCollapseClicked(args);
+            if (isNullOrUndefined(args.data) && this.selectionSettings.persistSelection
+                && this.columnModel.filter((col) => col.type === 'checkbox').length > 0 && isRemoteData(this)) {
+                if (isNullOrUndefined(args.data.parentItem)) {
+                    this.parentQuery = this.query.queries.filter((q) => q.e.field === this.parentIdMapping);
+                    this.query.queries = this.query.queries.slice(0, 0);
+                }
+            }
             this.trigger(rowDeselecting, args);
         };
         this.grid.rowSelected = (args) => {
@@ -5155,7 +5168,8 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     onPropertyChanged(newProp) {
         const properties = Object.keys(newProp);
         let 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((col) => col.isFrozen || col.freeze)) {
             this.grid.columns = this.getGridColumns(newProp.columns);
             this.grid['updateColumnObject']();
             requireRefresh = true;
@@ -6362,13 +6376,13 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 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 {
@@ -6713,9 +6727,12 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     }
     expandCollapse(action, row, record, isChild) {
         const expandingArgs = { row: row, data: record, childData: [], requestType: action };
-        const childRecords = this.grid.currentViewData.filter((e) => {
-            return e.parentUniqueID === record.uniqueID;
-        });
+        let childRecords;
+        if (!isNullOrUndefined(record)) {
+            childRecords = this.grid.currentViewData.filter((e) => {
+                return e.parentUniqueID === record.uniqueID;
+            });
+        }
         let 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);
@@ -6744,7 +6761,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             let displayAction;
             if (action === 'expand') {
                 displayAction = 'table-row';
-                if (!isChild) {
+                if (!isChild && !isNullOrUndefined(record)) {
                     record.expanded = true;
                     this.uniqueIDCollection[record.uniqueID].expanded = record.expanded;
                 }
@@ -6765,7 +6782,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             }
             else {
                 displayAction = 'none';
-                if (!isChild || isCountRequired(this)) {
+                if ((!isChild || isCountRequired(this)) && !isNullOrUndefined(row)) {
                     record.expanded = false;
                     this.uniqueIDCollection[record.uniqueID].expanded = record.expanded;
                 }
@@ -9548,13 +9565,7 @@ class TreeVirtualRowModelGenerator extends VirtualRowModelGenerator {
             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 {
@@ -13352,7 +13363,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
     }
     appendContent(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;
             }
@@ -13623,7 +13634,7 @@ class VirtualScroll {
         }
         else {
             const 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;
@@ -13664,7 +13675,7 @@ class VirtualScroll {
                 }
             }
             //}
-            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 });