@syncfusion/ej2-treegrid 20.1.56 → 20.2.36

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

@@ -884,7 +884,7 @@ class Selection {
     getCheckboxcolumnIndex() {
         let mappingUid;
         let columnIndex;
-        const stackedHeader = "stackedHeader";
+        const stackedHeader = 'stackedHeader';
         const columnModel = 'columnModel';
         const columns = this.parent[stackedHeader] ? this.parent[columnModel] : (this.parent.columns);
         for (let col = 0; col < columns.length; col++) {
@@ -1680,6 +1680,8 @@ class Render {
                         const cellRenderer = new CellRenderer(this.parent.grid, this.parent.grid.serviceLocator);
                         const td = this.parent.getCellFromIndex(rowsObj[j].index, cellIndex - indent);
                         cellRenderer.refreshTD(td, cell, rowsObj[j].data, { index: rowsObj[j][rowIdx] });
+                        const treecell = this.parent.getRows()[j].cells[cellIndex];
+                        this.cellRender({ data: rowsObj[j].data, cell: treecell, column: cell.column });
                     }
                 }
             });
@@ -2223,6 +2225,18 @@ class DataManipulation {
                 srtQry.sortBy(this.parent.grid.sortSettings.columns[srt].field, compFun);
             }
             const modifiedData = new DataManager(parentData).executeLocal(srtQry);
+            if (this.parent.allowRowDragAndDrop && !isNullOrUndefined(this.parent.rowDragAndDropModule['draggedRecord']) &&
+                this.parent.rowDragAndDropModule['droppedRecord'].hasChildRecords && this.parent.rowDragAndDropModule['dropPosition'] !== 'middleSegment') {
+                var dragdIndex = modifiedData.indexOf(this.parent.rowDragAndDropModule['draggedRecord']);
+                modifiedData.splice(dragdIndex, 1);
+                var dropdIndex = modifiedData.indexOf(this.parent.rowDragAndDropModule['droppedRecord']);
+                if (this.parent.rowDragAndDropModule['droppedRecord'].hasChildRecords && this.parent.rowDragAndDropModule['dropPosition'] === 'topSegment') {
+                    modifiedData.splice(dropdIndex, 0, this.parent.rowDragAndDropModule['draggedRecord']);
+                }
+                else if (this.parent.rowDragAndDropModule['dropPosition'] === 'bottomSegment') {
+                    modifiedData.splice(dropdIndex + 1, 0, this.parent.rowDragAndDropModule['draggedRecord']);
+                }
+            }
             const sortArgs = { modifiedData: modifiedData, filteredData: results, srtQry: srtQry };
             this.parent.notify('createSort', sortArgs);
             results = sortArgs.modifiedData;
@@ -3367,8 +3381,11 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 member: 'ExcelExport', args: [this]
             });
         }
+        const freezePresent = this.injectedModules.filter((e) => {
+            return e.prototype.getModuleName() === 'freeze';
+        });
         if (this.frozenColumns || this.frozenRows || this.getFrozenColumns() ||
-            this.grid.getFrozenLeftColumnsCount() || this.grid.getFrozenRightColumnsCount()) {
+            this.grid.getFrozenLeftColumnsCount() || this.grid.getFrozenRightColumnsCount() || freezePresent.length) {
             modules.push({
                 member: 'freeze', args: [this]
             });
@@ -4308,6 +4325,9 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                         gridColumn[prop] = this.getGridColumns(column[i][prop], false, index);
                         treeGridColumn[prop] = column[i][prop];
                     }
+                    else if (this.initialRender && !isNullOrUndefined(treeColumn) && this.enablePersistence && prop === 'edit') {
+                        gridColumn[prop] = treeGridColumn[prop] = treeColumn[prop];
+                    }
                     else if (!(treeColumn) || prop !== 'sortComparer') {
                         gridColumn[prop] = treeGridColumn[prop] = column[i][prop];
                     }
