@syncfusion/ej2-treegrid 20.3.49 → 20.3.50

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

@@ -1763,8 +1763,9 @@ var Render = /** @__PURE__ @class */ (function () {
                 if (args.column.template) {
                     args.cell.innerHTML = null;
                 }
-                else
+                else {
                     args.cell.innerHTML = summaryData;
+                }
             }
         }
         if (isNullOrUndefined(this.parent.rowTemplate)) {
@@ -2089,7 +2090,7 @@ var DataManipulation = /** @__PURE__ @class */ (function () {
                 }
             }
             else {
-                if (!isNullOrUndefined(records)) {
+                if (!isNullOrUndefined(records) && !((this.parent.loadChildOnDemand) && isCountRequired(this.parent) && !isNullOrUndefined(this.parent['dataResults']['expandRecord']))) {
                     this.convertToFlatData(records);
                 }
             }
@@ -2243,8 +2244,8 @@ var DataManipulation = /** @__PURE__ @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])) {
@@ -4326,7 +4327,7 @@ var TreeGrid = /** @__PURE__ @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)) {
@@ -6037,11 +6038,13 @@ var TreeGrid = /** @__PURE__ @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) {
@@ -6070,7 +6073,7 @@ var TreeGrid = /** @__PURE__ @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();
@@ -6164,10 +6167,34 @@ var TreeGrid = /** @__PURE__ @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;
@@ -6175,7 +6202,12 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         this.trigger(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++) {
@@ -6210,7 +6242,13 @@ var TreeGrid = /** @__PURE__ @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);
@@ -6224,6 +6262,10 @@ var TreeGrid = /** @__PURE__ @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();
@@ -12744,7 +12786,7 @@ var TreeInterSectionObserver = /** @__PURE__ @class */ (function (_super) {
         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) {
@@ -12793,9 +12835,12 @@ var TreeInterSectionObserver = /** @__PURE__ @class */ (function (_super) {
                         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 });
+                    else {
+                        callback({
+                            direction: direction, sentinel: current, offset: { top: top, left: left },
+                            focusElement: document.activeElement
+                        });
+                    }
                 }
             }
             _this[fromWheel] = false;