@syncfusion/ej2-treegrid 24.2.7 → 24.2.9

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

@@ -1896,11 +1896,21 @@ var Render = /** @__PURE__ @class */ (function () {
             }
         }
         this.parent['args'] = args;
-        if ((isNullOrUndefined(this.parent.rowTemplate) && !(this.parent.isReact))
-            || ((this.parent.isReact) &&
-                !args.column['template'])) {
+        var columnModel = getValue('columnModel', this.parent);
+        var 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)) {
+            var renderReactTemplates = 'renderReactTemplates';
+            // eslint-disable-next-line @typescript-eslint/no-this-alias
+            var thisRef_2 = this;
+            // tslint:disable-next-line:typedef
+            thisRef_2.parent["" + renderReactTemplates](function () {
+                thisRef_2.parent.trigger(queryCellInfo, args);
+            });
+        }
     };
     Render.prototype.updateTreeCell = function (args, cellElement) {
         var columnModel = getValue('columnModel', this.parent);
@@ -1936,10 +1946,10 @@ var Render = /** @__PURE__ @class */ (function () {
                     }
                     this.parent.notify('renderReactTemplate', this.parent["" + portals]);
                     // eslint-disable-next-line @typescript-eslint/no-this-alias
-                    var thisRef_2 = this;
+                    var thisRef_3 = this;
                     // tslint:disable-next-line:typedef
-                    thisRef_2.parent["" + renderReactTemplates](function () {
-                        thisRef_2.parent.trigger(queryCellInfo, args);
+                    thisRef_3.parent["" + renderReactTemplates](function () {
+                        thisRef_3.parent.trigger(queryCellInfo, args);
                     });
                 }
                 else {
@@ -6463,6 +6473,9 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                         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)];
                 }
@@ -6715,11 +6728,16 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         this.expandCollapseAll('collapse');
     };
     TreeGrid.prototype.expandCollapseAll = function (action) {
-        var rows = this.getRows().filter(function (e) {
-            return e.querySelector('.e-treegrid' + (action === 'expand' ? 'collapse' : 'expand'));
-        });
-        if (!rows.length && this.getRows().length) {
-            rows.push(this.getRows()[0]);
+        var rows;
+        if (this.rowTemplate) {
+            rows = [].slice.call(this.grid.getContentTable().querySelectorAll('tr')).filter(function (e) {
+                return e.querySelector('.e-treegrid' + (action === 'expand' ? 'collapse' : 'expand'));
+            });
+        }
+        else {
+            rows = this.getRows().filter(function (e) {
+                return e.querySelector('.e-treegrid' + (action === 'expand' ? 'collapse' : 'expand'));
+            });
         }
         this.isExpandAll = true;
         this.isCollapseAll = true;
@@ -11871,6 +11889,7 @@ var Edit$1 = /** @__PURE__ @class */ (function () {
     };
     Edit$$1.prototype.beforeBatchCancel = function (args) {
         if (this.parent.editSettings.mode === 'Cell') {
+            args['requestType'] = 'cancel';
             this.parent.trigger(actionComplete, args);
         }
     };