@syncfusion/ej2-treegrid 22.1.36 → 22.1.37

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 22.1.36
+*  version : 22.1.37
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-treegrid@*",
-  "_id": "@syncfusion/ej2-treegrid@21.1.36",
+  "_id": "@syncfusion/ej2-treegrid@22.1.36",
   "_inBundle": false,
-  "_integrity": "sha512-kruhXjj64HWfP7/3sgBNO8ds5WTf90FYh+Gw+AeaE6Ebq6fUgavPGjVmZbo4gfbO9TmEcSnQbT9f+bClNhIziA==",
+  "_integrity": "sha512-v4Iu+lVo/s6DbIN6B2tpcuh7jPfd9YmIexRJ36AEq/+COecwEQJ9Svj4BwgHhqmArel/uC7MIHXeiuyRU7/5nw==",
   "_location": "/@syncfusion/ej2-treegrid",
   "_phantomChildren": {},
   "_requested": {
@@ -24,8 +24,8 @@
     "/@syncfusion/ej2-react-treegrid",
     "/@syncfusion/ej2-vue-treegrid"
   ],
-  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-21.1.36.tgz",
-  "_shasum": "868c98e4823b60d1462d83aea652e8f292da0363",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-22.1.36.tgz",
+  "_shasum": "863e6c49ec54bc9b0717212ba2e55c6cd50f7467",
   "_spec": "@syncfusion/ej2-treegrid@*",
   "_where": "/jenkins/workspace/elease-automation_release_21.1.1/packages/included",
   "author": {
@@ -38,8 +38,8 @@
   "dependencies": {
     "@syncfusion/ej2-base": "~22.1.34",
     "@syncfusion/ej2-data": "~22.1.36",
-    "@syncfusion/ej2-grids": "~22.1.36",
-    "@syncfusion/ej2-popups": "~22.1.36"
+    "@syncfusion/ej2-grids": "~22.1.37",
+    "@syncfusion/ej2-popups": "~22.1.37"
   },
   "deprecated": false,
   "description": "Essential JS 2 TreeGrid Component",
@@ -66,6 +66,6 @@
     "url": "git+https://github.com/syncfusion/ej2-treegrid.git"
   },
   "typings": "index.d.ts",
-  "version": "22.1.36",
+  "version": "22.1.37",
   "sideEffects": false
 }

package/src/treegrid/base/treegrid.d.ts

@@ -86,6 +86,12 @@ export declare class TreeGrid extends Component<HTMLElement> implements INotifyP
     private isAddedFromGantt;
     private isIndentEnabled;
     private indentOutdentAction;
+    private isCollapsedEventTriggered;
+    private isCollapsingEventTriggered;
+    private isExpandedEventTriggered;
+    private isExpandingEventTriggered;
+    private collapseAllPrevent;
+    private expandAllPrevent;
     /**
      * The `sortModule` is used to manipulate sorting in TreeGrid.
      */
@@ -1732,6 +1738,7 @@ export declare class TreeGrid extends Component<HTMLElement> implements INotifyP
      * @returns {void}
      */
     expandRow(row: HTMLTableRowElement, record?: Object, key?: Object, level?: number): void;
+    private expandRows;
     private expandCollapseAllChildren;
     private setHeightForFrozenContent;
     private getCollapseExpandRecords;
@@ -1744,6 +1751,7 @@ export declare class TreeGrid extends Component<HTMLElement> implements INotifyP
      * @returns {void}
      */
     collapseRow(row: HTMLTableRowElement, record?: Object, key?: Object): void;
