@syncfusion/ej2-treegrid 22.1.36 → 22.1.37

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

@@ -5884,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);
+                    }
+                });
+            }
+            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.trigger(expanded, collapseArgs);
+                    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) ||
@@ -5962,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;
@@ -6143,6 +6219,8 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
      * @returns {void}
      */
     expandAll() {
+        this.isExpandedEventTriggered = false;
+        this.isExpandingEventTriggered = false;
         this.expandCollapseAll('expand');
     }
     /**
@@ -6151,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) {
@@ -12431,7 +12511,8 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             this.startIndex = 0;
             this.endIndex = this.parent.pageSettings.pageSize - 1;
         }
-        if ((this.endIndex - this.startIndex !== this.parent.pageSettings.pageSize) && (this.totalRecords > this.parent.pageSettings.pageSize) &&
+        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;
@@ -12752,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;
                 }
             }
@@ -12772,7 +12854,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                 lastIndex = nextSetResIndex +
                     (this.totalRecords - nextSetResIndex);
             }
-            this.startIndex = !isLastBlock || isNullOrUndefined(this["" + selectedRowIndex]) ? 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)) {