@syncfusion/ej2-treegrid 21.2.3 → 21.2.5

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

@@ -2146,6 +2146,10 @@ class DataManipulation {
             qry.expand(expandDetail);
         }
         qry.where(this.parent.parentIdMapping, 'equal', rowDetails.record[this.parent.idMapping]);
+        if (rowDetails.action === 'remoteExpand' && this.parent.grid.filterModule && this.parent.grid.filterModule['value']) {
+            const filterqry = this.parent.grid.getDataModule().generateQuery().queries.filter((e) => e.fn !== 'onPage' && typeof e.e.predicates !== 'undefined');
+            qry.queries.push(filterqry[0]);
+        }
         showSpinner(this.parent.element);
         dm.executeQuery(qry).then((e) => {
             const remoteExpandedData = 'remoteExpandedData';
@@ -2167,7 +2171,25 @@ class DataManipulation {
                 });
             }
             const haveChild = getObject('actual.nextLevel', e);
-            const result = e.result;
+            let result = e.result;
+            const resultChildData = [];
+            if (rowDetails.action === 'remoteExpand' && this.parent.grid.filterModule && this.parent.grid.filterModule['value']) {
+                for (let i = 0; i < datas.length; i++) {
+                    if (Object.prototype.hasOwnProperty.call(datas[parseInt(i.toString(), 10)], this.parent.parentIdMapping) && datas[parseInt(i.toString(), 10)]['' + this.parent.parentIdMapping] !== null && datas[parseInt(i.toString(), 10)].level === 0) {
+                        datas.splice(i, 1);
+                        i--;
+                    }
+                }
+                for (let i = 0; i < result.length; i++) {
+                    if (rowDetails.record['' + this.parent.idMapping] !== result[parseInt(i.toString(), 10)]['' + this.parent.idMapping] &&
+                        rowDetails.record['' + this.parent.idMapping] === result[parseInt(i.toString(), 10)]['' + this.parent.parentIdMapping]) {
+                        if (Object.prototype.hasOwnProperty.call(result, i)) {
+                            resultChildData.push(result[parseInt(i.toString(), 10)]);
+                        }
+                    }
+                }
+                result = resultChildData;
+            }
             rowDetails.record.childRecords = result;
             for (let r = 0; r < result.length; r++) {
                 if (this.parent.enableVirtualization && result[parseInt(r.toString(), 10)][`${this.parent.idMapping}`] === rowDetails.record[`${this.parent.idMapping}`] && rowDetails.action === 'remoteExpand') {
@@ -3538,7 +3560,12 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                     break;
                 case 'downArrow':
                     if (!this.enableVirtualization) {
-                        parentTarget = e.target.parentElement;
+                        target = e.target;
+                        parentTarget = target.parentElement;
+                        const cellIndex = parentTarget.cellIndex;
+                        if (this.grid.getColumnByIndex(cellIndex).editType === 'dropdownedit' && isNullOrUndefined(this.grid.getColumnByIndex(cellIndex).edit['obj'])) {
+                            parentTarget = target;
+                        }
                         summaryElement = this.findnextRowElement(parentTarget);
                         if (summaryElement !== null) {
                             const rowIndex = summaryElement.rowIndex;
@@ -3555,7 +3582,12 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                     break;
                 case 'upArrow':
                     if (!this.enableVirtualization) {
-                        parentTarget = e.target.parentElement;
+                        target = e.target;
+                        parentTarget = target.parentElement;
+                        const cellIndex = parentTarget.cellIndex;
+                        if (this.grid.getColumnByIndex(cellIndex).editType === 'dropdownedit' && isNullOrUndefined(this.grid.getColumnByIndex(cellIndex).edit['obj'])) {
+                            parentTarget = target;
+                        }
                         summaryElement = this.findPreviousRowElement(parentTarget);
                         if (summaryElement !== null) {
                             const rIndex = summaryElement.rowIndex;
@@ -4297,7 +4329,10 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                         const currentData = this.getCurrentViewRecords();
                         const rows = this.getContentTable().rows;
                         for (let i = 0; i < rows.length; i++) {
-                            let args = { data: currentData[parseInt(i.toString(), 10)], row: rows[parseInt(i.toString(), 10)] };
+                            const args = {
+                                data: currentData[parseInt(i.toString(), 10)],
+                                row: rows[parseInt(i.toString(), 10)]
+                            };
                             this.renderModule.RowModifier(args);
                         }
                     }
@@ -12981,6 +13016,9 @@ class VirtualScroll$1 {
                 this.parent.grid.getContent().firstElementChild.scrollTop = 0;
                 this.parent.grid.notify(virtualActionArgs, { setTop: true });
             }
+            if (requestType === 'save' && this.parent.editSettings.newRowPosition === 'Bottom') {
+                endIndex = counts.count;
+            }
             //if ((this.prevendIndex !== -1 && this.prevstartIndex !== -1) &&
             //this.prevendIndex === endIndex && this.prevstartIndex === startIndex) {
             if (!isNullOrUndefined(this.expandCollapseRec) && (pageingDetails.actionArgs.requestType === 'virtualscroll' ||