@syncfusion/ej2-treegrid 20.3.48 → 20.3.50

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.3.48
+*  version : 20.3.50
 *  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@20.3.47",
+  "_id": "@syncfusion/ej2-treegrid@20.3.49",
   "_inBundle": false,
-  "_integrity": "sha512-h6rSxBpMoZDLav2suqY58wIzpy42bpTtxPL/2APnJc98TC6Nk2c7seEgn4iJkc2hJ7AzZ+BEaTpJU72+r+W7vg==",
+  "_integrity": "sha512-48n9ELayHVf9o6D/gd4RUFkaaZLi8jbQw9ayr7xU+9E5iTtIzjzM+MagsBcmi3g6cGX9ia+ZA1jAMgVAbZkuSA==",
   "_location": "/@syncfusion/ej2-treegrid",
   "_phantomChildren": {},
   "_requested": {
@@ -24,8 +24,8 @@
     "/@syncfusion/ej2-react-treegrid",
     "/@syncfusion/ej2-vue-treegrid"
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-20.3.47.tgz",
-  "_shasum": "1847003b673227740c5a591d0292fe16bc4615b8",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-20.3.49.tgz",
+  "_shasum": "a830c8b6226e2b1d86a1ba0b50b1d9879604fbc2",
   "_spec": "@syncfusion/ej2-treegrid@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -36,10 +36,10 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.3.48",
-    "@syncfusion/ej2-data": "~20.3.47",
-    "@syncfusion/ej2-grids": "~20.3.48",
-    "@syncfusion/ej2-popups": "~20.3.48"
+    "@syncfusion/ej2-base": "~20.3.50",
+    "@syncfusion/ej2-data": "~20.3.50",
+    "@syncfusion/ej2-grids": "~20.3.50",
+    "@syncfusion/ej2-popups": "~20.3.50"
   },
   "deprecated": false,
   "description": "Essential JS 2 TreeGrid Component",
@@ -60,6 +60,6 @@
     "url": "git+https://github.com/syncfusion/ej2-treegrid.git"
   },
   "typings": "index.d.ts",
-  "version": "20.3.48",
+  "version": "20.3.50",
   "sideEffects": false
 }

package/src/treegrid/actions/rowdragdrop.js

