@syncfusion/ej2-treegrid 21.1.41 → 21.2.4

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

@@ -1503,10 +1503,12 @@ class Render {
             const collapsed$$1 = (this.parent.initialRender && (!(isNullOrUndefined(parentData[this.parent.expandStateMapping]) ||
                 parentData[this.parent.expandStateMapping]) || this.parent.enableCollapseAll)) ||
                 !getExpandStatus(this.parent, args.data, this.parent.grid.getCurrentViewRecords());
-            if (collapsed$$1) {
+            if (collapsed$$1 && !isNullOrUndefined(args.row)) {
                 args.row.style.display = 'none';
                 const rowsObj = this.parent.grid.getRowsObject();
-                rowsObj.filter((e) => e.uid === args.row.getAttribute('data-uid'))[0].visible = false;
+                if (!isNullOrUndefined(args.row.getAttribute('data-uid'))) {
+                    rowsObj.filter((e) => e.uid === args.row.getAttribute('data-uid'))[0].visible = false;
+                }
             }
         }
         if (isRemoteData(this.parent) && !isOffline(this.parent)) {
@@ -1514,7 +1516,7 @@ class Render {
             const parentrec = this.parent.getCurrentViewRecords().filter((rec) => {
                 return getValue(proxy.idMapping, rec) === getValue(proxy.parentIdMapping, data);
             });
-            if (parentrec.length > 0 && !parentrec[0].isSummaryRow) {
+            if (parentrec.length > 0 && !parentrec[0].isSummaryRow && !isNullOrUndefined(args.row)) {
                 const display = parentrec[0].expanded ? 'table-row' : 'none';
                 args.row.setAttribute('style', 'display: ' + display + ';');
             }
@@ -1524,15 +1526,17 @@ class Render {
         if (summaryRow) {
             addClass([args.row], 'e-summaryrow');
         }
-        if (args.row.querySelector('.e-treegridexpand')) {
-            args.row.setAttribute('aria-expanded', 'true');
-        }
-        else if (args.row.querySelector('.e-treegridcollapse')) {
-            args.row.setAttribute('aria-expanded', 'false');
-        }
-        if (this.parent.enableCollapseAll && this.parent.initialRender) {
-            if (!isNullOrUndefined(data.parentItem)) {
-                args.row.style.display = 'none';
+        if (!isNullOrUndefined(args.row)) {
+            if (args.row.querySelector('.e-treegridexpand')) {
+                args.row.setAttribute('aria-expanded', 'true');
+            }
+            else if (args.row.querySelector('.e-treegridcollapse')) {
+                args.row.setAttribute('aria-expanded', 'false');
+            }
+            if (this.parent.enableCollapseAll && this.parent.initialRender) {
+                if (!isNullOrUndefined(data.parentItem)) {
+                    args.row.style.display = 'none';
+                }
             }
         }
         const dragStartData = 'dragStartData';
@@ -3534,7 +3538,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;
@@ -3551,7 +3560,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;
@@ -4285,7 +4299,24 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         };
     }
     updateRowTemplate() {
-        this.treeColumnRowTemplate();
+        if (this.rowTemplate) {
+            if (this.isReact && this.getContentTable().rows.length === 0) {
+                setTimeout(() => {
+                    this.treeColumnRowTemplate();
+                    if (this.enableCollapseAll) {
+                        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)] };
+                            this.renderModule.RowModifier(args);
+                        }
+                    }
+                }, 0);
+            }
+            else {
+                this.treeColumnRowTemplate();
+            }
+        }
     }
     bindedDataSource() {
         const dataSource = 'dataSource';
@@ -4327,22 +4358,6 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             if (requestType === 'reorder') {
                 this.notify('getColumnIndex', {});
             }
-            if (requestType === 'filterbeforeopen' && args.columnName && this.filterSettings.hierarchyMode !== 'None') {
-                for (let j = 0; j < this.columns.length; j++) {
-                    const fields = 'field';
-                    if (this.columns[parseInt(j.toString(), 10)][`${fields}`] === args.columnName) {
-                        const taskFields = [];
-                        for (let i = 0; i < this.grid.currentViewData.length; i++) {
-                            const fieldValue = this.grid.currentViewData[parseInt(i.toString(), 10)][args.columnName];
-                            if (taskFields.indexOf(fieldValue) === -1) {
-                                taskFields.push(fieldValue);
-                            }
-                        }
-                        args['filterModel'].options.dataSource = taskFields.map((name) => ({ [args.columnName]: name }));
-                        args['filterModel'].options.filteredColumns = args['filterModel'].options.filteredColumns.filter((col) => col.field === args.columnName);
-                    }
-                }
-            }
             if (isRemoteData(this) && this.enableVirtualization) {
                 if (args.requestType === 'virtualscroll') {
                     this.query.expand('VirtualScrollingAction');
@@ -6443,17 +6458,15 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         }
     }
     treeColumnRowTemplate() {
-        if (this.rowTemplate) {
-            let rows = this.getContentTable().rows;
-            rows = [].slice.call(rows);
-            for (let i = 0; i < rows.length; i++) {
-                const rcell = this.grid.getContentTable().rows[parseInt(i.toString(), 10)]
-                    .cells[this.treeColumnIndex];
-                const row = rows[parseInt(i.toString(), 10)];
-                const rowData = this.grid.getRowsObject()[parseInt(i.toString(), 10)].data;
-                const arg = { data: rowData, row: row, cell: rcell, column: this.getColumns()[this.treeColumnIndex] };
-                this.renderModule.cellRender(arg);
-            }
+        let rows = this.getContentTable().rows;
+        rows = [].slice.call(rows);
+        for (let i = 0; i < rows.length; i++) {
+            const rcell = this.grid.getContentTable().rows[parseInt(i.toString(), 10)]
+                .cells[this.treeColumnIndex];
+            const row = rows[parseInt(i.toString(), 10)];
+            const rowData = this.grid.getRowsObject()[parseInt(i.toString(), 10)].data;
+            const arg = { data: rowData, row: row, cell: rcell, column: this.getColumns()[this.treeColumnIndex] };
+            this.renderModule.cellRender(arg);
         }
     }
     collapseRemoteChild(rowDetails, isChild) {