@syncfusion/ej2-treegrid 21.2.6 → 21.2.9

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

@@ -1,9 +1,28 @@
 import { Browser, ChildProperty, Collection, Complex, Component, Event, EventHandler, Internationalization, KeyboardEvents, L10n, NotifyPropertyChanges, Property, SanitizeHtmlHelper, addClass, classList, closest, compile, createElement, debounce, extend, getEnumValue, getValue, isNullOrUndefined, merge, remove, removeClass, select, setStyleAttribute, setValue } from '@syncfusion/ej2-base';
-import { Aggregate, Cell, CellRenderer, CellType, Clipboard, ColumnChooser, ColumnFreezeContentRenderer, ColumnFreezeHeaderRenderer, ColumnMenu, ColumnVirtualFreezeRenderer, CommandColumn, ContextMenu, DetailRow, Edit, ExcelExport, Filter, Freeze, FreezeContentRender, FreezeRender, FreezeRowModelGenerator, Grid, InfiniteScroll, InterSectionObserver, Logger, Page, PdfExport, Print, RenderType, Reorder, Resize, RowDD, RowDropSettings, RowRenderer, Scroll, Sort, Toolbar, VirtualContentRenderer, VirtualFreezeHdrRenderer, VirtualFreezeRenderer, VirtualHeaderRenderer, VirtualRowModelGenerator, VirtualScroll, appendChildren, calculateAggregate, detailLists, extend as extend$1, getActualProperties, getObject, getUid, iterateArrayOrObject, parentsUntil, resetRowIndex, setDebounce, templateCompiler } from '@syncfusion/ej2-grids';
+import { Aggregate, Cell, CellRenderer, CellType, Clipboard, ColumnChooser, ColumnFreezeContentRenderer, ColumnFreezeHeaderRenderer, ColumnMenu, ColumnVirtualFreezeRenderer, CommandColumn, ContextMenu, DetailRow, Edit, ExcelExport, Filter, Freeze, FreezeContentRender, FreezeRender, FreezeRowModelGenerator, Grid, InfiniteScroll, InterSectionObserver, Logger, Page, PdfExport, Print, RenderType, Reorder, Resize, RowDD, RowDropSettings, RowRenderer, Scroll, Sort, Toolbar, VirtualContentRenderer, VirtualFreezeHdrRenderer, VirtualFreezeRenderer, VirtualHeaderRenderer, VirtualRowModelGenerator, VirtualScroll, appendChildren, calculateAggregate, detailLists, extend as extend$1, getActualProperties, getObject, getTransformValues, getUid, iterateArrayOrObject, parentsUntil, resetRowIndex, setDebounce, templateCompiler } from '@syncfusion/ej2-grids';
 import { createCheckBox } from '@syncfusion/ej2-buttons';
 import { CacheAdaptor, DataManager, DataUtil, Deferred, JsonAdaptor, ODataAdaptor, Predicate, Query, RemoteSaveAdaptor, UrlAdaptor, WebApiAdaptor, WebMethodAdaptor } from '@syncfusion/ej2-data';
 import { createSpinner, hideSpinner, showSpinner } from '@syncfusion/ej2-popups';
 
+var __extends$1 = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __decorate$1 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 /**
  * Represents TreeGrid `Column` model class.
  */
@@ -97,8 +116,31 @@ var Column = /** @__PURE__ @class */ (function () {
     };
     return Column;
 }());
+/**
+ * Defines TreeGrid column
+ */
+var TreeGridColumn = /** @__PURE__ @class */ (function (_super) {
+    __extends$1(TreeGridColumn, _super);
+    function TreeGridColumn() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    __decorate$1([
+        Property(null)
+    ], TreeGridColumn.prototype, "columns", void 0);
+    return TreeGridColumn;
+}(Column));
+/**
+ * Defines stacked tree grid column
+ */
+var StackedColumn = /** @__PURE__ @class */ (function (_super) {
+    __extends$1(StackedColumn, _super);
+    function StackedColumn() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return StackedColumn;
+}(TreeGridColumn));
 
