@syncfusion/ej2-treegrid 20.1.47 → 20.1.48

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.1.47
+*  version : 20.1.48
 *  Copyright Syncfusion Inc. 2001 - 2020. 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@18.16.3",
+  "_id": "@syncfusion/ej2-treegrid@20.1.47",
   "_inBundle": false,
-  "_integrity": "sha512-OaaaeQK1Wag332oQTxhdgffuJg+IQA9aBRYfHc5OgYGw+FgdJAu4y/XBVY3LTgkZ0Z1qKxZIU2KxTjs/m0n7vg==",
+  "_integrity": "sha512-wi8XwhJB7KOHPpwl6tPNlqmE8HiFV+wPZHy+nOFvu2CL3/TQEqPhwz44h5EAuG+xRN6DqrOODGjf/R7DfWNAZA==",
   "_location": "/@syncfusion/ej2-treegrid",
   "_phantomChildren": {},
   "_requested": {
@@ -24,8 +24,8 @@
     "/@syncfusion/ej2-react-treegrid",
     "/@syncfusion/ej2-vue-treegrid"
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-release/@syncfusion/ej2-treegrid/-/ej2-treegrid-18.16.3.tgz",
-  "_shasum": "348932505ec2558f8d30b8ffead3f508749563e8",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-20.1.47.tgz",
+  "_shasum": "4e9347d2be3329f13cd71967f9b245887b42f746",
   "_spec": "@syncfusion/ej2-treegrid@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -36,9 +36,9 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.1.47",
+    "@syncfusion/ej2-base": "~20.1.48",
     "@syncfusion/ej2-data": "~20.1.47",
-    "@syncfusion/ej2-grids": "~20.1.47",
+    "@syncfusion/ej2-grids": "~20.1.48",
     "@syncfusion/ej2-popups": "~20.1.47"
   },
   "deprecated": false,
@@ -60,6 +60,6 @@
     "url": "git+https://github.com/syncfusion/ej2-treegrid.git"
   },
   "typings": "index.d.ts",
-  "version": "20.1.47",
+  "version": "20.1.48",
   "sideEffects": false
 }

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

@@ -4,6 +4,7 @@ import { DataManager } from '@syncfusion/ej2-data';
 import { findChildrenRecords, getParentData, extendArray } from '../utils';
 import { getUid } from '@syncfusion/ej2-grids';
 import { updateParentRow, editAction } from './crud-actions';
