@syncfusion/ej2-treegrid 20.2.44 → 20.2.49

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.2.44
+*  version : 20.2.49
 *  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@20.2.43",
+  "_id": "@syncfusion/ej2-treegrid@20.2.46",
   "_inBundle": false,
-  "_integrity": "sha512-All3AvUDevK49U7XAKoSUYwrSfbkE5eqyYMPppHtd+60ksQ35EmGVPppVPvI035s+PrDJOJvztD5M41JtjkEgw==",
+  "_integrity": "sha512-0SyT77dBgVOM2dMvYAZTKTa1lbiUkc2eAQXOWT+BUE0AS5gJZu2W7kNchvvayJVtor/3u3SkoUVg8lOsDy3eUw==",
   "_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-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-20.2.43.tgz",
-  "_shasum": "ce98748e645ea015021c79b70828538d8e5e0107",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-20.2.46.tgz",
+  "_shasum": "f7e5f74d66bffde32c3c7b995b213375cc3773c9",
   "_spec": "@syncfusion/ej2-treegrid@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -36,10 +36,10 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.2.43",
-    "@syncfusion/ej2-data": "~20.2.43",
-    "@syncfusion/ej2-grids": "~20.2.44",
-    "@syncfusion/ej2-popups": "~20.2.43"
+    "@syncfusion/ej2-base": "~20.2.48",
+    "@syncfusion/ej2-data": "~20.2.45",
+    "@syncfusion/ej2-grids": "~20.2.49",
+    "@syncfusion/ej2-popups": "~20.2.49"
   },
   "deprecated": false,
   "description": "Essential JS 2 TreeGrid Component",
@@ -60,6 +60,6 @@
     "url": "git+https://github.com/syncfusion/ej2-treegrid.git"
   },
   "typings": "index.d.ts",
-  "version": "20.2.44",
+  "version": "20.2.49",
   "sideEffects": false
 }

package/src/treegrid/actions/context-menu.js

