@syncfusion/ej2-treegrid 25.1.38 → 25.1.41

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

@@ -1992,7 +1992,8 @@ var Render = /** @__PURE__ @class */ (function () {
                 var cellIndex = _this.parent.grid.getNormalizedColumnIndex(columnUid);
                 if (rows.length !== 0) {
                     for (var j = 0; j < rowsObj.length; j++) {
-                        if (rowsObj[parseInt(j.toString(), 10)].isDataRow && !isNullOrUndefined(rowsObj[parseInt(j.toString(), 10)].index)) {
+                        if (rowsObj[parseInt(j.toString(), 10)].isDataRow
+                            && !isNullOrUndefined(rowsObj[parseInt(j.toString(), 10)].index)) {
                             var cell = rowsObj[parseInt(j.toString(), 10)]["" + cells][parseInt(cellIndex.toString(), 10)];
                             var cellRenderer = new CellRenderer(_this.parent.grid, _this.parent.grid.serviceLocator);
                             var td = _this.parent.getCellFromIndex(rowsObj[parseInt(j.toString(), 10)].index, cellIndex - indent);
@@ -7191,7 +7192,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         }
     };
     TreeGrid.prototype.collapseRemoteChild = function (rowDetails, isChild) {
-        if (!isChild) {
+        if (!isNullOrUndefined(isChild) && !isChild && !this.loadChildOnDemand) {
             rowDetails.record.expanded = false;
         }
         var rows = rowDetails.rows;
@@ -7858,7 +7859,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         Property(false)
     ], TreeGrid.prototype, "enableColumnVirtualization", void 0);
     __decorate([
-        Property(true)
+        Property(false)
     ], TreeGrid.prototype, "enableHtmlSanitizer", void 0);
     __decorate([
         Property(false)
@@ -9689,7 +9690,8 @@ var TreeVirtualRowModelGenerator = /** @__PURE__ @class */ (function (_super) {
             var rows = _super.prototype.generateRows.call(this, data, notifyArgs);
             if (!isNullOrUndefined((this.visualData))) {
                 for (var r = 0; r < rows.length; r++) {
-                    rows[parseInt(r.toString(), 10)].index = (this.visualData).indexOf(rows[parseInt(r.toString(), 10)].data);
+                    rows[parseInt(r.toString(), 10)].index =
+                        (this.visualData).indexOf(rows[parseInt(r.toString(), 10)].data);
                 }
             }
             return rows;
@@ -10096,7 +10098,7 @@ var ExcelExport$1 = /** @__PURE__ @class */ (function () {
         if (!this.isLocal()) {
             this.parent.flatData = [];
         }
-        if (property && property.dataSource && this.isLocal()) {
+        if (property && property.dataSource) {
             var flatsData = this.parent.flatData;
             var dataSrc = property.dataSource instanceof DataManager ? property.dataSource.dataSource.json : property.dataSource;
             this.parent.dataModule.convertToFlatData(dataSrc);
@@ -13230,7 +13232,7 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
     VirtualTreeContentRenderer.prototype.dataBoundEvent = function () {
         var dataBoundEve = 'dataBound';
         var initialRowTop = 'initialRowTop';
-        if (!isNullOrUndefined(this.parent.getRowByIndex(0)) && this.parent.getRows().length && !this["" + initialRowTop]) {
+        if (this.parent.getRows().length && !isNullOrUndefined(this.parent.getRowByIndex(0)) && !this["" + initialRowTop]) {
             var rowTop = this.parent.getRowByIndex(0).getBoundingClientRect().top;
             var gridTop = this.parent.element.getBoundingClientRect().top;
             if (rowTop > 0) {
@@ -13454,13 +13456,8 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
                 firsttdinx = +attr; // this.parent.getContent().querySelector('.e-content tr').getAttribute('data-rowindex');
             }
             if (firsttdinx === 0) {
-                scrollArgs.offset.top = content$$1.scrollTop;
-                if (this.parent.allowRowDragAndDrop) {
-                    this.translateY = scrollArgs.offset.top - rowHeight * 2;
-                }
-                else {
-                    this.translateY = scrollArgs.offset.top;
-                }
+                this.translateY = (scrollArgs.offset.top - (outBuffer * rowHeight) > 0) ?
+                    scrollArgs.offset.top - (outBuffer * this.parent.getRowHeight()) + 10 : 0;
             }
             else {
                 this.translateY = (scrollArgs.offset.top - (outBuffer * rowHeight) > 0) ?
@@ -13514,6 +13511,9 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
             this.previousInfo = viewInfo;
             this.parent.setColumnIndexesInView(this.parent.enableColumnVirtualization ? viewInfo.columnIndexes : []);
             var page = viewInfo.loadNext && !viewInfo.loadSelf ? viewInfo.nextInfo.page : viewInfo.page;
+            if (downScroll && this.endIndex === this.totalRecords && viewInfo.loadNext) {
+                viewInfo.loadNext = false;
+            }
             this.parent.setProperties({ pageSettings: { currentPage: page } }, true);
             this.requestType = 'virtualscroll';
             if (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left') {
@@ -13834,14 +13834,14 @@ var VirtualScroll$1 = /** @__PURE__ @class */ (function () {
             }
             if ((requestType === 'save' && pageingDetails.actionArgs.index >= (counts.count - this.parent.grid.pageSettings.pageSize)) || (requestType === 'refresh' && this.parent['isGantt'] && this.parent['isAddedFromGantt'])) {
                 var modifiedStartIndex = counts.startIndex + (counts.count - counts.endIndex);
-                if (counts.startIndex <= modifiedStartIndex && counts.endIndex <= modifiedStartIndex) {
-                    startIndex = counts.startIndex;
-                    endIndex = counts.endIndex;
-                }
-                else {
+                if (counts.count - counts.startIndex <= this.parent.grid.pageSettings.pageSize) {
                     startIndex = modifiedStartIndex;
                     endIndex = counts.count;
                 }
+                else {
+                    startIndex = counts.startIndex;
+                    endIndex = counts.endIndex;
+                }
                 this.parent['isAddedFromGantt'] = false;
             }
             //if ((this.prevendIndex !== -1 && this.prevstartIndex !== -1) &&