+import { classList } from '@syncfusion/ej2-base';
 /**
  * `BatchEdit` module is used to handle batch editing actions.
  *
@@ -236,9 +237,17 @@ var BatchEdit = /** @class */ (function () {
             this.parent.editModule[isTabLastRow] = false;
             return;
         }
-        this.selectedIndex = this.parent.grid.selectedRowIndex;
-        this.addRowIndex = this.parent.grid.selectedRowIndex > -1 ? this.parent.grid.selectedRowIndex : 0;
-        this.addRowRecord = this.parent.getSelectedRecords()[0];
+        if (this.parent.editModule['isAddedRowByMethod'] && !isNullOrUndefined(this.parent.editModule['addRowIndex']) && this.parent.grid.selectedRowIndex === -1) {
+            this.selectedIndex = this.parent.editModule['selectedIndex'];
+            this.addRowIndex = this.parent.editModule['addRowIndex'];
+            this.addRowRecord = this.parent.getCurrentViewRecords()[this.selectedIndex];
+        }
+        else {
+            this.selectedIndex = this.parent.grid.selectedRowIndex;
+            this.addRowIndex = this.parent.grid.selectedRowIndex > -1 ? this.parent.grid.selectedRowIndex : 0;
+            this.parent.editModule['addRowIndex'] = this.parent.grid.selectedRowIndex > -1 ? this.parent.grid.selectedRowIndex : 0;
+            this.addRowRecord = this.parent.getSelectedRecords()[0];
+        }
     };
     BatchEdit.prototype.batchAdd = function (e) {
         if (this.parent.editSettings.newRowPosition !== 'Bottom') {
@@ -250,6 +259,9 @@ var BatchEdit = /** @class */ (function () {
                 this.batchRecords = extendArray(this.parent.grid.getCurrentViewRecords());
                 this.currentViewRecords = extendArray(this.parent.grid.getCurrentViewRecords());
             }
+            if (this.parent.editModule['isAddedRowByMethod'] && !isNullOrUndefined(this.parent.editModule['addRowIndex'])) {
+                classList(this.parent.grid.getDataRows()[0], ['e-batchrow'], []);
+            }
             if (this.parent.editSettings.newRowPosition !== 'Top') {
                 var records = this.parent.grid.getCurrentViewRecords();
                 if (this.parent.editSettings.mode === 'Batch' && (this.parent.getBatchChanges()[this.addedRecords].length > 1
@@ -473,6 +485,10 @@ var BatchEdit = /** @class */ (function () {
             }
             if (this.parent.editSettings.newRowPosition !== 'Bottom' && !Object.hasOwnProperty.call(args, 'updatedRecords')) {
                 data.splice(data.length - addRecords.length, addRecords.length);
+                if (this.parent.editModule['isAddedRowByMethod'] && addRecords.length && !isNullOrUndefined(this.parent.editModule['addRowIndex'])) {
+                    var index_1 = parseInt(this.parent.getContentTable().getElementsByClassName('e-insertedrow')[0].ariaRowIndex);
+                    data.splice(index_1, 0, addRecords[0]);
+                }
                 if (!this.parent.allowPaging && data.length !== currentViewRecords.length) {
                     if (currentViewRecords.length > addRecords.length) {
                         currentViewRecords.splice(currentViewRecords.length - addRecords.length, addRecords.length);
@@ -524,7 +540,8 @@ var BatchEdit = /** @class */ (function () {
                 }
                 editAction({ value: addRecords[i], action: 'add' }, this.parent, this.isSelfReference, addRowIndex, selectedIndex, columnName, addRowRecord);
                 selectedIndex = null;
-                if (this.parent.editSettings.newRowPosition === 'Child' && !isNullOrUndefined(addRecords[i][parentItem])) {
+                if (this.parent.editSettings.newRowPosition === 'Child' && !isNullOrUndefined(addRecords[i][parentItem]) &&
+                    (isNullOrUndefined(this.parent.editModule['addRowIndex']) || this.isSelfReference)) {
                     var indexValue = currentViewRecords.map(function (e) { return e[primarykey_1]; })
                         .indexOf(addRecords[i][parentItem][primarykey_1]);
                     var children = currentViewRecords[indexValue][childRecords];

package/src/treegrid/actions/edit.js

@@ -677,6 +677,21 @@ var Edit = /** @class */ (function () {
                 focussedElement.focus();
             }
         }
+        if (this.parent.editSettings.mode === 'Batch' && !isNullOrUndefined(this.addRowIndex) && this.addRowIndex !== -1) {
+            index = this.batchEditModule.getAddRowIndex();
+            this.selectedIndex = this.batchEditModule.getSelectedIndex();
+            if (this.parent.editModule['isAddedRowByMethod']) {
+                var args = {
+                    action: "add",
+                    data: this.parent.getBatchChanges()['addedRecords'][0],
+                    index: index,
+                    seletedRow: 0
+                };
+                this.parent.editModule.beginAddEdit(args);
+                this.parent.editModule.batchEditModule['batchAddRowRecord'].push(this.parent.editModule.batchEditModule['addRowRecord']);
+                this.parent.editModule.batchEditModule['batchAddedRecords'].push(args['data']);
+            }
+        }
     };
     // private beforeDataBound(args: BeforeDataBoundArgs): void {
     //   if (this.parent.grid.isEdit && this.parent.dataSource instanceof DataManager &&

package/src/treegrid/actions/filter.js

@@ -155,6 +155,9 @@ var Filter = /** @class */ (function () {
                     }
                 }
                 else {
+                    if (parent['expanded'] === false && this.parent.getVisibleRecords().indexOf(record) === -1 && isNullOrUndefined(this.parent['dataResults']['action'])) {
+                        this.parent.expandRow(this.parent.getRows()[parent['index']], parent);
+                    }
                     this.addParentRecord(parent);
                 }
             }

package/src/treegrid/actions/rowdragdrop.js

@@ -139,17 +139,12 @@ var RowDD = /** @class */ (function () {
         }
     };
     RowDD.prototype.orderToIndex = function (currentData) {
-        var _loop_1 = function (i) {
+        for (var i = 0; i < currentData.length; i++) {
             currentData[i].index = i;
             if (!isNullOrUndefined(currentData[i].parentItem)) {
-                var updatedParent = currentData.filter(function (data) {
-                    return data.uniqueID === currentData[i].parentUniqueID;
-                })[0];
+                var updatedParent = getValue('uniqueIDCollection.' + currentData[i].parentUniqueID, this.parent);
                 currentData[i].parentItem.index = updatedParent.index;
             }
-        };
-        for (var i = 0; i < currentData.length; i++) {
-            _loop_1(i);
         }
         return currentData;
     };
@@ -799,7 +794,7 @@ var RowDD = /** @class */ (function () {
             if (!isNullOrUndefined(this.parent.idMapping)) {
                 dragRecords.reverse();
             }
-            var _loop_2 = function (i) {
+            var _loop_1 = function (i) {
                 draggedRecord_2 = dragRecords[i];
                 this_1.draggedRecord = draggedRecord_2;
                 if (this_1.dropPosition !== 'Invalid') {
@@ -886,7 +881,7 @@ var RowDD = /** @class */ (function () {
             };
             var this_1 = this;
             for (var i = 0; i < dragLength; i++) {
-                _loop_2(i);
+                _loop_1(i);
             }
         }
     };

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

@@ -1,4 +1,4 @@
-import { Component, addClass, createElement, EventHandler, isNullOrUndefined, Ajax, ModuleDeclaration, extend} from '@syncfusion/ej2-base';import { removeClass, EmitType, Complex, Collection, KeyboardEventArgs, getValue } 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, CellRenderer, Cell } from '@syncfusion/ej2-grids';import { GridModel, ColumnQueryModeType, HeaderCellInfoEventArgs, EditSettingsModel as GridEditModel } from '@syncfusion/ej2-grids';import {RowDragEventArgs, RowDropEventArgs, RowDropSettingsModel, RowDropSettings, getUid } from '@syncfusion/ej2-grids';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, 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 } 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 { CellSaveEventArgs, 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 { Component, addClass, createElement, EventHandler, isNullOrUndefined, Ajax, ModuleDeclaration, extend} from '@syncfusion/ej2-base';import { removeClass, EmitType, Complex, Collection, KeyboardEventArgs, getValue } 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 } from '@syncfusion/ej2-grids';import { GridModel, ColumnQueryModeType, HeaderCellInfoEventArgs, EditSettingsModel as GridEditModel } from '@syncfusion/ej2-grids';import {RowDragEventArgs, RowDropEventArgs, RowDropSettingsModel, RowDropSettings, getUid } from '@syncfusion/ej2-grids';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, 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 } 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 { CellSaveEventArgs, 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 {ComponentModel} from '@syncfusion/ej2-base';
 
 /**

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

@@ -1534,12 +1534,6 @@ export declare class TreeGrid extends Component<HTMLElement> implements INotifyP
      */
     getColumns(isRefresh?: boolean): Column[];
     private updateColumnModel;
-    /**
-     * @param {string} columnUid - Defines column uid
-     * @returns {void}
-     * @hidden
-     */
-    private refreshReactColumnTemplateByUid;
     /**
      * Gets the content div of the TreeGrid.
      *
@@ -1701,6 +1695,7 @@ export declare class TreeGrid extends Component<HTMLElement> implements INotifyP
      * @returns {void}
      */
     collapseRow(row: HTMLTableRowElement, record?: Object, key?: Object): void;
+    private updateExpandStateMapping;
     /**
      * Expands the records at specific hierarchical level
      *

package/src/treegrid/base/treegrid.js

@@ -21,7 +21,6 @@ import { Component, addClass, createElement, EventHandler, isNullOrUndefined, ex
 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 { CellRenderer } from '@syncfusion/ej2-grids';
 import { RowDropSettings, getUid } from '@syncfusion/ej2-grids';
 import { FilterSettings } from '../models/filter-settings';
 import { TextWrapSettings } from '../models/textwrap-settings';
@@ -1943,10 +1942,13 @@ var TreeGrid = /** @class */ (function (_super) {
         rowData.parentUniqueID = record.parentUniqueID;
         rowData.expanded = record.expanded;
         this.grid.setRowData(key, rowData);
-        var table = this.getContentTable();
-        var sHeight = table.scrollHeight;
-        var clientHeight = this.getContent().clientHeight;
-        this.lastRowBorder(this.getRows()[record.index], sHeight <= clientHeight);
+        var visibleRecords = this.getVisibleRecords();
+        if (visibleRecords.length > 0 && key === (visibleRecords[visibleRecords.length - 1])[primaryKey]) {
+            var table = this.getContentTable();
+            var sHeight = table.scrollHeight;
+            var clientHeight = this.getContent().clientHeight;
+            this.lastRowBorder(this.getRows()[currentRecords.indexOf(record)], sHeight <= clientHeight);
+        }
     };
     /**
      * Navigates to the specified target page.
@@ -2156,32 +2158,6 @@ var TreeGrid = /** @class */ (function (_super) {
         this[merge] = undefined; // Workaround for blazor updateModel
         return this.columnModel;
     };
-    /**
-     * @param {string} columnUid - Defines column uid
-     * @returns {void}
-     * @hidden
-     */
-    TreeGrid.prototype.refreshReactColumnTemplateByUid = function (columnUid) {
-        var _this = this;
-        if (this.isReact) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            this.clearTemplate(['columnTemplate'], undefined, function () {
-                var cells = 'cells';
-                var rowIdx = 'index';
-                var rowsObj = _this.grid.getRowsObject();
-                var indent = _this.grid.getIndentCount();
-                var cellIndex = _this.grid.getNormalizedColumnIndex(columnUid);
-                for (var j = 0; j < rowsObj.length; j++) {
-                    if (rowsObj[j].isDataRow && !isNullOrUndefined(rowsObj[j].index)) {
-                        var cell = rowsObj[j][cells][cellIndex];
-                        var cellRenderer = new CellRenderer(_this.grid, _this.grid.serviceLocator);
-                        var td = _this.getCellFromIndex(rowsObj[j].index, cellIndex - indent);
-                        cellRenderer.refreshTD(td, cell, rowsObj[j].data, { index: rowsObj[j][rowIdx] });
-                    }
-                }
-            });
-        }
-    };
     /**
      * Gets the content div of the TreeGrid.
      *
@@ -2327,8 +2303,14 @@ var TreeGrid = /** @class */ (function (_super) {
         this.uniqueIDCollection = {};
         this.convertTreeData(this.dataSource);
         if (!isCountRequired(this)) {
-            this.grid.dataSource = !(this.dataSource instanceof DataManager) ? this.flatData :
-                new DataManager(this.dataSource.dataSource, this.dataSource.defaultQuery, this.dataSource.adaptor);
+            if (!(this.dataSource instanceof DataManager)) {
+                this.grid.dataSource = this.flatData;
+            }
+            else {
+                this.grid.setProperties({
+                    dataSource: new DataManager(this.dataSource.dataSource, this.dataSource.defaultQuery, this.dataSource.adaptor)
+                }, true);
+            }
         }
         this.grid.refresh();
     };
@@ -2472,6 +2454,9 @@ var TreeGrid = /** @class */ (function (_super) {
                 if (!(isRemoteData(_this) && !isOffline(_this)) && (!isCountRequired(_this) || !isNullOrUndefined(record[children]))) {
                     var collapseArgs = { data: record, row: row };
                     _this.setHeightForFrozenContent();
+                    if (!isNullOrUndefined(_this.expandStateMapping)) {
+                        _this.updateExpandStateMapping(collapseArgs.data, true);
+                    }
                     _this.trigger(events.expanded, collapseArgs);
                 }
             }
@@ -2534,6 +2519,9 @@ var TreeGrid = /** @class */ (function (_super) {
                 var collapseArgs = { data: record, row: row };
                 if (!isRemoteData(_this)) {
                     _this.setHeightForFrozenContent();
+                    if (!isNullOrUndefined(_this.expandStateMapping)) {
+                        _this.updateExpandStateMapping(collapseArgs.data, false);
+                    }
                     _this.trigger(events.collapsed, collapseArgs);
                     if (_this.enableInfiniteScrolling) {
                         var scrollHeight = _this.grid.getContent().firstElementChild.scrollHeight;
@@ -2546,6 +2534,19 @@ var TreeGrid = /** @class */ (function (_super) {
             }
         });
     };
+    TreeGrid.prototype.updateExpandStateMapping = function (record, state) {
+        var totalRecords = record;
+        if (totalRecords.length) {
+            for (var i = 0; i < totalRecords.length; i++) {
+                totalRecords[i][this.expandStateMapping] = state;
+                editAction({ value: totalRecords[i], action: 'edit' }, this, this.isSelfReference, totalRecords[i].index, this.grid.selectedRowIndex, this.expandStateMapping);
+            }
+        }
+        else {
+            record[this.expandStateMapping] = state;
+            editAction({ value: record, action: 'edit' }, this, this.isSelfReference, record.index, this.grid.selectedRowIndex, this.expandStateMapping);
+        }
+    };
     /**
      * Expands the records at specific hierarchical level
      *

package/styles/bootstrap-dark.css

@@ -159,10 +159,6 @@
   width: 18px;
 }
 
-.e-bigger .e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 5px;
-}
-
 .e-bigger .e-treegrid .e-hierarchycheckbox {
   padding-left: 2px;
 }
@@ -216,10 +212,6 @@
   color: #f0f0f0;
 }
 
-.e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 5px;
-}
-
 .e-treegrid .e-rtl .e-treegridcollapse {
   transform: scale(-1);
 }

package/styles/bootstrap.css

@@ -160,10 +160,6 @@
   width: 18px;
 }
 
-.e-bigger .e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 5px;
-}
-
 .e-bigger .e-treegrid .e-hierarchycheckbox {
   padding-left: 2px;
 }
@@ -217,10 +213,6 @@
   color: #333;
 }
 
-.e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 5px;
-}
-
 .e-treegrid .e-rtl .e-treegridcollapse {
   transform: scale(-1);
 }

package/styles/bootstrap4.css

@@ -200,10 +200,6 @@
   width: 16px;
 }
 
-.e-bigger .e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 12px;
-}
-
 .e-bigger .e-treegrid .e-hierarchycheckbox {
   padding-left: 2px;
 }
@@ -254,10 +250,6 @@
   color: #343a40;
 }
 
-.e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 9px;
-}
-
 .e-treegrid .e-rtl .e-treegridcollapse {
   transform: scale(-1);
 }

package/styles/bootstrap5-dark.css

@@ -200,10 +200,6 @@
   width: 22px;
 }
 
-.e-bigger .e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 7px;
-}
-
 .e-bigger .e-treegrid .e-hierarchycheckbox {
   padding-left: 2px;
 }
@@ -254,10 +250,6 @@
   color: #dee2e6;
 }
 
-.e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 12px;
-}
-
 .e-treegrid .e-rtl .e-treegridcollapse {
   transform: scale(-1);
 }

package/styles/bootstrap5.css

@@ -200,10 +200,6 @@
   width: 22px;
 }
 
-.e-bigger .e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 7px;
-}
-
 .e-bigger .e-treegrid .e-hierarchycheckbox {
   padding-left: 2px;
 }
@@ -254,10 +250,6 @@
   color: #343a40;
 }
 
-.e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 12px;
-}
-
 .e-treegrid .e-rtl .e-treegridcollapse {
   transform: scale(-1);
 }

package/styles/fabric-dark.css

@@ -133,10 +133,6 @@
   width: 18px;
 }
 
-.e-bigger .e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 9px;
-}
-
 .e-bigger .e-treegrid .e-hierarchycheckbox {
   padding-left: 2px;
 }
@@ -190,10 +186,6 @@
   color: #dadada;
 }
 
-.e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 5px;
-}
-
 .e-treegrid .e-rtl .e-treegridcollapse {
   transform: scale(-1);
 }

package/styles/fabric.css

@@ -126,10 +126,6 @@
   width: 18px;
 }
 
-.e-bigger .e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 9px;
-}
-
 .e-bigger .e-treegrid .e-hierarchycheckbox {
   padding-left: 2px;
 }
@@ -183,10 +179,6 @@
   color: #333;
 }
 
-.e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 5px;
-}
-
 .e-treegrid .e-rtl .e-treegridcollapse {
   transform: scale(-1);
 }

package/styles/fluent-dark.css

@@ -178,10 +178,6 @@
   width: 22px;
 }
 
-.e-bigger .e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 7px;
-}
-
 .e-bigger .e-treegrid .e-hierarchycheckbox {
   padding-left: 2px;
 }
@@ -241,7 +237,7 @@
   color: #f3f2f1;
 }
 
-.e-treegrid .e-rowcell.e-treerowcell {
+.e-treegrid .e-rowcell.e-treerowcell.e-treegridcheckbox {
   padding-left: 12px;
 }
 

package/styles/fluent.css

@@ -178,10 +178,6 @@
   width: 22px;
 }
 
-.e-bigger .e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 7px;
-}
-
 .e-bigger .e-treegrid .e-hierarchycheckbox {
   padding-left: 2px;
 }
@@ -241,7 +237,7 @@
   color: #323130;
 }
 
-.e-treegrid .e-rowcell.e-treerowcell {
+.e-treegrid .e-rowcell.e-treerowcell.e-treegridcheckbox {
   padding-left: 12px;
 }
 

package/styles/highcontrast-light.css

@@ -143,10 +143,6 @@
   width: 18px;
 }
 
-.e-bigger .e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 9px;
-}
-
 .e-bigger .e-treegrid .e-hierarchycheckbox {
   padding-left: 2px;
 }
@@ -200,10 +196,6 @@
   color: #000;
 }
 
-.e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 5px;
-}
-
 .e-treegrid .e-rtl .e-treegridcollapse {
   transform: scale(-1);
 }

package/styles/highcontrast.css

@@ -143,10 +143,6 @@
   width: 18px;
 }
 
-.e-bigger .e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 9px;
-}
-
 .e-bigger .e-treegrid .e-hierarchycheckbox {
   padding-left: 2px;
 }
@@ -200,10 +196,6 @@
   color: #fff;
 }
 
-.e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 5px;
-}
-
 .e-treegrid .e-rtl .e-treegridcollapse {
   transform: scale(-1);
 }

package/styles/material-dark.css

@@ -169,10 +169,6 @@
   width: 18px;
 }
 
-.e-bigger .e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 25px;
-}
-
 .e-bigger .e-treegrid .e-hierarchycheckbox {
   padding-left: 2px;
 }
@@ -223,10 +219,6 @@
   color: #fff;
 }
 
-.e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 18px;
-}
-
 .e-treegrid .e-rtl .e-treegridcollapse {
   transform: scale(-1);
 }

package/styles/material.css

@@ -204,10 +204,6 @@
   width: 18px;
 }
 
-.e-bigger .e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 25px;
-}
-
 .e-bigger .e-treegrid .e-hierarchycheckbox {
   padding-left: 2px;
 }
@@ -258,10 +254,6 @@
   color: #000;
 }
 
-.e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 18px;
-}
-
 .e-treegrid .e-rtl .e-treegridcollapse {
   transform: scale(-1);
 }

package/styles/tailwind-dark.css

@@ -140,10 +140,6 @@
   width: 22px;
 }
 
-.e-bigger .e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 7px;
-}
-
 .e-bigger .e-treegrid .e-hierarchycheckbox {
   padding-left: 2px;
 }
@@ -194,10 +190,6 @@
   color: #f3f4f6;
 }
 
-.e-treegrid .e-rowcell.e-treerowcell {
-  padding-left: 12px;
-}
-
 .e-treegrid .e-rtl .e-treegridcollapse {
   transform: scale(-1);
 }