@syncfusion/ej2-treegrid 29.1.39 → 29.2.8

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

@@ -3751,6 +3751,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         _this.isFromChartSide = false;
         _this.modifiedRecords = [];
         _this.stackedHeader = false;
+        _this.freezeColumnRefresh = true;
         _this.objectEqualityChecker = function (old, current) {
             if (old) {
                 var keys = Object.keys(old);
@@ -4187,6 +4188,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         this.columnModel = [];
         this.isExpandAll = false;
         this.isCollapseAll = false;
+        this.freezeColumnRefresh = true;
         this.keyConfigs = {
             ctrlDownArrow: 'ctrl+downarrow',
             ctrlUpArrow: 'ctrl+uparrow',
@@ -4229,6 +4231,10 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
     TreeGrid.prototype.requiredModules = function () {
         var modules = [];
         var splitFrozenCount = 'splitFrozenCount';
+        var mergedColumns = 'mergedColumns';
+        if (this["" + mergedColumns]) {
+            this.grid["" + mergedColumns] = this["" + mergedColumns];
+        }
         if (isNullOrUndefined(this['changedProperties'].columns)) {
             this.grid["" + splitFrozenCount](this.getColumns());
         }
@@ -5165,12 +5171,12 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                 _this.grid.refresh();
             }
             if (args.action === 'filter') {
-                if (_this.filterModule['currentFilterObject'] !== '' && _this.enableVirtualization && !_this.initialRender && !(isRemoteData(_this) && _this.enableVirtualization)) {
+                if (!args.isCollapseMaintain && _this.filterModule['currentFilterObject'] !== '' && _this.enableVirtualization && !_this.initialRender && !(isRemoteData(_this) && _this.enableVirtualization)) {
                     _this.expandAll();
                 }
             }
             if (args.requestType === 'searching') {
-                if (_this.searchSettings.key !== '' && _this.enableVirtualization && !_this.initialRender && !(isRemoteData(_this) && _this.enableVirtualization)) {
+                if (!args.isCollapseMaintain && _this.searchSettings.key !== '' && _this.enableVirtualization && !_this.initialRender && !(isRemoteData(_this) && _this.enableVirtualization)) {
                     _this.expandAll();
                 }
             }
@@ -6447,14 +6453,30 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
     };
     TreeGrid.prototype.setFrozenCount = function () {
         var persist3 = 'setFrozenCount';
-        this.grid["" + persist3].apply(this.grid);
+        this.grid["" + persist3].apply(this);
     };
     TreeGrid.prototype.splitFrozenCount = function (columns) {
         var persist4 = 'splitFrozenCount';
-        this.grid["" + persist4].apply(this.grid, [columns]);
+        var instance = this.frozenColumns > 0 ? this.grid : this;
+        this.grid["" + persist4].apply(instance, [columns]);
+    };
+    TreeGrid.prototype.removeBorder = function (columns) {
+        var persist5 = 'removeBorder';
+        this.grid["" + persist5].apply(this.grid, [columns]);
+    };
+    TreeGrid.prototype.frozenLeftBorderColumns = function (columns) {
+        var persist6 = 'frozenLeftBorderColumns';
+        this.grid["" + persist6].apply(this.grid, [columns]);
+    };
+    TreeGrid.prototype.frozenRightBorderColumns = function (columns) {
+        var persist7 = 'frozenRightBorderColumns';
+        this.grid["" + persist7].apply(this.grid, [columns]);
     };
     TreeGrid.prototype.isFrozenGrid = function () {
-        return this.grid.isFrozenGrid();
+        var hasFreezeProp = Array.isArray(this.columns) &&
+            this.columns.some(function (col) { return !!col.freeze; });
+        return (this.frozenColumns > 0 || this.frozenRows > 0 || this.getFrozenColumns() > 0 ||
+            hasFreezeProp);
     };
     TreeGrid.prototype.updateTreeGridModel = function () {
         this.setProperties({ filterSettings: getObject('properties', this.grid.filterSettings) }, true);
@@ -10623,22 +10645,11 @@ var TreeVirtualRowModelGenerator = /** @__PURE__ @class */ (function (_super) {
         return _super.prototype.getData.call(this);
     };
     TreeVirtualRowModelGenerator.prototype.generateRows = function (data, notifyArgs) {
-        if (!isNullOrUndefined(notifyArgs.virtualInfo) && notifyArgs.virtualInfo.loadNext &&
-            notifyArgs.virtualInfo.nextInfo.page !== this.parent.pageSettings.currentPage) {
-            this.parent.setProperties({ pageSettings: { currentPage: notifyArgs.virtualInfo.nextInfo.page } }, true);
-        }
-        else if (!isNullOrUndefined(notifyArgs.virtualInfo) && !notifyArgs.virtualInfo.loadNext &&
-            notifyArgs.virtualInfo.page !== this.parent.pageSettings.currentPage) {
-            this.parent.setProperties({ pageSettings: { currentPage: notifyArgs.virtualInfo.page } }, true);
-        }
         var info = this.getDataInfo();
         if (!isNullOrUndefined(notifyArgs.virtualInfo)) {
-            if (notifyArgs.virtualInfo.direction !== 'right' && notifyArgs.virtualInfo.direction !== 'left') {
-                if (!((this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
-                    && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent))
-                    || notifyArgs.virtualInfo.blockIndexes.length === 1) {
-                    notifyArgs.virtualInfo.blockIndexes = info.blockIndexes;
-                }
+            if ((!isRemoteData(this.parent.root) || isCountRequired(this.parent))
+                || notifyArgs.virtualInfo.blockIndexes.length === 1) {
+                notifyArgs.virtualInfo.blockIndexes = info.blockIndexes;
             }
             else {
                 notifyArgs.virtualInfo.blockIndexes = this.getBlockIndexes(notifyArgs.virtualInfo.page);
@@ -11965,8 +11976,13 @@ var Sort = /** @__PURE__ @class */ (function () {
         this.flatSortedData = [];
     };
     Sort.prototype.iterateSort = function (data, srtQry) {
+        var gridQuery = this.parent.query;
+        var filterQuery = [];
+        if (!isNullOrUndefined(gridQuery)) {
+            filterQuery = gridQuery.queries.filter(function (q) { return q.fn === 'onWhere'; });
+        }
         for (var d = 0; d < data.length; d++) {
-            if (this.parent.grid.filterSettings.columns.length > 0 || this.parent.grid.searchSettings.key !== '') {
+            if (filterQuery.length > 0 || this.parent.grid.filterSettings.columns.length > 0 || this.parent.grid.searchSettings.key !== '') {
                 if (!isNullOrUndefined(getParentData(this.parent, data[parseInt(d.toString(), 10)].uniqueID, true))) {
                     this.storedIndex++;
                     this.flatSortedData[this.storedIndex] = data[parseInt(d.toString(), 10)];
@@ -14827,6 +14843,7 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
                     || (this.parent.isFrozenGrid() && this.parent.getVisibleFrozenLeftCount() >= viewInfo.columnIndexes[0]
                         && this.prevInfo.columnIndexes.toString().includes(viewInfo.columnIndexes.toString()))))) {
                 this.parent.removeMaskRow();
+                this.parent.notify('removeGanttShimmer', { requestType: 'hideShimmer' });
                 if (Browser.isIE) {
                     this.parent.hideSpinner();
                 }