@@ -47,9 +47,9 @@ var ContextMenu = /** @class */ (function () {
             && !(isNullOrUndefined(editRecord)) && !(editRecord.classList.contains('e-menu-hide'))) {
             editRecord.style.display = 'none';
         }
-        if (indent || outdent) {
-            var tObj = this.parent;
-            var selectedrow = tObj.getSelectedRows()[0];
+        var tObj = this.parent;
+        var selectedrow = tObj.getSelectedRows()[0];
+        if ((indent || outdent) && !isNullOrUndefined(selectedrow)) {
             var targetElement = args.event.target.closest('td');
             if (isNullOrUndefined(targetElement) || (!isNullOrUndefined(targetElement) && !targetElement.classList.contains('e-rowcell'))) {
                 indent.style.display = outdent.style.display = 'none';
@@ -61,31 +61,32 @@ var ContextMenu = /** @class */ (function () {
                 else if (args['name'] !== 'rowDeselected' || (!isNullOrUndefined(selectedrow) && tObj.grid.isCheckBoxSelection)) {
                     var selectedItem = tObj.getCurrentViewRecords()[selectedrow.rowIndex];
                     if (!isNullOrUndefined(selectedItem)) {
-                        if ((selectedItem.level > tObj.getCurrentViewRecords()[selectedrow.rowIndex - 1].level)) {
+                        if ((selectedItem.level > tObj.getCurrentViewRecords()[selectedrow.rowIndex - 1].level) || this.parent.editSettings.mode === 'Batch'
+                            || this.parent.editSettings.mode === 'Cell') {
                             indent.style.display = 'none';
                         }
                         else {
                             indent.style.display = 'block';
                         }
-                        if (selectedItem.level === tObj.getCurrentViewRecords()[selectedrow.rowIndex - 1].level) {
+                        if ((selectedItem.level === tObj.getCurrentViewRecords()[selectedrow.rowIndex - 1].level) && this.parent.editSettings.mode !== 'Batch'
+                            && this.parent.editSettings.mode !== 'Cell') {
                             indent.style.display = 'block';
                         }
-                        if (selectedItem.level === 0) {
+                        if ((selectedItem.level === 0) || this.parent.editSettings.mode === 'Batch'
+                            || this.parent.editSettings.mode === 'Cell') {
                             outdent.style.display = 'none';
                         }
-                        if (selectedItem.level !== 0) {
+                        else {
                             outdent.style.display = 'block';
                         }
                     }
                 }
-                if (args['name'] === 'rowDeselected' && isNullOrUndefined(selectedrow) && !tObj.grid.isCheckBoxSelection) {
-                    if (this.parent.toolbar['includes']('Indent')) {
-                        indent.style.display = 'none';
-                    }
-                    if (this.parent.toolbar['includes']('Outdent')) {
-                        outdent.style.display = 'none';
-                    }
-                }
+            }
+        }
+        else {
+            if (tObj.grid.isEdit && isNullOrUndefined(selectedrow)) {
+                indent.style.display = 'none';
+                outdent.style.display = 'none';
             }
         }
     };

package/src/treegrid/actions/crud-actions.js

@@ -66,7 +66,7 @@ export function editAction(details, control, isSelfReference, addRowIndex, selec
                                 var childRecords = parentData ? parentData[control.childMapping] : [];
                                 for (var p = childRecords.length - 1; p >= 0; p--) {
                                     if (childRecords[p][control.idMapping] === currentData_1[control.idMapping]) {
-                                        if (!control.enableImmutableMode) {
+                                        if (!control.enableImmutableMode && parentData.childRecords.length === parentData['Children'].length) {
                                             parentData['childRecords'].splice(p, 1);
                                         }
                                         childRecords.splice(p, 1);

package/src/treegrid/actions/filter.js

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

package/src/treegrid/actions/selection.js

@@ -266,6 +266,8 @@ var Selection = /** @class */ (function () {
         var _this = this;
         var index = -1;
         var length = 0;
+        //This property used to maintain the check state of the currentview data after clear filtering
+        var multiFilterCheckState = false;
         if (!isNullOrUndefined(this.parent.filterModule) && this.parent.filterModule.filteredResult.length > 0) {
             var filterResult = this.parent.filterModule.filteredResult;
             if (this.filteredList.length === 0) {
@@ -274,6 +276,10 @@ var Selection = /** @class */ (function () {
             else {
                 if (this.filteredList !== filterResult) {
                     this.filteredList = filterResult;
+                    multiFilterCheckState = true;
+                }
+                else {
+                    multiFilterCheckState = false;
                 }
             }
         }
@@ -292,6 +298,9 @@ var Selection = /** @class */ (function () {
                     if (data[i].checkboxState === 'check') {
                         continue;
                     }
+                    if (multiFilterCheckState) {
+                        continue;
+                    }
                     data[i].checkboxState = 'check';
                     this.updateSelectedItems(data[i], data[i].checkboxState);
                 }

package/src/treegrid/actions/toolbar.js

@@ -43,53 +43,55 @@ var Toolbar = /** @class */ (function () {
         this.parent.off(events.toolbarClick, this.toolbarClickHandler);
     };
     Toolbar.prototype.refreshToolbar = function (args) {
-        var tObj = this.parent;
-        var indentElement;
-        var outdentElement;
-        var indentID = tObj.element.id + '_gridcontrol_indent';
-        var outdentID = tObj.element.id + '_gridcontrol_outdent';
         var toolbarElement = this.parent.grid.toolbarModule.getToolbar();
-        var indentEle = toolbarElement.querySelector('#' + indentID);
-        var outdentEle = toolbarElement.querySelector('#' + outdentID);
-        var row = args.row;
-        var selectedrow = tObj.getSelectedRows()[0];
-        if (!isNullOrUndefined(row[0])) {
-            row = row[0];
-        }
-        row = (!isNullOrUndefined(selectedrow) && selectedrow.rowIndex !== row.rowIndex) ? selectedrow : row;
-        if (indentEle !== null && outdentEle !== null) {
-            indentElement = toolbarElement.querySelector('#' + indentID).parentElement;
-            outdentElement = toolbarElement.querySelector('#' + outdentID).parentElement;
-            if (row.rowIndex === 0 || tObj.getSelectedRowIndexes().length > 1) {
-                indentElement.classList.add('e-hidden');
-                outdentElement.classList.add('e-hidden');
+        if (!isNullOrUndefined(toolbarElement)) {
+            var tObj = this.parent;
+            var indentElement = void 0;
+            var outdentElement = void 0;
+            var indentID = tObj.element.id + '_gridcontrol_indent';
+            var outdentID = tObj.element.id + '_gridcontrol_outdent';
+            var indentEle = toolbarElement.querySelector('#' + indentID);
+            var outdentEle = toolbarElement.querySelector('#' + outdentID);
+            var row = args.row;
+            var selectedrow = tObj.getSelectedRows()[0];
+            if (!isNullOrUndefined(row[0])) {
+                row = row[0];
             }
-            else if (args['name'] !== 'rowDeselected' || (!isNullOrUndefined(selectedrow) && tObj.grid.isCheckBoxSelection)) {
-                var selectedItem = tObj.getCurrentViewRecords()[row.rowIndex];
-                if (!isNullOrUndefined(selectedItem)) {
-                    if ((selectedItem.level > tObj.getCurrentViewRecords()[row.rowIndex - 1].level)) {
-                        indentElement.classList.add('e-hidden');
-                    }
-                    else {
-                        indentElement.classList.remove('e-hidden');
+            row = (!isNullOrUndefined(selectedrow) && selectedrow.rowIndex !== row.rowIndex) ? selectedrow : row;
+            if (indentEle !== null && outdentEle !== null) {
+                indentElement = toolbarElement.querySelector('#' + indentID).parentElement;
+                outdentElement = toolbarElement.querySelector('#' + outdentID).parentElement;
+                if (row.rowIndex === 0 || tObj.getSelectedRowIndexes().length > 1) {
+                    indentElement.classList.add('e-hidden');
+                    outdentElement.classList.add('e-hidden');
+                }
+                else if (args['name'] !== 'rowDeselected' || (!isNullOrUndefined(selectedrow) && tObj.grid.isCheckBoxSelection)) {
+                    var selectedItem = tObj.getCurrentViewRecords()[row.rowIndex];
+                    if (!isNullOrUndefined(selectedItem)) {
+                        if ((selectedItem.level > tObj.getCurrentViewRecords()[row.rowIndex - 1].level)) {
+                            indentElement.classList.add('e-hidden');
+                        }
+                        else {
+                            indentElement.classList.remove('e-hidden');
+                        }
+                        if (selectedItem.level === tObj.getCurrentViewRecords()[row.rowIndex - 1].level) {
+                            indentElement.classList.remove('e-hidden');
+                        }
+                        if (selectedItem.level === 0) {
+                            outdentElement.classList.add('e-hidden');
+                        }
+                        if (selectedItem.level !== 0) {
+                            outdentElement.classList.remove('e-hidden');
+                        }
                     }
-                    if (selectedItem.level === tObj.getCurrentViewRecords()[row.rowIndex - 1].level) {
-                        indentElement.classList.remove('e-hidden');
+                }
+                if (args['name'] === 'rowDeselected' && isNullOrUndefined(selectedrow) && !tObj.grid.isCheckBoxSelection) {
+                    if (this.parent.toolbar['includes']('Indent')) {
+                        indentElement.classList.add('e-hidden');
                     }
-                    if (selectedItem.level === 0) {
+                    if (this.parent.toolbar['includes']('Outdent')) {
                         outdentElement.classList.add('e-hidden');
                     }
-                    if (selectedItem.level !== 0) {
-                        outdentElement.classList.remove('e-hidden');
-                    }
-                }
-            }
-            if (args['name'] === 'rowDeselected' && isNullOrUndefined(selectedrow) && !tObj.grid.isCheckBoxSelection) {
-                if (this.parent.toolbar['includes']('Indent')) {
-                    indentElement.classList.add('e-hidden');
-                }
-                if (this.parent.toolbar['includes']('Outdent')) {
-                    outdentElement.classList.add('e-hidden');
                 }
             }
         }

package/src/treegrid/base/data.js

@@ -378,7 +378,7 @@ var DataManipulation = /** @class */ (function () {
                 currentData.index = this.storedIndex;
             }
             if ((!isNullOrUndefined(currentData[this.parent.childMapping]) && !isCountRequired(this.parent)) ||
-                ((currentData[this.parent.hasChildMapping]) && isCountRequired(this.parent) && this.parent.initialRender)) {
+                ((currentData[this.parent.hasChildMapping]) && isCountRequired(this.parent) && (this.parent.initialRender || isNullOrUndefined(this.parent['dataResults'].result)))) {
                 currentData.hasChildRecords = true;
                 if (this.parent.enableCollapseAll || !isNullOrUndefined(this.parent.dataStateChange)
                     && isNullOrUndefined(currentData[this.parent.childMapping])) {

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 } 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, merge} 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.js

@@ -17,7 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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;
 };
-import { Component, addClass, createElement, EventHandler, isNullOrUndefined, extend } from '@syncfusion/ej2-base';
+import { Component, addClass, createElement, EventHandler, isNullOrUndefined, extend, merge } from '@syncfusion/ej2-base';
 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';
@@ -1126,6 +1126,19 @@ var TreeGrid = /** @class */ (function (_super) {
             if (args.requestType === 'save' && _this.aggregates.map(function (ag) { return ag.showChildSummary === true; }).length) {
                 _this.grid.refresh();
             }
+            if (args.action === 'filter') {
+                if (_this.filterModule['currentFilterObject'] !== '' && _this.enableVirtualization && !_this.initialRender) {
+                    _this.expandAll();
+                }
+            }
+            if (args.requestType === 'searching') {
+                if (_this.searchSettings.key !== '' && _this.enableVirtualization && !_this.initialRender) {
+                    _this.expandAll();
+                }
+            }
+            if (args.action === 'clearFilter' && _this.enableCollapseAll) {
+                _this.collapseAll();
+            }
             if (_this.action === 'indenting' || _this.action === 'outdenting') {
                 _this.action = _this.action === 'indenting' ? 'indented' : 'outdented';
                 var selectedItem_1 = [_this.selectedRecords];
@@ -1409,7 +1422,7 @@ var TreeGrid = /** @class */ (function (_super) {
                         treeGridColumn[prop] = column[i][prop];
                     }
                     else if (prop === 'columns' && !isNullOrUndefined(column[i][prop])) {
-                        gridColumn[prop] = this.getGridColumns(column[i][prop], false, index);
+                        gridColumn[prop] = this.getGridColumns(column[i][prop], false, this.columnModel.length - 1);
                         treeGridColumn[prop] = column[i][prop];
                     }
                     else if (this.initialRender && !isNullOrUndefined(treeColumn) && this.enablePersistence && prop === 'edit') {
@@ -2201,15 +2214,15 @@ var TreeGrid = /** @class */ (function (_super) {
                 }
             }
         }
-        var merge = 'deepMerge';
-        this[merge] = ['columns']; // Workaround for blazor updateModel
+        var deepMerge = 'deepMerge';
+        this[deepMerge] = ['columns']; // Workaround for blazor updateModel
         if (this.grid.columns.length !== this.columnModel.length) {
             this.stackedHeader = true;
         }
         if (!this.stackedHeader) {
-            this.setProperties({ columns: this.columnModel }, true);
+            merge(this.columns, this.columnModel);
         }
-        this[merge] = undefined; // Workaround for blazor updateModel
+        this[deepMerge] = undefined; // Workaround for blazor updateModel
         return this.columnModel;
     };
     /**

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

@@ -327,6 +327,8 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
         var upScroll = (scrollArgs.offset.top - this.translateY) < 0;
         var downScroll = Math.ceil(scrollArgs.offset.top - this.translateY) >= scrollHeight;
         var selectedRowIndex = 'selectedRowIndex';
+        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 :
                 this.parent.element.getBoundingClientRect().height);
@@ -345,6 +347,10 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                 this.endIndex = lastInx;
                 this.startIndex = (this.startIndex - remains) < 0 ? 0 : (this.startIndex - remains);
             }
+            if (currentViewData.length && ((currentViewData[0][indexValue] - this.startIndex) < (this.parent.pageSettings.pageSize / 2))) {
+                this.startIndex = currentViewData[0][indexValue] - (this.parent.pageSettings.pageSize / 2);
+                this.endIndex = this.startIndex + this.parent.pageSettings.pageSize;
+            }
             //var firsttdinx = parseInt(this.parent.getContent().querySelector('.e-content td').getAttribute('index'), 0);
             var rowPt = Math.ceil(scrollArgs.offset.top / this.parent.getRowHeight());
             rowPt = rowPt % this.parent.pageSettings.pageSize;
@@ -383,6 +389,10 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
             }
             this.startIndex = !isLastBlock ? lastIndex - this.parent.pageSettings.pageSize : nextSetResIndex;
             this.endIndex = lastIndex;
+            if (currentViewData.length && this.startIndex > currentViewData[0][indexValue] &&
+                ((this.startIndex - currentViewData[0][indexValue]) < (this.parent.pageSettings.pageSize / 2))) {
+                this.startIndex = currentViewData[0][indexValue] + (this.parent.pageSettings.pageSize / 2);
+            }
             if (scrollArgs.offset.top > (this.parent.getRowHeight() * this.totalRecords)) {
                 this.translateY = this.getTranslateY(scrollArgs.offset.top, content.getBoundingClientRect().height);
             }