@syncfusion/ej2-treegrid 20.2.44 → 20.2.45

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

@@ -2080,7 +2080,7 @@ class DataManipulation {
                 currentData.index = this.storedIndex;
             }
             if ((!isNullOrUndefined(currentData[this.parent.childMapping]) && !isCountRequired(this.parent)) ||
-                ((currentData[this.parent.hasChildMapping]) && isCountRequired(this.parent) && this.parent.initialRender)) {
+                ((currentData[this.parent.hasChildMapping]) && isCountRequired(this.parent) && (this.parent.initialRender || isNullOrUndefined(this.parent['dataResults'].result)))) {
                 currentData.hasChildRecords = true;
                 if (this.parent.enableCollapseAll || !isNullOrUndefined(this.parent.dataStateChange)
                     && isNullOrUndefined(currentData[this.parent.childMapping])) {
@@ -2636,7 +2636,7 @@ function editAction(details, control, isSelfReference, addRowIndex, selectedInde
                                 const childRecords = parentData ? parentData[control.childMapping] : [];
                                 for (let p = childRecords.length - 1; p >= 0; p--) {
                                     if (childRecords[p][control.idMapping] === currentData[control.idMapping]) {
-                                        if (!control.enableImmutableMode) {
+                                        if (!control.enableImmutableMode && parentData.childRecords.length === parentData['Children'].length) {
                                             parentData['childRecords'].splice(p, 1);
                                         }
                                         childRecords.splice(p, 1);
@@ -4336,7 +4336,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                         treeGridColumn[prop] = column[i][prop];
                     }
                     else if (prop === 'columns' && !isNullOrUndefined(column[i][prop])) {
-                        gridColumn[prop] = this.getGridColumns(column[i][prop], false, index);
+                        gridColumn[prop] = this.getGridColumns(column[i][prop], false, this.columnModel.length - 1);
                         treeGridColumn[prop] = column[i][prop];
                     }
                     else if (this.initialRender && !isNullOrUndefined(treeColumn) && this.enablePersistence && prop === 'edit') {
@@ -5126,15 +5126,15 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 }
             }
         }
-        const merge$$1 = 'deepMerge';
-        this[merge$$1] = ['columns']; // Workaround for blazor updateModel
+        const deepMerge = 'deepMerge';
+        this[deepMerge] = ['columns']; // Workaround for blazor updateModel
         if (this.grid.columns.length !== this.columnModel.length) {
             this.stackedHeader = true;
         }
         if (!this.stackedHeader) {
-            this.setProperties({ columns: this.columnModel }, true);
+            merge(this.columns, this.columnModel);
         }
-        this[merge$$1] = undefined; // Workaround for blazor updateModel
+        this[deepMerge] = undefined; // Workaround for blazor updateModel
         return this.columnModel;
     }
     /**
@@ -9777,9 +9777,9 @@ class ContextMenu$1 {
             && !(isNullOrUndefined(editRecord)) && !(editRecord.classList.contains('e-menu-hide'))) {
             editRecord.style.display = 'none';
         }
-        if (indent || outdent) {
-            const tObj = this.parent;
-            const selectedrow = tObj.getSelectedRows()[0];
+        const tObj = this.parent;
+        const selectedrow = tObj.getSelectedRows()[0];
+        if ((indent || outdent) && !isNullOrUndefined(selectedrow)) {
             const targetElement = args.event.target.closest('td');
             if (isNullOrUndefined(targetElement) || (!isNullOrUndefined(targetElement) && !targetElement.classList.contains('e-rowcell'))) {
                 indent.style.display = outdent.style.display = 'none';
@@ -9791,31 +9791,32 @@ class ContextMenu$1 {
                 else if (args['name'] !== 'rowDeselected' || (!isNullOrUndefined(selectedrow) && tObj.grid.isCheckBoxSelection)) {
                     const selectedItem = tObj.getCurrentViewRecords()[selectedrow.rowIndex];
                     if (!isNullOrUndefined(selectedItem)) {
-                        if ((selectedItem.level > tObj.getCurrentViewRecords()[selectedrow.rowIndex - 1].level)) {
+                        if ((selectedItem.level > tObj.getCurrentViewRecords()[selectedrow.rowIndex - 1].level) || this.parent.editSettings.mode === 'Batch'
+                            || this.parent.editSettings.mode === 'Cell') {
                             indent.style.display = 'none';
                         }
                         else {
                             indent.style.display = 'block';
                         }
-                        if (selectedItem.level === tObj.getCurrentViewRecords()[selectedrow.rowIndex - 1].level) {
+                        if ((selectedItem.level === tObj.getCurrentViewRecords()[selectedrow.rowIndex - 1].level) && this.parent.editSettings.mode !== 'Batch'
+                            && this.parent.editSettings.mode !== 'Cell') {
                             indent.style.display = 'block';
                         }
-                        if (selectedItem.level === 0) {
+                        if ((selectedItem.level === 0) || this.parent.editSettings.mode === 'Batch'
+                            || this.parent.editSettings.mode === 'Cell') {
                             outdent.style.display = 'none';
                         }
-                        if (selectedItem.level !== 0) {
+                        else {
                             outdent.style.display = 'block';
                         }
                     }
                 }
-                if (args['name'] === 'rowDeselected' && isNullOrUndefined(selectedrow) && !tObj.grid.isCheckBoxSelection) {
-                    if (this.parent.toolbar['includes']('Indent')) {
-                        indent.style.display = 'none';
-                    }
-                    if (this.parent.toolbar['includes']('Outdent')) {
-                        outdent.style.display = 'none';
-                    }
-                }
+            }
+        }
+        else {
+            if (tObj.grid.isEdit && isNullOrUndefined(selectedrow)) {
+                indent.style.display = 'none';
+                outdent.style.display = 'none';
             }
         }
     }
@@ -11980,6 +11981,8 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
         const upScroll = (scrollArgs.offset.top - this.translateY) < 0;
         const downScroll = Math.ceil(scrollArgs.offset.top - this.translateY) >= scrollHeight;
         const selectedRowIndex = 'selectedRowIndex';
+        const currentViewData = this.parent.currentViewData;
+        const indexValue = 'index';
         if (upScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left')) {
             const vHeight = +(this.parent.height.toString().indexOf('%') < 0 ? this.parent.height :
                 this.parent.element.getBoundingClientRect().height);
@@ -11998,6 +12001,10 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                 this.endIndex = lastInx;
                 this.startIndex = (this.startIndex - remains) < 0 ? 0 : (this.startIndex - remains);
             }
+            if (currentViewData.length && ((currentViewData[0][indexValue] - this.startIndex) < (this.parent.pageSettings.pageSize / 2))) {
+                this.startIndex = currentViewData[0][indexValue] - (this.parent.pageSettings.pageSize / 2);
+                this.endIndex = this.startIndex + this.parent.pageSettings.pageSize;
+            }
             //var firsttdinx = parseInt(this.parent.getContent().querySelector('.e-content td').getAttribute('index'), 0);
             let rowPt = Math.ceil(scrollArgs.offset.top / this.parent.getRowHeight());
             rowPt = rowPt % this.parent.pageSettings.pageSize;
@@ -12036,6 +12043,10 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             }
             this.startIndex = !isLastBlock ? lastIndex - this.parent.pageSettings.pageSize : nextSetResIndex;
             this.endIndex = lastIndex;
+            if (currentViewData.length && this.startIndex > currentViewData[0][indexValue] &&
+                ((this.startIndex - currentViewData[0][indexValue]) < (this.parent.pageSettings.pageSize / 2))) {
+                this.startIndex = currentViewData[0][indexValue] + (this.parent.pageSettings.pageSize / 2);
+            }
             if (scrollArgs.offset.top > (this.parent.getRowHeight() * this.totalRecords)) {
                 this.translateY = this.getTranslateY(scrollArgs.offset.top, content.getBoundingClientRect().height);
             }