@syncfusion/ej2-treegrid 25.1.42 → 25.2.4

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 25.1.42
+*  version : 25.2.4
 *  Copyright Syncfusion Inc. 2001 - 2023. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-treegrid@*",
-  "_id": "@syncfusion/ej2-treegrid@25.1.41",
+  "_id": "@syncfusion/ej2-treegrid@25.2.3",
   "_inBundle": false,
-  "_integrity": "sha512-oDcAbey3zDcULE67WmjiYHVTjbV7eTXnVvrsPXmQEdM0a/+/kfcPCQzw/p53ryKRHRypi04/DtaiywrRq5x3nQ==",
+  "_integrity": "sha512-HOkPjvJIYwpxfaWkUIOYpnGC5XJO7/cJB/tZwq6Jg9EMWQ7l7aqvuTQrYhxbzxSiHddeWg0QQMr5kn01Hjn4DQ==",
   "_location": "/@syncfusion/ej2-treegrid",
   "_phantomChildren": {},
   "_requested": {
@@ -24,8 +24,8 @@
     "/@syncfusion/ej2-react-treegrid",
     "/@syncfusion/ej2-vue-treegrid"
   ],
-  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-25.1.41.tgz",
-  "_shasum": "00dd3e401fc8059a49d07aca8a2121a3aa172419",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-25.2.3.tgz",
+  "_shasum": "533c93d33f5d4bfab536136267ea32479a363b5b",
   "_spec": "@syncfusion/ej2-treegrid@*",
   "_where": "/jenkins/workspace/elease-automation_release_25.1.1/packages/included",
   "author": {
@@ -36,10 +36,10 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~25.1.35",
-    "@syncfusion/ej2-data": "~25.1.35",
-    "@syncfusion/ej2-grids": "~25.1.42",
-    "@syncfusion/ej2-popups": "~25.1.42"
+    "@syncfusion/ej2-base": "~25.2.3",
+    "@syncfusion/ej2-data": "~25.2.3",
+    "@syncfusion/ej2-grids": "~25.2.3",
+    "@syncfusion/ej2-popups": "~25.2.4"
   },
   "deprecated": false,
   "description": "Essential JS 2 TreeGrid Component",
@@ -66,6 +66,6 @@
     "url": "git+https://github.com/syncfusion/ej2-treegrid.git"
   },
   "typings": "index.d.ts",
-  "version": "25.1.42",
+  "version": "25.2.4",
   "sideEffects": false
 }

package/src/treegrid/actions/edit.js

