@syncfusion/ej2-treegrid 20.3.48 → 20.3.50

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

@@ -1644,7 +1644,12 @@ class Render {
                 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)) {
@@ -1966,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);
                 }
             }
@@ -2117,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])) {
@@ -4070,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)) {
@@ -5765,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) {
@@ -5798,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();
@@ -5890,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;
@@ -5900,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++) {
@@ -5935,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);
@@ -5949,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();
@@ -8147,7 +8193,12 @@ class RowDD$1 {
         }
         length = record.childRecords.length;
         for (let 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);
@@ -8169,7 +8220,12 @@ class RowDD$1 {
         }
         length = record.childRecords.length;
         for (let 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];
+            }
             let parentData;
             if (record.parentItem) {
                 parentData = getParentData(this.parent, record.parentItem.uniqueID);
@@ -8432,7 +8488,11 @@ class TreeVirtualRowModelGenerator extends VirtualRowModelGenerator {
         const 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);
@@ -11879,7 +11939,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             this.parent[action]('data-ready', this.onDataReady, this);
             this.parent[action]('refresh-virtual-block', this.refreshContentRows, this);
             this.fn = () => {
-                this.observers.observes((scrollArgs) => this.scrollListeners(scrollArgs), this.onEnteredAction());
+                this.observers.observes((scrollArgs) => this.scrollListeners(scrollArgs), this.onEnteredAction(), this.parent);
                 this.parent.off('content-ready', this.fn);
             };
             this.parent.addEventListener('dataBound', this.dataBoundEvent.bind(this));
@@ -12207,7 +12267,9 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             }
         }
         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))) {
             const viewInfo = this.currentInfo = getValue('getInfoFromView', this).apply(this, [scrollArgs.direction, info, scrollArgs.offset]);
             this.previousInfo = viewInfo;
             this.parent.setColumnIndexesInView(this.parent.enableColumnVirtualization ? viewInfo.columnIndexes : []);
@@ -12324,26 +12386,26 @@ class TreeInterSectionObserver extends InterSectionObserver {
         this.lastPos = 0;
         this.timer = 0;
     }
-    observes(callback, onEnterCallback) {
+    observes(callback, onEnterCallback, instance) {
         const containerRect = 'containerRect';
         super[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) {
             const movableContainerRect = 'movableContainerRect';
             super[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);
         }
     }
     clear() {
         this.lastPos = null;
     }
-    virtualScrollHandlers(callback, onEnterCallback) {
+    virtualScrollHandlers(callback, onEnterCallback, instance) {
         const delay = Browser.info.name === 'chrome' ? 200 : 100;
         const options = 'options';
         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) => {
@@ -12381,15 +12443,23 @@ class TreeInterSectionObserver extends InterSectionObserver {
                 }
             }
             if (check) {
-                let fn = debounced100;
+                const 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;