@syncfusion/ej2-treegrid 29.1.39 → 29.2.8

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

@@ -3462,6 +3462,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         this.isFromChartSide = false;
         this.modifiedRecords = [];
         this.stackedHeader = false;
+        this.freezeColumnRefresh = true;
         this.objectEqualityChecker = (old, current) => {
             if (old) {
                 const keys = Object.keys(old);
@@ -3896,6 +3897,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         this.columnModel = [];
         this.isExpandAll = false;
         this.isCollapseAll = false;
+        this.freezeColumnRefresh = true;
         this.keyConfigs = {
             ctrlDownArrow: 'ctrl+downarrow',
             ctrlUpArrow: 'ctrl+uparrow',
@@ -3938,6 +3940,10 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     requiredModules() {
         const modules = [];
         const splitFrozenCount = 'splitFrozenCount';
+        const mergedColumns = 'mergedColumns';
+        if (this[`${mergedColumns}`]) {
+            this.grid[`${mergedColumns}`] = this[`${mergedColumns}`];
+        }
         if (isNullOrUndefined(this['changedProperties'].columns)) {
             this.grid[`${splitFrozenCount}`](this.getColumns());
         }
@@ -4864,12 +4870,12 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 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();
                 }
             }
@@ -6137,14 +6143,30 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     }
     setFrozenCount() {
         const persist3 = 'setFrozenCount';
-        this.grid[`${persist3}`].apply(this.grid);
+        this.grid[`${persist3}`].apply(this);
     }
     splitFrozenCount(columns) {
         const persist4 = 'splitFrozenCount';
-        this.grid[`${persist4}`].apply(this.grid, [columns]);
+        const instance = this.frozenColumns > 0 ? this.grid : this;
+        this.grid[`${persist4}`].apply(instance, [columns]);
+    }
+    removeBorder(columns) {
+        const persist5 = 'removeBorder';
+        this.grid[`${persist5}`].apply(this.grid, [columns]);
+    }
+    frozenLeftBorderColumns(columns) {
+        const persist6 = 'frozenLeftBorderColumns';
+        this.grid[`${persist6}`].apply(this.grid, [columns]);
+    }
+    frozenRightBorderColumns(columns) {
+        const persist7 = 'frozenRightBorderColumns';
+        this.grid[`${persist7}`].apply(this.grid, [columns]);
     }
     isFrozenGrid() {
-        return this.grid.isFrozenGrid();
+        const hasFreezeProp = Array.isArray(this.columns) &&
+            this.columns.some((col) => !!col.freeze);
+        return (this.frozenColumns > 0 || this.frozenRows > 0 || this.getFrozenColumns() > 0 ||
+            hasFreezeProp);
     }
     updateTreeGridModel() {
         this.setProperties({ filterSettings: getObject('properties', this.grid.filterSettings) }, true);
@@ -10237,22 +10259,11 @@ class TreeVirtualRowModelGenerator extends VirtualRowModelGenerator {
         return super.getData();
     }
     generateRows(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);
-        }
         const 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);
@@ -11560,8 +11571,13 @@ class Sort {
         this.flatSortedData = [];
     }
     iterateSort(data, srtQry) {
+        const gridQuery = this.parent.query;
+        let filterQuery = [];
+        if (!isNullOrUndefined(gridQuery)) {
+            filterQuery = gridQuery.queries.filter((q) => q.fn === 'onWhere');
+        }
         for (let 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)];
@@ -14389,6 +14405,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                     || (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();
                 }