@syncfusion/ej2-treegrid 20.3.49 → 20.3.50

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

@@ -1647,8 +1647,9 @@ class Render {
                 if (args.column.template) {
                     args.cell.innerHTML = null;
                 }
-                else
+                else {
                     args.cell.innerHTML = summaryData;
+                }
             }
         }
         if (isNullOrUndefined(this.parent.rowTemplate)) {
@@ -1970,7 +1971,7 @@ class DataManipulation {
                 }
             }
             else {
-                if (!isNullOrUndefined(records)) {
+                if (!isNullOrUndefined(records) && !((this.parent.loadChildOnDemand) && isCountRequired(this.parent) && !isNullOrUndefined(this.parent['dataResults']['expandRecord']))) {
                     this.convertToFlatData(records);
                 }
             }
@@ -2121,8 +2122,8 @@ class DataManipulation {
             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])) {
@@ -4074,7 +4075,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             }
             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)) {
@@ -5769,11 +5770,13 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 }
             });
             if (rows.length) {
-                if (action === 'collapse') {
-                    this.collapseRow(rows[0]);
-                }
-                else {
-                    this.expandRow(rows[0]);
+                for (let i = 0; i < rows.length; i++) {
+                    if (action === 'collapse') {
+                        this.collapseRow(rows[i]);
+                    }
+                    else {
+                        this.expandRow(rows[i]);
+                    }
                 }
             }
             else if (this.allowPaging) {
@@ -5802,7 +5805,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             return e.parentUniqueID === record.uniqueID;
         });
         let 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);
         }
         let gridRows = this.getRows();
@@ -5894,9 +5897,33 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             }
             this.notify('rowExpandCollapse', { detailrows: detailrows, action: displayAction, record: record, row: row });
             this.updateAltRow(gridRows);
+            this.updateGridRowsVisible();
         }
     }
+    updateGridRowsVisible() {
+        const rowsToRefresh = this.grid.getRowsObject();
+        const rows = this.getRows();
+        for (let i = 0; i < rows.length; i++) {
+            for (let 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 });
+    }
     updateChildOnDemand(expandingArgs) {
+        if (expandingArgs.requestType === 'collapse' && isCountRequired(this)) {
+            const flatDataRecords = [...this.flatData];
+            for (let 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;
+        }
         const deff = new Deferred();
         const childDataBind = 'childDataBind';
         expandingArgs[childDataBind] = deff.resolve;
@@ -5904,7 +5931,12 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         this.trigger(dataStateChange, expandingArgs);
         deff.promise.then(() => {
             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;
+                }
                 const currentData = (this.flatData);
                 let index = 0;
                 for (let i = 0; i < currentData.length; i++) {
@@ -5939,7 +5971,13 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                             (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);
@@ -5953,6 +5991,10 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                     data.push(expandingArgs.childData[j]);
                 }
             }
+            if (isCountRequired(this) && this.loadChildOnDemand && expandingArgs.requestType === 'expand') {
+                this.dataResults['expandRecord'] = {};
+                this.dataResults['expandRecord'] = expandingArgs.data;
+            }
             this.isExpandRefresh = true;
             const scrollHeightBeforeRefresh = this.getContentTable().parentElement.scrollTop;
             this.grid.refresh();
@@ -12363,7 +12405,7 @@ class TreeInterSectionObserver extends InterSectionObserver {
         const movableEle = 'movableEle';
         const element = 'element';
         const fromWheel = 'fromWheel';
-        const debounced100 = debounce(callback, delay);
+        //const debounced100: Function = debounce(callback, delay);
         const debounced50 = debounce(callback, 50);
         this[options].prevTop = this[options].prevLeft = 0;
         return (e) => {
@@ -12401,7 +12443,7 @@ class TreeInterSectionObserver extends InterSectionObserver {
                 }
             }
             if (check) {
-                let fn = debounced50;
+                const fn = debounced50;
                 if (current.axis === 'X') {
                     fn({ direction: direction, sentinel: current, offset: { top: top, left: left },
                         focusElement: document.activeElement });
@@ -12412,9 +12454,12 @@ class TreeInterSectionObserver extends InterSectionObserver {
                         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;