-var __extends$1 = (undefined && undefined.__extends) || (function () {
+var __extends$2 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -111,7 +153,7 @@ var __extends$1 = (undefined && undefined.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __decorate$1 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+var __decorate$2 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -121,17 +163,17 @@ var __decorate$1 = (undefined && undefined.__decorate) || function (decorators,
  * Configures the Loading Indicator of the Tree Grid.
  */
 var LoadingIndicator = /** @__PURE__ @class */ (function (_super) {
-    __extends$1(LoadingIndicator, _super);
+    __extends$2(LoadingIndicator, _super);
     function LoadingIndicator() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    __decorate$1([
+    __decorate$2([
         Property('Spinner')
     ], LoadingIndicator.prototype, "indicatorType", void 0);
     return LoadingIndicator;
 }(ChildProperty));
 
-var __extends$2 = (undefined && undefined.__extends) || (function () {
+var __extends$3 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -144,7 +186,7 @@ var __extends$2 = (undefined && undefined.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __decorate$2 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+var __decorate$3 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -154,44 +196,44 @@ var __decorate$2 = (undefined && undefined.__decorate) || function (decorators,
  * Represents the Tree Grid predicate for the filter column.
  */
 var Predicate$1 = /** @__PURE__ @class */ (function (_super) {
-    __extends$2(Predicate$$1, _super);
+    __extends$3(Predicate$$1, _super);
     function Predicate$$1() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    __decorate$2([
+    __decorate$3([
         Property()
     ], Predicate$$1.prototype, "field", void 0);
-    __decorate$2([
+    __decorate$3([
         Property()
     ], Predicate$$1.prototype, "operator", void 0);
-    __decorate$2([
+    __decorate$3([
         Property()
     ], Predicate$$1.prototype, "value", void 0);
-    __decorate$2([
+    __decorate$3([
         Property()
     ], Predicate$$1.prototype, "matchCase", void 0);
-    __decorate$2([
+    __decorate$3([
         Property()
     ], Predicate$$1.prototype, "ignoreAccent", void 0);
-    __decorate$2([
+    __decorate$3([
         Property()
     ], Predicate$$1.prototype, "predicate", void 0);
-    __decorate$2([
+    __decorate$3([
         Property({})
     ], Predicate$$1.prototype, "actualFilterValue", void 0);
-    __decorate$2([
+    __decorate$3([
         Property({})
     ], Predicate$$1.prototype, "actualOperator", void 0);
-    __decorate$2([
+    __decorate$3([
         Property()
     ], Predicate$$1.prototype, "type", void 0);
-    __decorate$2([
+    __decorate$3([
         Property()
     ], Predicate$$1.prototype, "ejpredicate", void 0);
-    __decorate$2([
+    __decorate$3([
         Property()
     ], Predicate$$1.prototype, "uid", void 0);
-    __decorate$2([
+    __decorate$3([
         Property()
     ], Predicate$$1.prototype, "isForeignKey", void 0);
     return Predicate$$1;
@@ -200,38 +242,38 @@ var Predicate$1 = /** @__PURE__ @class */ (function (_super) {
  * Configures the filtering behavior of the TreeGrid.
  */
 var FilterSettings = /** @__PURE__ @class */ (function (_super) {
-    __extends$2(FilterSettings, _super);
+    __extends$3(FilterSettings, _super);
     function FilterSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    __decorate$2([
+    __decorate$3([
         Collection([], Predicate$1)
     ], FilterSettings.prototype, "columns", void 0);
-    __decorate$2([
+    __decorate$3([
         Property('FilterBar')
     ], FilterSettings.prototype, "type", void 0);
-    __decorate$2([
+    __decorate$3([
         Property()
     ], FilterSettings.prototype, "mode", void 0);
-    __decorate$2([
+    __decorate$3([
         Property(true)
     ], FilterSettings.prototype, "showFilterBarStatus", void 0);
-    __decorate$2([
+    __decorate$3([
         Property(1500)
     ], FilterSettings.prototype, "immediateModeDelay", void 0);
-    __decorate$2([
+    __decorate$3([
         Property()
     ], FilterSettings.prototype, "operators", void 0);
-    __decorate$2([
+    __decorate$3([
         Property(false)
     ], FilterSettings.prototype, "ignoreAccent", void 0);
-    __decorate$2([
+    __decorate$3([
         Property('Parent')
     ], FilterSettings.prototype, "hierarchyMode", void 0);
     return FilterSettings;
 }(ChildProperty));
 
-var __extends$3 = (undefined && undefined.__extends) || (function () {
+var __extends$4 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -244,7 +286,7 @@ var __extends$3 = (undefined && undefined.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __decorate$3 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+var __decorate$4 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -254,17 +296,17 @@ var __decorate$3 = (undefined && undefined.__decorate) || function (decorators,
  * Configures the textwrap behavior of the TreeGrid.
  */
 var TextWrapSettings = /** @__PURE__ @class */ (function (_super) {
-    __extends$3(TextWrapSettings, _super);
+    __extends$4(TextWrapSettings, _super);
     function TextWrapSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    __decorate$3([
+    __decorate$4([
         Property('Both')
     ], TextWrapSettings.prototype, "wrapMode", void 0);
     return TextWrapSettings;
 }(ChildProperty));
 
-var __extends$4 = (undefined && undefined.__extends) || (function () {
+var __extends$5 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -287,7 +329,7 @@ var BASE_DOC_URL = 'https://ej2.syncfusion.com/documentation';
 var ERROR = '[EJ2TreeGrid.Error]';
 var IsRowDDEnabled = false;
 var Logger$1 = /** @__PURE__ @class */ (function (_super) {
-    __extends$4(Logger$$1, _super);
+    __extends$5(Logger$$1, _super);
     function Logger$$1(parent) {
         var _this = this;
         Grid.Inject(Logger);
@@ -561,7 +603,7 @@ var dataRowIndex = 'data-rowindex';
 /** @hidden */
 var ariaRowIndex = 'aria-rowindex';
 
-var __extends$5 = (undefined && undefined.__extends) || (function () {
+var __extends$6 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -580,7 +622,7 @@ var __extends$5 = (undefined && undefined.__extends) || (function () {
  * @hidden
  */
 var TreeClipboard = /** @__PURE__ @class */ (function (_super) {
-    __extends$5(TreeClipboard, _super);
+    __extends$6(TreeClipboard, _super);
     function TreeClipboard(parent, serviceLocator) {
         var _this = _super.call(this, parent.grid, serviceLocator) || this;
         _this.treeCopyContent = '';
@@ -1506,7 +1548,7 @@ var Print$1 = /** @__PURE__ @class */ (function () {
     return Print$$1;
 }());
 
-var __extends$6 = (undefined && undefined.__extends) || (function () {
+var __extends$7 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -1519,7 +1561,7 @@ var __extends$6 = (undefined && undefined.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __decorate$4 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+var __decorate$5 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -1529,29 +1571,29 @@ var __decorate$4 = (undefined && undefined.__decorate) || function (decorators,
  * Configures the filtering behavior of the TreeGrid.
  */
 var SearchSettings = /** @__PURE__ @class */ (function (_super) {
-    __extends$6(SearchSettings, _super);
+    __extends$7(SearchSettings, _super);
     function SearchSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    __decorate$4([
+    __decorate$5([
         Property()
     ], SearchSettings.prototype, "fields", void 0);
-    __decorate$4([
+    __decorate$5([
         Property(false)
     ], SearchSettings.prototype, "ignoreCase", void 0);
-    __decorate$4([
+    __decorate$5([
         Property('contains')
     ], SearchSettings.prototype, "operator", void 0);
-    __decorate$4([
+    __decorate$5([
         Property()
     ], SearchSettings.prototype, "key", void 0);
-    __decorate$4([
+    __decorate$5([
         Property()
     ], SearchSettings.prototype, "hierarchyMode", void 0);
     return SearchSettings;
 }(ChildProperty));
 
-var __extends$7 = (undefined && undefined.__extends) || (function () {
+var __extends$8 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -1564,7 +1606,7 @@ var __extends$7 = (undefined && undefined.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __decorate$5 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+var __decorate$6 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -1574,29 +1616,29 @@ var __decorate$5 = (undefined && undefined.__decorate) || function (decorators,
  * Configures the selection behavior of the TreeGrid.
  */
 var SelectionSettings = /** @__PURE__ @class */ (function (_super) {
-    __extends$7(SelectionSettings, _super);
+    __extends$8(SelectionSettings, _super);
     function SelectionSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    __decorate$5([
+    __decorate$6([
         Property('Row')
     ], SelectionSettings.prototype, "mode", void 0);
-    __decorate$5([
+    __decorate$6([
         Property('Flow')
     ], SelectionSettings.prototype, "cellSelectionMode", void 0);
-    __decorate$5([
+    __decorate$6([
         Property('Single')
     ], SelectionSettings.prototype, "type", void 0);
-    __decorate$5([
+    __decorate$6([
         Property(false)
     ], SelectionSettings.prototype, "persistSelection", void 0);
-    __decorate$5([
+    __decorate$6([
         Property('Default')
     ], SelectionSettings.prototype, "checkboxMode", void 0);
-    __decorate$5([
+    __decorate$6([
         Property(false)
     ], SelectionSettings.prototype, "checkboxOnly", void 0);
-    __decorate$5([
+    __decorate$6([
         Property(true)
     ], SelectionSettings.prototype, "enableToggle", void 0);
     return SelectionSettings;
@@ -1640,7 +1682,7 @@ var Render = /** @__PURE__ @class */ (function () {
             if (collapsed$$1 && !isNullOrUndefined(args.row)) {
                 args.row.style.display = 'none';
                 var rowsObj = this.parent.grid.getRowsObject();
-                if (!isNullOrUndefined(args.row.getAttribute('data-uid'))) {
+                if (!this.parent.grid.isFrozenGrid() && !isNullOrUndefined(args.row.getAttribute('data-uid'))) {
                     rowsObj.filter(function (e) { return e.uid === args.row.getAttribute('data-uid'); })[0].visible = false;
                 }
             }
@@ -1826,6 +1868,7 @@ var Render = /** @__PURE__ @class */ (function () {
         if (summaryRow) {
             addClass([args.cell], 'e-summarycell');
             var summaryData = getObject(args.column.field, args.data);
+            summaryData = isNullOrUndefined(summaryData) ? null : summaryData;
             if (args.cell.querySelector('.e-treecell') != null) {
                 args.cell.querySelector('.e-treecell').innerHTML = summaryData;
             }
@@ -2334,7 +2377,18 @@ var DataManipulation = /** @__PURE__ @class */ (function () {
                 }
                 result = resultChildData;
             }
-            rowDetails.record.childRecords = result;
+            if (_this.parent.enableVirtualization && rowDetails.action === 'remoteExpand') {
+                rowDetails.record.childRecords = [];
+                for (var i = 0; i < result.length; i++) {
+                    if (rowDetails.record['' + _this.parent.idMapping] !== result[parseInt(i.toString(), 10)]['' + _this.parent.idMapping] &&
+                        rowDetails.record['' + _this.parent.idMapping] === result[parseInt(i.toString(), 10)]['' + _this.parent.parentIdMapping] && Object.prototype.hasOwnProperty.call(result, i)) {
+                        rowDetails.record.childRecords.push(result[parseInt(i.toString(), 10)]);
+                    }
+                }
+            }
+            else {
+                rowDetails.record.childRecords = result;
+            }
             for (var r = 0; r < result.length; r++) {
                 if (_this.parent.enableVirtualization && result[parseInt(r.toString(), 10)]["" + _this.parent.idMapping] === rowDetails.record["" + _this.parent.idMapping] && rowDetails.action === 'remoteExpand') {
                     _this.parent["" + remoteExpandedData].push(rowDetails.record);
@@ -2352,6 +2406,7 @@ var DataManipulation = /** @__PURE__ @class */ (function () {
                         if (result[parseInt(r.toString(), 10)]["" + _this.parent.parentIdMapping] === _this.parent["" + remoteExpandedData][parseInt(i.toString(), 10)]["" + _this.parent.idMapping]) {
                             result[parseInt(r.toString(), 10)].level = _this.parent["" + remoteExpandedData][parseInt(i.toString(), 10)]["" + level] + 1;
                             var parentData = _this.parent["" + remoteExpandedData][parseInt(i.toString(), 10)];
+                            delete parentData.childRecords;
                             result[parseInt(r.toString(), 10)].parentItem = parentData;
                             result[parseInt(r.toString(), 10)].parentUniqueID = rowDetails.record.uniqueID;
                         }
@@ -2363,6 +2418,10 @@ var DataManipulation = /** @__PURE__ @class */ (function () {
                         && !(haveChild && !haveChild[parseInt(r.toString(), 10)])) {
                         if (isNullOrUndefined(result[parseInt(r.toString(), 10)]["" + _this.parent.parentIdMapping])) {
                             result[parseInt(r.toString(), 10)].level = 0;
+                            if (rowDetails.action === 'remoteExpand') {
+                                result[parseInt(r.toString(), 10)].childRecords = [];
+                                result[parseInt(r.toString(), 10)].childRecords = rowDetails.record.childRecords;
+                            }
                         }
                         else {
                             result[parseInt(r.toString(), 10)].level = rowDetails.record.level;
@@ -2807,7 +2866,7 @@ var ContextMenuItems;
     ContextMenuItems[ContextMenuItems["RowOutdent"] = 17] = "RowOutdent";
 })(ContextMenuItems || (ContextMenuItems = {}));
 
-var __extends$8 = (undefined && undefined.__extends) || (function () {
+var __extends$9 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -2820,7 +2879,7 @@ var __extends$8 = (undefined && undefined.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __decorate$6 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+var __decorate$7 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -2830,38 +2889,38 @@ var __decorate$6 = (undefined && undefined.__decorate) || function (decorators,
  * Configures the paging behavior of the TreeGrid.
  */
 var PageSettings = /** @__PURE__ @class */ (function (_super) {
-    __extends$8(PageSettings, _super);
+    __extends$9(PageSettings, _super);
     function PageSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    __decorate$6([
+    __decorate$7([
         Property(12)
     ], PageSettings.prototype, "pageSize", void 0);
-    __decorate$6([
+    __decorate$7([
         Property(8)
     ], PageSettings.prototype, "pageCount", void 0);
-    __decorate$6([
+    __decorate$7([
         Property(1)
     ], PageSettings.prototype, "currentPage", void 0);
-    __decorate$6([
+    __decorate$7([
         Property()
     ], PageSettings.prototype, "totalRecordsCount", void 0);
-    __decorate$6([
+    __decorate$7([
         Property(false)
     ], PageSettings.prototype, "enableQueryString", void 0);
-    __decorate$6([
+    __decorate$7([
         Property(false)
     ], PageSettings.prototype, "pageSizes", void 0);
-    __decorate$6([
+    __decorate$7([
         Property(null)
     ], PageSettings.prototype, "template", void 0);
-    __decorate$6([
+    __decorate$7([
         Property('All')
     ], PageSettings.prototype, "pageSizeMode", void 0);
     return PageSettings;
 }(ChildProperty));
 
-var __extends$9 = (undefined && undefined.__extends) || (function () {
+var __extends$10 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -2874,7 +2933,7 @@ var __extends$9 = (undefined && undefined.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __decorate$7 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+var __decorate$8 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -2884,7 +2943,7 @@ var __decorate$7 = (undefined && undefined.__decorate) || function (decorators,
  * Configures the TreeGrid's aggregate column.
  */
 var AggregateColumn = /** @__PURE__ @class */ (function (_super) {
-    __extends$9(AggregateColumn, _super);
+    __extends$10(AggregateColumn, _super);
     function AggregateColumn() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.intl = new Internationalization();
@@ -2952,41 +3011,41 @@ var AggregateColumn = /** @__PURE__ @class */ (function (_super) {
     AggregateColumn.prototype.setPropertiesSilent = function (prop) {
         this.setProperties(prop, true);
     };
-    __decorate$7([
+    __decorate$8([
         Property()
     ], AggregateColumn.prototype, "type", void 0);
-    __decorate$7([
+    __decorate$8([
         Property()
     ], AggregateColumn.prototype, "footerTemplate", void 0);
-    __decorate$7([
+    __decorate$8([
         Property()
     ], AggregateColumn.prototype, "field", void 0);
-    __decorate$7([
+    __decorate$8([
         Property()
     ], AggregateColumn.prototype, "format", void 0);
-    __decorate$7([
+    __decorate$8([
         Property()
     ], AggregateColumn.prototype, "columnName", void 0);
-    __decorate$7([
+    __decorate$8([
         Property()
     ], AggregateColumn.prototype, "customAggregate", void 0);
     return AggregateColumn;
 }(ChildProperty));
 var AggregateRow = /** @__PURE__ @class */ (function (_super) {
-    __extends$9(AggregateRow, _super);
+    __extends$10(AggregateRow, _super);
     function AggregateRow() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    __decorate$7([
+    __decorate$8([
         Collection([], AggregateColumn)
     ], AggregateRow.prototype, "columns", void 0);
-    __decorate$7([
+    __decorate$8([
         Property(true)
     ], AggregateRow.prototype, "showChildSummary", void 0);
     return AggregateRow;
 }(ChildProperty));
 
-var __extends$10 = (undefined && undefined.__extends) || (function () {
+var __extends$11 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -2999,7 +3058,7 @@ var __extends$10 = (undefined && undefined.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __decorate$8 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+var __decorate$9 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -3009,47 +3068,47 @@ var __decorate$8 = (undefined && undefined.__decorate) || function (decorators,
  * Configures the edit behavior of the TreeGrid.
  */
 var EditSettings = /** @__PURE__ @class */ (function (_super) {
-    __extends$10(EditSettings, _super);
+    __extends$11(EditSettings, _super);
     function EditSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    __decorate$8([
+    __decorate$9([
         Property(false)
     ], EditSettings.prototype, "allowAdding", void 0);
-    __decorate$8([
+    __decorate$9([
         Property(false)
     ], EditSettings.prototype, "allowEditing", void 0);
-    __decorate$8([
+    __decorate$9([
         Property(false)
     ], EditSettings.prototype, "allowDeleting", void 0);
-    __decorate$8([
+    __decorate$9([
         Property('Cell')
     ], EditSettings.prototype, "mode", void 0);
-    __decorate$8([
+    __decorate$9([
         Property('Top')
     ], EditSettings.prototype, "newRowPosition", void 0);
-    __decorate$8([
+    __decorate$9([
         Property(true)
     ], EditSettings.prototype, "allowEditOnDblClick", void 0);
-    __decorate$8([
+    __decorate$9([
         Property(true)
     ], EditSettings.prototype, "showConfirmDialog", void 0);
-    __decorate$8([
+    __decorate$9([
         Property(false)
     ], EditSettings.prototype, "showDeleteConfirmDialog", void 0);
-    __decorate$8([
+    __decorate$9([
         Property('')
     ], EditSettings.prototype, "template", void 0);
-    __decorate$8([
+    __decorate$9([
         Property({})
     ], EditSettings.prototype, "dialog", void 0);
-    __decorate$8([
+    __decorate$9([
         Property(false)
     ], EditSettings.prototype, "allowNextRowEdit", void 0);
     return EditSettings;
 }(ChildProperty));
 
-var __extends$11 = (undefined && undefined.__extends) || (function () {
+var __extends$12 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -3062,7 +3121,7 @@ var __extends$11 = (undefined && undefined.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __decorate$9 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+var __decorate$10 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -3072,14 +3131,14 @@ var __decorate$9 = (undefined && undefined.__decorate) || function (decorators,
  * Represents the field name and direction of sort column.
  */
 var SortDescriptor = /** @__PURE__ @class */ (function (_super) {
-    __extends$11(SortDescriptor, _super);
+    __extends$12(SortDescriptor, _super);
     function SortDescriptor() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    __decorate$9([
+    __decorate$10([
         Property()
     ], SortDescriptor.prototype, "field", void 0);
-    __decorate$9([
+    __decorate$10([
         Property()
     ], SortDescriptor.prototype, "direction", void 0);
     return SortDescriptor;
@@ -3088,14 +3147,14 @@ var SortDescriptor = /** @__PURE__ @class */ (function (_super) {
  * Configures the sorting behavior of TreeGrid.
  */
 var SortSettings = /** @__PURE__ @class */ (function (_super) {
-    __extends$11(SortSettings, _super);
+    __extends$12(SortSettings, _super);
     function SortSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    __decorate$9([
+    __decorate$10([
         Collection([], SortDescriptor)
     ], SortSettings.prototype, "columns", void 0);
-    __decorate$9([
+    __decorate$10([
         Property(true)
     ], SortSettings.prototype, "allowUnsort", void 0);
     return SortSettings;
@@ -3508,7 +3567,7 @@ function updateParentRow(key, record, action, control, isSelfReference, child) {
     }
 }
 
-var __extends$12 = (undefined && undefined.__extends) || (function () {
+var __extends$13 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -3521,7 +3580,7 @@ var __extends$12 = (undefined && undefined.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __decorate$10 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+var __decorate$11 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -3531,17 +3590,17 @@ var __decorate$10 = (undefined && undefined.__decorate) || function (decorators,
  * Configures the infinite scroll behavior of Tree Grid.
  */
 var InfiniteScrollSettings = /** @__PURE__ @class */ (function (_super) {
-    __extends$12(InfiniteScrollSettings, _super);
+    __extends$13(InfiniteScrollSettings, _super);
     function InfiniteScrollSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    __decorate$10([
+    __decorate$11([
         Property(false)
     ], InfiniteScrollSettings.prototype, "enableCache", void 0);
-    __decorate$10([
+    __decorate$11([
         Property(3)
     ], InfiniteScrollSettings.prototype, "maxBlocks", void 0);
-    __decorate$10([
+    __decorate$11([
         Property(3)
     ], InfiniteScrollSettings.prototype, "initialBlocks", void 0);
     return InfiniteScrollSettings;
@@ -6174,7 +6233,17 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                 record = this.grid.getCurrentViewRecords()[row.getAttribute('data-rowindex')];
             }
             else {
-                record = this.grid.getCurrentViewRecords()[parseInt(row.getAttribute('data-rowindex'), 10)];
+                if (this.enableVirtualization && this.isCollapseAll) {
+                    if (this.isExpandAll && row.rowIndex === -1) {
+                        record = this.grid.getCurrentViewRecords()[parseInt(row.getAttribute('data-rowindex'), 10)];
+                    }
+                    else {
+                        record = this.grid.getCurrentViewRecords()[row.rowIndex];
+                    }
+                }
+                else {
+                    record = this.grid.getCurrentViewRecords()[parseInt(row.getAttribute('data-rowindex'), 10)];
+                }
             }
         }
         return record;
@@ -6404,10 +6473,17 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             if (rows.length) {
                 for (var i = 0; i < rows.length; i++) {
                     if (action === 'collapse') {
-                        this.collapseRow(rows[parseInt(i.toString(), 10)]);
+                        if (!isNullOrUndefined(this.getCurrentViewRecords()[rows[parseInt(i.toString(), 10)].rowIndex])) {
+                            this.collapseRow(rows[parseInt(i.toString(), 10)]);
+                        }
                     }
                     else {
-                        this.expandRow(rows[parseInt(i.toString(), 10)]);
+                        if (!this.enableVirtualization) {
+                            this.expandRow(rows[parseInt(i.toString(), 10)]);
+                        }
+                        else if (rows[0].getAttribute('aria-expanded') !== 'true') {
+                            this.expandRow(rows[0]);
+                        }
                     }
                 }
             }
@@ -8771,14 +8847,13 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
                             var childRecords = rec[0].childRecords;
                             var droppedRecordIndex = childRecords.indexOf(droppedRecord) + 1;
                             childRecords.splice(droppedRecordIndex, 0, draggedRecord_2);
-                            if (this_1.parent.enableImmutableMode || this_1.parent['isIndentEnabled'] && !this_1.parent.parentIdMapping) {
-                                draggedRecord_2.parentItem = droppedRecord.parentItem;
-                                draggedRecord_2.level = droppedRecord.level;
-                            }
+                            draggedRecord_2.parentItem = droppedRecord.parentItem;
                             draggedRecord_2.parentUniqueID = droppedRecord.parentUniqueID;
+                            draggedRecord_2.level = droppedRecord.level;
                             if (this_1.parent.parentIdMapping) {
                                 draggedRecord_2[this_1.parent.parentIdMapping] = droppedRecord[this_1.parent.parentIdMapping];
-                                draggedRecord_2.parentUniqueID = droppedRecord.parentUniqueID;
+                                draggedRecord_2.parentItem = droppedRecord.parentItem;
+                                draggedRecord_2.level = droppedRecord.level;
                             }
                         }
                         if (draggedRecord_2.hasChildRecords) {
@@ -9169,7 +9244,7 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
  * Base export
  */
 
-var __extends$13 = (undefined && undefined.__extends) || (function () {
+var __extends$14 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -9182,7 +9257,7 @@ var __extends$13 = (undefined && undefined.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __decorate$11 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+var __decorate$12 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -9192,11 +9267,11 @@ var __decorate$11 = (undefined && undefined.__decorate) || function (decorators,
  * Configures the row drop settings of the TreeGrid.
  */
 var RowDropSettings$1 = /** @__PURE__ @class */ (function (_super) {
-    __extends$13(RowDropSettings$$1, _super);
+    __extends$14(RowDropSettings$$1, _super);
     function RowDropSettings$$1() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    __decorate$11([
+    __decorate$12([
         Property()
     ], RowDropSettings$$1.prototype, "targetID", void 0);
     return RowDropSettings$$1;
@@ -9206,7 +9281,7 @@ var RowDropSettings$1 = /** @__PURE__ @class */ (function (_super) {
  * Models export
  */
 
-var __extends$14 = (undefined && undefined.__extends) || (function () {
+var __extends$15 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -9225,7 +9300,7 @@ var __extends$14 = (undefined && undefined.__extends) || (function () {
  * @hidden
  */
 var TreeVirtualRowModelGenerator = /** @__PURE__ @class */ (function (_super) {
-    __extends$14(TreeVirtualRowModelGenerator, _super);
+    __extends$15(TreeVirtualRowModelGenerator, _super);
     function TreeVirtualRowModelGenerator(parent) {
         var _this = _super.call(this, parent) || this;
         _this.addEventListener();
@@ -11498,6 +11573,9 @@ var Edit$1 = /** @__PURE__ @class */ (function () {
     };
     Edit$$1.prototype.gridDblClick = function (e) {
         this.doubleClickTarget = e.target;
+        if (e.target.classList.contains('e-frame') && this.parent.getCurrentViewRecords().length === 0) {
+            this.doubleClickTarget = null;
+        }
     };
     Edit$$1.prototype.getRowPosition = function (addArgs) {
         addArgs.newRowPosition = this.parent.editSettings.newRowPosition;
@@ -11505,7 +11583,9 @@ var Edit$1 = /** @__PURE__ @class */ (function () {
         addArgs.dataRowIndex = +this.prevAriaRowIndex;
     };
     Edit$$1.prototype.beforeStartEdit = function (args) {
-        this.parent.trigger(actionBegin, args);
+        if (this.parent.editSettings.mode === 'Cell') {
+            this.parent.trigger(actionBegin, args);
+        }
     };
     Edit$$1.prototype.beforeBatchCancel = function (args) {
         if (this.parent.editSettings.mode === 'Cell') {
@@ -12074,7 +12154,7 @@ var Edit$1 = /** @__PURE__ @class */ (function () {
                             index = index + batchChildCount;
                         }
                     }
-                    else {
+                    else if (!this.parent.enableVirtualization) {
                         index += findChildrenRecords(records[parseInt(index.toString(), 10)]).length;
                     }
                 }
@@ -12650,7 +12730,7 @@ var DetailRow$1 = /** @__PURE__ @class */ (function () {
     return DetailRow$$1;
 }());
 
-var __extends$16 = (undefined && undefined.__extends) || (function () {
+var __extends$17 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -12664,7 +12744,7 @@ var __extends$16 = (undefined && undefined.__extends) || (function () {
     };
 })();
 var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
-    __extends$16(VirtualTreeContentRenderer, _super);
+    __extends$17(VirtualTreeContentRenderer, _super);
     function VirtualTreeContentRenderer(parent, locator) {
         var _this = _super.call(this, parent, locator) || this;
         _this.isExpandCollapse = false;
@@ -13027,7 +13107,7 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
         var currentViewData = this.parent.currentViewData;
         var indexValue = 'index';
         if (upScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left')) {
-            var vHeight = +(this.parent.height.toString().indexOf('%') < 0 ? this.parent.height :
+            var vHeight = +(this.parent.height.toString().indexOf('%') < 0 ? parseInt(this.parent.height.toString(), 10) :
                 this.parent.element.getBoundingClientRect().height);
             var index = (~~(content$$1.scrollTop / rowHeight)
                 + Math.ceil(vHeight / rowHeight))
@@ -13086,6 +13166,11 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
             }
             this.startIndex = !isLastBlock ? lastIndex - this.parent.pageSettings.pageSize : nextSetResIndex;
             this.endIndex = lastIndex;
+            if ((nextSetResIndex + this.parent.pageSettings.pageSize) > this.totalRecords &&
+                (this.endIndex - this.startIndex) < (this.parent.pageSettings.pageSize / 2) &&
+                (this.endIndex - nextSetResIndex) < (this.parent.pageSettings.pageSize / 2)) {
+                this.startIndex = lastIndex - (this.parent.pageSettings.pageSize / 2);
+            }
             if (currentViewData.length && this.startIndex > currentViewData[0]["" + indexValue] &&
                 ((this.startIndex - currentViewData[0]["" + indexValue]) < (this.parent.pageSettings.pageSize / 2)) && this.parent.selectionModule.isRowSelected) {
                 this.startIndex = currentViewData[0]["" + indexValue] + (this.parent.pageSettings.pageSize / 2);
@@ -13098,7 +13183,12 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
                     this.translateY = scrollArgs.offset.top - rowHeight * 2;
                 }
                 else {
-                    this.translateY = scrollArgs.offset.top;
+                    if (this.totalRecords == this.endIndex) {
+                        this.translateY = scrollArgs.offset.top - (rowHeight - outBuffer);
+                    }
+                    else {
+                        this.translateY = scrollArgs.offset.top;
+                    }
                 }
             }
         }
@@ -13228,7 +13318,7 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
     return VirtualTreeContentRenderer;
 }(VirtualContentRenderer));
 var TreeInterSectionObserver = /** @__PURE__ @class */ (function (_super) {
-    __extends$16(TreeInterSectionObserver, _super);
+    __extends$17(TreeInterSectionObserver, _super);
     function TreeInterSectionObserver() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.isWheeling = false;
@@ -13320,7 +13410,7 @@ var TreeInterSectionObserver = /** @__PURE__ @class */ (function (_super) {
     return TreeInterSectionObserver;
 }(InterSectionObserver));
 
-var __extends$15 = (undefined && undefined.__extends) || (function () {
+var __extends$16 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -13438,14 +13528,17 @@ var VirtualScroll$1 = /** @__PURE__ @class */ (function () {
                 this.parent.grid.getContent().firstElementChild.scrollTop = 0;
                 this.parent.grid.notify(virtualActionArgs, { setTop: true });
             }
-            if (requestType === 'save' && this.parent.editSettings.newRowPosition === 'Bottom') {
+            if (requestType === 'save') {
+                startIndex = counts.startIndex + (counts.count - counts.endIndex);
                 endIndex = counts.count;
             }
             //if ((this.prevendIndex !== -1 && this.prevstartIndex !== -1) &&
             //this.prevendIndex === endIndex && this.prevstartIndex === startIndex) {
+            var virtualWrapperElement = this.parent.grid.contentModule.virtualEle.wrapper;
+            var translateY = getTransformValues(virtualWrapperElement).height;
             if (!isNullOrUndefined(this.expandCollapseRec) && (pageingDetails.actionArgs.requestType === 'virtualscroll' ||
                 (pageingDetails.actionArgs.requestType === 'refresh' && startIndex !== this.prevstartIndex)) &&
-                (startIndex < this.parent.getRows().length && endIndex <= startIndex + this.parent.getRows().length)) {
+                (startIndex < this.parent.getRows().length && endIndex <= startIndex + this.parent.getRows().length) && translateY === 0) {
                 startIndex = 0;
             }
             if (!isNullOrUndefined(this.expandCollapseRec)) {
@@ -13493,7 +13586,7 @@ var VirtualScroll$1 = /** @__PURE__ @class */ (function () {
     return VirtualScroll$$1;
 }());
 var TreeVirtual = /** @__PURE__ @class */ (function (_super) {
-    __extends$15(TreeVirtual, _super);
+    __extends$16(TreeVirtual, _super);
     function TreeVirtual(parent, locator) {
         var _this = _super.call(this, parent, locator) || this;
         getValue('parent', _this).off('initial-load', getValue('instantiateRenderer', _this), _this);
@@ -13524,7 +13617,7 @@ var TreeVirtual = /** @__PURE__ @class */ (function (_super) {
         if (!isNullOrUndefined(parentGrid.height) && typeof (parentGrid.height) === 'string' && parentGrid.height.indexOf('%') !== -1) {
             parentGrid.element.style.height = parentGrid.height;
         }
-        var vHeight = parentGrid.height.toString().indexOf('%') < 0 ? parentGrid.height :
+        var vHeight = parentGrid.height.toString().indexOf('%') < 0 ? parseInt(parentGrid.height.toString(), 10) :
             parentGrid.element.getBoundingClientRect().height;
         var blockSize = ~~(vHeight / rowHeight);
         var height = blockSize * 2;
@@ -13534,7 +13627,7 @@ var TreeVirtual = /** @__PURE__ @class */ (function (_super) {
     return TreeVirtual;
 }(VirtualScroll));
 
-var __extends$17 = (undefined && undefined.__extends) || (function () {
+var __extends$18 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -13553,7 +13646,7 @@ var __extends$17 = (undefined && undefined.__extends) || (function () {
  * @hidden
  */
 var VirtualTreeFreezeRenderer = /** @__PURE__ @class */ (function (_super) {
-    __extends$17(VirtualTreeFreezeRenderer, _super);
+    __extends$18(VirtualTreeFreezeRenderer, _super);
     function VirtualTreeFreezeRenderer(parent, locator) {
         var _this = _super.call(this, parent, locator) || this;
         _this.addEventListener();
@@ -13623,7 +13716,7 @@ var VirtualTreeFreezeRenderer = /** @__PURE__ @class */ (function (_super) {
  * @hidden
  */
 var ColumnVirtualTreeFreezeRenderer = /** @__PURE__ @class */ (function (_super) {
-    __extends$17(ColumnVirtualTreeFreezeRenderer, _super);
+    __extends$18(ColumnVirtualTreeFreezeRenderer, _super);
     function ColumnVirtualTreeFreezeRenderer(parent, locator) {
         var _this = _super.call(this, parent, locator) || this;
         _this.serviceLoc = locator;
@@ -13673,7 +13766,7 @@ var ColumnVirtualTreeFreezeRenderer = /** @__PURE__ @class */ (function (_super)
  * @hidden
  */
 var VirtualTreeFreezeHdrRenderer = /** @__PURE__ @class */ (function (_super) {
-    __extends$17(VirtualTreeFreezeHdrRenderer, _super);
+    __extends$18(VirtualTreeFreezeHdrRenderer, _super);
     function VirtualTreeFreezeHdrRenderer() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
@@ -14212,5 +14305,5 @@ var InfiniteScroll$1 = /** @__PURE__ @class */ (function () {
  * Export TreeGrid component
  */
 
-export { TreeGrid, load, rowDataBound, dataBound, queryCellInfo, beforeDataBound, actionBegin, dataStateChange, actionComplete, rowSelecting, rowSelected, checkboxChange, rowDeselected, toolbarClick, beforeExcelExport, beforePdfExport, resizeStop, expanded, expanding, collapsed, collapsing, remoteExpand, localPagedExpandCollapse, pagingActions, printGridInit, contextMenuOpen, contextMenuClick, beforeCopy, beforePaste, savePreviousRowPosition, crudAction, beginEdit, beginAdd, recordDoubleClick, cellSave, cellSaved, cellEdit, batchDelete, batchCancel, batchAdd, beforeBatchDelete, beforeBatchAdd, beforeBatchSave, batchSave, keyPressed, updateData, doubleTap, virtualColumnIndex, virtualActionArgs, destroy, dataListener, indexModifier, beforeStartEdit, beforeBatchCancel, batchEditFormRendered, detailDataBound, rowDrag, rowDragStartHelper, rowDrop, rowDragStart, rowsAdd, rowsRemove, rowdraging, rowDropped, autoCol, rowDeselecting, headerContent, movableContent, movableHeader, frozenContent, frozenHeader, content, table, leftRight, frozenRight, frozenLeft, dataColIndex, ariaColIndex, dataRowIndex, ariaRowIndex, DataManipulation, Reorder$1 as Reorder, Resize$1 as Resize, RowDD$1 as RowDD, Column, EditSettings, Predicate$1 as Predicate, FilterSettings, PageSettings, SearchSettings, SelectionSettings, AggregateColumn, AggregateRow, SortDescriptor, SortSettings, RowDropSettings$1 as RowDropSettings, InfiniteScrollSettings, LoadingIndicator, Render, TreeVirtualRowModelGenerator, isRemoteData, isCountRequired, isCheckboxcolumn, isFilterChildHierarchy, findParentRecords, getExpandStatus, findChildrenRecords, isOffline, extendArray, getPlainData, getParentData, isHidden, ToolbarItem, ContextMenuItems, Filter$1 as Filter, ExcelExport$1 as ExcelExport, PdfExport$1 as PdfExport, Page$1 as Page, Toolbar$1 as Toolbar, Aggregate$1 as Aggregate, Sort$1 as Sort, TreeClipboard, ColumnMenu$1 as ColumnMenu, ContextMenu$1 as ContextMenu, Edit$1 as Edit, CommandColumn$1 as CommandColumn, Selection, DetailRow$1 as DetailRow, VirtualScroll$1 as VirtualScroll, TreeVirtual, Freeze$1 as Freeze, ColumnChooser$1 as ColumnChooser, Logger$1 as Logger, treeGridDetails, InfiniteScroll$1 as InfiniteScroll };
+export { TreeGrid, load, rowDataBound, dataBound, queryCellInfo, beforeDataBound, actionBegin, dataStateChange, actionComplete, rowSelecting, rowSelected, checkboxChange, rowDeselected, toolbarClick, beforeExcelExport, beforePdfExport, resizeStop, expanded, expanding, collapsed, collapsing, remoteExpand, localPagedExpandCollapse, pagingActions, printGridInit, contextMenuOpen, contextMenuClick, beforeCopy, beforePaste, savePreviousRowPosition, crudAction, beginEdit, beginAdd, recordDoubleClick, cellSave, cellSaved, cellEdit, batchDelete, batchCancel, batchAdd, beforeBatchDelete, beforeBatchAdd, beforeBatchSave, batchSave, keyPressed, updateData, doubleTap, virtualColumnIndex, virtualActionArgs, destroy, dataListener, indexModifier, beforeStartEdit, beforeBatchCancel, batchEditFormRendered, detailDataBound, rowDrag, rowDragStartHelper, rowDrop, rowDragStart, rowsAdd, rowsRemove, rowdraging, rowDropped, autoCol, rowDeselecting, headerContent, movableContent, movableHeader, frozenContent, frozenHeader, content, table, leftRight, frozenRight, frozenLeft, dataColIndex, ariaColIndex, dataRowIndex, ariaRowIndex, DataManipulation, Reorder$1 as Reorder, Resize$1 as Resize, RowDD$1 as RowDD, Column, TreeGridColumn, StackedColumn, EditSettings, Predicate$1 as Predicate, FilterSettings, PageSettings, SearchSettings, SelectionSettings, AggregateColumn, AggregateRow, SortDescriptor, SortSettings, RowDropSettings$1 as RowDropSettings, InfiniteScrollSettings, LoadingIndicator, Render, TreeVirtualRowModelGenerator, isRemoteData, isCountRequired, isCheckboxcolumn, isFilterChildHierarchy, findParentRecords, getExpandStatus, findChildrenRecords, isOffline, extendArray, getPlainData, getParentData, isHidden, ToolbarItem, ContextMenuItems, Filter$1 as Filter, ExcelExport$1 as ExcelExport, PdfExport$1 as PdfExport, Page$1 as Page, Toolbar$1 as Toolbar, Aggregate$1 as Aggregate, Sort$1 as Sort, TreeClipboard, ColumnMenu$1 as ColumnMenu, ContextMenu$1 as ContextMenu, Edit$1 as Edit, CommandColumn$1 as CommandColumn, Selection, DetailRow$1 as DetailRow, VirtualScroll$1 as VirtualScroll, TreeVirtual, Freeze$1 as Freeze, ColumnChooser$1 as ColumnChooser, Logger$1 as Logger, treeGridDetails, InfiniteScroll$1 as InfiniteScroll };
 //# sourceMappingURL=ej2-treegrid.es5.js.map