@syncfusion/ej2-treegrid 21.1.35 → 21.1.38

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

@@ -1505,6 +1505,8 @@ class Render {
                 !getExpandStatus(this.parent, args.data, this.parent.grid.getCurrentViewRecords());
             if (collapsed$$1) {
                 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 (isRemoteData(this.parent) && !isOffline(this.parent)) {
@@ -1533,6 +1535,15 @@ class Render {
                 args.row.style.display = 'none';
             }
         }
+        const draggedRecord = 'draggedRecord';
+        if (!isNullOrUndefined(this.parent.rowDragAndDropModule) && !isNullOrUndefined(this.parent.rowDragAndDropModule[`${draggedRecord}`])
+            && this.parent.getContentTable().scrollHeight <= this.parent.getContent().clientHeight) {
+            const lastRowBorder = 'lastRowBorder';
+            const 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);
     }
     /**
@@ -3974,7 +3985,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     IsExpandCollapseClicked(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;
         }
@@ -4182,6 +4193,11 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             return callBackPromise;
         };
         this.grid.cellSelecting = (args) => {
+            const actualTarget = 'actualTarget';
+            const target = this.grid.selectionModule[`${actualTarget}`];
+            if (!isNullOrUndefined(target) && (target.classList.contains('e-treegridexpand') || target.classList.contains('e-treegridcollapse'))) {
+                args.cancel = true;
+            }
             const callBackPromise = new Deferred();
             this.trigger(getObject('name', args), args, (cellselectingArgs) => {
                 callBackPromise.resolve(cellselectingArgs);
@@ -8386,13 +8402,14 @@ class RowDD$1 {
                             const childRecords = rec[0].childRecords;
                             const droppedRecordIndex = childRecords.indexOf(droppedRecord) + 1;
                             childRecords.splice(droppedRecordIndex, 0, draggedRecord);
-                            draggedRecord.parentItem = droppedRecord.parentItem;
+                            if (this.parent.enableImmutableMode || this.parent['isIndentEnabled'] && !this.parent.parentIdMapping) {
+                                draggedRecord.parentItem = droppedRecord.parentItem;
+                                draggedRecord.level = droppedRecord.level;
+                            }
                             draggedRecord.parentUniqueID = droppedRecord.parentUniqueID;
-                            draggedRecord.level = droppedRecord.level;
                             if (this.parent.parentIdMapping) {
                                 draggedRecord[this.parent.parentIdMapping] = droppedRecord[this.parent.parentIdMapping];
-                                draggedRecord.parentItem = droppedRecord.parentItem;
-                                draggedRecord.level = droppedRecord.level;
+                                draggedRecord.parentUniqueID = droppedRecord.parentUniqueID;
                             }
                         }
                         if (draggedRecord.hasChildRecords) {