@syncfusion/ej2-treegrid 26.1.35-469198 → 26.1.35-760834

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

@@ -1,5 +1,5 @@
 import { Property, merge, ChildProperty, Collection, isNullOrUndefined, Browser, removeClass, addClass, getValue, createElement, setValue, extend as extend$1, Internationalization, getEnumValue, compile, L10n, EventHandler, KeyboardEvents, SanitizeHtmlHelper, Complex, Event, NotifyPropertyChanges, Component, closest, classList, setStyleAttribute, select, debounce, remove } from '@syncfusion/ej2-base';
-import { Grid, Logger as Logger$1, detailLists, Clipboard, getObject, parentsUntil, Print as Print$1, templateCompiler, appendChildren, extend, CellRenderer, getUid, CellType, Freeze as Freeze$1, getNumberFormat, getActualProperties, iterateArrayOrObject, RowDropSettings as RowDropSettings$1, Reorder as Reorder$1, Resize as Resize$1, Scroll, RowDD as RowDD$1, VirtualRowModelGenerator, Filter as Filter$1, ExcelExport as ExcelExport$1, PdfExport as PdfExport$1, Page as Page$1, Toolbar as Toolbar$1, calculateAggregate, Aggregate as Aggregate$1, Sort as Sort$1, ColumnMenu as ColumnMenu$1, ContextMenu as ContextMenu$1, resetRowIndex, Edit as Edit$1, CommandColumn as CommandColumn$1, DetailRow as DetailRow$1, Cell, VirtualContentRenderer, InterSectionObserver, getTransformValues, RenderType, VirtualHeaderRenderer, VirtualScroll as VirtualScroll$1, ColumnChooser as ColumnChooser$1, RowRenderer, InfiniteScroll as InfiniteScroll$1 } from '@syncfusion/ej2-grids';
+import { Grid, Logger as Logger$1, detailLists, Clipboard, getObject, parentsUntil, Print as Print$1, templateCompiler, appendChildren, extend, CellRenderer, getUid, CellType, Freeze as Freeze$1, getNumberFormat, getActualProperties, iterateArrayOrObject, RowDropSettings as RowDropSettings$1, Reorder as Reorder$1, Resize as Resize$1, Scroll, RowDD as RowDD$1, VirtualRowModelGenerator, Filter as Filter$1, Data, ExportHelper, ExcelExport as ExcelExport$1, PdfExport as PdfExport$1, Page as Page$1, Toolbar as Toolbar$1, calculateAggregate, Aggregate as Aggregate$1, Sort as Sort$1, ColumnMenu as ColumnMenu$1, ContextMenu as ContextMenu$1, resetRowIndex, Edit as Edit$1, CommandColumn as CommandColumn$1, DetailRow as DetailRow$1, Cell, VirtualContentRenderer, InterSectionObserver, getTransformValues, RenderType, VirtualHeaderRenderer, VirtualScroll as VirtualScroll$1, ColumnChooser as ColumnChooser$1, RowRenderer, InfiniteScroll as InfiniteScroll$1 } from '@syncfusion/ej2-grids';
 import { createCheckBox } from '@syncfusion/ej2-buttons';
 import { DataManager, ODataAdaptor, WebApiAdaptor, WebMethodAdaptor, CacheAdaptor, UrlAdaptor, Query, DataUtil, RemoteSaveAdaptor, Deferred, JsonAdaptor, Predicate as Predicate$1 } from '@syncfusion/ej2-data';
 import { showSpinner, hideSpinner, createSpinner } from '@syncfusion/ej2-popups';
