@syncfusion/ej2-treegrid 27.1.57 → 27.2.3

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

@@ -1854,7 +1854,7 @@ class Render {
                             const cellRenderer = new CellRenderer(this.parent.grid, this.parent.grid.serviceLocator);
                             const td = rows.length >= rowsObj.length
                                 ? this.parent.getCellFromIndex(rowsObj[parseInt(j.toString(), 10)].index, cellIndex - indent)
-                                : this.parent.getRows()[rowsObj[parseInt(j.toString(), 10)].index].querySelector('.e-templatecell');
+                                : rows[rowsObj[parseInt(j.toString(), 10)].index].querySelector('.e-templatecell');
                             cellRenderer.refreshTD(td, cell, rowsObj[parseInt(j.toString(), 10)].data, { index: rowsObj[parseInt(j.toString(), 10)][`${rowIdx}`] });
                             const treecell = this.parent.getRows()[parseInt(j.toString(), 10)]
                                 .cells[parseInt(cellIndex.toString(), 10)];
@@ -4428,10 +4428,6 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             if (this.pageSettings.pageSizeMode === 'Root') {
                 this.grid.selectionModule['totalRecordsCount'] = this.grid.currentViewData.length;
             }
-            if (!isNullOrUndefined(this.selectionSettings) && !this.selectionSettings.persistSelection &&
-                this.enableVirtualization && args.rowIndex === this.selectedRowIndex && this.isGantt) {
-                args.cancel = false;
-            }
             this.trigger(rowSelecting, args);
         };
         this.grid.rowDeselecting = (args) => {
@@ -5596,7 +5592,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
      */
     closeEdit() {
         if (this.grid.editModule) {
-            this.grid.editModule.closeEdit();
+            this.editModule['closeEdit']();
         }
     }
     /**
@@ -7272,7 +7268,9 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
      * @returns {void}
      */
     clearSelection() {
-        this.grid.selectionModule['actualTarget'] = null;
+        if (!isNullOrUndefined(this.grid.selectionModule)) {
+            this.grid.selectionModule['actualTarget'] = null;
+        }
         this.grid.clearSelection();
     }
     /**
@@ -11971,7 +11969,7 @@ class Edit {
             this.recordDoubleClick(args);
         }
         if (args.action === 'escape') {
-            this.parent.closeEdit();
+            this.closeEdit();
         }
     }
     deleteUniqueID(value) {
@@ -12038,6 +12036,9 @@ class Edit {
     batchCancel() {
         if (this.parent.editSettings.mode === 'Cell') {
             const cellDetails = getValue('editModule.cellDetails', this.parent.grid.editModule);
+            if (!isNullOrUndefined(this.editedRowIndex)) {
+                cellDetails.rowIndex = this.editedRowIndex;
+            }
             const treeCell = this.parent.getCellFromIndex(cellDetails.rowIndex, this.parent.treeColumnIndex);
             this.parent.renderModule.cellRender({
                 data: cellDetails.rowData,
@@ -12358,6 +12359,7 @@ class Edit {
                     this.prevAriaRowIndex = '-1';
                 }
                 if (!this.parent.enableVirtualization || this.parent.enableVirtualization && !Object.keys(this.parent.grid.contentModule['emptyRowData']).length) {
+                    this.isScrollByFocus = true;
                     focussedElement.focus();
                 }
                 if (this.parent.enableVirtualization && !Object.keys(this.parent.grid.contentModule['emptyRowData']).length) {
@@ -12737,6 +12739,18 @@ class Edit {
             this.parent.grid.editModule.editCell(rowIndex, field);
         }
     }
+    /**
+     * Cancels edited state.
+     *
+     * @returns {void}
+     */
+    closeEdit() {
+        if (this.parent.enableVirtualization && this.parent.grid.editSettings.mode === 'Batch' && this.parent.grid.pageSettings.currentPage > 1) {
+            this.editedRowIndex = this.parent.grid.editModule.editModule['cellDetails'].rowIndex;
+            this.parent.grid.editModule.editModule['cellDetails'].rowIndex = parseInt(this.parent.getRows()[this.parent.grid.editModule.editModule['cellDetails'].rowIndex].getAttribute('data-rowIndex'), 10);
+        }
+        this.parent.grid.editModule.closeEdit();
+    }
 }
 
 /**
@@ -12908,9 +12922,12 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
         if (this.parent.enableVirtualization && this.parent.isFrozenGrid()) {
             return this.getRowCollection(index, true);
         }
-        else {
-            return this.parent.getDataRows().filter((e) => parseInt(e.getAttribute('data-rowindex'), 10) === index)[0];
+        const dataRows = this.parent.getDataRows();
+        const targetRow = dataRows.find((e) => parseInt(e.getAttribute('data-rowindex'), 10) === index);
+        if (!targetRow && this.parent.isEdit && this.parent.editSettings.mode === 'Batch') {
+            return index != null ? this.parent.getRows()[parseInt(index.toString(), 10)] : undefined;
         }
+        return targetRow;
     }
     getFrozenRightVirtualRowByIndex(index) {
         return this.getRowCollection(index, false, false, true);
@@ -13281,8 +13298,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.root && this.parent.root.treeGrid && this.parent.root.treeGrid.isGantt)) {
+                ((this.parent.rowHeight * this.parent.pageSettings.pageSize) < content.scrollTop)) {
                 index = this[`${selectedRowIndex}`];
             }
             this.startIndex = index;
@@ -13309,9 +13325,15 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                 firsttdinx = +attr; // this.parent.getContent().querySelector('.e-content tr').getAttribute('data-rowindex');
             }
             if (firsttdinx === 0) {
-                this.translateY = !isNullOrUndefined(this.endIndex) ?
-                    (this.endIndex - this.parent.pageSettings.pageSize) * (this.parent.rowHeight ?
-                        this.parent.rowHeight : this.parent.getRowHeight()) : 0;
+                if (this.endIndex - this.startIndex < this.parent.pageSettings.pageSize) {
+                    this.translateY = !isNullOrUndefined(this.endIndex) ?
+                        (this.endIndex - this.parent.pageSettings.pageSize) * (this.parent.rowHeight ?
+                            this.parent.rowHeight : this.parent.getRowHeight()) : 0;
+                }
+                else {
+                    this.translateY = (scrollArgs.offset.top - (outBuffer * rowHeight) > 0) ?
+                        scrollArgs.offset.top - (outBuffer * rowHeight) + rowHeight : 0;
+                }
             }
             else if (this.parent.getFrozenColumns() > 0) {
                 scrollArgs.offset.top = scrollArgs.offset.top + 80;
@@ -13327,7 +13349,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 && !(this.parent.root && this.parent.root.treeGrid && this.parent.root.treeGrid.isGantt)) {
+                nextSetResIndex !== this[`${selectedRowIndex}`] && !isLastBlock) {
                 nextSetResIndex = this[`${selectedRowIndex}`];
             }
             let lastIndex = nextSetResIndex + this.parent.pageSettings.pageSize;
@@ -13345,6 +13367,8 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                 ((this.startIndex - currentViewData[0][`${indexValue}`]) < (this.parent.pageSettings.pageSize / 2)) && this.parent.selectionModule.isRowSelected) {
                 this.startIndex = currentViewData[0][`${indexValue}`] + (this.parent.pageSettings.pageSize / 2);
             }
+            const selectedIndex = this.parent.root.selectedRowIndex;
+            this.startIndex = selectedIndex !== -1 && selectedIndex !== this.startIndex ? this.startIndex - 1 : this.startIndex;
             if (scrollArgs.offset.top > (rowHeight * this.totalRecords)) {
                 this.translateY = this.getTranslateY(scrollArgs.offset.top, content.getBoundingClientRect().height);
             }
@@ -13353,10 +13377,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                     this.translateY = (this.totalRecords * rowHeight) - ((this.endIndex - this.startIndex) * rowHeight);
                 }
                 else {
-                    if (this.parent.allowRowDragAndDrop) {
-                        this.translateY = scrollArgs.offset.top - rowHeight * 2;
-                    }
-                    else if (this.parent.getFrozenColumns() > 0) {
+                    if (this.parent.getFrozenColumns() > 0) {
                         this.translateY = scrollArgs.offset.top - ((rowHeight * 2) + this.parent.pageSettings.pageSize);
                     }
                     else {
@@ -13509,7 +13530,12 @@ class TreeInterSectionObserver extends InterSectionObserver {
         const debounced100 = debounce(callback, delay);
         const debounced50 = debounce(callback, 50);
         this[`${options}`].prevTop = this[`${options}`].prevLeft = 0;
+        const isScrollByFocus = 'isScrollByFocus';
         return (e) => {
+            if (instance.isEdit && instance.root.editModule[`${isScrollByFocus}`]) {
+                instance.root.editModule[`${isScrollByFocus}`] = false;
+                return;
+            }
             const top = this[`${options}`].movableContainer ? this[`${options}`].container.scrollTop : e.target.scrollTop;
             const left = this[`${options}`].movableContainer ? this[`${options}`].scrollbar.scrollLeft : e.target.scrollLeft;
             let direction = this[`${options}`].prevTop < top ? 'down' : 'up';