@@ -933,6 +933,7 @@ var Edit = /** @class */ (function () {
                     args.index = position === 'before' ? index : index + 1;
                 }
                 if (this.parent.editSettings.newRowPosition === 'Bottom') {
+                    level = 0;
                     var dataSource = (this.parent.grid.dataSource instanceof DataManager ?
                         this.parent.grid.dataSource.dataSource.json : this.parent.grid.dataSource);
                     args.index = dataSource.length;

package/src/treegrid/actions/excel-export.js

@@ -76,12 +76,17 @@ var ExcelExport = /** @class */ (function () {
         if (!isNullOrUndefined(excelExportProperties)) {
             this.isCollapsedStatePersist = excelExportProperties.isCollapsedStatePersist;
         }
+        if (!isNullOrUndefined(excelExportProperties) && !isNullOrUndefined(excelExportProperties.dataSource)
+            && !isNullOrUndefined(excelExportProperties.dataSource instanceof DataManager)) {
+            return this.parent.grid.excelExportModule.Map(this.parent.grid, excelExportProperties, isMultipleExport, workbook, isCsv, isBlob);
+        }
         return new Promise(function (resolve) {
             var dm = _this.isLocal() && !(dataSource instanceof DataManager) ? new DataManager(dataSource)
                 : _this.parent.dataSource;
             var query = new Query();
             if (!_this.isLocal()) {
                 query = _this.generateQuery(query);
+                query.queries = _this.parent.grid.getDataModule().generateQuery().queries;
                 setValue('query', query, property);
             }
             _this.parent.trigger(event.beforeExcelExport, extend(property, excelExportProperties));

package/src/treegrid/actions/virtual-scroll.js

@@ -126,15 +126,11 @@ var VirtualScroll = /** @class */ (function () {
                 this.parent.grid.notify(events.virtualActionArgs, { setTop: true });
             }
             if ((requestType === 'save' && pageingDetails.actionArgs.index >= (counts.count - this.parent.grid.pageSettings.pageSize)) || (requestType === 'refresh' && this.parent['isGantt'] && this.parent['isAddedFromGantt'])) {
-                var modifiedStartIndex = counts.startIndex + (counts.count - counts.endIndex);
-                if (counts.count - counts.startIndex <= this.parent.grid.pageSettings.pageSize) {
-                    startIndex = modifiedStartIndex;
+                if ((counts.endIndex + this.parent.pageSettings.pageSize >= counts.count && (this.parent.root && counts.count - counts.endIndex === this.visualData.length - this.parent.root['previousFlatData'].length))
+                    || !(this.parent['isGantt'] && this.parent['isAddedFromGantt'])) {
+                    startIndex = counts.startIndex + (counts.count - counts.endIndex);
                     endIndex = counts.count;
                 }
-                else {
-                    startIndex = counts.startIndex;
-                    endIndex = counts.endIndex;
-                }
                 this.parent['isAddedFromGantt'] = false;
             }
             //if ((this.prevendIndex !== -1 && this.prevstartIndex !== -1) &&

package/src/treegrid/base/treegrid-model.d.ts

@@ -1,4 +1,4 @@
-import { Component, addClass, createElement, EventHandler, isNullOrUndefined, Fetch, ModuleDeclaration, extend, merge, SanitizeHtmlHelper} from '@syncfusion/ej2-base';import { removeClass, EmitType, Complex, Collection, KeyboardEventArgs, getValue, NumberFormatOptions, DateFormatOptions } from '@syncfusion/ej2-base';import {Event, Property, NotifyPropertyChanges, INotifyPropertyChanged, setValue, KeyboardEvents, L10n } from '@syncfusion/ej2-base';import { Column, ColumnModel } from '../models/column';import { BeforeBatchSaveArgs, BeforeBatchAddArgs, BatchDeleteArgs, BeforeBatchDeleteArgs, Row, getNumberFormat } from '@syncfusion/ej2-grids';import { GridModel, ColumnQueryModeType, HeaderCellInfoEventArgs, EditSettingsModel as GridEditModel } from '@syncfusion/ej2-grids';import { RowDragEventArgs, RowDropEventArgs, RowDropSettingsModel, RowDropSettings, getUid, parentsUntil } from '@syncfusion/ej2-grids';import { LoadingIndicator } from '../models/loading-indicator';import { LoadingIndicatorModel } from '../models/loading-indicator-model';import { ActionEventArgs, TextAlign } from'@syncfusion/ej2-grids';import { DetailDataBoundEventArgs, ClipMode, ColumnChooser}  from '@syncfusion/ej2-grids';import { SearchEventArgs, AddEventArgs, EditEventArgs, DeleteEventArgs}  from '@syncfusion/ej2-grids';import { SaveEventArgs, CellSaveArgs, BatchAddArgs, BatchCancelArgs,  BeginEditArgs, CellEditArgs}  from '@syncfusion/ej2-grids';import { FilterSettings } from '../models/filter-settings';import { TextWrapSettings } from '../models/textwrap-settings';import { TextWrapSettingsModel } from '../models/textwrap-settings-model';import {Filter} from '../actions/filter';import { Logger as TreeLogger } from '../actions/logger';import { BeforeCopyEventArgs, BeforePasteEventArgs } from '@syncfusion/ej2-grids';import { TreeClipboard } from '../actions/clipboard';import {Aggregate} from '../actions/summary';import { Reorder } from '../actions/reorder';import { Resize } from '../actions/resize';import { Selection as TreeGridSelection } from '../actions/selection';import { ColumnMenu } from '../actions/column-menu';import { DetailRow } from '../actions/detail-row';import { Freeze } from '../actions/freeze-column';import { Print } from '../actions/print';import * as events from '../base/constant';import { FilterSettingsModel } from '../models/filter-settings-model';import { SearchSettings} from '../models/search-settings';import { SearchSettingsModel } from '../models/search-settings-model';import {RowInfo, RowDataBoundEventArgs, PageEventArgs, FilterEventArgs, FailureEventArgs, SortEventArgs } from '@syncfusion/ej2-grids';import { RowSelectingEventArgs, RowSelectEventArgs, RowDeselectingEventArgs, RowDeselectEventArgs, IIndex, ISelectedCell } from '@syncfusion/ej2-grids';import {ColumnModel as GridColumnModel, Column as GridColumn, CellSelectEventArgs, CellDeselectEventArgs } from '@syncfusion/ej2-grids';import { SelectionSettings } from '../models/selection-settings';import { SelectionSettingsModel } from '../models/selection-settings-model';import {getActualProperties, SortDirection, getObject, ColumnDragEventArgs } from '@syncfusion/ej2-grids';import { PrintMode, Data, IGrid, ContextMenuItemModel } from '@syncfusion/ej2-grids';import { ColumnMenuItem, ColumnMenuItemModel, CheckBoxChangeEventArgs } from '@syncfusion/ej2-grids';import { ExcelExportCompleteArgs, ExcelHeaderQueryCellInfoEventArgs, ExcelQueryCellInfoEventArgs } from '@syncfusion/ej2-grids';import { PdfExportCompleteArgs, PdfHeaderQueryCellInfoEventArgs, PdfQueryCellInfoEventArgs } from '@syncfusion/ej2-grids';import { ExcelExportProperties, PdfExportProperties, CellSelectingEventArgs, PrintEventArgs } from '@syncfusion/ej2-grids';import { ColumnMenuOpenEventArgs } from '@syncfusion/ej2-grids';import {BeforeDataBoundArgs} from '@syncfusion/ej2-grids';import { DataManager, ReturnOption, RemoteSaveAdaptor, Query, JsonAdaptor, Deferred, UrlAdaptor } from '@syncfusion/ej2-data';import { createSpinner, hideSpinner, showSpinner, Dialog } from '@syncfusion/ej2-popups';import { isRemoteData, isOffline, extendArray, isCountRequired, findChildrenRecords } from '../utils';import { Grid, QueryCellInfoEventArgs, Logger } from '@syncfusion/ej2-grids';import { Render } from '../renderer/render';import { VirtualTreeContentRenderer } from '../renderer/virtual-tree-content-render';import { DataManipulation } from './data';import { RowDD } from '../actions/rowdragdrop';import { Sort } from '../actions/sort';import { ITreeData, RowExpandedEventArgs, RowCollapsedEventArgs, RowCollapsingEventArgs, TreeGridExcelExportProperties } from './interface';import { DataStateChangeEventArgs, RowExpandingEventArgs, TreeGridPdfExportProperties } from './interface';import { iterateArrayOrObject, GridLine } from '@syncfusion/ej2-grids';import { DataSourceChangedEventArgs, RecordDoubleClickEventArgs, ResizeArgs } from '@syncfusion/ej2-grids';import { ToolbarItems, ToolbarItem, ContextMenuItem, ContextMenuItems, RowPosition, CopyHierarchyType } from '../enum';import { ItemModel, ClickEventArgs, BeforeOpenCloseMenuEventArgs, MenuEventArgs } from '@syncfusion/ej2-navigations';import { PageSettings } from '../models/page-settings';import { PageSettingsModel } from '../models/page-settings-model';import { AggregateRow } from '../models/summary';import { AggregateRowModel } from '../models/summary-model';import { ExcelExport } from '../actions/excel-export';import { PdfExport } from '../actions/pdf-export';import { Toolbar } from '../actions/toolbar';import { Page } from '../actions/page';import { ContextMenu } from '../actions/context-menu';import { EditSettings } from '../models/edit-settings';import { EditSettingsModel } from '../models/edit-settings-model';import { Edit} from '../actions/edit';import { SortSettings } from '../models/sort-settings';import { SortSettingsModel } from '../models/sort-settings-model';import { isHidden, getExpandStatus } from '../utils';import { editAction } from '../actions/crud-actions';import { InfiniteScrollSettings } from '../models/infinite-scroll-settings';import { InfiniteScrollSettingsModel } from '../models/infinite-scroll-settings-model';import { TreeActionEventArgs } from '..';import * as literals from '../base/constant';
+import { Component, addClass, createElement, EventHandler, isNullOrUndefined, Fetch, ModuleDeclaration, extend, merge, SanitizeHtmlHelper} from '@syncfusion/ej2-base';import { removeClass, EmitType, Complex, Collection, KeyboardEventArgs, getValue, NumberFormatOptions, DateFormatOptions } from '@syncfusion/ej2-base';import {Event, Property, NotifyPropertyChanges, INotifyPropertyChanged, setValue, KeyboardEvents, L10n } from '@syncfusion/ej2-base';import { Column, ColumnModel } from '../models/column';import { BeforeBatchSaveArgs, BeforeBatchAddArgs, BatchDeleteArgs, BeforeBatchDeleteArgs, Row, getNumberFormat } from '@syncfusion/ej2-grids';import { GridModel, ColumnQueryModeType, HeaderCellInfoEventArgs, EditSettingsModel as GridEditModel, Freeze as FreezeColumn } from '@syncfusion/ej2-grids';import { RowDragEventArgs, RowDropEventArgs, RowDropSettingsModel, RowDropSettings, getUid, parentsUntil } from '@syncfusion/ej2-grids';import { LoadingIndicator } from '../models/loading-indicator';import { LoadingIndicatorModel } from '../models/loading-indicator-model';import { ActionEventArgs, TextAlign } from'@syncfusion/ej2-grids';import { DetailDataBoundEventArgs, ClipMode, ColumnChooser}  from '@syncfusion/ej2-grids';import { SearchEventArgs, AddEventArgs, EditEventArgs, DeleteEventArgs}  from '@syncfusion/ej2-grids';import { SaveEventArgs, CellSaveArgs, BatchAddArgs, BatchCancelArgs,  BeginEditArgs, CellEditArgs}  from '@syncfusion/ej2-grids';import { FilterSettings } from '../models/filter-settings';import { TextWrapSettings } from '../models/textwrap-settings';import { TextWrapSettingsModel } from '../models/textwrap-settings-model';import {Filter} from '../actions/filter';import { Logger as TreeLogger } from '../actions/logger';import { BeforeCopyEventArgs, BeforePasteEventArgs } from '@syncfusion/ej2-grids';import { TreeClipboard } from '../actions/clipboard';import {Aggregate} from '../actions/summary';import { Reorder } from '../actions/reorder';import { Resize } from '../actions/resize';import { Selection as TreeGridSelection } from '../actions/selection';import { ColumnMenu } from '../actions/column-menu';import { DetailRow } from '../actions/detail-row';import { Freeze } from '../actions/freeze-column';import { Print } from '../actions/print';import * as events from '../base/constant';import { FilterSettingsModel } from '../models/filter-settings-model';import { SearchSettings} from '../models/search-settings';import { SearchSettingsModel } from '../models/search-settings-model';import {RowInfo, RowDataBoundEventArgs, PageEventArgs, FilterEventArgs, FailureEventArgs, SortEventArgs } from '@syncfusion/ej2-grids';import { RowSelectingEventArgs, RowSelectEventArgs, RowDeselectingEventArgs, RowDeselectEventArgs, IIndex, ISelectedCell } from '@syncfusion/ej2-grids';import {ColumnModel as GridColumnModel, Column as GridColumn, CellSelectEventArgs, CellDeselectEventArgs } from '@syncfusion/ej2-grids';import { SelectionSettings } from '../models/selection-settings';import { SelectionSettingsModel } from '../models/selection-settings-model';import {getActualProperties, SortDirection, getObject, ColumnDragEventArgs } from '@syncfusion/ej2-grids';import { PrintMode, Data, IGrid, ContextMenuItemModel } from '@syncfusion/ej2-grids';import { ColumnMenuItem, ColumnMenuItemModel, CheckBoxChangeEventArgs } from '@syncfusion/ej2-grids';import { ExcelExportCompleteArgs, ExcelHeaderQueryCellInfoEventArgs, ExcelQueryCellInfoEventArgs } from '@syncfusion/ej2-grids';import { PdfExportCompleteArgs, PdfHeaderQueryCellInfoEventArgs, PdfQueryCellInfoEventArgs } from '@syncfusion/ej2-grids';import { ExcelExportProperties, PdfExportProperties, CellSelectingEventArgs, PrintEventArgs } from '@syncfusion/ej2-grids';import { ColumnMenuOpenEventArgs } from '@syncfusion/ej2-grids';import {BeforeDataBoundArgs} from '@syncfusion/ej2-grids';import { DataManager, ReturnOption, RemoteSaveAdaptor, Query, JsonAdaptor, Deferred, UrlAdaptor } from '@syncfusion/ej2-data';import { createSpinner, hideSpinner, showSpinner, Dialog } from '@syncfusion/ej2-popups';import { isRemoteData, isOffline, extendArray, isCountRequired, findChildrenRecords } from '../utils';import { Grid, QueryCellInfoEventArgs, Logger } from '@syncfusion/ej2-grids';import { Render } from '../renderer/render';import { VirtualTreeContentRenderer } from '../renderer/virtual-tree-content-render';import { DataManipulation } from './data';import { RowDD } from '../actions/rowdragdrop';import { Sort } from '../actions/sort';import { ITreeData, RowExpandedEventArgs, RowCollapsedEventArgs, RowCollapsingEventArgs, TreeGridExcelExportProperties } from './interface';import { DataStateChangeEventArgs, RowExpandingEventArgs, TreeGridPdfExportProperties } from './interface';import { iterateArrayOrObject, GridLine } from '@syncfusion/ej2-grids';import { DataSourceChangedEventArgs, RecordDoubleClickEventArgs, ResizeArgs } from '@syncfusion/ej2-grids';import { ToolbarItems, ToolbarItem, ContextMenuItem, ContextMenuItems, RowPosition, CopyHierarchyType } from '../enum';import { ItemModel, ClickEventArgs, BeforeOpenCloseMenuEventArgs, MenuEventArgs } from '@syncfusion/ej2-navigations';import { PageSettings } from '../models/page-settings';import { PageSettingsModel } from '../models/page-settings-model';import { AggregateRow } from '../models/summary';import { AggregateRowModel } from '../models/summary-model';import { ExcelExport } from '../actions/excel-export';import { PdfExport } from '../actions/pdf-export';import { Toolbar } from '../actions/toolbar';import { Page } from '../actions/page';import { ContextMenu } from '../actions/context-menu';import { EditSettings } from '../models/edit-settings';import { EditSettingsModel } from '../models/edit-settings-model';import { Edit} from '../actions/edit';import { SortSettings } from '../models/sort-settings';import { SortSettingsModel } from '../models/sort-settings-model';import { isHidden, getExpandStatus } from '../utils';import { editAction } from '../actions/crud-actions';import { InfiniteScrollSettings } from '../models/infinite-scroll-settings';import { InfiniteScrollSettingsModel } from '../models/infinite-scroll-settings-model';import { TreeActionEventArgs } from '..';import * as literals from '../base/constant';
 import {ComponentModel} from '@syncfusion/ej2-base';
 
 /**

package/src/treegrid/base/treegrid.js

@@ -22,6 +22,7 @@ import { removeClass, Complex, Collection, getValue } from '@syncfusion/ej2-base
 import { Event, Property, NotifyPropertyChanges, setValue, KeyboardEvents, L10n } from '@syncfusion/ej2-base';
 import { Column } from '../models/column';
 import { getNumberFormat } from '@syncfusion/ej2-grids';
+import { Freeze as FreezeColumn } from '@syncfusion/ej2-grids';
 import { RowDropSettings, getUid } from '@syncfusion/ej2-grids';
 import { LoadingIndicator } from '../models/loading-indicator';
 import { FilterSettings } from '../models/filter-settings';
@@ -102,6 +103,11 @@ var TreeGrid = /** @class */ (function (_super) {
         if (!isNullOrUndefined(_this.injectedModules["" + logger])) {
             Grid.Inject(Logger);
         }
+        var freezeModulePresent = _this.injectedModules.filter(function (e) {
+            if (e.prototype.getModuleName() === 'freeze') {
+                Grid.Inject(FreezeColumn);
+            }
+        });
         _this.grid = new Grid();
         return _this;
     }
@@ -418,19 +424,21 @@ var TreeGrid = /** @class */ (function (_super) {
                     if (!this.enableVirtualization) {
                         target = e.target;
                         parentTarget = target.parentElement;
-                        var cellIndex = parentTarget.cellIndex;
-                        if (this.grid.getColumnByIndex(cellIndex).editType === 'dropdownedit' && isNullOrUndefined(this.grid.getColumnByIndex(cellIndex).edit['obj'])) {
-                            parentTarget = target;
-                        }
-                        summaryElement = this.findnextRowElement(parentTarget);
-                        if (summaryElement !== null) {
-                            var cellIndex_1 = e.target.cellIndex;
-                            var row_1 = summaryElement.children[parseInt(cellIndex_1.toString(), 10)];
-                            addClass([row_1], 'e-focused');
-                            addClass([row_1], 'e-focus');
-                        }
-                        else {
-                            this.clearSelection();
+                        if (!isNullOrUndefined(parentTarget)) {
+                            var cellIndex = parentTarget.cellIndex;
+                            if (this.grid.getColumnByIndex(cellIndex).editType === 'dropdownedit' && isNullOrUndefined(this.grid.getColumnByIndex(cellIndex).edit['obj'])) {
+                                parentTarget = target;
+                            }
+                            summaryElement = this.findnextRowElement(parentTarget);
+                            if (summaryElement !== null) {
+                                var cellIndex_1 = e.target.cellIndex;
+                                var row_1 = summaryElement.children[parseInt(cellIndex_1.toString(), 10)];
+                                addClass([row_1], 'e-focused');
+                                addClass([row_1], 'e-focus');
+                            }
+                            else {
+                                this.clearSelection();
+                            }
                         }
                     }
                     break;
@@ -438,19 +446,21 @@ var TreeGrid = /** @class */ (function (_super) {
                     if (!this.enableVirtualization) {
                         target = e.target;
                         parentTarget = target.parentElement;
-                        var cellIndex = parentTarget.cellIndex;
-                        if (this.grid.getColumnByIndex(cellIndex).editType === 'dropdownedit' && isNullOrUndefined(this.grid.getColumnByIndex(cellIndex).edit['obj'])) {
-                            parentTarget = target;
-                        }
-                        summaryElement = this.findPreviousRowElement(parentTarget);
-                        if (summaryElement !== null) {
-                            var cIndex = e.target.cellIndex;
-                            var rows = summaryElement.children[parseInt(cIndex.toString(), 10)];
-                            addClass([rows], 'e-focused');
-                            addClass([rows], 'e-focus');
-                        }
-                        else {
-                            this.clearSelection();
+                        if (!isNullOrUndefined(parentTarget)) {
+                            var cellIndex = parentTarget.cellIndex;
+                            if (this.grid.getColumnByIndex(cellIndex).editType === 'dropdownedit' && isNullOrUndefined(this.grid.getColumnByIndex(cellIndex).edit['obj'])) {
+                                parentTarget = target;
+                            }
+                            summaryElement = this.findPreviousRowElement(parentTarget);
+                            if (summaryElement !== null) {
+                                var cIndex = e.target.cellIndex;
+                                var rows = summaryElement.children[parseInt(cIndex.toString(), 10)];
+                                addClass([rows], 'e-focused');
+                                addClass([rows], 'e-focus');
+                            }
+                            else {
+                                this.clearSelection();
+                            }
                         }
                     }
             }
@@ -2507,11 +2517,11 @@ var TreeGrid = /** @class */ (function (_super) {
     };
     TreeGrid.prototype.setFrozenCount = function () {
         var persist3 = 'setFrozenCount';
-        this.grid["" + persist3].apply(this);
+        this.grid["" + persist3].apply(this.grid);
     };
     TreeGrid.prototype.splitFrozenCount = function (columns) {
         var persist4 = 'splitFrozenCount';
-        this.grid["" + persist4].apply(this, [columns]);
+        this.grid["" + persist4].apply(this.grid, [columns]);
     };
     TreeGrid.prototype.isFrozenGrid = function () {
         return this.grid.isFrozenGrid();
@@ -2805,7 +2815,7 @@ var TreeGrid = /** @class */ (function (_super) {
             if (!this.isExpandingEventTriggered) {
                 this.trigger(events.expanding, args, function (expandingArgs) {
                     _this.expandAllPrevent = expandingArgs.cancel;
-                    if (!expandingArgs.cancel) {
+                    if (!expandingArgs.cancel && !isNullOrUndefined(record)) {
                         if (expandingArgs.expandAll) {
                             _this.expandCollapseAllChildren(record, 'expand', key, level);
                         }
@@ -2931,7 +2941,7 @@ var TreeGrid = /** @class */ (function (_super) {
         else if (!this.isCollapseAll || (this.isCollapseAll && isRemoteData(this))) {
             var args = { data: record, row: row, cancel: false };
             this.trigger(events.collapsing, args, function (collapsingArgs) {
-                if (!collapsingArgs.cancel) {
+                if (!collapsingArgs.cancel && !isNullOrUndefined(record)) {
                     _this.collapseRows(row, record, parentRec, key);
                 }
             });

package/src/treegrid/renderer/virtual-tree-content-render.js

@@ -427,7 +427,12 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
             }
             if (firsttdinx === 0) {
                 this.translateY = (scrollArgs.offset.top - (outBuffer * rowHeight) > 0) ?
-                    scrollArgs.offset.top - (outBuffer * this.parent.getRowHeight()) + 10 : 0;
+                    scrollArgs.offset.top - (outBuffer * this.parent.getRowHeight()) + rowHeight : 0;
+            }
+            else if (this.parent.getFrozenColumns() > 0) {
+                scrollArgs.offset.top = scrollArgs.offset.top + 80;
+                this.translateY = (scrollArgs.offset.top - (outBuffer * rowHeight) > 0) ?
+                    scrollArgs.offset.top - (outBuffer * rowHeight) + 10 : 0;
             }
             else {
                 this.translateY = (scrollArgs.offset.top - (outBuffer * rowHeight) > 0) ?
@@ -467,6 +472,9 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                     if (this.parent.allowRowDragAndDrop) {
                         this.translateY = scrollArgs.offset.top - rowHeight * 2;
                     }
+                    else if (this.parent.getFrozenColumns() > 0) {
+                        this.translateY = scrollArgs.offset.top - ((rowHeight * 2) + this.parent.pageSettings.pageSize);
+                    }
                     else {
                         this.translateY = scrollArgs.offset.top;
                     }