@syncfusion/ej2-treegrid 26.2.4 → 26.2.8

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

@@ -2422,13 +2422,13 @@ class DataManipulation {
                     e[`${result}`] = this.parent.summaryModule.calculateSummaryValue(summaryQuery, e[`${result}`], true);
                 }
             }
+            if (rowDetails.action === 'remoteExpand' && this.parent.allowPaging && this.parent.pageSettings.pageSizeMode === 'All') {
+                this.parent.grid.pageSettings.totalRecordsCount = this.parent.grid.currentViewData.length + result.length;
+            }
             if (this.parent.enableVirtualization) {
                 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);
@@ -4410,21 +4410,25 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             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)) {
+                if (!isNullOrUndefined(args.data.parentItem) || args.isHeaderCheckboxClicked) {
                     this.parentQuery = this.query.queries.filter((q) => q.e.field === this.parentIdMapping);
                     this.query.queries = this.query.queries.slice(0, 0);
                 }
             }
+            if (this.pageSettings.pageSizeMode === 'Root') {
+                this.grid.selectionModule['totalRecordsCount'] = this.grid.currentViewData.length;
+            }
+            if (this.enableVirtualization && args.rowIndex === this.selectedRowIndex) {
+                args.cancel = true;
+            }
             this.trigger(rowSelecting, args);
         };
         this.grid.rowDeselecting = (args) => {
             this.IsExpandCollapseClicked(args);
-            if (isNullOrUndefined(args.data) && this.selectionSettings.persistSelection
+            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.parentQuery = this.query.queries.filter((q) => q.e.field === this.parentIdMapping);
+                this.query.queries = this.query.queries.slice(0, 0);
             }
             this.trigger(rowDeselecting, args);
         };
@@ -6354,6 +6358,19 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             else if (!this.isExpandAll) {
                 this.trigger(expanded, expandArgs);
             }
+            if (record.expanded && this.enableVirtualization && this.selectionSettings.persistSelection
+                && !isNullOrUndefined(this.virtualScrollModule.prevSelectedRecord)) {
+                for (let i = 0; i < this.virtualScrollModule.prevSelectedRecord.length; i++) {
+                    if (record.uniqueID ===
+                        this.virtualScrollModule.prevSelectedRecord[parseInt(i.toString(), 10)].parentItem.uniqueID) {
+                        const updateRowSelection = 'updateRowSelection';
+                        const index = 
+                        // eslint-disable-next-line max-len
+                        this.getCurrentViewRecords().indexOf(this.virtualScrollModule.prevSelectedRecord[parseInt(i.toString(), 10)]);
+                        this.grid.selectionModule[`${updateRowSelection}`](this.getRows()[parseInt(index.toString(), 10)], index);
+                    }
+                }
+            }
         }
     }
     expandCollapseAllChildren(record, action, key, level) {
@@ -13605,6 +13622,10 @@ class VirtualScroll {
             this.parent.selectionSettings.mode === 'Row' && !this.parent.selectionSettings.persistSelection) {
             this.parent.grid.clearSelection();
         }
+        if (getValue('isCollapseAll', this.parent) && this.parent.selectionSettings.persistSelection && this.parent.getSelectedRecords().length > 0) {
+            this.prevSelectedRecord = this.parent.getSelectedRecords();
+            this.parent.grid.clearSelection();
+        }
         const requestType = getValue('isCollapseAll', this.parent) ? 'collapseAll' : 'refresh';
         getValue('grid.renderModule', this.parent).dataManagerSuccess(ret, { requestType: requestType });
     }