@@ -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];
@@ -2373,16 +2382,20 @@ var DataManipulation = /** @__PURE__ @class */ (function () {
         var clonequries = qry.queries.filter(function (e) { return e.fn !== 'onPage' && e.fn !== 'onWhere'; });
         qry.queries = clonequries;
         qry.isCountRequired = true;
+        var idMappingValue = parseInt(rowDetails.record[this.parent.idMapping], 10);
+        if (isNaN(idMappingValue)) {
+            idMappingValue = rowDetails.record[this.parent.idMapping].toString();
+        }
         if (this.parent.enableVirtualization && rowDetails.action === 'remoteExpand') {
             qry.take(this.parent.pageSettings.pageSize);
             var expandDetail = [];
-            expandDetail.push('ExpandingAction', parseInt(rowDetails.record[this.parent.idMapping], 10).toString());
+            expandDetail.push('ExpandingAction', idMappingValue.toString());
             qry.expand(expandDetail);
         }
         else if (this.parent.enableVirtualization && rowDetails.action === 'collapse') {
             qry.take(this.parent.grid.pageSettings.pageSize);
             var expandDetail = [];
-            expandDetail.push('CollapsingAction', parseInt(rowDetails.record[this.parent.idMapping], 10).toString());
+            expandDetail.push('CollapsingAction', idMappingValue.toString());
             qry.expand(expandDetail);
         }
         qry.where(this.parent.parentIdMapping, 'equal', rowDetails.record[this.parent.idMapping]);
@@ -2577,6 +2590,9 @@ var DataManipulation = /** @__PURE__ @class */ (function () {
                     e["" + result_1] = _this.parent.summaryModule.calculateSummaryValue(summaryQuery, e["" + result_1], 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;
             }
@@ -2630,7 +2646,17 @@ var DataManipulation = /** @__PURE__ @class */ (function () {
             }
             if ((!isNullOrUndefined(currentData[this.parent.childMapping]) && !isCountRequired(this.parent)) ||
                 ((currentData[this.parent.hasChildMapping]) && isCountRequired(this.parent))) {
-                currentData.hasChildRecords = true;
+                if (!isNullOrUndefined(currentData[this.parent.childMapping])) {
+                    if (currentData[this.parent.childMapping].length > 0) {
+                        currentData.hasChildRecords = true;
+                    }
+                    else {
+                        currentData.hasChildRecords = false;
+                    }
+                }
+                else {
+                    currentData.hasChildRecords = true;
+                }
                 if (this.parent.enableCollapseAll || !isNullOrUndefined(this.parent.dataStateChange)
                     && isNullOrUndefined(currentData[this.parent.childMapping])) {
                     currentData.expanded = false;
@@ -3463,7 +3489,7 @@ function removeChildRecords(childRecords, modifiedData, action, key, control, is
                             editedData.taskData[keys[parseInt(i.toString(), 10)]] =
                                 childRecords[parseInt(j.toString(), 10)][keys[parseInt(i.toString(), 10)]] =
                                     modifiedData[keys[parseInt(i.toString(), 10)]];
-                        if (control.grid.editSettings.mode === 'Normal' && control.editSettings.mode === 'Cell') {
+                        if (control.grid.editSettings.mode === 'Normal' && control.editSettings.mode === 'Cell' && !isNullOrUndefined(control.grid.editModule)) {
                             var editModule = 'editModule';
                             control.grid.editModule["" + editModule].editRowIndex = modifiedData.index;
                             control.grid.editModule["" + editModule].updateCurrentViewData(modifiedData);
@@ -4088,8 +4114,10 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                                 if (summaryElement !== null) {
                                     var cellIndex_1 = target.cellIndex;
                                     var row_1 = summaryElement.children[parseInt(cellIndex_1.toString(), 10)];
-                                    addClass([row_1], 'e-focused');
-                                    addClass([row_1], 'e-focus');
+                                    if (!isNullOrUndefined(row_1) && !this.grid.isEdit) {
+                                        addClass([row_1], 'e-focused');
+                                        addClass([row_1], 'e-focus');
+                                    }
                                 }
                                 else {
                                     this.clearSelection();
@@ -4116,8 +4144,10 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                                     var cellIndex_2 = target.cellIndex;
                                     if (!isNullOrUndefined(cellIndex_2)) {
                                         var row_2 = summaryElement.children[parseInt(cellIndex_2.toString(), 10)];
-                                        addClass([row_2], 'e-focused');
-                                        addClass([row_2], 'e-focus');
+                                        if (!isNullOrUndefined(row_2) && !this.grid.isEdit) {
+                                            addClass([row_2], 'e-focused');
+                                            addClass([row_2], 'e-focus');
+                                        }
                                     }
                                 }
                                 else {
@@ -4196,7 +4226,9 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
     TreeGrid.prototype.requiredModules = function () {
         var modules = [];
         var splitFrozenCount = 'splitFrozenCount';
-        this.grid["" + splitFrozenCount](this.getColumns());
+        if (!this.isReact && isNullOrUndefined(this['changedProperties'].columns)) {
+            this.grid["" + splitFrozenCount](this.getColumns());
+        }
         if (this.isDestroyed) {
             return modules;
         }
@@ -4515,12 +4547,12 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         if (this.treeColumnIndex >= this.columns.length) {
             failureCases.push('TreeColumnIndex value should not exceed the total column count.');
         }
-        if (this.enableVirtualization && (!/[0-9]$/.test(this.columnModel.filter(function (col) { return col.width; }).toString())
-            && !/[px]$/.test(this.columnModel.filter(function (col) { return col.width; }).toString()))
-            || (/[0-9]$/.test(this.height.toString()) && /[px]$/.test(this.height.toString()))) {
+        if (this.enableVirtualization &&
+            (this.columnModel.some(function (col) { return /%$/.test(col.width); }) ||
+                /%$/.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))) ||
@@ -4685,10 +4717,28 @@ 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) || args.isHeaderCheckboxClicked) {
+                    _this.parentQuery = _this.query.queries.filter(function (q) { return 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 = 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)) {
+                _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) {
@@ -4829,6 +4879,16 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                     _this.grid.selectionModule["" + updateRowSelection](_this.getRows()[parseInt(index.toString(), 10)], index);
                 }
             }
+            if (_this.enableVirtualization && _this.selectionSettings.persistSelection
+                && !isNullOrUndefined(_this.virtualScrollModule.prevSelectedRecord)) {
+                for (var i = 0; i < _this.virtualScrollModule.prevSelectedRecord.length; i++) {
+                    var updateRowSelection = 'updateRowSelection';
+                    var 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);
+                }
+            }
             _this.trigger(dataBound, args);
             _this.initialRender = false;
         };
@@ -5441,6 +5501,12 @@ 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) && 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;
+        }
         for (var _i = 0, properties_1 = properties; _i < properties_1.length; _i++) {
             var prop = properties_1[_i];
             switch (prop) {
@@ -5756,6 +5822,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         }
     };
     TreeGrid.prototype.mouseClickHandler = function (e) {
+        var _this = this;
         if (!isNullOrUndefined(e.touches)) {
             return;
         }
@@ -5783,6 +5850,22 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                 }
             }
         }
+        if (((target.classList.contains('e-flmenu-cancelbtn') || target.classList.contains('e-flmenu-okbtn')
+            || target.classList.contains('e-content') || target.classList.contains('e-rowcell'))
+            && !isNullOrUndefined(this.filterModule) && this.isReact)) {
+            if (!isNullOrUndefined(this.grid.filterModule['column'])) {
+                if (this.grid.filterModule['column'].filterTemplate) {
+                    var elem = document.getElementById(this.grid.filterModule.filterModule['dlgObj'].element.id);
+                    this.grid.filterModule['fltrDlgDetails'].isOpen = false;
+                    if (this.grid.filterModule.filterModule['dlgObj'] && !this.grid.filterModule.filterModule['dlgObj'].isDestroyed && elem) {
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        this.clearTemplate(['filterTemplate'], undefined, function () {
+                            _this.grid.filterModule.filterModule['dlgObj'].destroy();
+                        });
+                    }
+                }
+            }
+        }
     };
     /**
      * Returns TreeGrid rows
@@ -6559,6 +6642,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
      */
     TreeGrid.prototype.expandRow = function (row, record, key, level) {
         var _this = this;
+        this.isCollapseAll = false;
         if (isNullOrUndefined(row) && isNullOrUndefined(record) && isNullOrUndefined(key) && isNullOrUndefined(level)) {
             var error = 'The provided value for the row is undefined. Please ensure the row contains row element.';
             this.trigger(actionFailure, { error: error });
@@ -6622,6 +6706,10 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                 expandArgs = { data: parentRec, row: row };
                 this.trigger(expanded, expandArgs);
             }
+            else if (!this.isExpandAll && this.enableVirtualization && this.selectionSettings.persistSelection
+                && !isNullOrUndefined(this.virtualScrollModule.prevSelectedRecord)) {
+                this.virtualScrollModule.prevSelectedRecord = [];
+            }
             else if (!this.isExpandAll) {
                 this.trigger(expanded, expandArgs);
             }
@@ -6647,13 +6735,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 {
@@ -6680,6 +6768,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
      */
     TreeGrid.prototype.collapseRow = function (row, record, key) {
         var _this = this;
+        this.isExpandAll = false;
         if (isNullOrUndefined(row) && isNullOrUndefined(record) && isNullOrUndefined(key)) {
             var error = 'The provided value for the row is undefined. Please ensure the row contains row element.';
             this.trigger(actionFailure, { error: error });
@@ -6954,6 +7043,9 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                 return e.querySelector('.e-treegrid' + (action === 'expand' ? 'collapse' : 'expand'));
             });
         }
+        if (!rows.length && this.getRows().length) {
+            rows.push(this.getRows()[0]);
+        }
         this.isExpandAll = true;
         this.isCollapseAll = true;
         if (((this.allowPaging && this.pageSettings.pageSizeMode === 'All') || this.enableVirtualization || this.enableInfiniteScrolling) && !isRemoteData(this)) {
@@ -7002,9 +7094,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);
@@ -7033,7 +7128,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;
                 }
@@ -7054,7 +7149,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;
                 }
@@ -9098,7 +9193,7 @@ var RowDD = /** @__PURE__ @class */ (function () {
             this.canDrop = false;
             this.addErrorElem();
         }
-        if (!tObj.rowDropSettings.targetID && this.canDrop) {
+        if (!tObj.rowDropSettings.targetID && this.canDrop && !isNullOrUndefined(args.rows[0])) {
             tObj.rowDragAndDropModule.updateIcon(args.rows, rowIdx, args);
         }
         if (isNullOrUndefined(tObj.rowDropSettings.targetID) && !this.canDrop) {
@@ -9342,7 +9437,7 @@ var RowDD = /** @__PURE__ @class */ (function () {
             var _loop_1 = function (i) {
                 draggedRecord_2 = dragRecords[parseInt(i.toString(), 10)];
                 this_1.draggedRecord = draggedRecord_2;
-                if (this_1.dropPosition !== 'Invalid') {
+                if (this_1.dropPosition !== 'Invalid' && !isNullOrUndefined(this_1.droppedRecord)) {
                     if (!tObj.rowDropSettings.targetID || isByMethod) {
                         this_1.deleteDragRow();
                     }
@@ -10221,14 +10316,19 @@ var ExcelExport = /** @__PURE__ @class */ (function () {
     isMultipleExport, workbook, isBlob, isCsv) {
         var _this = this;
         var dataSource = this.parent.dataSource;
+        var data = new Data(this.parent.grid);
         var property = Object();
         setValue('isCsv', isCsv, property);
         setValue('cancel', false, property);
         if (!isNullOrUndefined(excelExportProperties)) {
             this.isCollapsedStatePersist = excelExportProperties.isCollapsedStatePersist;
         }
-        if (!isNullOrUndefined(excelExportProperties) && !isNullOrUndefined(excelExportProperties.dataSource)) {
-            if (!excelExportProperties.dataSource['dataSource']) {
+        if (!isNullOrUndefined(excelExportProperties)) {
+            if (!isNullOrUndefined(excelExportProperties.dataSource) && !excelExportProperties.dataSource['dataSource']) {
+                return this.parent.grid.excelExportModule.Map(this.parent.grid, excelExportProperties, isMultipleExport, workbook, isCsv, isBlob);
+            }
+            if (excelExportProperties.exportType === 'CurrentPage') {
+                excelExportProperties.dataSource = this.parent.getCurrentViewRecords();
                 return this.parent.grid.excelExportModule.Map(this.parent.grid, excelExportProperties, isMultipleExport, workbook, isCsv, isBlob);
             }
         }
@@ -10239,6 +10339,11 @@ var ExcelExport = /** @__PURE__ @class */ (function () {
             if (!_this.isLocal()) {
                 query = _this.generateQuery(query);
                 query.queries = _this.parent.grid.getDataModule().generateQuery().queries;
+                query = ExportHelper.getQuery(_this.parent.grid, data);
+                if (isNullOrUndefined(_this.parent.filterModule)) {
+                    query.queries = query.queries.slice(1, 2);
+                    query.params = query.params.slice(0, 0);
+                }
                 setValue('query', query, property);
             }
             _this.parent.trigger(beforeExcelExport, extend$1(property, excelExportProperties));
@@ -12831,6 +12936,7 @@ var Edit = /** @__PURE__ @class */ (function () {
                     this.addRowIndex = this.parent.grid.selectedRowIndex > -1 ? this.parent.grid.selectedRowIndex : 0;
                 }
             }
+            var selectedRecords = this.parent.getSelectedRecords()[0];
             if ((this.isAddedRowByMethod || (this.isAddedRowByContextMenu && this.parent.grid.selectedRowIndex !== -1)) &&
                 (this.parent.enableVirtualization || this.parent.enableInfiniteScrolling)) {
                 this.addRowRecord = this.parent.flatData[this.parent.grid.selectedRowIndex];
@@ -12838,8 +12944,8 @@ var Edit = /** @__PURE__ @class */ (function () {
                     this.addRowRecord = this.parent.getCurrentViewRecords()[this.addRowIndex];
                 }
             }
-            else {
-                this.addRowRecord = this.parent.getSelectedRecords()[0];
+            else if (!isNullOrUndefined(selectedRecords)) {
+                this.addRowRecord = selectedRecords;
             }
         }
         if (this.isAddedRowByMethod && args.index !== 0) {
@@ -13450,6 +13556,7 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
     VirtualTreeContentRenderer.prototype.rowSelectedEvent = function (args) {
         var rowSelected = 'rowSelected';
         _super.prototype["" + rowSelected].call(this, args);
+        this.parent.notify('virtualTransform', { requestType: 'transformChange' });
     };
     VirtualTreeContentRenderer.prototype.toSelectVirtualRow = function (args) {
         if (this.parent.isEdit) {
@@ -13617,21 +13724,25 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
         var info = scrollArgs.sentinel;
         var rowHeight = this.parent.getRowHeight();
         var outBuffer = this.parent.pageSettings.pageSize - Math.ceil(this.parent.pageSettings.pageSize / 2);
-        var content = this.parent.getContent().querySelector('.e-content');
+        var content;
+        if (!isNullOrUndefined(this.parent.contentModule)) {
+            content = this.parent.getContent().querySelector('.e-content');
+        }
         var scrollHeight = outBuffer * rowHeight;
-        var upScroll = (scrollArgs.offset.top - this.translateY) < 0;
+        var upScroll = (scrollArgs.offset.top - this.translateY) <= 0;
         var downScroll = Math.ceil(scrollArgs.offset.top - this.translateY) + rowHeight >= scrollHeight;
         var selectedRowIndex = 'selectedRowIndex';
         var currentViewData = this.parent.currentViewData;
         var indexValue = 'index';
-        if (upScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left')) {
+        if (upScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left') && !isNullOrUndefined(content)) {
             var vHeight = +(this.parent.height.toString().indexOf('%') < 0 ? parseInt(this.parent.height.toString(), 10) :
                 this.parent.element.getBoundingClientRect().height);
             var index = (~~(content.scrollTop / rowHeight)
                 + Math.ceil(vHeight / rowHeight))
                 - this.parent.pageSettings.pageSize;
             index = (index > 0) ? index : 0;
-            if (!isNullOrUndefined(this["" + selectedRowIndex]) && this["" + selectedRowIndex] !== -1 && index !== this["" + selectedRowIndex]) {
+            if (!isNullOrUndefined(this["" + selectedRowIndex]) && this["" + selectedRowIndex] !== -1 && index !== this["" + selectedRowIndex] &&
+                ((this.parent.rowHeight * this.parent.pageSettings.pageSize) < content.scrollTop)) {
                 index = this["" + selectedRowIndex];
             }
             this.startIndex = index;
@@ -13671,7 +13782,7 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
                     scrollArgs.offset.top - (outBuffer * rowHeight) + 10 : 0;
             }
         }
-        else if (downScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left')) {
+        else if (downScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left') && !isNullOrUndefined(content)) {
             var nextSetResIndex = ~~(content.scrollTop / rowHeight);
             var isLastBlock = (this["" + selectedRowIndex] + this.parent.pageSettings.pageSize) < this.totalRecords ? false : true;
             if (!isNullOrUndefined(this["" + selectedRowIndex]) && this["" + selectedRowIndex] !== -1 &&
@@ -13745,7 +13856,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;
             }
@@ -13950,6 +14061,7 @@ var VirtualScroll = /** @__PURE__ @class */ (function () {
     function VirtualScroll(parent) {
         this.prevstartIndex = -1;
         this.prevendIndex = -1;
+        this.prevSelectedRecord = [];
         this.parent = parent;
         Grid.Inject(TreeVirtual);
         this.addEventListener();
@@ -14005,6 +14117,10 @@ var VirtualScroll = /** @__PURE__ @class */ (function () {
             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();
+        }
         var requestType = getValue('isCollapseAll', this.parent) ? 'collapseAll' : 'refresh';
         getValue('grid.renderModule', this.parent).dataManagerSuccess(ret, { requestType: requestType });
     };
@@ -14035,7 +14151,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;
@@ -14076,6 +14192,12 @@ var VirtualScroll = /** @__PURE__ @class */ (function () {
                 }
             }
             //}
+            if (this.prevrequestType === 'collapseAll' && pageingDetails.actionArgs.requestType === 'virtualscroll'
+                && !isNullOrUndefined(this.parent.idMapping) && startIndex === 0) {
+                startIndex = 0;
+                endIndex = this.parent.grid.pageSettings.pageSize - 1;
+                this.parent.grid.notify(virtualActionArgs, { setTop: true });
+            }
             if ((this.parent.enableCollapseAll || this.parent.expandStateMapping) && !isNullOrUndefined(this.expandCollapseRec)) {
                 if (pageingDetails.count < this.parent.getRows()[0].getBoundingClientRect().height) {
                     startIndex = 0;
@@ -14094,6 +14216,7 @@ var VirtualScroll = /** @__PURE__ @class */ (function () {
             }
             this.prevstartIndex = startIndex;
             this.prevendIndex = endIndex;
+            this.prevrequestType = pageingDetails.actionArgs.requestType;
         }
         this.parent.notify('updateAction', pageingDetails);
     };