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

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

@@ -1,5 +1,5 @@
 import { merge, Property, ChildProperty, Collection, isNullOrUndefined, Browser, removeClass, addClass, getValue, createElement, setValue, extend as extend$1, Internationalization, getEnumValue, compile, Component, L10n, EventHandler, KeyboardEvents, SanitizeHtmlHelper, Complex, Event, NotifyPropertyChanges, closest, classList, setStyleAttribute, select, debounce, remove } from '@syncfusion/ej2-base';
-import { Logger as Logger$1, Grid, 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, RowDD as RowDD$1, Scroll, VirtualRowModelGenerator, Filter as Filter$1, ExcelExport as ExcelExport$1, PdfExport as PdfExport$1, Page as Page$1, Toolbar as Toolbar$1, Aggregate as Aggregate$1, calculateAggregate, Sort as Sort$1, ColumnMenu as ColumnMenu$1, ContextMenu as ContextMenu$1, Edit as Edit$1, resetRowIndex, CommandColumn as CommandColumn$1, DetailRow as DetailRow$1, VirtualContentRenderer, Cell, InterSectionObserver, getTransformValues, VirtualScroll as VirtualScroll$1, RenderType, VirtualHeaderRenderer, ColumnChooser as ColumnChooser$1, InfiniteScroll as InfiniteScroll$1, RowRenderer } from '@syncfusion/ej2-grids';
+import { Logger as Logger$1, Grid, 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, RowDD as RowDD$1, Scroll, VirtualRowModelGenerator, Filter as Filter$1, ExcelExport as ExcelExport$1, Data, ExportHelper, PdfExport as PdfExport$1, Page as Page$1, Toolbar as Toolbar$1, Aggregate as Aggregate$1, calculateAggregate, Sort as Sort$1, ColumnMenu as ColumnMenu$1, ContextMenu as ContextMenu$1, Edit as Edit$1, resetRowIndex, CommandColumn as CommandColumn$1, DetailRow as DetailRow$1, VirtualContentRenderer, Cell, InterSectionObserver, getTransformValues, VirtualScroll as VirtualScroll$1, RenderType, VirtualHeaderRenderer, ColumnChooser as ColumnChooser$1, InfiniteScroll as InfiniteScroll$1, RowRenderer } 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';
@@ -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];
@@ -2206,16 +2214,20 @@ class DataManipulation {
         const clonequries = qry.queries.filter((e) => e.fn !== 'onPage' && e.fn !== 'onWhere');
         qry.queries = clonequries;
         qry.isCountRequired = true;
+        let 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);
             const 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);
             const 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]);
@@ -2410,6 +2422,9 @@ 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;
             }
@@ -2463,7 +2478,17 @@ class DataManipulation {
             }
             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;
@@ -3207,7 +3232,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)) {
                             const editModule = 'editModule';
                             control.grid.editModule[`${editModule}`].editRowIndex = modifiedData.index;
                             control.grid.editModule[`${editModule}`].updateCurrentViewData(modifiedData);
@@ -3799,8 +3824,10 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                                 if (summaryElement !== null) {
                                     const cellIndex = target.cellIndex;
                                     const row = summaryElement.children[parseInt(cellIndex.toString(), 10)];
-                                    addClass([row], 'e-focused');
-                                    addClass([row], 'e-focus');
+                                    if (!isNullOrUndefined(row) && !this.grid.isEdit) {
+                                        addClass([row], 'e-focused');
+                                        addClass([row], 'e-focus');
+                                    }
                                 }
                                 else {
                                     this.clearSelection();
@@ -3827,8 +3854,10 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                                     const cellIndex = target.cellIndex;
                                     if (!isNullOrUndefined(cellIndex)) {
                                         const row = summaryElement.children[parseInt(cellIndex.toString(), 10)];
-                                        addClass([row], 'e-focused');
-                                        addClass([row], 'e-focus');
+                                        if (!isNullOrUndefined(row) && !this.grid.isEdit) {
+                                            addClass([row], 'e-focused');
+                                            addClass([row], 'e-focus');
+                                        }
                                     }
                                 }
                                 else {
@@ -3907,7 +3936,9 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     requiredModules() {
         const modules = [];
         const splitFrozenCount = 'splitFrozenCount';
-        this.grid[`${splitFrozenCount}`](this.getColumns());
+        if (!this.isReact && isNullOrUndefined(this['changedProperties'].columns)) {
+            this.grid[`${splitFrozenCount}`](this.getColumns());
+        }
         if (this.isDestroyed) {
             return modules;
         }
@@ -4223,12 +4254,12 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         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((col) => col.width).toString())
-            && !/[px]$/.test(this.columnModel.filter((col) => col.width).toString()))
-            || (/[0-9]$/.test(this.height.toString()) && /[px]$/.test(this.height.toString()))) {
+        if (this.enableVirtualization &&
+            (this.columnModel.some((col) => /%$/.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))) ||
@@ -4391,10 +4422,28 @@ 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) || 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
+                && this.columnModel.filter((col) => col.type === 'checkbox').length > 0 && isRemoteData(this)) {
+                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) => {
@@ -4534,6 +4583,16 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                     this.grid.selectionModule[`${updateRowSelection}`](this.getRows()[parseInt(index.toString(), 10)], index);
                 }
             }
+            if (this.enableVirtualization && this.selectionSettings.persistSelection
+                && !isNullOrUndefined(this.virtualScrollModule.prevSelectedRecord)) {
+                for (let i = 0; i < this.virtualScrollModule.prevSelectedRecord.length; i++) {
+                    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);
+                }
+            }
             this.trigger(dataBound, args);
             this.initialRender = false;
         };
