@syncfusion/ej2-treegrid 27.1.51 → 27.1.53

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

@@ -5477,12 +5477,12 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
      */
     getPersistData() {
         const keyEntity = ['pageSettings', 'sortSettings',
-            'filterSettings', 'columns', 'searchSettings', 'selectedRowIndex', 'treeColumnIndex'];
+            'filterSettings', 'columns', 'searchSettings', 'selectedRowIndex', 'treeColumnIndex', 'scrollPosition'];
         const ignoreOnPersist = {
             pageSettings: ['template', 'pageSizes', 'pageSizeMode', 'enableQueryString', 'totalRecordsCount', 'pageCount'],
             filterSettings: ['type', 'mode', 'showFilterBarStatus', 'immediateModeDelay', 'ignoreAccent', 'hierarchyMode'],
             searchSettings: ['fields', 'operator', 'ignoreCase'],
-            sortSettings: [], columns: [], selectedRowIndex: []
+            sortSettings: [], columns: [], selectedRowIndex: [], scrollPosition: []
         };
         const ignoreOnColumn = ['filter', 'edit', 'filterBarTemplate', 'headerTemplate', 'template',
             'commandTemplate', 'commands', 'dataSource'];
@@ -6327,6 +6327,9 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             });
         }
         record = this.getCollapseExpandRecords(row, record);
+        if (isNullOrUndefined(row) && isNullOrUndefined(record)) {
+            return;
+        }
         if (!isNullOrUndefined(row) && row.cells[0].classList.contains('e-lastrowcell')) {
             this.lastRowBorder(row, false);
         }
@@ -6408,7 +6411,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 return e.hasChildRecords;
             });
         }
-        else if (isNullOrUndefined(record)) {
+        else if (isNullOrUndefined(record) && !isNullOrUndefined(row)) {
             if (this.detailTemplate) {
                 record = this.grid.getCurrentViewRecords()[row.getAttribute('data-rowindex')];
             }
@@ -6448,6 +6451,9 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             });
         }
         record = this.getCollapseExpandRecords(row, record);
+        if (isNullOrUndefined(row) && isNullOrUndefined(record)) {
+            return;
+        }
         if (this.isCollapseAll && !isRemoteData(this)) {
             const args = { data: parentRec, row: row, cancel: false };
             if (!this.isCollapsingEventTriggered) {
@@ -6469,7 +6475,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         else if (!this.isCollapseAll || (this.isCollapseAll && isRemoteData(this))) {
             const args = { data: record, row: row, cancel: false };
             this.trigger(collapsing, args, (collapsingArgs) => {
-                if (!collapsingArgs.cancel && !isNullOrUndefined(record)) {
+                if (!collapsingArgs.cancel) {
                     this.collapseRows(row, record, parentRec);
                 }
             });
@@ -12978,6 +12984,18 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             this.parent[`${action}`]('refresh-virtual-block', this.refreshContentRows, this);
             this.fn = () => {
                 this.observers.observes((scrollArgs) => this.scrollListeners(scrollArgs), this.onEnteredAction(), this.parent);
+                const gObj = this.parent;
+                if (gObj.root.enablePersistence && gObj.root.scrollPosition) {
+                    this.content.scrollTop = gObj.root.scrollPosition.top;
+                    if (gObj.root.enableColumnVirtualization) {
+                        this.content.scrollLeft = gObj.root.scrollPosition.left;
+                    }
+                    const scrollValues = {
+                        direction: 'down', sentinel: this.observer.sentinelInfo.down,
+                        offset: gObj.root.scrollPosition, focusElement: gObj.element
+                    };
+                    this.scrollListeners(scrollValues);
+                }
                 this.parent.off('content-ready', this.fn);
             };
             this.parent.addEventListener('dataBound', this.dataBoundEvent.bind(this));
@@ -13235,6 +13253,9 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
     }
     scrollListeners(scrollArgs) {
         this['scrollAfterEdit']();
+        if (this.parent.root.enablePersistence) {
+            this.parent.root.scrollPosition = scrollArgs.offset;
+        }
         const info = scrollArgs.sentinel;
         const rowHeight = this.parent.getRowHeight();
         const outBuffer = this.parent.pageSettings.pageSize - Math.ceil(this.parent.pageSettings.pageSize / 2);