@syncfusion/ej2-treegrid 33.2.12 → 34.1.29

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 33.2.12
+*  version : 34.1.29
 *  Copyright Syncfusion Inc. 2001 - 2025. 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/helpers/e2e/index.d.ts

@@ -0,0 +1 @@
+export * from './treegridhelper';

package/helpers/e2e/index.js

@@ -0,0 +1,8 @@
+define(["require", "exports", "./treegridhelper"], function (require, exports, treegridhelper_1) {
+    "use strict";
+    function __export(m) {
+        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    }
+    Object.defineProperty(exports, "__esModule", { value: true });
+    __export(treegridhelper_1);
+});

package/helpers/e2e/treegridhelper.d.ts

@@ -0,0 +1,21 @@
+import { TestHelper } from '@syncfusion/ej2-base/helpers/e2e';
+export declare class TreeGridHelper extends TestHelper {
+    id: string;
+    wrapperFn: Function;
+    constructor(id: string, wrapperFn: Function);
+    getDataGridElement(): any;
+    getHeaderElement(): any;
+    getContentElement(): any;
+    getFooterElement(): any;
+    getPagerElement(): any;
+    getDialogElement(): any;
+    getFilterPopupElement(): any;
+    getToolbarElement(): any;
+    getCurrentPagerElement(): any;
+    getPagerDropDownElement(): any;
+    getExpandedElements(): any;
+    getCollapsedElements(): any;
+    setModel(property: any, value: any): any;
+    getModel(property: any): any;
+    invoke(fName: any, args?: any): any;
+}

package/helpers/e2e/treegridhelper.js