@@ -5137,6 +5196,12 @@ 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) && 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;
+        }
         for (const prop of properties) {
             switch (prop) {
                 case 'treeColumnIndex':
@@ -5478,6 +5543,22 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 }
             }
         }
+        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) {
+                    const 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, () => {
+                            this.grid.filterModule.filterModule['dlgObj'].destroy();
+                        });
+                    }
+                }
+            }
+        }
     }
     /**
      * Returns TreeGrid rows
@@ -6250,6 +6331,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
      * @returns {void}
      */
     expandRow(row, record, key, level) {
+        this.isCollapseAll = false;
         if (isNullOrUndefined(row) && isNullOrUndefined(record) && isNullOrUndefined(key) && isNullOrUndefined(level)) {
             const error = 'The provided value for the row is undefined. Please ensure the row contains row element.';
             this.trigger(actionFailure, { error: error });
@@ -6313,6 +6395,10 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 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);
             }
@@ -6338,13 +6424,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 {
@@ -6370,6 +6456,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
      * @returns {void}
      */
     collapseRow(row, record, key) {
+        this.isExpandAll = false;
         if (isNullOrUndefined(row) && isNullOrUndefined(record) && isNullOrUndefined(key)) {
             const error = 'The provided value for the row is undefined. Please ensure the row contains row element.';
             this.trigger(actionFailure, { error: error });
@@ -6638,6 +6725,9 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 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)) {
@@ -6685,9 +6775,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);
@@ -6716,7 +6809,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;
                 }
@@ -6737,7 +6830,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;
                 }
@@ -8759,7 +8852,7 @@ class RowDD {
             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) {
@@ -9003,7 +9096,7 @@ class RowDD {
             for (let i = 0; i < dragLength; i++) {
                 draggedRecord = dragRecords[parseInt(i.toString(), 10)];
                 this.draggedRecord = draggedRecord;
-                if (this.dropPosition !== 'Invalid') {
+                if (this.dropPosition !== 'Invalid' && !isNullOrUndefined(this.droppedRecord)) {
                     if (!tObj.rowDropSettings.targetID || isByMethod) {
                         this.deleteDragRow();
                     }
@@ -9840,14 +9933,19 @@ class ExcelExport {
     /* eslint-disable-next-line */
     isMultipleExport, workbook, isBlob, isCsv) {
         const dataSource = this.parent.dataSource;
+        const data = new Data(this.parent.grid);
         const 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);
             }
         }
@@ -9858,6 +9956,11 @@ class ExcelExport {
             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));
@@ -12421,6 +12524,7 @@ class Edit {
                     this.addRowIndex = this.parent.grid.selectedRowIndex > -1 ? this.parent.grid.selectedRowIndex : 0;
                 }
             }
+            const 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];
@@ -12428,8 +12532,8 @@ class Edit {
                     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) {
@@ -13021,6 +13125,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
     rowSelectedEvent(args) {
         const rowSelected = 'rowSelected';
         super[`${rowSelected}`](args);
+        this.parent.notify('virtualTransform', { requestType: 'transformChange' });
     }
     toSelectVirtualRow(args) {
         if (this.parent.isEdit) {
@@ -13187,21 +13292,25 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
         const info = scrollArgs.sentinel;
         const rowHeight = this.parent.getRowHeight();
         const outBuffer = this.parent.pageSettings.pageSize - Math.ceil(this.parent.pageSettings.pageSize / 2);
-        const content = this.parent.getContent().querySelector('.e-content');
+        let content;
+        if (!isNullOrUndefined(this.parent.contentModule)) {
+            content = this.parent.getContent().querySelector('.e-content');
+        }
         const scrollHeight = outBuffer * rowHeight;
-        const upScroll = (scrollArgs.offset.top - this.translateY) < 0;
+        const upScroll = (scrollArgs.offset.top - this.translateY) <= 0;
         const downScroll = Math.ceil(scrollArgs.offset.top - this.translateY) + rowHeight >= scrollHeight;
         const selectedRowIndex = 'selectedRowIndex';
         const currentViewData = this.parent.currentViewData;
         const indexValue = 'index';
-        if (upScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left')) {
+        if (upScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left') && !isNullOrUndefined(content)) {
             const vHeight = +(this.parent.height.toString().indexOf('%') < 0 ? parseInt(this.parent.height.toString(), 10) :
                 this.parent.element.getBoundingClientRect().height);
             let 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;
@@ -13241,7 +13350,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                     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)) {
             let nextSetResIndex = ~~(content.scrollTop / rowHeight);
             const isLastBlock = (this[`${selectedRowIndex}`] + this.parent.pageSettings.pageSize) < this.totalRecords ? false : true;
             if (!isNullOrUndefined(this[`${selectedRowIndex}`]) && this[`${selectedRowIndex}`] !== -1 &&
@@ -13315,7 +13424,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;
             }
@@ -13502,6 +13611,7 @@ class VirtualScroll {
     constructor(parent) {
         this.prevstartIndex = -1;
         this.prevendIndex = -1;
+        this.prevSelectedRecord = [];
         this.parent = parent;
         Grid.Inject(TreeVirtual);
         this.addEventListener();
@@ -13557,6 +13667,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 });
     }
@@ -13586,7 +13700,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;
@@ -13627,6 +13741,12 @@ class VirtualScroll {
                 }
             }
             //}
+            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;
@@ -13645,6 +13765,7 @@ class VirtualScroll {
             }
             this.prevstartIndex = startIndex;
             this.prevendIndex = endIndex;
+            this.prevrequestType = pageingDetails.actionArgs.requestType;
         }
         this.parent.notify('updateAction', pageingDetails);
     }