@syncfusion/ej2-treegrid 28.1.33 → 28.1.36

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

@@ -4010,8 +4010,10 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         const freezePresent = this.injectedModules.filter((e) => {
             return e.prototype.getModuleName() === 'freeze';
         });
+        const hasFreezeProp = Array.isArray(this.columns) &&
+            this.columns.some((col) => !!col.freeze);
         if ((this.frozenColumns || this.frozenRows || this.getFrozenColumns() ||
-            this.grid.getFrozenLeftColumnsCount() || this.grid.getFrozenRightColumnsCount()) && freezePresent.length > 0) {
+            hasFreezeProp) && freezePresent.length > 0) {
             modules.push({
                 member: 'freeze', args: [this],
                 name: 'Freeze'
@@ -4181,7 +4183,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             this.grid.rowDropSettings.targetID += '_gridcontrol';
         }
         this.addListener();
-        const gridContainer = createElement('div', { id: this.element.id + '_gridcontrol' });
+        const gridContainer = createElement('div', { id: this.element.id + '_gridcontrol', className: 'e-treelistgrid' });
         addClass([this.element], 'e-treegrid');
         if (!isNullOrUndefined(this.height) && typeof (this.height) === 'string' && this.height.indexOf('%') !== -1) {
             this.element.style.height = this.height;
@@ -6394,6 +6396,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     }
     // Internal method to handle the rows expand
     expandRows(row, record, parentRec) {
+        const initialTotalRecordsCount = this.grid.totalDataRecordsCount;
         this.expandCollapse('expand', row, record);
         const children = 'Children';
         if (!(isRemoteData(this) && !isOffline(this)) && (!isCountRequired(this) || !isNullOrUndefined(record[`${children}`]))) {
@@ -6414,6 +6417,18 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 this.trigger(expanded, expandArgs);
             }
         }
+        if (this.enableVirtualization) {
+            const index = this.grid.currentViewData.indexOf(record);
+            const expandedRow = isNullOrUndefined(row) ? this.getRows()[parseInt(index.toString(), 10)] : row;
+            if (!isNullOrUndefined(expandedRow)) {
+                const rowIndex = +expandedRow.getAttribute('data-rowindex');
+                const outBuffer = this.grid.pageSettings.pageSize - Math.ceil(this.grid.pageSettings.pageSize / 2);
+                const lastBlockIdx = initialTotalRecordsCount - outBuffer;
+                if (rowIndex > lastBlockIdx) {
+                    this.grid.getContent().firstElementChild.scrollTop = rowIndex * this.grid.getRowHeight();
+                }
+            }
+        }
     }
     expandCollapseAllChildren(record, action, key, level) {
         if ((!isNullOrUndefined(key) && record[this.getPrimaryKeyFieldNames()[0]] !== key) ||
@@ -6528,6 +6543,18 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                     this.grid.getContent().firstElementChild.scrollBy(0, this.grid.getRowHeight());
                 }
             }
+            if (this.enableVirtualization) {
+                const index = this.grid.currentViewData.indexOf(record);
+                const collapsedRow = isNullOrUndefined(row) ? this.getRows()[parseInt(index.toString(), 10)] : row;
+                if (!isNullOrUndefined(collapsedRow)) {
+                    const rowIndex = +collapsedRow.getAttribute('data-rowindex');
+                    const outBuffer = this.grid.pageSettings.pageSize - Math.ceil(this.grid.pageSettings.pageSize / 2);
+                    const lastBlockIdx = this.grid.totalDataRecordsCount - outBuffer;
+                    if (rowIndex > lastBlockIdx) {
+                        this.grid.getContent().firstElementChild.scrollBy(0, (rowIndex - lastBlockIdx) * this.grid.getRowHeight());
+                    }
+                }
+            }
         }
     }
     updateExpandStateMapping(record, state) {
@@ -13402,13 +13429,13 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
     dataBoundEvent() {
         const dataBoundEve = 'dataBound';
         const initialRowTop = 'initialRowTop';
-        if (this.parent.getRows().length && !isNullOrUndefined(this.parent.getRowByIndex(0)) && !this[`${initialRowTop}`]) {
+        if (!isNullOrUndefined(this.parent.getRows()) && this.parent.getRows().length && !isNullOrUndefined(this.parent.getRowByIndex(0)) && !this[`${initialRowTop}`]) {
             const rowTop = this.parent.getRowByIndex(0).getBoundingClientRect().top;
             const gridTop = this.parent.element.getBoundingClientRect().top;
             if (rowTop > 0) {
                 this[`${initialRowTop}`] = this.parent.getRowByIndex(0).getBoundingClientRect().top - gridTop;
             }
-            else {
+            else if (this.parent.selectedRowIndex === -1) {
                 this[`${initialRowTop}`] = this.content.getBoundingClientRect().top -
                     this.parent.getRowByIndex(0).getBoundingClientRect().height;
             }
@@ -13593,7 +13620,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             content = this.parent.getContent().querySelector('.e-content');
         }
         const scrollHeight = outBuffer * rowHeight;
-        const upScroll = (scrollArgs.offset.top - this.translateY) < 0;
+        const upScroll = (scrollArgs.offset.top - this.translateY) < 0 && this.activeKey !== 'downArrow';
         const downScroll = Math.ceil(scrollArgs.offset.top - this.translateY) + rowHeight >= scrollHeight;
         const selectedRowIndex = 'selectedRowIndex';
         const currentViewData = this.parent.currentViewData;
@@ -13606,7 +13633,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                 - this.parent.pageSettings.pageSize;
             index = (index > 0) ? index : 0;
             if (!isNullOrUndefined(this[`${selectedRowIndex}`]) && this[`${selectedRowIndex}`] !== -1 && index !== this[`${selectedRowIndex}`] &&
-                ((this.parent.rowHeight * this.parent.pageSettings.pageSize) < content.scrollTop)) {
+                ((this.parent.rowHeight * this.parent.pageSettings.pageSize) < content.scrollTop) && !this.parent.allowRowDragAndDrop) {
                 index = this[`${selectedRowIndex}`];
             }
             this.startIndex = index;
@@ -13618,7 +13645,8 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                 this.startIndex = (this.startIndex - remains) < 0 ? 0 : (this.startIndex - remains);
             }
             if (currentViewData.length && (currentViewData[0][`${indexValue}`] >= this.parent.pageSettings.pageSize / 2) &&
-                ((currentViewData[0][`${indexValue}`] - this.startIndex) < (this.parent.pageSettings.pageSize / 2)) && this.parent.selectionModule.isRowSelected) {
+                ((currentViewData[0][`${indexValue}`] - this.startIndex) < (this.parent.pageSettings.pageSize / 2)) &&
+                this.parent.selectionModule && this.parent.selectionModule.isRowSelected) {
                 this.startIndex = currentViewData[0][`${indexValue}`] - (this.parent.pageSettings.pageSize / 2);
                 this.endIndex = this.startIndex + this.parent.pageSettings.pageSize;
             }
@@ -13638,6 +13666,9 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                         (this.endIndex - this.parent.pageSettings.pageSize) * (this.parent.rowHeight ?
                             this.parent.rowHeight : this.parent.getRowHeight()) : 0;
                 }
+                else if (this.startIndex === this[`${selectedRowIndex}`]) {
+                    this.translateY = scrollArgs.offset.top;
+                }
                 else {
                     this.translateY = (scrollArgs.offset.top - (outBuffer * rowHeight) > 0) ?
                         scrollArgs.offset.top - (outBuffer * rowHeight) + rowHeight : 0;
@@ -13657,7 +13688,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             let nextSetResIndex = ~~(content.scrollTop / rowHeight);
             const isLastBlock = (this[`${selectedRowIndex}`] + this.parent.pageSettings.pageSize) < this.totalRecords ? false : true;
             if (!isNullOrUndefined(this[`${selectedRowIndex}`]) && this[`${selectedRowIndex}`] !== -1 &&
-                nextSetResIndex !== this[`${selectedRowIndex}`] && !isLastBlock) {
+                nextSetResIndex !== this[`${selectedRowIndex}`] && !isLastBlock && !this.parent.allowRowDragAndDrop) {
                 nextSetResIndex = this[`${selectedRowIndex}`];
             }
             let lastIndex = nextSetResIndex + this.parent.pageSettings.pageSize;
@@ -13672,7 +13703,8 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                 this.startIndex = lastIndex - (this.parent.pageSettings.pageSize / 2);
             }
             if (currentViewData.length && this.startIndex > currentViewData[0][`${indexValue}`] &&
-                ((this.startIndex - currentViewData[0][`${indexValue}`]) < (this.parent.pageSettings.pageSize / 2)) && this.parent.selectionModule.isRowSelected) {
+                ((this.startIndex - currentViewData[0][`${indexValue}`]) < (this.parent.pageSettings.pageSize / 2)) &&
+                this.parent.selectionModule && this.parent.selectionModule.isRowSelected) {
                 this.startIndex = currentViewData[0][`${indexValue}`] + (this.parent.pageSettings.pageSize / 2);
             }
             if (this.parent.root.isSelfReference) {
@@ -13684,7 +13716,12 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             }
             else {
                 if (this.totalRecords === this.endIndex) {
-                    this.translateY = (this.totalRecords * rowHeight) - ((this.endIndex - this.startIndex) * rowHeight);
+                    if (isLastBlock) {
+                        this.translateY = (this.totalRecords * rowHeight) - (this.parent.pageSettings.pageSize * rowHeight);
+                    }
+                    else {
+                        this.translateY = (this.totalRecords * rowHeight) - ((this.endIndex - this.startIndex) * rowHeight);
+                    }
                 }
                 else {
                     if (this.parent.getFrozenColumns() > 0) {