@syncfusion/ej2-treegrid 33.1.46 → 33.1.49

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

@@ -2019,16 +2019,6 @@ class Render {
         }
         const data = args.data;
         const parentData = data.parentItem;
-        if (!isNullOrUndefined(parentData) && data.isCollapsedChild && !isNullOrUndefined(args.row)) {
-            this.parent['toggleRowVisibility'](args.row, 'e-childrow-hidden');
-            const rowsObj = this.parent.grid.getRowsObject();
-            if (!this.parent.grid.isFrozenGrid() && !isNullOrUndefined(args.row.getAttribute('data-uid'))) {
-                const row = rowsObj.filter((e) => e.uid === args.row.getAttribute('data-uid'))[0];
-                if (row) {
-                    row.visible = false;
-                }
-            }
-        }
         if (!isNullOrUndefined(data.parentItem) && !isFilterChildHierarchy(this.parent) &&
             (!(this.parent.allowPaging && !(this.parent.pageSettings.pageSizeMode === 'Root')) ||
                 (isRemoteData(this.parent) && !isOffline(this.parent)))) {
@@ -9822,7 +9812,7 @@ class RowDD {
         this.removeLastrowBorder(rowEle);
         for (let i = 0; i < args.rows.length; i++) {
             if (!isNullOrUndefined(rowEle) && rowEle.getAttribute('data-uid') === args.rows[parseInt(i.toString(), 10)].getAttribute('data-uid')
-                || !parentsUntil(args.target, 'e-gridcontent')) {
+                || !parentsUntil(args.target, 'e-gridcontent') || rowEle.classList.contains('e-summaryrow')) {
                 this.dropPosition = 'Invalid';
                 this.addErrorElem();
                 if (isNullOrUndefined(this.parent.rowDropSettings.targetID)) {
@@ -10332,8 +10322,10 @@ class RowDD {
     rowDropped(args) {
         if (!isNullOrUndefined(this.parent.aggregates[0]) && this.parent.aggregates[0].showChildSummary) {
             const records = this.parent.grid.getCurrentViewRecords();
-            args.fromIndex = records[args.fromIndex].index;
-            args.dropIndex = records[args.dropIndex].index;
+            if (!isNullOrUndefined(records[records[args.fromIndex].index]) && !isNullOrUndefined(records[records[args.dropIndex].index])) {
+                args.fromIndex = records[args.fromIndex].index;
+                args.dropIndex = records[args.dropIndex].index;
+            }
         }
         const tObj = this.parent;
         const parentItem = 'parentItem';
@@ -10852,14 +10844,16 @@ class RowDD {
             else {
                 currentRecord = record.childRecords[parseInt(i.toString(), 10)];
             }
-            count++;
-            tObj.flatData.splice(count, 0, currentRecord);
-            setValue('uniqueIDCollection.' + currentRecord.uniqueID, currentRecord, this.parent);
-            if (tObj.parentIdMapping) {
-                this.treeData.splice(count, 0, currentRecord.taskData);
-            }
-            if (currentRecord.hasChildRecords) {
-                count = this.updateChildRecord(currentRecord, count);
+            if (!isNullOrUndefined(currentRecord)) {
+                count++;
+                tObj.flatData.splice(count, 0, currentRecord);
+                setValue('uniqueIDCollection.' + currentRecord.uniqueID, currentRecord, this.parent);
+                if (tObj.parentIdMapping) {
+                    this.treeData.splice(count, 0, currentRecord.taskData);
+                }
+                if (currentRecord.hasChildRecords) {
+                    count = this.updateChildRecord(currentRecord, count);
+                }
             }
         }
         return count;
@@ -10886,17 +10880,19 @@ class RowDD {
             else {
                 currentRecord = record.childRecords[parseInt(i.toString(), 10)];
             }
-            let parentData;
-            if (record.parentItem) {
-                parentData = getParentData(this.parent, record.parentItem.uniqueID);
-            }
-            if (isNullOrUndefined(parentData) && !isNullOrUndefined(record.parentItem)) {
-                parentData = record.parentItem;
-            }
-            currentRecord.level = record.parentItem ? parentData.level + level : record.level + 1;
-            if (currentRecord.hasChildRecords) {
-                level--;
-                level = this.updateChildRecordLevel(currentRecord, level);
+            if (!isNullOrUndefined(currentRecord)) {
+                let parentData;
+                if (record.parentItem) {
+                    parentData = getParentData(this.parent, record.parentItem.uniqueID);
+                }
+                if (isNullOrUndefined(parentData) && !isNullOrUndefined(record.parentItem)) {
+                    parentData = record.parentItem;
+                }
+                currentRecord.level = record.parentItem ? parentData.level + level : record.level + 1;
+                if (currentRecord.hasChildRecords) {
+                    level--;
+                    level = this.updateChildRecordLevel(currentRecord, level);
+                }
             }
         }
         return level;
@@ -11025,22 +11021,29 @@ class RowDD {
                 treeGridData = this.parent.dataSource;
             }
             for (let i = 0; i < treeGridData.length; i++) {
-                if (treeGridData[parseInt(i.toString(), 10)][this.parent.idMapping] === currentRecord.taskData[this.parent.idMapping]) {
-                    idx = i;
+                if (!isNullOrUndefined(currentRecord.taskData)) {
+                    if (treeGridData[parseInt(i.toString(), 10)][this.parent.idMapping] === currentRecord.taskData[this.parent.idMapping]) {
+                        idx = i;
+                        break;
+                    }
                 }
             }
             for (let i = 0; i < this.treeGridData.length; i++) {
-                if (this.treeGridData[parseInt(i.toString(), 10)][this.parent.idMapping]
-                    === currentRecord.taskData[this.parent.idMapping]) {
-                    idz = i;
-                    break;
+                if (!isNullOrUndefined(currentRecord.taskData)) {
+                    if (this.treeGridData[parseInt(i.toString(), 10)][this.parent.idMapping]
+                        === currentRecord.taskData[this.parent.idMapping]) {
+                        idz = i;
+                        break;
+                    }
                 }
             }
             if (idx !== -1 && !isNullOrUndefined(idx)) {
                 dataSource.splice(idx, 1);
+                idx = -1;
             }
             if (idz !== -1 && !isNullOrUndefined(idz)) {
                 this.treeGridData.splice(idz, 1);
+                idz = -1;
             }
             if (currentRecord.hasChildRecords) {
                 this.removeChildItem(currentRecord);
@@ -11061,7 +11064,7 @@ class RowDD {
         }
         for (let i = 0; i < record.childRecords.length; i++) {
             currentRecord = record.childRecords[parseInt(i.toString(), 10)];
-            count++;
+            count = currentRecord.isSummaryRow ? count : count + 1;
             if (currentRecord.hasChildRecords) {
                 count = this.getChildCount(currentRecord, count);
             }
@@ -11340,21 +11343,6 @@ class Filter {
         if (this.flatFilteredData.length > 0 && this.isHierarchyFilter) {
             this.updateFilterLevel();
         }
-        for (let i = 0; i < this.filteredResult.length; i++) {
-            const record = this.filteredResult[parseInt(i.toString(), 10)];
-            if (!isNullOrUndefined(record.parentItem)) {
-                const parentUID = record.parentItem.uniqueID;
-                const parentPresent = this.filteredResult.some((r) => {
-                    return !isNullOrUndefined(r.uniqueID) && r.uniqueID === parentUID;
-                });
-                if (parentPresent) {
-                    record.isCollapsedChild = !getExpandStatus(this.parent, record, this.parent.parentData);
-                }
-                else {
-                    record.isCollapsedChild = false;
-                }
-            }
-        }
         this.parent.notify('updateAction', { result: this.filteredResult });
     }
     updateParentFilteredRecord(record) {
@@ -15468,7 +15456,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             this.parent.root.scrollPosition = scrollArgs.offset;
         }
         const info = scrollArgs.sentinel;
-        const rowHeight = this.parent.getRowHeight();
+        const rowHeight = parseInt(this.parent.getRowHeight().toString(), 10);
         const outBuffer = this.parent.pageSettings.pageSize - Math.ceil(this.parent.pageSettings.pageSize / 2);
         let content;
         if (!isNullOrUndefined(this.parent.contentModule)) {
@@ -16046,7 +16034,13 @@ class VirtualScroll {
         const isFlatHierarchy = this.parent.filterSettings.hierarchyMode === 'Child' ||
             this.parent.filterSettings.hierarchyMode === 'None';
         const visualData = isFiltering && isFlatHierarchy
-            ? parents
+            ? parents.filter((e) => {
+                if (isNullOrUndefined(e.parentItem)) {
+                    return true;
+                }
+                const hasParentInFilteredList = parents.some((p) => p.uniqueID === e.parentItem.uniqueID);
+                return hasParentInFilteredList ? getExpandStatus(this.parent, e) : true;
+            })
             : parents.filter((e) => getExpandStatus(this.parent, e));
         this.visualData = visualData;
         pageingDetails.count = visualData.length;
@@ -16102,27 +16096,9 @@ class VirtualScroll {
                 endIndex = startIndex + this.parent.grid.pageSettings.pageSize;
             }
             if (!isNullOrUndefined(this.expandCollapseRec)) {
-                const resourceCount = this.parent.grid.pageSettings.pageSize;
-                let sIndex = visualData.indexOf(this.expandCollapseRec);
-                const tempdata = visualData.slice(sIndex, sIndex + resourceCount);
-                if (tempdata.length < resourceCount && sIndex >= 0 && startIndex !== 0) {
-                    sIndex = visualData.length - resourceCount;
-                    sIndex = sIndex > 0 ? sIndex : 0;
-                    endIndex = visualData.length;
-                    if (endIndex - startIndex < resourceCount) {
-                        startIndex = sIndex;
-                        if (visualData.indexOf(this.expandCollapseRec) > visualData.length - resourceCount / 2) {
-                            const newTranslateY = startIndex * this.parent.grid.getRowHeight();
-                            this.parent.grid.contentModule['translateY'] = newTranslateY;
-                            this.parent.grid.contentModule.virtualEle.adjustTable(0, newTranslateY);
-                        }
-                    }
-                }
-                else if (getValue('isCollapseAll', this.parent)) {
-                    startIndex = 0;
-                    endIndex = this.parent.grid.pageSettings.pageSize - 1;
-                    this.parent.grid.notify(virtualActionArgs, { setTop: true });
-                }
+                const result = this.adjustRangeForExpandCollapse(startIndex, endIndex, visualData);
+                startIndex = result.startIndex;
+                endIndex = result.endIndex;
             }
             //}
             if (this.prevrequestType === 'collapseAll' && pageingDetails.actionArgs.requestType === 'virtualscroll'
@@ -16153,6 +16129,30 @@ class VirtualScroll {
         }
         this.parent.notify('updateAction', pageingDetails);
     }
+    adjustRangeForExpandCollapse(startIndex, endIndex, visualData) {
+        const pageSize = this.parent.grid.pageSettings.pageSize;
+        const expandedRecordIndex = visualData.indexOf(this.expandCollapseRec);
+        const pageWindowRecords = visualData.slice(expandedRecordIndex, expandedRecordIndex + pageSize);
+        if (pageWindowRecords.length < pageSize && expandedRecordIndex >= 0 && startIndex !== 0) {
+            let startForLastPage = visualData.length - pageSize;
+            startForLastPage = startForLastPage > 0 ? startForLastPage : 0;
+            endIndex = visualData.length;
+            if (endIndex - startIndex < pageSize) {
+                startIndex = startForLastPage;
+                if (expandedRecordIndex > visualData.length - pageSize / 2) {
+                    const viewportTranslateY = startIndex * this.parent.grid.getRowHeight();
+                    this.parent.grid.contentModule['translateY'] = viewportTranslateY;
+                    this.parent.grid.contentModule.virtualEle.adjustTable(0, viewportTranslateY);
+                }
+            }
+        }
+        else if (getValue('isCollapseAll', this.parent)) {
+            startIndex = 0;
+            endIndex = this.parent.grid.pageSettings.pageSize - 1;
+            this.parent.grid.notify(virtualActionArgs, { setTop: true });
+        }
+        return { startIndex: startIndex, endIndex: endIndex };
+    }
     /**
      * To destroy the virtualScroll module
      *