@syncfusion/ej2-treegrid 26.2.8 → 26.2.9

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

@@ -4569,6 +4569,16 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                     this.grid.selectionModule[`${updateRowSelection}`](this.getRows()[parseInt(index.toString(), 10)], index);
                 }
             }
+            if (this.enableVirtualization && this.selectionSettings.persistSelection
+                && !isNullOrUndefined(this.virtualScrollModule.prevSelectedRecord)) {
+                for (let i = 0; i < this.virtualScrollModule.prevSelectedRecord.length; i++) {
+                    const updateRowSelection = 'updateRowSelection';
+                    const index = 
+                    // eslint-disable-next-line max-len
+                    this.getCurrentViewRecords().indexOf(this.virtualScrollModule.prevSelectedRecord[parseInt(i.toString(), 10)]);
+                    this.grid.selectionModule[`${updateRowSelection}`](this.getRows()[parseInt(index.toString(), 10)], index);
+                }
+            }
             this.trigger(dataBound, args);
             this.initialRender = false;
         };
@@ -6355,22 +6365,13 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 expandArgs = { data: parentRec, row: row };
                 this.trigger(expanded, expandArgs);
             }
+            else if (!this.isExpandAll && this.enableVirtualization && this.selectionSettings.persistSelection
+                && !isNullOrUndefined(this.virtualScrollModule.prevSelectedRecord)) {
+                this.virtualScrollModule.prevSelectedRecord = [];
+            }
             else if (!this.isExpandAll) {
                 this.trigger(expanded, expandArgs);
             }
-            if (record.expanded && this.enableVirtualization && this.selectionSettings.persistSelection
-                && !isNullOrUndefined(this.virtualScrollModule.prevSelectedRecord)) {
-                for (let i = 0; i < this.virtualScrollModule.prevSelectedRecord.length; i++) {
-                    if (record.uniqueID ===
-                        this.virtualScrollModule.prevSelectedRecord[parseInt(i.toString(), 10)].parentItem.uniqueID) {
-                        const updateRowSelection = 'updateRowSelection';
-                        const index = 
-                        // eslint-disable-next-line max-len
-                        this.getCurrentViewRecords().indexOf(this.virtualScrollModule.prevSelectedRecord[parseInt(i.toString(), 10)]);
-                        this.grid.selectionModule[`${updateRowSelection}`](this.getRows()[parseInt(index.toString(), 10)], index);
-                    }
-                }
-            }
         }
     }
     expandCollapseAllChildren(record, action, key, level) {
@@ -8812,7 +8813,7 @@ class RowDD {
             this.canDrop = false;
             this.addErrorElem();
         }
-        if (!tObj.rowDropSettings.targetID && this.canDrop) {
+        if (!tObj.rowDropSettings.targetID && this.canDrop && !isNullOrUndefined(args.rows[0])) {
             tObj.rowDragAndDropModule.updateIcon(args.rows, rowIdx, args);
         }
         if (isNullOrUndefined(tObj.rowDropSettings.targetID) && !this.canDrop) {
@@ -13251,14 +13252,17 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
         const info = scrollArgs.sentinel;
         const rowHeight = this.parent.getRowHeight();
         const outBuffer = this.parent.pageSettings.pageSize - Math.ceil(this.parent.pageSettings.pageSize / 2);
-        const content = this.parent.getContent().querySelector('.e-content');
+        let content;
+        if (!isNullOrUndefined(this.parent.contentModule)) {
+            content = this.parent.getContent().querySelector('.e-content');
+        }
         const scrollHeight = outBuffer * rowHeight;
         const upScroll = (scrollArgs.offset.top - this.translateY) <= 0;
         const downScroll = Math.ceil(scrollArgs.offset.top - this.translateY) + rowHeight >= scrollHeight;
         const selectedRowIndex = 'selectedRowIndex';
         const currentViewData = this.parent.currentViewData;
         const indexValue = 'index';
-        if (upScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left')) {
+        if (upScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left') && !isNullOrUndefined(content)) {
             const vHeight = +(this.parent.height.toString().indexOf('%') < 0 ? parseInt(this.parent.height.toString(), 10) :
                 this.parent.element.getBoundingClientRect().height);
             let index = (~~(content.scrollTop / rowHeight)
@@ -13306,7 +13310,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                     scrollArgs.offset.top - (outBuffer * rowHeight) + 10 : 0;
             }
         }
-        else if (downScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left')) {
+        else if (downScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left') && !isNullOrUndefined(content)) {
             let nextSetResIndex = ~~(content.scrollTop / rowHeight);
             const isLastBlock = (this[`${selectedRowIndex}`] + this.parent.pageSettings.pageSize) < this.totalRecords ? false : true;
             if (!isNullOrUndefined(this[`${selectedRowIndex}`]) && this[`${selectedRowIndex}`] !== -1 &&
@@ -13567,6 +13571,7 @@ class VirtualScroll {
     constructor(parent) {
         this.prevstartIndex = -1;
         this.prevendIndex = -1;
+        this.prevSelectedRecord = [];
         this.parent = parent;
         Grid.Inject(TreeVirtual);
         this.addEventListener();
@@ -13696,7 +13701,8 @@ class VirtualScroll {
                 }
             }
             //}
-            if (this.prevrequestType === 'collapseAll' && pageingDetails.actionArgs.requestType === 'virtualscroll' && !isNullOrUndefined(this.parent.idMapping)) {
+            if (this.prevrequestType === 'collapseAll' && pageingDetails.actionArgs.requestType === 'virtualscroll'
+                && !isNullOrUndefined(this.parent.idMapping) && startIndex === 0) {
                 startIndex = 0;
                 endIndex = this.parent.grid.pageSettings.pageSize - 1;
                 this.parent.grid.notify(virtualActionArgs, { setTop: true });