@@ -0,0 +1,83 @@
+var __extends = (this && this.__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 __());
+    };
+})();
+define(["require", "exports", "@syncfusion/ej2-base/helpers/e2e"], function (require, exports, e2e_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var TreeGridHelper = (function (_super) {
+        __extends(TreeGridHelper, _super);
+        function TreeGridHelper(id, wrapperFn) {
+            var _this = _super.call(this) || this;
+            _this.id = id;
+            if (wrapperFn !== undefined) {
+                _this.wrapperFn = wrapperFn;
+            }
+            return _this;
+        }
+        TreeGridHelper.prototype.getDataGridElement = function () {
+            return this.selector('#' + this.id);
+        };
+        TreeGridHelper.prototype.getHeaderElement = function () {
+            return this.selector('#' + this.id + ' .e-gridheader');
+        };
+        TreeGridHelper.prototype.getContentElement = function () {
+            return this.selector('#' + this.id + ' .e-gridcontent');
+        };
+        TreeGridHelper.prototype.getFooterElement = function () {
+            return this.selector('#' + this.id + ' .e-gridfooter');
+        };
+        TreeGridHelper.prototype.getPagerElement = function () {
+            return this.selector('#' + this.id + ' .e-gridpager');
+        };
+        TreeGridHelper.prototype.getDialogElement = function () {
+            return this.selector('#' + this.id + '_gridcontrol_dialogEdit_wrapper');
+        };
+        TreeGridHelper.prototype.getFilterPopupElement = function () {
+            return this.selector('#' + this.id + ' .e-filter-popup');
+        };
+        TreeGridHelper.prototype.getToolbarElement = function () {
+            return this.selector('#' + this.id + '_gridcontrol_toolbarItems');
+        };
+        TreeGridHelper.prototype.getCurrentPagerElement = function () {
+            return this.selector('#' + this.id + ' .e-numericitem.e-currentitem');
+        };
+        TreeGridHelper.prototype.getPagerDropDownElement = function () {
+            return this.selector('#' + this.id + ' .e-pagerdropdown');
+        };
+        TreeGridHelper.prototype.getExpandedElements = function () {
+            return this.selector('#' + this.id + ' .e-treegridexpand');
+        };
+        TreeGridHelper.prototype.getCollapsedElements = function () {
+            return this.selector('#' + this.id + ' .e-treegridcollapsed');
+        };
+        TreeGridHelper.prototype.setModel = function (property, value) {
+            return cy.get('#' + this.id).then(function (ele) {
+                return ele[0].ej2_instances[0][property] = value;
+            });
+        };
+        TreeGridHelper.prototype.getModel = function (property) {
+            return cy.get('#' + this.id).then(function (ele) {
+                return ele[0].ej2_instances[0][property];
+            });
+        };
+        TreeGridHelper.prototype.invoke = function (fName, args) {
+            if (args === void 0) { args = []; }
+            return cy.get('#' + this.id).then(function (ele) {
+                var inst = ele[0].ej2_instances[0];
+                return inst[fName].apply(inst, args);
+            });
+        };
+        return TreeGridHelper;
+    }(e2e_1.TestHelper));
+    exports.TreeGridHelper = TreeGridHelper;
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syncfusion/ej2-treegrid",
-  "version": "33.2.12",
+  "version": "34.1.29",
   "description": "Essential JS 2 TreeGrid Component",
   "author": "Syncfusion Inc.",
   "license": "SEE LICENSE IN license",
@@ -8,10 +8,10 @@
   "module": "./index.js",
   "es2015": "./dist/es6/ej2-treegrid.es5.js",
   "dependencies": {
-    "@syncfusion/ej2-base": "~33.2.3",
-    "@syncfusion/ej2-data": "~33.2.12",
-    "@syncfusion/ej2-grids": "~33.2.12",
-    "@syncfusion/ej2-popups": "~33.2.7"
+    "@syncfusion/ej2-base": "~34.1.29",
+    "@syncfusion/ej2-data": "~34.1.29",
+    "@syncfusion/ej2-grids": "~34.1.29",
+    "@syncfusion/ej2-popups": "~34.1.29"
   },
   "devDependencies": {},
   "keywords": [

package/src/treegrid/actions/batch-edit.d.ts

@@ -66,6 +66,7 @@ export declare class BatchEdit {
     private beforeBatchSave;
     private deleteUniqueID;
     private batchCancelAction;
+    private getInsertedRowIndex;
     private batchSave;
     private getActualRowObjectIndex;
     private immutableBatchAction;

package/src/treegrid/actions/batch-edit.js

@@ -290,7 +290,8 @@ var BatchEdit = /** @class */ (function () {
             if (this.parent.editModule['isAddedRowByMethod'] && !isNullOrUndefined(this.parent.editModule['addRowIndex']) &&
                 !this.parent.editModule['isAddedRowByContextMenu'] && !this.parent.editModule.isAddedMultipleRowsByMethod) {
                 var newlyAddedRecords = this.parent.getBatchChanges()['addedRecords'];
-                var index = parseInt(this.parent.getContentTable().getElementsByClassName('e-insertedrow')[newlyAddedRecords.length - 1].getAttribute('aria-rowindex'), 10) - 1;
+                var index = this.getInsertedRowIndex(newlyAddedRecords.length - 1);
+                this.batchIndex = index;
                 this.batchRecords.splice(index, 0, newlyAddedRecords[newlyAddedRecords.length - 1]);
             }
         }
@@ -466,6 +467,17 @@ var BatchEdit = /** @class */ (function () {
         this.batchDeletedRecords = [];
         this.parent.grid.renderModule.refresh();
     };
+    BatchEdit.prototype.getInsertedRowIndex = function (elementIndex) {
+        var header = this.parent.getHeaderTable().getElementsByClassName('e-insertedrow')[parseInt(elementIndex.toString(), 10)];
+        var content = this.parent.getContentTable().getElementsByClassName('e-insertedrow')[parseInt(elementIndex.toString(), 10)];
+        if (this.parent.frozenRows && header) {
+            return parseInt(header.getAttribute('aria-rowindex'), 10) - 1;
+        }
+        if (content) {
+            return parseInt(content.getAttribute('aria-rowindex'), 10) - 1;
+        }
+        return -1;
+    };
     BatchEdit.prototype.batchSave = function (args) {
         if (this.parent.editSettings.mode === 'Batch') {
             var i = void 0;
@@ -494,7 +506,7 @@ var BatchEdit = /** @class */ (function () {
                 if (this.parent.editModule['isAddedRowByMethod'] && addRecords.length && !isNullOrUndefined(this.parent.editModule['addRowIndex']) && !this.parent.editModule['isAddedRowByContextMenu']) {
                     addRecords.reverse();
                     for (var i_1 = 0; i_1 < addRecords.length; i_1++) {
-                        var index_1 = parseInt(this.parent.getContentTable().getElementsByClassName('e-insertedrow')[parseInt(i_1.toString(), 10)].getAttribute('aria-rowindex'), 10) - 1;
+                        var index_1 = this.getInsertedRowIndex(parseInt(i_1.toString(), 10));
                         data.splice(index_1, 0, addRecords[parseInt(i_1.toString(), 10)]);
                     }
                 }

package/src/treegrid/actions/edit.d.ts

@@ -121,4 +121,16 @@ export declare class Edit {
      * @returns {void}
      */
     private closeEdit;
+    /**
+     * Handles TreeGrid-specific validation for tooltip positioning on last row.
+     *
+     * @param {Object} args - Validation flags
+     * @param {boolean} args.isBeginEdit - Whether editing has begun
+     * @param {boolean} args.isAddedRow - Whether the row is newly added
+     * @param {boolean} args.isLastRow - Whether this is the last row
+     * @param {boolean} args.validationPositionResult - Validation position result
+     * @returns {void}
+     * @hidden
+     */
+    private lastRowValidation;
 }

package/src/treegrid/actions/edit.js

@@ -67,6 +67,7 @@ var Edit = /** @class */ (function () {
         this.parent.grid.on(events.beforeBatchCancel, this.beforeBatchCancel, this);
         this.parent.grid.on('reset-edit-props', this.resetIsOnBatch, this);
         this.parent.grid.on('get-row-position', this.getRowPosition, this);
+        this.parent.grid.on('last-row-validation', this.lastRowValidation, this);
     };
     Edit.prototype.gridDblClick = function (e) {
         this.doubleClickTarget = e.target;
@@ -80,6 +81,7 @@ var Edit = /** @class */ (function () {
                 /* eslint-disable-next-line */
                 this.parent.grid.getDataRows()[rowIndex].dataset.uid = this.parent.grid.contentModule.getRows()[rowIndex].uid;
             }
+            this.doubleClickTarget = null;
         }
     };
     Edit.prototype.getRowPosition = function (addArgs) {
@@ -125,6 +127,7 @@ var Edit = /** @class */ (function () {
         this.parent.grid.off('dblclick', this.gridDblClick);
         this.parent.grid.off('reset-edit-props', this.resetIsOnBatch);
         this.parent.grid.off('get-row-position', this.getRowPosition);
+        this.parent.grid.off('last-row-validation', this.lastRowValidation);
         //this.parent.grid.off('click', this.gridSingleClick);
     };
     /**
@@ -273,7 +276,7 @@ var Edit = /** @class */ (function () {
         this.parent.grid.isEdit = false;
     };
     Edit.prototype.resetIsOnBatch = function () {
-        if (this.parent.enableVirtualization && this.parent.editSettings.mode === 'Cell') {
+        if (this.parent.enableVirtualization && this.parent.editSettings.mode === 'Cell' && !this.parent['isGantt']) {
             this.isOnBatch = false;
             this.updateGridEditMode('Normal');
         }
@@ -706,7 +709,9 @@ var Edit = /** @class */ (function () {
                 seletedRow: 0
             };
             this.beginAddEdit(args);
-            this.batchEditModule['batchAddRowRecord'].push(this.batchEditModule['addRowRecord']);
+            if (this.batchEditModule['addRowRecord']) {
+                this.batchEditModule['batchAddRowRecord'].push(this.batchEditModule['addRowRecord']);
+            }
             this.batchEditModule['batchAddedRecords'].push(args['data']);
         }
         else if (this.parent.editSettings.mode === 'Batch' && this.isAddedMultipleRowsByMethod && (this.parent.editSettings.newRowPosition === 'Above' || this.parent.editSettings.newRowPosition === 'Below')) {
@@ -726,7 +731,9 @@ var Edit = /** @class */ (function () {
                         seletedRow: 0
                     };
                     this.beginAddEdit(args);
-                    this.batchEditModule['batchAddRowRecord'].push(this.batchEditModule['addRowRecord']);
+                    if (this.batchEditModule['addRowRecord']) {
+                        this.batchEditModule['batchAddRowRecord'].push(this.batchEditModule['addRowRecord']);
+                    }
                     this.batchEditModule['batchAddedRecords'].push(args['data']);
                 }
             }
@@ -1143,6 +1150,31 @@ var Edit = /** @class */ (function () {
         }
         this.parent.grid.editModule.closeEdit();
     };
+    /**
+     * Handles TreeGrid-specific validation for tooltip positioning on last row.
+     *
+     * @param {Object} args - Validation flags
+     * @param {boolean} args.isBeginEdit - Whether editing has begun
+     * @param {boolean} args.isAddedRow - Whether the row is newly added
+     * @param {boolean} args.isLastRow - Whether this is the last row
+     * @param {boolean} args.validationPositionResult - Validation position result
+     * @returns {void}
+     * @hidden
+     */
+    Edit.prototype.lastRowValidation = function (args) {
+        if (!this.parent.enableVirtualization) {
+            return;
+        }
+        var isBeginEdit = args.isBeginEdit, isAddedRow = args.isAddedRow, isLastRow = args.isLastRow;
+        var newRowPosition = this.parent.editSettings.newRowPosition;
+        if ((newRowPosition === 'Child' || newRowPosition === 'Below' || newRowPosition === 'Above') &&
+            isAddedRow && isLastRow) {
+            args.validationPositionResult = true;
+        }
+        else if (isBeginEdit && isLastRow) {
+            args.validationPositionResult = true;
+        }
+    };
     return Edit;
 }());
 export { Edit };

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

@@ -173,7 +173,9 @@ var PdfExport = /** @class */ (function () {
         }
         prop = isNullOrUndefined(prop) ? {} : prop;
         prop.dataSource = new DataManager({ json: dtSrc });
-        prop.query = args['query'];
+        if (this.parent.aggregates.length > 0) {
+            prop.query = args['query'];
+        }
         return prop;
     };
     /**

package/src/treegrid/base/data.js

@@ -88,12 +88,10 @@ var DataManipulation = /** @class */ (function () {
             if (this.parent.parentIdMapping) {
                 this.parent.query = isNullOrUndefined(this.parent.query) ?
                     new Query() : this.parent.query;
-                if (this.parent.parentIdMapping) {
-                    var filterKey = this.parent.query.params.filter(function (param) { return param.key === 'IdMapping'; });
-                    if (this.parent.initialRender && !filterKey.length) {
-                        this.parent.query.where(this.parent.parentIdMapping, 'equal', null);
-                        this.parent.query.addParams('IdMapping', this.parent.idMapping);
-                    }
+                var filterKey = this.parent.query.params.filter(function (param) { return param.key === 'IdMapping'; });
+                if (this.parent.initialRender && !filterKey.length) {
+                    this.parent.query.where(this.parent.parentIdMapping, 'equal', null);
+                    this.parent.query.addParams('IdMapping', this.parent.idMapping);
                 }
                 if (!this.parent.hasChildMapping) {
                     var qry = this.parent.query.clone();
@@ -659,9 +657,6 @@ var DataManipulation = /** @class */ (function () {
                         ? currentData[this.parent.expandStateMapping] : true;
                 }
             }
-            if (!Object.prototype.hasOwnProperty.call(currentData, 'index')) {
-                currentData.index = currentData.hasChildRecords ? this.storedIndex : this.storedIndex;
-            }
             if (this.isSelfReference && isNullOrUndefined(currentData[this.parent.parentIdMapping])) {
                 this.parent.parentData.push(currentData);
             }
@@ -848,8 +843,7 @@ var DataManipulation = /** @class */ (function () {
         }
         var isPdfExport = 'isPdfExport';
         var isCollapsedStatePersist = 'isCollapsedStatePersist';
-        if ((isPrinting === true || (args["" + isPdfExport] && (isNullOrUndefined(args["" + isCollapsedStatePersist])
-            || args["" + isCollapsedStatePersist]))) && this.parent.printMode === 'AllPages') {
+        if ((isPrinting === true || (args["" + isPdfExport] && args["" + isCollapsedStatePersist] === true)) && this.parent.printMode === 'AllPages') {
             var actualResults = [];
             for (var i = 0; i < results.length; i++) {
                 var expandStatus = getExpandStatus(this.parent, results[parseInt(i.toString(), 10)], this.parent.parentData);

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

@@ -2504,6 +2504,13 @@ export declare class TreeGrid extends Component<HTMLElement> implements INotifyP
      * @returns {number} returns the page size
      */
     getPageSizeByHeight(containerHeight?: number | string): number;
+    /**
+     * Gets the row index based on the given primary key value or row data.
+     *
+     * @param {string | number | object} value - The primary key value or row data.
+     * @returns {number} Returns the row index.
+     */
+    getRowIndexByPrimaryKey(value: string | Object | number): number;
     /**
      * `columnchooserModule` is used to dynamically show or hide the TreeGrid columns.
      *

package/src/treegrid/base/treegrid.js

@@ -1508,8 +1508,13 @@ var TreeGrid = /** @class */ (function (_super) {
             this.grid.dataSource = { result: data, count: datacount };
         }
         else {
+            var cacheAdaptor = null;
+            if ((this.dataSource instanceof DataManager) && this.dataSource["" + dataSource] &&
+                this.dataSource["" + dataSource].enableCaching) {
+                cacheAdaptor = this.dataSource["" + adaptor].cacheAdaptor;
+            }
             this.grid.dataSource = !(this.dataSource instanceof DataManager) ?
-                this.flatData : new DataManager(this.dataSource.dataSource, this.dataSource.defaultQuery, this.dataSource.adaptor, this.hasPreAndPostMiddleware(this.dataSource) ? this.dataSource : undefined);
+                this.flatData : new DataManager(this.dataSource.dataSource, this.dataSource.defaultQuery, cacheAdaptor ? cacheAdaptor : this.dataSource.adaptor, this.hasPreAndPostMiddleware(this.dataSource) ? this.dataSource : undefined);
         }
         if (this.dataSource instanceof DataManager && (this.dataSource.dataSource.offline || this.dataSource.ready)) {
             this.grid.dataSource["" + dataSource].json = extendArray(this.dataSource["" + dataSource].json);
@@ -1909,6 +1914,14 @@ var TreeGrid = /** @class */ (function (_super) {
                     gridColumn.textAlign = 'Right';
                 }
             }
+            else if (!isNullOrUndefined(this.columnModel[this.treeColumnIndex]) && !this.enableRtl) {
+                if (isNullOrUndefined(this.treeColumnField)) {
+                    this.treeColumnField = gridColumn.field;
+                }
+                if (isNullOrUndefined(this.treeColumnTextAlign) && this.treeColumnField === this.columnModel[this.treeColumnIndex].field) {
+                    this.treeColumnTextAlign = this.columnModel[this.treeColumnIndex].textAlign;
+                }
+            }
         }
         return gridColumnCollection;
     };
@@ -1930,6 +1943,7 @@ var TreeGrid = /** @class */ (function (_super) {
     TreeGrid.prototype.onPropertyChanged = function (newProp) {
         var properties = Object.keys(newProp);
         var requireRefresh = false;
+        var refreshComponent = false;
         for (var _i = 0, properties_1 = properties; _i < properties_1.length; _i++) {
             var prop = properties_1[_i];
             switch (prop) {
@@ -2073,6 +2087,8 @@ var TreeGrid = /** @class */ (function (_super) {
                     this.TreeGridLocale();
                     this.grid.toolbar = this.getGridToolbar();
                     this.grid.contextMenuItems = this.getContextMenu();
+                    requireRefresh = true;
+                    refreshComponent = true;
                     break;
                 case 'selectedRowIndex':
                     this.grid.selectedRowIndex = this.selectedRowIndex;
@@ -2102,10 +2118,8 @@ var TreeGrid = /** @class */ (function (_super) {
                     this.grid.allowPdfExport = this.allowPdfExport;
                     break;
                 case 'enableRtl':
-                    if (!isNullOrUndefined(this.treeColumnField)) {
-                        this.updateTreeColumnTextAlign();
-                    }
                     this.grid.enableRtl = this.enableRtl;
+                    this.updateColumnModel();
                     break;
                 case 'allowReordering':
                     this.grid.allowReordering = this.allowReordering;
@@ -2158,7 +2172,7 @@ var TreeGrid = /** @class */ (function (_super) {
             }
         }
         if (requireRefresh) {
-            if (this.isFrozenGrid()) {
+            if (refreshComponent || this.isFrozenGrid()) {
                 this.refreshLayout();
             }
             else {
@@ -2973,6 +2987,12 @@ var TreeGrid = /** @class */ (function (_super) {
         if (!this.stackedHeader && !isNullOrUndefined(this.columns)) {
             merge(this.columns, this.columnModel);
         }
+        if (!this.enableRtl && !isNullOrUndefined(this.columnModel[this.treeColumnIndex])
+            && !isNullOrUndefined(this.treeColumnField)) {
+            if (this.columnModel[this.treeColumnIndex].field === this.treeColumnField) {
+                this.columnModel[this.treeColumnIndex].textAlign = this.treeColumnTextAlign;
+            }
+        }
         this["" + deepMerge] = undefined; // Workaround for blazor updateModel
         return this.columnModel;
     };
@@ -4864,6 +4884,15 @@ var TreeGrid = /** @class */ (function (_super) {
             return 0;
         }
     };
+    /**
+     * Gets the row index based on the given primary key value or row data.
+     *
+     * @param {string | number | object} value - The primary key value or row data.
+     * @returns {number} Returns the row index.
+     */
+    TreeGrid.prototype.getRowIndexByPrimaryKey = function (value) {
+        return this.grid.getRowIndexByPrimaryKey(value);
+    };
     var TreeGrid_1;
     __decorate([
         Property(0)

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

@@ -155,7 +155,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                 this.startIndex = lastIndex - this.parent.getRows().length;
                 this.endIndex = lastIndex;
             }
-            else if (this.parent.root.editSettings.newRowPosition !== 'Top' && this.parent.root.editModule.selectedIndex !== -1 || this.parent.root.editModule.selectedIndex !== -1) {
+            else if (this.parent.root.editModule.selectedIndex !== -1) {
                 this.startIndex += 1;
                 this.endIndex += 1;
             }
@@ -634,8 +634,10 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
             var directVirtualRender = 'directVirtualRender';
             if (!_this.parent["" + directVirtualRender]) { // with this property, columns are rendered without debouncing on horizontal scroll.
                 var preventEvent = 'preventEvent';
-                if (Browser.isIE && !isWheel && check && !_this["" + preventEvent] && !_this.parent.enableVirtualMaskRow) {
-                    _this.parent.showSpinner();
+                if (!isWheel && check && !_this["" + preventEvent] && !_this.parent.enableVirtualMaskRow) {
+                    if (Browser.isIE) {
+                        _this.parent.showSpinner();
+                    }
                 }
                 if (_this.parent.enableVirtualMaskRow && !_this["" + preventEvent]) {
                     setTimeout(function () {
@@ -713,12 +715,12 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
             this.parent.root.scrollPosition = scrollArgs.offset;
         }
         var info = scrollArgs.sentinel;
+        var rowHeight = parseInt(this.parent.getRowHeight().toString(), 10);
+        var outBuffer = this.parent.pageSettings.pageSize - Math.ceil(this.parent.pageSettings.pageSize / 2);
         var treeGridParent = null;
         if (this.parent.clipboardModule && this.parent.clipboardModule['treeGridParent']) {
             treeGridParent = this.parent.clipboardModule['treeGridParent'];
         }
-        var rowHeight = parseInt(this.parent.getRowHeight().toString(), 10);
-        var outBuffer = this.parent.pageSettings.pageSize - Math.ceil(this.parent.pageSettings.pageSize / 2);
         var content;
         if (!isNullOrUndefined(this.parent.contentModule)) {
             content = this.parent.getContent().querySelector('.e-content');
@@ -985,6 +987,9 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
             var focusCell = 'focusCell';
             var restoreAdd = 'restoreAdd';
             var ensureSelectedRowPosition = 'ensureSelectedRowPosition';
+            if (this['pressedKey'] === 'downArrow' || this['pressedKey'] === 'upArrow') {
+                this['activeKey'] = this['pressedKey'];
+            }
             _super.prototype["" + focusCell].call(this, e);
             var isAdd = 'isAdd';
             if (this["" + isAdd] && !this.parent.getContent().querySelector('.e-content').querySelector('.e-addedrow')) {