@syncfusion/ej2-treegrid 27.2.2 → 28.1.33

package/src/treegrid/actions/virtual-scroll.js

@@ -153,6 +153,11 @@ var VirtualScroll = /** @class */ (function () {
                 (startIndex < this.parent.getRows().length && endIndex <= startIndex + this.parent.getRows().length) && translateY === 0) {
                 startIndex = 0;
             }
+            if ((pageingDetails.actionArgs.requestType === 'save' && startIndex !== this.prevstartIndex) &&
+                (startIndex < this.parent.getRows().length && endIndex <= startIndex + this.parent.getRows().length) && translateY === 0) {
+                startIndex = 0;
+                endIndex = startIndex + this.parent.grid.pageSettings.pageSize;
+            }
             if (!isNullOrUndefined(this.expandCollapseRec)) {
                 var resourceCount = this.parent.getRows();
                 var sIndex = visualData.indexOf(this.expandCollapseRec);

package/src/treegrid/base/data.js

@@ -201,6 +201,7 @@ var DataManipulation = /** @class */ (function () {
      * @returns {void}
      */
     DataManipulation.prototype.updateParentRemoteData = function (args) {
+        var _this = this;
         var actionArgs = 'actionArgs';
         if (isRemoteData(this.parent) && this.parent.enableVirtualization && args["" + actionArgs].requestType === 'virtualscroll') {
             this.parent.hideSpinner();
@@ -240,9 +241,15 @@ var DataManipulation = /** @class */ (function () {
                         records[parseInt(rec.toString(), 10)].taskData = extend({}, records[parseInt(rec.toString(), 10)]);
                         records[parseInt(rec.toString(), 10)].uniqueID = getUid(this_1.parent.element.id + '_data_');
                         setValue('uniqueIDCollection.' + records[parseInt(rec.toString(), 10)].uniqueID, records[parseInt(rec.toString(), 10)], this_1.parent);
-                        records[parseInt(rec.toString(), 10)].level = 0;
-                        if (isRemoteData(this_1.parent) && this_1.parent.enableVirtualization && records[parseInt(rec.toString(), 10)]["" + this_1.parent.parentIdMapping] && records[parseInt(rec.toString(), 10)].level === 0) {
-                            records[parseInt(rec.toString(), 10)].level = records[parseInt(rec.toString(), 10)].level + 1;
+                        if (isRemoteData(this_1.parent) && this_1.parent.enableVirtualization && records[parseInt(rec.toString(), 10)]["" + this_1.parent.parentIdMapping] && (isNullOrUndefined(records[parseInt(rec.toString(), 10)].level) || records[parseInt(rec.toString(), 10)].level === 0)) {
+                            var parentID_1 = records[parseInt(rec.toString(), 10)]["" + this_1.parent.parentIdMapping];
+                            var parentRec = records.find(function (record) { return record["" + _this.parent.idMapping] === parentID_1; });
+                            if (parentRec) {
+                                records[parseInt(rec.toString(), 10)].level = parentRec.level + 1;
+                            }
+                        }
+                        else {
+                            records[parseInt(rec.toString(), 10)].level = 0;
                         }
                         records[parseInt(rec.toString(), 10)].index = Math.ceil(Math.random() * 1000);
                         if ((records[parseInt(rec.toString(), 10)][this_1.parent.hasChildMapping] ||
@@ -448,7 +455,7 @@ var DataManipulation = /** @class */ (function () {
                             var parentData = _this.parent["" + remoteExpandedData][parseInt(i.toString(), 10)];
                             delete parentData.childRecords;
                             result[parseInt(r.toString(), 10)].parentItem = parentData;
-                            result[parseInt(r.toString(), 10)].parentUniqueID = rowDetails.record.uniqueID;
+                            result[parseInt(r.toString(), 10)].parentUniqueID = parentData.uniqueID;
                         }
                     }
                 }
@@ -483,6 +490,9 @@ var DataManipulation = /** @class */ (function () {
                 }
                 result[parseInt(r.toString(), 10)].index = Math.ceil(Math.random() * 1000);
                 result[parseInt(r.toString(), 10)].uniqueID = getUid(_this.parent.element.id + '_data_');
+                if (rowDetails.record["" + _this.parent.idMapping] === result[parseInt(r.toString(), 10)]["" + _this.parent.idMapping]) {
+                    rowDetails.record.uniqueID = result[parseInt(r.toString(), 10)].uniqueID;
+                }
                 result[parseInt(r.toString(), 10)].checkboxState = 'uncheck';
                 if (_this.parent.enableVirtualization && isNullOrUndefined(result[parseInt(r.toString(), 10)].level)) {
                     for (var p = 0; p < _this.parent.grid.currentViewData.length; p++) {
@@ -671,7 +681,14 @@ var DataManipulation = /** @class */ (function () {
                 this.parent.flatData.push(currentData);
             }
             else if (isNullOrUndefined(currentData["" + this.parent.parentIdMapping]) || currentData.parentItem) {
-                this.parent.flatData.push(currentData);
+                if (!isNullOrUndefined(this.parent.rowDropSettings.targetID)) {
+                    if (!this.parent.rowDragAndDropModule['isDuplicateData'](currentData)) {
+                        this.parent.flatData.push(currentData);
+                    }
+                }
+                else {
+                    this.parent.flatData.push(currentData);
+                }
                 this.parent['infiniteScrollData'].push(currentData);
             }
             if (!this.isSelfReference && currentData.level === 0) {

package/src/treegrid/base/treegrid.d.ts

@@ -1774,6 +1774,7 @@ export declare class TreeGrid extends Component<HTMLElement> implements INotifyP
      * @returns {void}
      */
     refreshColumns(refreshUI?: boolean): void;
+    private getTreeColumn;
     /**
      * Refreshes the TreeGrid header.
      *

package/src/treegrid/base/treegrid.js

@@ -554,7 +554,7 @@ var TreeGrid = /** @class */ (function (_super) {
     TreeGrid.prototype.requiredModules = function () {
         var modules = [];
         var splitFrozenCount = 'splitFrozenCount';
-        if (!this.isReact && isNullOrUndefined(this['changedProperties'].columns)) {
+        if (isNullOrUndefined(this['changedProperties'].columns)) {
             this.grid["" + splitFrozenCount](this.getColumns());
         }
         if (this.isDestroyed) {
@@ -1059,7 +1059,9 @@ var TreeGrid = /** @class */ (function (_super) {
             if (_this.pageSettings.pageSizeMode === 'Root') {
                 _this.grid.selectionModule['totalRecordsCount'] = _this.grid.currentViewData.length;
             }
-            _this.trigger(events.rowSelecting, args);
+            if (!args.cancel) {
+                _this.trigger(events.rowSelecting, args);
+            }
         };
         this.grid.rowDeselecting = function (args) {
             _this.IsExpandCollapseClicked(args);
@@ -1830,11 +1832,8 @@ var TreeGrid = /** @class */ (function (_super) {
     TreeGrid.prototype.onPropertyChanged = function (newProp) {
         var properties = Object.keys(newProp);
         var requireRefresh = false;
-        if (properties.indexOf('columns') > -1 && !isNullOrUndefined(newProp.columns) && this.frozenColumns === 0
-            && this.frozenRows === 0 && !this.columnModel.some(function (col) { return col.isFrozen || col.freeze; })) {
-            this.grid.columns = this.getGridColumns(newProp.columns);
-            this.grid['updateColumnObject']();
-            requireRefresh = true;
+        if (properties.indexOf('columns') > -1 && !isNullOrUndefined(newProp.columns)) {
+            this.refreshColumns();
         }
         for (var _i = 0, properties_1 = properties; _i < properties_1.length; _i++) {
             var prop = properties_1[_i];
@@ -2887,12 +2886,28 @@ var TreeGrid = /** @class */ (function (_super) {
     TreeGrid.prototype.refreshColumns = function (refreshUI) {
         if (isNullOrUndefined(refreshUI) || refreshUI) {
             this.grid.columns = this.getGridColumns(this.columns);
+            this.getTreeColumn();
             this.grid.refreshColumns();
         }
         else {
             this.grid.setProperties({ columns: this.getGridColumns(this.columns) }, true);
         }
     };
+    TreeGrid.prototype.getTreeColumn = function () {
+        var columnModel = 'columnModel';
+        var treeColumn = this["" + columnModel][this.treeColumnIndex];
+        var treeIndex;
+        var updatedCols = this.getColumns();
+        for (var f = 0; f < updatedCols.length; f++) {
+            var treeColumnfield = getObject('field', treeColumn);
+            var parentColumnfield = getObject('field', updatedCols[parseInt(f.toString(), 10)]);
+            if (treeColumnfield === parentColumnfield) {
+                treeIndex = f;
+                break;
+            }
+        }
+        this.setProperties({ treeColumnIndex: treeIndex }, true);
+    };
     /**
      * Refreshes the TreeGrid header.
      *
@@ -3704,7 +3719,7 @@ var TreeGrid = /** @class */ (function (_super) {
                 this.toggleRowVisibility(freezeRightRows[parseInt(i.toString(), 10)], displayAction);
             }
             this.notify('childRowExpand', { row: rows[parseInt(i.toString(), 10)] });
-            if ((!isNullOrUndefined(childRecords[parseInt(i.toString(), 10)].childRecords) && childRecords[parseInt(i.toString(), 10)].childRecords.length > 0) && (action !== 'expand' ||
+            if ((!isNullOrUndefined(childRecords)) && (!isNullOrUndefined(childRecords[parseInt(i.toString(), 10)].childRecords) && childRecords[parseInt(i.toString(), 10)].childRecords.length > 0) && (action !== 'expand' ||
                 isNullOrUndefined(childRecords[parseInt(i.toString(), 10)].expanded) || childRecords[parseInt(i.toString(), 10)].expanded)) {
                 this.expandCollapse(action, rows[parseInt(i.toString(), 10)], childRecords[parseInt(i.toString(), 10)], true);
                 if (this.frozenColumns <= this.treeColumnIndex && !isNullOrUndefined(movableRows)) {
@@ -3726,7 +3741,7 @@ var TreeGrid = /** @class */ (function (_super) {
     };
     TreeGrid.prototype.toggleRowVisibility = function (row, displayAction) {
         if (row) {
-            row.classList.remove('e-childrow-hidden', 'e-childrow-visible');
+            row.classList.remove('e-childrow-hidden', 'e-childrow-visible', 'e-hide');
             row.classList.add(displayAction);
         }
     };
@@ -4231,7 +4246,9 @@ var TreeGrid = /** @class */ (function (_super) {
      * @returns {void}
      */
     TreeGrid.prototype.reorderRows = function (fromIndexes, toIndex, position) {
-        this.rowDragAndDropModule.reorderRows(fromIndexes, toIndex, position);
+        if (!isNullOrUndefined(this.rowDragAndDropModule)) {
+            this.rowDragAndDropModule.reorderRows(fromIndexes, toIndex, position);
+        }
     };
     /**
      * Indents the record to one level of hierarchy. Moves the selected row as the last child of its previous row.

package/src/treegrid/renderer/virtual-tree-content-render.js

@@ -450,9 +450,15 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                 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;
@@ -486,6 +492,10 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                 ((this.startIndex - currentViewData[0]["" + indexValue]) < (this.parent.pageSettings.pageSize / 2)) && this.parent.selectionModule.isRowSelected) {
                 this.startIndex = currentViewData[0]["" + indexValue] + (this.parent.pageSettings.pageSize / 2);
             }
+            if (this.parent.root.isSelfReference) {
+                var 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);
             }
@@ -494,10 +504,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                     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 {