+    private collapseRows;
     private updateExpandStateMapping;
     /**
      * Expands the records at specific hierarchical level

package/src/treegrid/base/treegrid.js

@@ -2610,28 +2610,70 @@ var TreeGrid = /** @class */ (function (_super) {
      */
     TreeGrid.prototype.expandRow = function (row, record, key, level) {
         var _this = this;
+        var parentRec = this.parentData;
+        if (!this.enableVirtualization) {
+            parentRec = this.flatData.filter(function (e) {
+                return e.hasChildRecords;
+            });
+        }
         record = this.getCollapseExpandRecords(row, record);
         if (!isNullOrUndefined(row) && row.cells[0].classList.contains('e-lastrowcell')) {
             this.lastRowBorder(row, false);
         }
-        var args = { data: record, row: row, cancel: false };
-        this.trigger(events.expanding, args, function (expandingArgs) {
-            if (!expandingArgs.cancel) {
-                _this.expandCollapse('expand', row, record);
-                if (expandingArgs.expandAll) {
-                    _this.expandCollapseAllChildren(record, 'expand', key, level);
-                }
-                var children = 'Children';
-                if (!(isRemoteData(_this) && !isOffline(_this)) && (!isCountRequired(_this) || !isNullOrUndefined(record["" + children]))) {
-                    var collapseArgs = { data: record, row: row };
-                    _this.setHeightForFrozenContent();
-                    if (!isNullOrUndefined(_this.expandStateMapping)) {
-                        _this.updateExpandStateMapping(collapseArgs.data, true);
+        if (this.isExpandAll && !isRemoteData(this)) {
+            var args = { data: parentRec, row: row, cancel: false };
+            var 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(events.expanding, args, function (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(events.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))) {
+            var args = { data: record, row: row, cancel: false };
+            this.trigger(events.expanding, args, function (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
+    TreeGrid.prototype.expandRows = function (row, record, parentRec, key, level) {
+        this.expandCollapse('expand', row, record);
+        var children = 'Children';
+        if (!(isRemoteData(this) && !isOffline(this)) && (!isCountRequired(this) || !isNullOrUndefined(record["" + children]))) {
+            var 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(events.expanded, expandArgs);
+            }
+            else if (!this.isExpandAll) {
+                this.trigger(events.expanded, expandArgs);
+            }
+        }
     };
     TreeGrid.prototype.expandCollapseAllChildren = function (record, action, key, level) {
         if ((!isNullOrUndefined(key) && record[this.getPrimaryKeyFieldNames()[0]] !== key) ||
@@ -2689,31 +2731,65 @@ var TreeGrid = /** @class */ (function (_super) {
      */
     TreeGrid.prototype.collapseRow = function (row, record, key) {
         var _this = this;
+        var parentRec = this.parentData;
+        if (!this.enableVirtualization) {
+            parentRec = this.flatData.filter(function (e) {
+                return e.hasChildRecords;
+            });
+        }
         record = this.getCollapseExpandRecords(row, record);
-        var args = { data: record, row: row, cancel: false };
-        this.trigger(events.collapsing, args, function (collapsingArgs) {
-            if (!collapsingArgs.cancel) {
-                if (collapsingArgs.collapseAll) {
-                    _this.expandCollapseAllChildren(record, 'collapse', key);
-                }
-                _this.expandCollapse('collapse', row, record);
-                var collapseArgs = { data: record, row: row };
-                if (!isRemoteData(_this)) {
-                    _this.setHeightForFrozenContent();
-                    if (!isNullOrUndefined(_this.expandStateMapping)) {
-                        _this.updateExpandStateMapping(collapseArgs.data, false);
-                    }
-                    _this.trigger(events.collapsed, collapseArgs);
-                    if (_this.enableInfiniteScrolling) {
-                        var scrollHeight = _this.grid.getContent().firstElementChild.scrollHeight;
-                        var 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)) {
+            var args = { data: parentRec, row: row, cancel: false };
+            if (!this.isCollapsingEventTriggered) {
+                this.trigger(events.collapsing, args, function (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))) {
+            var args = { data: record, row: row, cancel: false };
+            this.trigger(events.collapsing, args, function (collapsingArgs) {
+                if (!collapsingArgs.cancel) {
+                    _this.collapseRows(row, record, parentRec, key);
+                }
+            });
+        }
+    };
+    // Internal method for handling the rows collapse
+    TreeGrid.prototype.collapseRows = function (row, record, parentRec, key) {
+        this.expandCollapse('collapse', row, record);
+        var 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(events.collapsed, collapseArgs);
+            }
+            else if (!this.isCollapseAll) {
+                this.trigger(events.collapsed, collapseArgs);
+            }
+            if (this.enableInfiniteScrolling) {
+                var scrollHeight = this.grid.getContent().firstElementChild.scrollHeight;
+                var scrollTop = this.grid.getContent().firstElementChild.scrollTop;
+                if ((scrollHeight - scrollTop) < this.grid.getRowHeight() + +this.height) {
+                    this.grid.getContent().firstElementChild.scrollBy(0, this.grid.getRowHeight());
                 }
             }
-        });
+        }
     };
     TreeGrid.prototype.updateExpandStateMapping = function (record, state) {
         var totalRecords = record;
@@ -2876,6 +2952,8 @@ var TreeGrid = /** @class */ (function (_super) {
      * @returns {void}
      */
     TreeGrid.prototype.expandAll = function () {
+        this.isExpandedEventTriggered = false;
+        this.isExpandingEventTriggered = false;
         this.expandCollapseAll('expand');
     };
     /**
@@ -2884,6 +2962,8 @@ var TreeGrid = /** @class */ (function (_super) {
      * @returns {void}
      */
     TreeGrid.prototype.collapseAll = function () {
+        this.isCollapsedEventTriggered = false;
+        this.isCollapsingEventTriggered = false;
         this.expandCollapseAll('collapse');
     };
     TreeGrid.prototype.expandCollapseAll = function (action) {

package/src/treegrid/renderer/virtual-tree-content-render.js

@@ -105,7 +105,8 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
             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;
@@ -428,6 +429,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                     this.translateY = scrollArgs.offset.top - rowHeight * 2;
                 }
                 else {
+                    scrollArgs.offset.top = content.scrollTop;
                     this.translateY = scrollArgs.offset.top;
                 }
             }
@@ -448,7 +450,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                 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)) {