@syncfusion/ej2-treegrid 21.1.38 → 21.2.3

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

@@ -1637,10 +1637,12 @@ var Render = /** @__PURE__ @class */ (function () {
             var 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';
                 var rowsObj = this.parent.grid.getRowsObject();
-                rowsObj.filter(function (e) { return e.uid === args.row.getAttribute('data-uid'); })[0].visible = false;
+                if (!isNullOrUndefined(args.row.getAttribute('data-uid'))) {
+                    rowsObj.filter(function (e) { return e.uid === args.row.getAttribute('data-uid'); })[0].visible = false;
+                }
             }
         }
         if (isRemoteData(this.parent) && !isOffline(this.parent)) {
@@ -1648,7 +1650,7 @@ var Render = /** @__PURE__ @class */ (function () {
             var parentrec = this.parent.getCurrentViewRecords().filter(function (rec) {
                 return getValue(proxy_1.idMapping, rec) === getValue(proxy_1.parentIdMapping, data);
             });
-            if (parentrec.length > 0 && !parentrec[0].isSummaryRow) {
+            if (parentrec.length > 0 && !parentrec[0].isSummaryRow && !isNullOrUndefined(args.row)) {
                 var display = parentrec[0].expanded ? 'table-row' : 'none';
                 args.row.setAttribute('style', 'display: ' + display + ';');
             }
@@ -1658,20 +1660,23 @@ var Render = /** @__PURE__ @class */ (function () {
         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';
+                }
             }
         }
+        var dragStartData = 'dragStartData';
         var draggedRecord = 'draggedRecord';
-        if (!isNullOrUndefined(this.parent.rowDragAndDropModule) && !isNullOrUndefined(this.parent.rowDragAndDropModule["" + draggedRecord])
-            && this.parent.getContentTable().scrollHeight <= this.parent.getContent().clientHeight) {
+        if (this.parent.rowDragAndDropModule && this.parent.grid.rowDragAndDropModule && (this.parent.grid.rowDragAndDropModule["" + dragStartData] ||
+            this.parent.rowDragAndDropModule["" + draggedRecord]) && this.parent.getContentTable().scrollHeight <= this.parent.getContent().clientHeight) {
             var lastRowBorder = 'lastRowBorder';
             var lastVisualData = this.parent.getVisibleRecords()[this.parent.getVisibleRecords().length - 1];
             if (lastVisualData.uniqueID === args.data.uniqueID && !isNullOrUndefined(args.row) && !args.row.cells[0].classList.contains('e-lastrowcell')) {
@@ -4557,7 +4562,25 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         };
     };
     TreeGrid.prototype.updateRowTemplate = function () {
-        this.treeColumnRowTemplate();
+        var _this = this;
+        if (this.rowTemplate) {
+            if (this.isReact && this.getContentTable().rows.length === 0) {
+                setTimeout(function () {
+                    _this.treeColumnRowTemplate();
+                    if (_this.enableCollapseAll) {
+                        var currentData = _this.getCurrentViewRecords();
+                        var rows = _this.getContentTable().rows;
+                        for (var i = 0; i < rows.length; i++) {
+                            var args = { data: currentData[parseInt(i.toString(), 10)], row: rows[parseInt(i.toString(), 10)] };
+                            _this.renderModule.RowModifier(args);
+                        }
+                    }
+                }, 0);
+            }
+            else {
+                this.treeColumnRowTemplate();
+            }
+        }
     };
     TreeGrid.prototype.bindedDataSource = function () {
         var dataSource = 'dataSource';
@@ -6730,17 +6753,15 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         }
     };
     TreeGrid.prototype.treeColumnRowTemplate = function () {
-        if (this.rowTemplate) {
-            var rows = this.getContentTable().rows;
-            rows = [].slice.call(rows);
-            for (var i = 0; i < rows.length; i++) {
-                var rcell = this.grid.getContentTable().rows[parseInt(i.toString(), 10)]
-                    .cells[this.treeColumnIndex];
-                var row = rows[parseInt(i.toString(), 10)];
-                var rowData = this.grid.getRowsObject()[parseInt(i.toString(), 10)].data;
-                var arg = { data: rowData, row: row, cell: rcell, column: this.getColumns()[this.treeColumnIndex] };
-                this.renderModule.cellRender(arg);
-            }
+        var rows = this.getContentTable().rows;
+        rows = [].slice.call(rows);
+        for (var i = 0; i < rows.length; i++) {
+            var rcell = this.grid.getContentTable().rows[parseInt(i.toString(), 10)]
+                .cells[this.treeColumnIndex];
+            var row = rows[parseInt(i.toString(), 10)];
+            var rowData = this.grid.getRowsObject()[parseInt(i.toString(), 10)].data;
+            var arg = { data: rowData, row: row, cell: rcell, column: this.getColumns()[this.treeColumnIndex] };
+            this.renderModule.cellRender(arg);
         }
     };
     TreeGrid.prototype.collapseRemoteChild = function (rowDetails, isChild) {