@@ -6984,7 +7004,8 @@ class RowDD$1 {
             this.parent[dropPosition] = this.dropPosition;
             const data = [];
             for (let i = 0; i < fromIndexes.length; i++) {
-                data[i] = this.parent.getCurrentViewRecords()[fromIndexes[i]];
+                const index = this.parent.getRowByIndex(fromIndexes[i]).rowIndex;
+                data[i] = this.parent.getCurrentViewRecords()[index];
             }
             const isByMethod = true;
             const args = {
@@ -7088,6 +7109,9 @@ class RowDD$1 {
                 else {
                     dropIndex = this.selectedRow.rowIndex - 1;
                 }
+                if (this.parent.enableVirtualization && this.parent.allowRowDragAndDrop && this.selectedRecord) {
+                    dropIndex = parseInt(this.selectedRow.getAttribute('aria-rowindex'), 10) - 1;
+                }
                 tObj[action] = 'indenting';
                 tObj[droppedIndex] = dropIndex;
                 this.eventTrigger('indenting', dropIndex);
@@ -7104,6 +7128,9 @@ class RowDD$1 {
                         dropIndex = i;
                     }
                 }
+                if (this.parent.enableVirtualization && this.parent.allowRowDragAndDrop && this.selectedRecord) {
+                    dropIndex = parseInt(this.parent.getRows()[dropIndex].getAttribute('aria-rowindex'), 10);
+                }
                 tObj[action] = 'outdenting';
                 tObj[droppedIndex] = dropIndex;
                 this.eventTrigger('outdenting', dropIndex);
@@ -7120,10 +7147,20 @@ class RowDD$1 {
         this.parent.trigger(actionBegin, actionArgs, (actionArgs) => {
             if (!actionArgs.cancel) {
                 if (actionArgs.action === 'indenting') {
-                    this.reorderRows([this.selectedRow.rowIndex], dropIndex, 'child');
+                    if (this.parent.enableVirtualization && this.parent.allowRowDragAndDrop) {
+                        this.reorderRows([parseInt(this.selectedRow.getAttribute('aria-rowindex'), 10)], dropIndex, 'child');
+                    }
+                    else {
+                        this.reorderRows([this.selectedRow.rowIndex], dropIndex, 'child');
+                    }
                 }
                 else if (actionArgs.action === 'outdenting') {
-                    this.reorderRows([this.selectedRow.rowIndex], dropIndex, 'below');
+                    if (this.parent.enableVirtualization && this.parent.allowRowDragAndDrop) {
+                        this.reorderRows([parseInt(this.selectedRow.getAttribute('aria-rowindex'), 10)], dropIndex, 'below');
+                    }
+                    else {
+                        this.reorderRows([this.selectedRow.rowIndex], dropIndex, 'below');
+                    }
                 }
             }
         });
@@ -7318,16 +7355,24 @@ class RowDD$1 {
     removeLastrowBorder(element) {
         const isEmptyRow = element && (element.classList.contains('e-emptyrow') || element.classList.contains('e-columnheader')
             || element.classList.contains('e-detailrow'));
-        const islastRowIndex = element && !isEmptyRow &&
-            this.parent.getRowByIndex(this.parent.getCurrentViewRecords().length - 1).getAttribute('data-uid') !==
-                element.getAttribute('data-uid');
+        let islastRowIndex;
+        if (this.parent.enableVirtualization) {
+            islastRowIndex = element && !isEmptyRow &&
+                this.parent.getRows()[this.parent.getCurrentViewRecords().length - 1].getAttribute('data-uid') !==
+                    element.getAttribute('data-uid');
+        }
+        else {
+            islastRowIndex = element && !isEmptyRow &&
+                this.parent.getRowByIndex(this.parent.getCurrentViewRecords().length - 1).getAttribute('data-uid') !==
+                    element.getAttribute('data-uid');
+        }
         const canremove = islastRowIndex || this.dropPosition === 'topSegment';
         if (this.parent.element.getElementsByClassName('e-lastrow-border').length > 0 && element && (islastRowIndex || canremove)) {
             this.parent.element.getElementsByClassName('e-lastrow-border')[0].remove();
         }
     }
     updateIcon(row, index, args) {
-        const rowEle = args.target ? closest(args.target, 'tr') : null;
+        let rowEle = args.target ? closest(args.target, 'tr') : null;
         this.dropPosition = undefined;
         let rowPositionHeight = 0;
         this.removeFirstrowBorder(rowEle);
@@ -7354,7 +7399,12 @@ class RowDD$1 {
             rowPositionHeight = rowEle.offsetTop - scrollTop;
         }
         // let scrollTop = (tObj.grid.scrollModule as any).content.scrollTop;
-        rowTop = rowPositionHeight + contentHeight + roundOff;
+        if (this.parent.enableVirtualization) {
+            rowTop = rowEle.getBoundingClientRect().top;
+        }
+        else {
+            rowTop = rowPositionHeight + contentHeight + roundOff;
+        }
         const rowBottom = rowTop + row[0].offsetHeight;
         const difference = rowBottom - rowTop;
         const divide = difference / 3;
@@ -7434,7 +7484,7 @@ class RowDD$1 {
     addLastRowborder(trElement) {
         const isEmptyRow = trElement && (trElement.classList.contains('e-emptyrow') ||
             trElement.classList.contains('e-columnheader') || trElement.classList.contains('e-detailrow'));
-        if (trElement && !isEmptyRow && this.parent.getRowByIndex(this.parent.getCurrentViewRecords().length - 1).getAttribute('data-uid') ===
+        if (trElement && !isEmptyRow && this.parent.getRows()[this.parent.getCurrentViewRecords().length - 1].getAttribute('data-uid') ===
             trElement.getAttribute('data-uid')) {
             const bottomborder = this.parent.createElement('div', { className: 'e-lastrow-border' });
             const gridcontentEle = this.parent.getContent();
@@ -7776,7 +7826,13 @@ class RowDD$1 {
             }
             else {
                 args.dropIndex = args.dropIndex === args.fromIndex ? this.getTargetIdx(args.target.parentElement) : args.dropIndex;
-                this.droppedRecord = tObj.getCurrentViewRecords()[args.dropIndex];
+                if (this.parent.enableVirtualization) {
+                    const index = this.parent.getRowByIndex(args.dropIndex).rowIndex;
+                    this.droppedRecord = tObj.getCurrentViewRecords()[index];
+                }
+                else {
+                    this.droppedRecord = tObj.getCurrentViewRecords()[args.dropIndex];
+                }
             }
             let dragRecords = [];
             droppedRecord = this.droppedRecord;
@@ -7853,6 +7909,7 @@ class RowDD$1 {
                             childRecords.splice(droppedRecordIndex, 0, draggedRecord);
                             draggedRecord.parentItem = droppedRecord.parentItem;
                             draggedRecord.parentUniqueID = droppedRecord.parentUniqueID;
+                            draggedRecord.level = droppedRecord.level;
                             if (this.parent.parentIdMapping) {
                                 draggedRecord[this.parent.parentIdMapping] = droppedRecord[this.parent.parentIdMapping];
                                 draggedRecord.parentItem = droppedRecord.parentItem;
@@ -9567,7 +9624,18 @@ class Sort$1 {
                 this.flatSortedData[this.storedIndex] = data[d];
             }
             if (data[d].hasChildRecords) {
-                const childSort = (new DataManager(data[d].childRecords).executeLocal(srtQry));
+                let childSort = (new DataManager(data[d].childRecords).executeLocal(srtQry));
+                if (this.parent.allowRowDragAndDrop && data[d].childRecords.indexOf(this.parent.rowDragAndDropModule['draggedRecord']) !== -1 && this.parent.rowDragAndDropModule['dropPosition'] !== 'middleSegment') {
+                    var dragdIndex = childSort.indexOf(this.parent.rowDragAndDropModule['draggedRecord']);
+                    childSort.splice(dragdIndex, 1);
+                    var dropdIndex = childSort.indexOf(this.parent.rowDragAndDropModule['droppedRecord']);
+                    if (this.parent.rowDragAndDropModule['dropPosition'] === 'topSegment') {
+                        childSort.splice(dropdIndex, 0, this.parent.rowDragAndDropModule['draggedRecord']);
+                    }
+                    else if (this.parent.rowDragAndDropModule['dropPosition'] === 'bottomSegment') {
+                        childSort.splice(dropdIndex + 1, 0, this.parent.rowDragAndDropModule['draggedRecord']);
+                    }
+                }
                 this.iterateSort(childSort, srtQry);
             }
         }
@@ -10384,7 +10452,12 @@ class BatchEdit {
     nextCellIndex(args) {
         const index = 'index';
         const rowIndex = 'rowIndex';
-        args[index] = this.parent.getSelectedRows()[0][rowIndex];
+        if (this.parent.getSelectedRows().length) {
+            args[index] = this.parent.getSelectedRows()[0][rowIndex];
+        }
+        else {
+            args[index] = this.batchIndex;
+        }
     }
 }
 
@@ -10919,11 +10992,13 @@ class Edit$1 {
     updateIndex(data, rows, records) {
         for (let j = 0; j < this.parent.getDataRows().length; j++) {
             const data1 = records[j];
-            const index = getValue('uniqueIDCollection.' + data1.uniqueID + '.index', this.parent);
-            data1.index = index;
-            if (!isNullOrUndefined(data1.parentItem)) {
-                const parentIndex = getValue('uniqueIDCollection.' + data1.parentItem.uniqueID + '.index', this.parent);
-                data1.parentItem.index = parentIndex;
+            if (!isNullOrUndefined(data1)) {
+                const index = getValue('uniqueIDCollection.' + data1.uniqueID + '.index', this.parent);
+                data1.index = index;
+                if (!isNullOrUndefined(data1.parentItem)) {
+                    const parentIndex = getValue('uniqueIDCollection.' + data1.parentItem.uniqueID + '.index', this.parent);
+                    data1.parentItem.index = parentIndex;
+                }
             }
         }
         let count = -1;
@@ -10942,32 +11017,34 @@ class Edit$1 {
                 count++;
             }
             const data2 = records[count];
-            let index = data2.index;
-            const level = data2.level;
-            const row = rows[k];
-            if (!isNullOrUndefined(data2.parentItem)) {
-                index = getValue('uniqueIDCollection.' + data2.parentItem.uniqueID + '.index', this.parent);
-            }
-            const treecell = row.cells[treeColIndex];
-            if (!isNullOrUndefined(treecell)) {
-                for (let l = 0; l < treecell.classList.length; l++) {
-                    const value = treecell.classList[l];
-                    const remove$$1 = /e-gridrowindex/i;
-                    const removed = /e-griddetailrowindex/i;
-                    const result = value.match(remove$$1);
-                    const results = value.match(removed);
-                    if (result != null) {
-                        removeClass([treecell], value);
-                    }
-                    if (results != null) {
-                        removeClass([treecell], value);
-                    }
-                }
-                if (!rows[k].classList.contains('e-detailrow')) {
-                    addClass([treecell], 'e-gridrowindex' + index + 'level' + level);
-                }
-                else {
-                    addClass([treecell], 'e-griddetailrowindex' + index + 'level' + level);
+            if (!isNullOrUndefined(data2)) {
+                let index = data2.index;
+                const level = data2.level;
+                const row = rows[k];
+                if (!isNullOrUndefined(data2.parentItem)) {
+                    index = getValue('uniqueIDCollection.' + data2.parentItem.uniqueID + '.index', this.parent);
+                }
+                const treecell = row.cells[treeColIndex];
+                if (!isNullOrUndefined(treecell)) {
+                    for (let l = 0; l < treecell.classList.length; l++) {
+                        const value = treecell.classList[l];
+                        const remove$$1 = /e-gridrowindex/i;
+                        const removed = /e-griddetailrowindex/i;
+                        const result = value.match(remove$$1);
+                        const results = value.match(removed);
+                        if (result != null) {
+                            removeClass([treecell], value);
+                        }
+                        if (results != null) {
+                            removeClass([treecell], value);
+                        }
+                    }
+                    if (!rows[k].classList.contains('e-detailrow')) {
+                        addClass([treecell], 'e-gridrowindex' + index + 'level' + level);
+                    }
+                    else {
+                        addClass([treecell], 'e-griddetailrowindex' + index + 'level' + level);
+                    }
                 }
             }
         }
@@ -11872,7 +11949,12 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                 firsttdinx = +attr; // this.parent.getContent().querySelector('.e-content tr').getAttribute('aria-rowindex');
             }
             if (firsttdinx === 0) {
-                this.translateY = scrollArgs.offset.top;
+                if (this.parent.allowRowDragAndDrop) {
+                    this.translateY = scrollArgs.offset.top - this.parent.getRowHeight() * 2;
+                }
+                else {
+                    this.translateY = scrollArgs.offset.top;
+                }
             }
             else {
                 const height = this.parent.getRowHeight();
@@ -11898,7 +11980,12 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                 this.translateY = this.getTranslateY(scrollArgs.offset.top, content.getBoundingClientRect().height);
             }
             else {
-                this.translateY = scrollArgs.offset.top;
+                if (this.parent.allowRowDragAndDrop) {
+                    this.translateY = scrollArgs.offset.top - this.parent.getRowHeight() * 2;
+                }
+                else {
+                    this.translateY = scrollArgs.offset.top;
+                }
             }
         }
         if (((downScroll && (scrollArgs.offset.top < (this.parent.getRowHeight() * this.totalRecords)))
@@ -12684,7 +12771,7 @@ class InfiniteScroll$1 {
                 if (getValue('selectedIndex', this.parent.editModule) !== -1 && this.parent.editSettings.newRowPosition !== 'Top') {
                     if (this.parent.editSettings.newRowPosition === 'Below' || this.parent.editSettings.newRowPosition === 'Child') {
                         position = 'after';
-                        newRowIndex += findChildrenRecords(currentData[newRowIndex + 1]).length;
+                        newRowIndex += findChildrenRecords(currentData[newRowIndex]).length;
                         if (this.parent.editSettings.newRowPosition === 'Child') {
                             newRowIndex -= 1; //// for child position already child record is added in childRecords so subtracting 1
                         }