@syncfusion/ej2-treegrid 22.1.34 → 22.1.37

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

@@ -1219,11 +1219,11 @@ class Selection {
         }
     }
     updateSelectedItems(currentRecord, checkState) {
-        const record = this.parent.getCurrentViewRecords().filter((e) => {
+        const record = this.parent.grid.currentViewData.filter((e) => {
             return e.uniqueID === currentRecord.uniqueID;
         });
         let checkedRecord;
-        const recordIndex = this.parent.getCurrentViewRecords().indexOf(record[0]);
+        const recordIndex = this.parent.grid.currentViewData.indexOf(record[0]);
         const checkboxRecord = getParentData(this.parent, currentRecord.uniqueID);
         const tr = this.parent.getRows()[parseInt(recordIndex.toString(), 10)];
         let checkbox;
@@ -5581,21 +5581,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             this.stackedHeader = true;
         }
         if (this.stackedHeader && this.allowResizing) {
-            for (let i = 0; i < this.columns.length; i++) {
-                if (!isNullOrUndefined(this.columns[parseInt(i.toString(), 10)].columns)) {
-                    for (let j = 0; j < this.columns[parseInt(i.toString(), 10)].columns.length; j++) {
-                        const stackedColumn = this.columns[parseInt(i.toString(), 10)]
-                            .columns[parseInt(j.toString(), 10)];
-                        const currentColumn = this.grid.getColumnByField(stackedColumn.field);
-                        stackedColumn.width = currentColumn.width;
-                    }
-                }
-                else if (!isNullOrUndefined(this.columns[parseInt(i.toString(), 10)].field)) {
-                    const currentColumn = this.grid.getColumnByField(this.columns[parseInt(i.toString(), 10)]
-                        .field);
-                    this.columns[parseInt(i.toString(), 10)].width = currentColumn.width;
-                }
-            }
+            this.updateColumnsWidth(this.columns);
         }
         if (!this.stackedHeader) {
             merge(this.columns, this.columnModel);
@@ -5603,6 +5589,17 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         this[`${deepMerge}`] = undefined; // Workaround for blazor updateModel
         return this.columnModel;
     }
+    updateColumnsWidth(columns) {
+        columns.forEach((column) => {
+            if (column.columns) {
+                this.updateColumnsWidth(column.columns);
+            }
+            else if (column.field) {
+                const currentColumn = this.grid.getColumnByField(column.field);
+                column.width = currentColumn.width;
+            }
+        });
+    }
     /**
      * Gets the content div of the TreeGrid.
      *
@@ -5655,7 +5652,8 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
      * @isGenericType true
      */
     getCurrentViewRecords() {
-        return this.grid.currentViewData;
+        const isSummaryRow = 'isSummaryRow';
+        return this.grid.currentViewData.filter((e) => isNullOrUndefined(e[`${isSummaryRow}`]));
     }
     /**
      * Gets the added, edited,and deleted data before bulk save to the DataSource in batch mode.
@@ -5886,28 +5884,70 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
      * @returns {void}
      */
     expandRow(row, record, key, level) {
+        let parentRec = this.parentData;
+        if (!this.enableVirtualization) {
+            parentRec = this.flatData.filter((e) => {
+                return e.hasChildRecords;
+            });
+        }
         record = this.getCollapseExpandRecords(row, record);
         if (!isNullOrUndefined(row) && row.cells[0].classList.contains('e-lastrowcell')) {
             this.lastRowBorder(row, false);
         }
-        const args = { data: record, row: row, cancel: false };
-        this.trigger(expanding, args, (expandingArgs) => {
-            if (!expandingArgs.cancel) {
-                this.expandCollapse('expand', row, record);
-                if (expandingArgs.expandAll) {
-                    this.expandCollapseAllChildren(record, 'expand', key, level);
-                }
-                const children = 'Children';
-                if (!(isRemoteData(this) && !isOffline(this)) && (!isCountRequired(this) || !isNullOrUndefined(record[`${children}`]))) {
-                    const collapseArgs = { data: record, row: row };
-                    this.setHeightForFrozenContent();
-                    if (!isNullOrUndefined(this.expandStateMapping)) {
-                        this.updateExpandStateMapping(collapseArgs.data, true);
+        if (this.isExpandAll && !isRemoteData(this)) {
+            const args = { data: parentRec, row: row, cancel: false };
+            let pagerValuePresent = false;
+            if (this.grid.pagerModule && !isNullOrUndefined(this.grid.pagerModule.pagerObj.pagerdropdownModule)) {
+                pagerValuePresent = this.grid.pagerModule.pagerObj.pagerdropdownModule['dropDownListObject'].value ? true : false;
+            }
+            if (!this.isExpandingEventTriggered) {
+                this.trigger(expanding, args, (expandingArgs) => {
+                    this.expandAllPrevent = expandingArgs.cancel;
+                    if (!expandingArgs.cancel) {
+                        if (expandingArgs.expandAll) {
+                            this.expandCollapseAllChildren(record, 'expand', key, level);
+                        }
+                        this.expandRows(row, record, parentRec, key, level);
                     }
-                    this.trigger(expanded, collapseArgs);
+                });
+            }
+            else if ((!this.allowPaging || (pagerValuePresent && this.grid.pagerModule.pagerObj.pagerdropdownModule['dropDownListObject'].value === 'All')) &&
+                !this.expandAllPrevent && this.isExpandingEventTriggered) {
+                this.expandRows(row, record, parentRec, key, level);
+            }
+            this.isExpandingEventTriggered = true;
+        }
+        else if (!this.isExpandAll || (this.isExpandAll && isRemoteData(this))) {
+            const args = { data: record, row: row, cancel: false };
+            this.trigger(expanding, args, (expandingArgs) => {
+                if (!expandingArgs.cancel) {
+                    if (expandingArgs.expandAll) {
+                        this.expandCollapseAllChildren(record, 'expand', key, level);
+                    }
+                    this.expandRows(row, record, parentRec, key, level);
                 }
+            });
+        }
+    }
+    // Internal method to handle the rows expand
+    expandRows(row, record, parentRec, key, level) {
+        this.expandCollapse('expand', row, record);
+        const children = 'Children';
+        if (!(isRemoteData(this) && !isOffline(this)) && (!isCountRequired(this) || !isNullOrUndefined(record[`${children}`]))) {
+            let expandArgs = { data: record, row: row };
+            this.setHeightForFrozenContent();
+            if (!isNullOrUndefined(this.expandStateMapping)) {
+                this.updateExpandStateMapping(expandArgs.data, true);
             }
-        });
+            if (this.isExpandAll && !this.isExpandedEventTriggered) {
+                this.isExpandedEventTriggered = true;
+                expandArgs = { data: parentRec, row: row };
+                this.trigger(expanded, expandArgs);
+            }
+            else if (!this.isExpandAll) {
+                this.trigger(expanded, expandArgs);
+            }
+        }
     }
     expandCollapseAllChildren(record, action, key, level) {
         if ((!isNullOrUndefined(key) && record[this.getPrimaryKeyFieldNames()[0]] !== key) ||
@@ -5964,31 +6004,65 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
      * @returns {void}
      */
     collapseRow(row, record, key) {
+        let parentRec = this.parentData;
+        if (!this.enableVirtualization) {
+            parentRec = this.flatData.filter((e) => {
+                return e.hasChildRecords;
+            });
+        }
         record = this.getCollapseExpandRecords(row, record);
-        const args = { data: record, row: row, cancel: false };
-        this.trigger(collapsing, args, (collapsingArgs) => {
-            if (!collapsingArgs.cancel) {
-                if (collapsingArgs.collapseAll) {
-                    this.expandCollapseAllChildren(record, 'collapse', key);
-                }
-                this.expandCollapse('collapse', row, record);
-                const collapseArgs = { data: record, row: row };
-                if (!isRemoteData(this)) {
-                    this.setHeightForFrozenContent();
-                    if (!isNullOrUndefined(this.expandStateMapping)) {
-                        this.updateExpandStateMapping(collapseArgs.data, false);
-                    }
-                    this.trigger(collapsed, collapseArgs);
-                    if (this.enableInfiniteScrolling) {
-                        const scrollHeight = this.grid.getContent().firstElementChild.scrollHeight;
-                        const scrollTop = this.grid.getContent().firstElementChild.scrollTop;
-                        if ((scrollHeight - scrollTop) < this.grid.getRowHeight() + +this.height) {
-                            this.grid.getContent().firstElementChild.scrollBy(0, this.grid.getRowHeight());
+        if (this.isCollapseAll && !isRemoteData(this)) {
+            const args = { data: parentRec, row: row, cancel: false };
+            if (!this.isCollapsingEventTriggered) {
+                this.trigger(collapsing, args, (collapsingArgs) => {
+                    this.collapseAllPrevent = collapsingArgs.cancel;
+                    if (!collapsingArgs.cancel) {
+                        if (collapsingArgs.collapseAll) {
+                            this.expandCollapseAllChildren(record, 'collapse', key);
                         }
+                        this.collapseRows(row, record, parentRec, key);
                     }
+                });
+            }
+            else if (!this.allowPaging && !this.collapseAllPrevent && this.isCollapsingEventTriggered) {
+                this.collapseRows(row, record, parentRec, key);
+            }
+            this.isCollapsingEventTriggered = true;
+        }
+        else if (!this.isCollapseAll || (this.isCollapseAll && isRemoteData(this))) {
+            const args = { data: record, row: row, cancel: false };
+            this.trigger(collapsing, args, (collapsingArgs) => {
+                if (!collapsingArgs.cancel) {
+                    this.collapseRows(row, record, parentRec, key);
                 }
+            });
+        }
+    }
+    // Internal method for handling the rows collapse
+    collapseRows(row, record, parentRec, key) {
+        this.expandCollapse('collapse', row, record);
+        let collapseArgs = { data: record, row: row };
+        if (!isRemoteData(this)) {
+            this.setHeightForFrozenContent();
+            if (!isNullOrUndefined(this.expandStateMapping)) {
+                this.updateExpandStateMapping(collapseArgs.data, false);
             }
-        });
+            if (this.isCollapseAll && !this.isCollapsedEventTriggered) {
+                this.isCollapsedEventTriggered = true;
+                collapseArgs = { data: parentRec, row: row };
+                this.trigger(collapsed, collapseArgs);
+            }
+            else if (!this.isCollapseAll) {
+                this.trigger(collapsed, collapseArgs);
+            }
+            if (this.enableInfiniteScrolling) {
+                const scrollHeight = this.grid.getContent().firstElementChild.scrollHeight;
+                const scrollTop = this.grid.getContent().firstElementChild.scrollTop;
+                if ((scrollHeight - scrollTop) < this.grid.getRowHeight() + +this.height) {
+                    this.grid.getContent().firstElementChild.scrollBy(0, this.grid.getRowHeight());
+                }
+            }
+        }
     }
     updateExpandStateMapping(record, state) {
         const totalRecords = record;
@@ -6145,6 +6219,8 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
      * @returns {void}
      */
     expandAll() {
+        this.isExpandedEventTriggered = false;
+        this.isExpandingEventTriggered = false;
         this.expandCollapseAll('expand');
     }
     /**
@@ -6153,6 +6229,8 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
      * @returns {void}
      */
     collapseAll() {
+        this.isCollapsedEventTriggered = false;
+        this.isCollapsingEventTriggered = false;
         this.expandCollapseAll('collapse');
     }
     expandCollapseAll(action) {
@@ -6209,7 +6287,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     }
     expandCollapse(action, row, record, isChild) {
         const expandingArgs = { row: row, data: record, childData: [], requestType: action };
-        const childRecords = this.getCurrentViewRecords().filter((e) => {
+        const childRecords = this.grid.currentViewData.filter((e) => {
             return e.parentUniqueID === record.uniqueID;
         });
         let targetEle;
@@ -6223,7 +6301,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         }
         let rowIndex;
         if (isNullOrUndefined(row)) {
-            rowIndex = this.getCurrentViewRecords().indexOf(record);
+            rowIndex = this.grid.currentViewData.indexOf(record);
             row = gridRows[parseInt(rowIndex.toString(), 10)];
         }
         else {
@@ -6446,7 +6524,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     }
     localExpand(action, row, record) {
         let rows;
-        const childRecords = this.getCurrentViewRecords().filter((e) => {
+        const childRecords = this.grid.currentViewData.filter((e) => {
             return e.parentUniqueID === record.uniqueID;
         });
         if (this.isPixelHeight() && row.cells[0].classList.contains('e-lastrowcell')) {
@@ -6479,7 +6557,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             freezeRightRows = this.getFrozenRightRows().filter((r) => r.querySelector('.e-gridrowindex' + record.index + 'level' + (record.level + 1)));
         }
         const gridRowsObject = this.grid.getRowsObject();
-        const currentViewData = this.getCurrentViewRecords();
+        const currentViewData = this.grid.currentViewData;
         const currentRecord = currentViewData.filter((e) => {
             return e.uniqueID === record.uniqueID;
         });
@@ -12433,8 +12511,16 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             this.startIndex = 0;
             this.endIndex = this.parent.pageSettings.pageSize - 1;
         }
-        args.startIndex = this.startIndex;
-        args.endIndex = this.endIndex;
+        if ((this.endIndex - this.startIndex !== this.parent.pageSettings.pageSize) &&
+            (this.totalRecords > this.parent.pageSettings.pageSize) &&
+            (this.endIndex === this.totalRecords)) {
+            args.startIndex = this.endIndex - this.parent.pageSettings.pageSize;
+            args.endIndex = this.endIndex;
+        }
+        else {
+            args.startIndex = this.startIndex;
+            args.endIndex = this.endIndex;
+        }
     }
     eventListener(action) {
         if (!(this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
@@ -12747,6 +12833,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                     this.translateY = scrollArgs.offset.top - rowHeight * 2;
                 }
                 else {
+                    scrollArgs.offset.top = content$$1.scrollTop;
                     this.translateY = scrollArgs.offset.top;
                 }
             }
@@ -12767,7 +12854,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                 lastIndex = nextSetResIndex +
                     (this.totalRecords - nextSetResIndex);
             }
-            this.startIndex = !isLastBlock ? lastIndex - this.parent.pageSettings.pageSize : nextSetResIndex;
+            this.startIndex = !isLastBlock || isNullOrUndefined(this['' + selectedRowIndex]) ? lastIndex - this.parent.pageSettings.pageSize : nextSetResIndex;
             this.endIndex = lastIndex;
             if ((nextSetResIndex + this.parent.pageSettings.pageSize) > this.totalRecords && (this.endIndex - this.startIndex) <
                 (this.parent.pageSettings.pageSize / 2) && (this.endIndex - nextSetResIndex) < (this.parent.pageSettings.pageSize / 2)) {
@@ -13387,10 +13474,6 @@ class Freeze$1 {
                 getValue('addRenderer', renderer)
                     .apply(renderer, [RenderType.Content, new VirtualTreeFreezeRenderer(getValue('grid', this.parent), getValue('serviceLocator', this.parent.grid))]);
             }
-            else {
-                getValue('addRenderer', renderer)
-                    .apply(renderer, [RenderType.Content, new FreezeContentRender(getValue('grid', this.parent), getValue('serviceLocator', this.parent.grid))]);
-            }
         }
         if (this.parent.getFrozenLeftColumnsCount() || this.parent.getFrozenRightColumnsCount()) {
             getValue('addRenderer', renderer)