@@ -1139,7 +1139,12 @@ var RowDD = /** @class */ (function () {
         }
         length = record.childRecords.length;
         for (var i = 0; i < length; i++) {
-            currentRecord = getValue('uniqueIDCollection.' + record.childRecords[i].uniqueID, tObj);
+            if (!this.isMultipleGrid) {
+                currentRecord = getValue('uniqueIDCollection.' + record.childRecords[i].uniqueID, tObj);
+            }
+            else {
+                currentRecord = record.childRecords[i];
+            }
             count++;
             tObj.flatData.splice(count, 0, currentRecord);
             setValue('uniqueIDCollection.' + currentRecord.uniqueID, currentRecord, this.parent);
@@ -1161,7 +1166,12 @@ var RowDD = /** @class */ (function () {
         }
         length = record.childRecords.length;
         for (var i = 0; i < length; i++) {
-            currentRecord = getValue('uniqueIDCollection.' + record.childRecords[i].uniqueID, this.parent);
+            if (!this.isMultipleGrid) {
+                currentRecord = getValue('uniqueIDCollection.' + record.childRecords[i].uniqueID, this.parent);
+            }
+            else {
+                currentRecord = record.childRecords[i];
+            }
             var parentData = void 0;
             if (record.parentItem) {
                 parentData = getParentData(this.parent, record.parentItem.uniqueID);

package/src/treegrid/base/data.js

@@ -223,7 +223,7 @@ var DataManipulation = /** @class */ (function () {
                 }
             }
             else {
-                if (!isNullOrUndefined(records)) {
+                if (!isNullOrUndefined(records) && !((this.parent.loadChildOnDemand) && isCountRequired(this.parent) && !isNullOrUndefined(this.parent['dataResults']['expandRecord']))) {
                     this.convertToFlatData(records);
                 }
             }
@@ -377,8 +377,8 @@ var DataManipulation = /** @class */ (function () {
             if (!Object.prototype.hasOwnProperty.call(currentData, 'index')) {
                 currentData.index = this.storedIndex;
             }
-            if ((!isNullOrUndefined(currentData[this.parent.childMapping]) && !isCountRequired(this.parent)) || ((currentData[this.parent.hasChildMapping]) &&
-                isCountRequired(this.parent) && (this.parent.initialRender || isNullOrUndefined(this.parent['dataResults'].result) || this.parent.enableInfiniteScrolling))) {
+            if ((!isNullOrUndefined(currentData[this.parent.childMapping]) && !isCountRequired(this.parent)) ||
+                ((currentData[this.parent.hasChildMapping]) && isCountRequired(this.parent))) {
                 currentData.hasChildRecords = true;
                 if (this.parent.enableCollapseAll || !isNullOrUndefined(this.parent.dataStateChange)
                     && isNullOrUndefined(currentData[this.parent.childMapping])) {

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

@@ -1752,6 +1752,7 @@ export declare class TreeGrid extends Component<HTMLElement> implements INotifyP
     collapseAll(): void;
     private expandCollapseAll;
     private expandCollapse;
+    private updateGridRowsVisible;
     private updateChildOnDemand;
     private remoteExpand;
     private localExpand;

package/src/treegrid/base/treegrid.js

@@ -1096,7 +1096,7 @@ var TreeGrid = /** @class */ (function (_super) {
             }
             _this.notify('actionBegin', { editAction: args });
             if (!isRemoteData(_this) && !isNullOrUndefined(_this.filterModule) && !isCountRequired(_this)
-                && (_this.grid.filterSettings.columns.length === 0 || _this.grid.searchSettings.key.length === 0)) {
+                && (_this.grid.filterSettings.columns.length === 0 && _this.grid.searchSettings.key.length === 0)) {
                 _this.notify('clearFilters', { flatData: _this.grid.dataSource });
                 _this.grid.setProperties({ dataSource: _this.dataResults.result }, true);
                 if (isNullOrUndefined(_this.grid['changedProperties'].dataSource)) {
@@ -2807,11 +2807,13 @@ var TreeGrid = /** @class */ (function (_super) {
                 }
             });
             if (rows.length) {
-                if (action === 'collapse') {
-                    this.collapseRow(rows[0]);
-                }
-                else {
-                    this.expandRow(rows[0]);
+                for (var i = 0; i < rows.length; i++) {
+                    if (action === 'collapse') {
+                        this.collapseRow(rows[i]);
+                    }
+                    else {
+                        this.expandRow(rows[i]);
+                    }
                 }
             }
             else if (this.allowPaging) {
@@ -2840,7 +2842,7 @@ var TreeGrid = /** @class */ (function (_super) {
             return e.parentUniqueID === record.uniqueID;
         });
         var targetEle;
-        if (!isRemoteData(this) && action === 'expand' && this.isSelfReference && isCountRequired(this) && !childRecords.length) {
+        if ((!isRemoteData(this) && action === 'expand' && this.isSelfReference && isCountRequired(this) && !childRecords.length) || (action === 'collapse' || (this.isExpandAll && this.loadChildOnDemand) && !isRemoteData(this) && this.isSelfReference && isCountRequired(this))) {
             this.updateChildOnDemand(expandingArgs);
         }
         var gridRows = this.getRows();
@@ -2934,10 +2936,34 @@ var TreeGrid = /** @class */ (function (_super) {
             }
             this.notify('rowExpandCollapse', { detailrows: detailrows, action: displayAction, record: record, row: row });
             this.updateAltRow(gridRows);
+            this.updateGridRowsVisible();
+        }
+    };
+    TreeGrid.prototype.updateGridRowsVisible = function () {
+        var rowsToRefresh = this.grid.getRowsObject();
+        var rows = this.getRows();
+        for (var i = 0; i < rows.length; i++) {
+            for (var j = 0; j < rowsToRefresh.length; j++) {
+                if (rows[i].dataset.uid === rowsToRefresh[j].uid) {
+                    rowsToRefresh[j].visible = rows[i].style.display === 'none' ? false : true;
+                }
+            }
         }
+        this.grid.notify('refresh-Expand-and-Collapse', { rows: rowsToRefresh });
     };
     TreeGrid.prototype.updateChildOnDemand = function (expandingArgs) {
         var _this = this;
+        if (expandingArgs.requestType === 'collapse' && isCountRequired(this)) {
+            var flatDataRecords = this.flatData.slice();
+            for (var i = 0; i < flatDataRecords.length; i++) {
+                if (flatDataRecords[i]['parentUniqueID'] === expandingArgs.data['uniqueID']) {
+                    flatDataRecords.splice(i, 1);
+                    i = i - 1;
+                }
+            }
+            this.dataResults.result = flatDataRecords;
+            return;
+        }
         var deff = new Deferred();
         var childDataBind = 'childDataBind';
         expandingArgs[childDataBind] = deff.resolve;
@@ -2945,7 +2971,12 @@ var TreeGrid = /** @class */ (function (_super) {
         this.trigger(events.dataStateChange, expandingArgs);
         deff.promise.then(function () {
             if (expandingArgs.childData.length) {
-                _this.flatData = _this.infiniteScrollData;
+                if (isCountRequired(_this)) {
+                    _this.flatData = _this.dataResults.result;
+                }
+                if (_this.enableInfiniteScrolling && isCountRequired(_this)) {
+                    _this.flatData = _this.infiniteScrollData;
+                }
                 var currentData = (_this.flatData);
                 var index = 0;
                 for (var i = 0; i < currentData.length; i++) {
@@ -2980,7 +3011,13 @@ var TreeGrid = /** @class */ (function (_super) {
                             (childData[i][_this.hasChildMapping] && isCountRequired(_this))) {
                             childData[i].hasChildRecords = true;
                         }
-                        currentData.splice(index + 1 + i, record[_this.childMapping] && record[_this.childMapping][i] ? 1 : 0, childData[i]);
+                        if (isCountRequired(_this) && record[_this.childMapping] && record[_this.childMapping][i]) {
+                            currentData.splice(index + 1 + i, 0, childData[i]);
+                        }
+                        else {
+                            currentData.splice(index + 1 + i, record[_this.childMapping] &&
+                                record[_this.childMapping][i] ? 1 : 0, childData[i]);
+                        }
                     }
                     else {
                         currentData.splice(index + 1 + i, 1);
@@ -2994,6 +3031,10 @@ var TreeGrid = /** @class */ (function (_super) {
                     data_1.push(expandingArgs.childData[j]);
                 }
             }
+            if (isCountRequired(_this) && _this.loadChildOnDemand && expandingArgs.requestType === 'expand') {
+                _this.dataResults['expandRecord'] = {};
+                _this.dataResults['expandRecord'] = expandingArgs.data;
+            }
             _this.isExpandRefresh = true;
             var scrollHeightBeforeRefresh = _this.getContentTable().parentElement.scrollTop;
             _this.grid.refresh();

package/src/treegrid/renderer/render.js

@@ -214,7 +214,12 @@ var Render = /** @class */ (function () {
                 args.cell.querySelector('.e-treecell').innerHTML = summaryData;
             }
             else {
-                args.cell.innerHTML = summaryData;
+                if (args.column.template) {
+                    args.cell.innerHTML = null;
+                }
+                else {
+                    args.cell.innerHTML = summaryData;
+                }
             }
         }
         if (isNullOrUndefined(this.parent.rowTemplate)) {

package/src/treegrid/renderer/virtual-row-model-generator.js

@@ -49,7 +49,11 @@ var TreeVirtualRowModelGenerator = /** @class */ (function (_super) {
         var info = this.getDataInfo();
         if (!isNullOrUndefined(notifyArgs.virtualInfo)) {
             if (notifyArgs.virtualInfo.direction !== 'right' && notifyArgs.virtualInfo.direction !== 'left') {
-                notifyArgs.virtualInfo.blockIndexes = info.blockIndexes;
+                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;
+                }
             }
             else {
                 notifyArgs.virtualInfo.blockIndexes = this.getBlockIndexes(notifyArgs.virtualInfo.page);

package/src/treegrid/renderer/virtual-tree-content-render.d.ts

@@ -62,7 +62,7 @@ export declare class TreeInterSectionObserver extends InterSectionObserver {
     private newPos;
     private lastPos;
     private timer;
-    observes(callback: Function, onEnterCallback: Function): void;
+    observes(callback: Function, onEnterCallback: Function, instance: IGrid): void;
     private clear;
     private virtualScrollHandlers;
 }

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

@@ -114,7 +114,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
             this.parent[action]('data-ready', this.onDataReady, this);
             this.parent[action]('refresh-virtual-block', this.refreshContentRows, this);
             this.fn = function () {
-                _this.observers.observes(function (scrollArgs) { return _this.scrollListeners(scrollArgs); }, _this.onEnteredAction());
+                _this.observers.observes(function (scrollArgs) { return _this.scrollListeners(scrollArgs); }, _this.onEnteredAction(), _this.parent);
                 _this.parent.off('content-ready', _this.fn);
             };
             this.parent.addEventListener('dataBound', this.dataBoundEvent.bind(this));
@@ -443,7 +443,9 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
             }
         }
         if (((downScroll && (scrollArgs.offset.top < (this.parent.getRowHeight() * this.totalRecords)))
-            || (upScroll)) || (scrollArgs.direction === 'right' || scrollArgs.direction === 'left')) {
+            || (upScroll)) || (scrollArgs.direction === 'right' || scrollArgs.direction === 'left') ||
+            ((this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
+                && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent))) {
             var viewInfo = this.currentInfo = getValue('getInfoFromView', this).apply(this, [scrollArgs.direction, info, scrollArgs.offset]);
             this.previousInfo = viewInfo;
             this.parent.setColumnIndexesInView(this.parent.enableColumnVirtualization ? viewInfo.columnIndexes : []);
@@ -564,27 +566,27 @@ var TreeInterSectionObserver = /** @class */ (function (_super) {
         _this.timer = 0;
         return _this;
     }
-    TreeInterSectionObserver.prototype.observes = function (callback, onEnterCallback) {
+    TreeInterSectionObserver.prototype.observes = function (callback, onEnterCallback, instance) {
         var containerRect = 'containerRect';
         _super.prototype[containerRect] = getValue('options', this).container.getBoundingClientRect();
-        EventHandler.add(getValue('options', this).container, 'scroll', this.virtualScrollHandlers(callback, onEnterCallback), this);
+        EventHandler.add(getValue('options', this).container, 'scroll', this.virtualScrollHandlers(callback, onEnterCallback, instance), this);
         if (getValue('options', this).movableContainer) {
             var movableContainerRect = 'movableContainerRect';
             _super.prototype[movableContainerRect] = getValue('options', this).movableContainer.getBoundingClientRect();
-            EventHandler.add(getValue('options', this).movableContainer, 'scroll', this.virtualScrollHandlers(callback, onEnterCallback), this);
+            EventHandler.add(getValue('options', this).movableContainer, 'scroll', this.virtualScrollHandlers(callback, onEnterCallback, instance), this);
         }
     };
     TreeInterSectionObserver.prototype.clear = function () {
         this.lastPos = null;
     };
-    TreeInterSectionObserver.prototype.virtualScrollHandlers = function (callback, onEnterCallback) {
+    TreeInterSectionObserver.prototype.virtualScrollHandlers = function (callback, onEnterCallback, instance) {
         var _this = this;
         var delay = Browser.info.name === 'chrome' ? 200 : 100;
         var options = 'options';
         var movableEle = 'movableEle';
         var element = 'element';
         var fromWheel = 'fromWheel';
-        var debounced100 = debounce(callback, delay);
+        //const debounced100: Function = debounce(callback, delay);
         var debounced50 = debounce(callback, 50);
         this[options].prevTop = this[options].prevLeft = 0;
         return function (e) {
@@ -622,15 +624,23 @@ var TreeInterSectionObserver = /** @class */ (function (_super) {
                 }
             }
             if (check) {
-                var fn = debounced100;
+                var fn = debounced50;
                 if (current.axis === 'X') {
-                    fn = debounced50;
                     fn({ direction: direction, sentinel: current, offset: { top: top, left: left },
                         focusElement: document.activeElement });
                 }
                 else {
-                    callback({ direction: direction, sentinel: current, offset: { top: top, left: left },
-                        focusElement: document.activeElement });
+                    if ((instance.dataSource instanceof DataManager && instance.dataSource.dataSource.url !== undefined
+                        && !instance.dataSource.dataSource.offline && instance.dataSource.dataSource.url !== '') || isCountRequired(instance)) {
+                        fn({ direction: direction, sentinel: current, offset: { top: top, left: left },
+                            focusElement: document.activeElement });
+                    }
+                    else {
+                        callback({
+                            direction: direction, sentinel: current, offset: { top: top, left: left },
+                            focusElement: document.activeElement
+                        });
+                    }
                 }
             }
             _this[fromWheel] = false;