@syncfusion/ej2-treegrid 21.1.35 → 21.1.38

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

@@ -1639,6 +1639,8 @@ var Render = /** @__PURE__ @class */ (function () {
                 !getExpandStatus(this.parent, args.data, this.parent.grid.getCurrentViewRecords());
             if (collapsed$$1) {
                 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 (isRemoteData(this.parent) && !isOffline(this.parent)) {
@@ -1667,6 +1669,15 @@ var Render = /** @__PURE__ @class */ (function () {
                 args.row.style.display = 'none';
             }
         }
+        var draggedRecord = 'draggedRecord';
+        if (!isNullOrUndefined(this.parent.rowDragAndDropModule) && !isNullOrUndefined(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')) {
+                this.parent["" + lastRowBorder](args.row, true);
+            }
+        }
         this.parent.trigger(rowDataBound, args);
     };
     /**
@@ -4243,7 +4254,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
     TreeGrid.prototype.IsExpandCollapseClicked = function (args) {
         if (!isNullOrUndefined(args.target) && (args.target.classList.contains('e-treegridexpand')
             || args.target.classList.contains('e-treegridcollapse') || args.target.classList.contains('e-summarycell'))
-            && (!isNullOrUndefined(args.data) && args.data['hasChildRecords'])) {
+            && (!isNullOrUndefined(args.data) && args.data['hasChildRecords']) && !this.selectionSettings.checkboxOnly) {
             args.cancel = true;
             return;
         }
@@ -4454,6 +4465,11 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             return callBackPromise;
         };
         this.grid.cellSelecting = function (args) {
+            var actualTarget = 'actualTarget';
+            var target = _this.grid.selectionModule["" + actualTarget];
+            if (!isNullOrUndefined(target) && (target.classList.contains('e-treegridexpand') || target.classList.contains('e-treegridcollapse'))) {
+                args.cancel = true;
+            }
             var callBackPromise = new Deferred();
             _this.trigger(getObject('name', args), args, function (cellselectingArgs) {
                 callBackPromise.resolve(cellselectingArgs);
@@ -8699,13 +8715,14 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
                             var childRecords = rec[0].childRecords;
                             var droppedRecordIndex = childRecords.indexOf(droppedRecord) + 1;
                             childRecords.splice(droppedRecordIndex, 0, draggedRecord_2);
-                            draggedRecord_2.parentItem = droppedRecord.parentItem;
+                            if (this_1.parent.enableImmutableMode || this_1.parent['isIndentEnabled'] && !this_1.parent.parentIdMapping) {
+                                draggedRecord_2.parentItem = droppedRecord.parentItem;
+                                draggedRecord_2.level = droppedRecord.level;
+                            }
                             draggedRecord_2.parentUniqueID = droppedRecord.parentUniqueID;
-                            draggedRecord_2.level = droppedRecord.level;
                             if (this_1.parent.parentIdMapping) {
                                 draggedRecord_2[this_1.parent.parentIdMapping] = droppedRecord[this_1.parent.parentIdMapping];
-                                draggedRecord_2.parentItem = droppedRecord.parentItem;
-                                draggedRecord_2.level = droppedRecord.level;
+                                draggedRecord_2.parentUniqueID = droppedRecord.parentUniqueID;
                             }
                         }
                         if (draggedRecord_2.hasChildRecords) {