@syncfusion/ej2-treegrid 24.2.7 → 24.2.9

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

@@ -1739,11 +1739,21 @@ class Render {
             }
         }
         this.parent['args'] = args;
-        if ((isNullOrUndefined(this.parent.rowTemplate) && !(this.parent.isReact))
-            || ((this.parent.isReact) &&
-                !args.column['template'])) {
+        const columnModel = getValue('columnModel', this.parent);
+        const treeColumn = columnModel[this.parent.treeColumnIndex];
+        if ((isNullOrUndefined(this.parent.rowTemplate) && !(this.parent.isReact))) {
             this.parent.trigger(queryCellInfo, args);
         }
+        else if (((this.parent.isReact) &&
+            treeColumn.field !== args.column.field)) {
+            const renderReactTemplates = 'renderReactTemplates';
+            // eslint-disable-next-line @typescript-eslint/no-this-alias
+            const thisRef = this;
+            // tslint:disable-next-line:typedef
+            thisRef.parent[`${renderReactTemplates}`](function () {
+                thisRef.parent.trigger(queryCellInfo, args);
+            });
+        }
     }
     updateTreeCell(args, cellElement) {
         const columnModel = getValue('columnModel', this.parent);
@@ -6155,6 +6165,9 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                         record = this.grid.getCurrentViewRecords()[row.rowIndex];
                     }
                 }
+                else if (this.rowTemplate) {
+                    record = this.grid.getCurrentViewRecords()[row.rowIndex];
+                }
                 else {
                     record = this.grid.getCurrentViewRecords()[parseInt(row.getAttribute('data-rowindex'), 10)];
                 }
@@ -6400,11 +6413,16 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         this.expandCollapseAll('collapse');
     }
     expandCollapseAll(action) {
-        const rows = this.getRows().filter((e) => {
-            return e.querySelector('.e-treegrid' + (action === 'expand' ? 'collapse' : 'expand'));
-        });
-        if (!rows.length && this.getRows().length) {
-            rows.push(this.getRows()[0]);
+        let rows;
+        if (this.rowTemplate) {
+            rows = [].slice.call(this.grid.getContentTable().querySelectorAll('tr')).filter((e) => {
+                return e.querySelector('.e-treegrid' + (action === 'expand' ? 'collapse' : 'expand'));
+            });
+        }
+        else {
+            rows = this.getRows().filter((e) => {
+                return e.querySelector('.e-treegrid' + (action === 'expand' ? 'collapse' : 'expand'));
+            });
         }
         this.isExpandAll = true;
         this.isCollapseAll = true;
@@ -11469,6 +11487,7 @@ class Edit$1 {
     }
     beforeBatchCancel(args) {
         if (this.parent.editSettings.mode === 'Cell') {
+            args['requestType'] = 'cancel';
             this.parent.trigger(actionComplete, args);
         }
     }