@syncfusion/ej2-treegrid 29.1.33 → 29.1.37

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 29.1.33
+*  version : 29.1.37
 *  Copyright Syncfusion Inc. 2001 - 2024. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-treegrid@*",
-  "_id": "@syncfusion/ej2-treegrid@20.12.1",
+  "_id": "@syncfusion/ej2-treegrid@29.1.33",
   "_inBundle": false,
-  "_integrity": "sha512-T2iLgcfL9PVtMewE3eKalMyIayzFzSK7s7VBP3OFuzk4aV927ZFGuTTXolkDNnVbudBMoa03WIynLt/9eYFm6A==",
+  "_integrity": "sha512-H8pw8MOJvp9jnSCHxVdIzh/R7A/rgBG4qO4y56ywK1AkS9XUo6yF9H/DRQ1b8OXHnH7km86j7cr7is0ZRUCCJw==",
   "_location": "/@syncfusion/ej2-treegrid",
   "_phantomChildren": {},
   "_requested": {
@@ -24,8 +24,8 @@
     "/@syncfusion/ej2-react-treegrid",
     "/@syncfusion/ej2-vue-treegrid"
   ],
-  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-release/@syncfusion/ej2-treegrid/-/ej2-treegrid-20.12.1.tgz",
-  "_shasum": "f0257995d71df038d6ea9161ed71740c677da2fb",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-29.1.33.tgz",
+  "_shasum": "1f3fe526c6645ecb45e41159f58b96e9b80160f7",
   "_spec": "@syncfusion/ej2-treegrid@*",
   "_where": "/jenkins/workspace/elease-automation_release_29.1.1/packages/included",
   "author": {
@@ -36,10 +36,10 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~29.1.33",
+    "@syncfusion/ej2-base": "~29.1.36",
     "@syncfusion/ej2-data": "~29.1.33",
-    "@syncfusion/ej2-grids": "~29.1.33",
-    "@syncfusion/ej2-popups": "~29.1.33"
+    "@syncfusion/ej2-grids": "~29.1.37",
+    "@syncfusion/ej2-popups": "~29.1.37"
   },
   "deprecated": false,
   "description": "Essential JS 2 TreeGrid Component",
@@ -76,6 +76,6 @@
     "url": "git+https://github.com/syncfusion/ej2-treegrid.git"
   },
   "typings": "index.d.ts",
-  "version": "29.1.33",
+  "version": "29.1.37",
   "sideEffects": false
 }

package/src/treegrid/actions/rowdragdrop.js

@@ -686,7 +686,7 @@ var RowDD = /** @class */ (function () {
                 var regex = /index(\d+)|level(\d+)/g;
                 var parentIndexLevel = e === null || e === undefined ? undefined : e.cells["" + treeColIndex].className.match(regex);
                 var dropIndexLevel = targetRow[0].cells["" + treeColIndex].className.match(regex);
-                if (isNullOrUndefined(dropIndexLevel) || isNullOrUndefined(dropIndexLevel)) {
+                if (isNullOrUndefined(dropIndexLevel) || isNullOrUndefined(dropIndexLevel) || isNullOrUndefined(parentIndexLevel)) {
                     return true;
                 }
                 var parentLevel = +parentIndexLevel[1].match(/\d+/)[0];
@@ -963,6 +963,9 @@ var RowDD = /** @class */ (function () {
     RowDD.prototype.removetopOrBottomBorder = function () {
         var border = [];
         border = [].slice.call(this.parent.element.querySelectorAll('.e-dropbottom, .e-droptop'));
+        if (this.parent.rowDropSettings.targetID) {
+            border = [].slice.call(document.querySelectorAll('.e-dropbottom, .e-droptop'));
+        }
         if (border.length) {
             this.addRemoveClasses(border, false, 'e-dropbottom');
             this.addRemoveClasses(border, false, 'e-droptop');
@@ -1052,6 +1055,7 @@ var RowDD = /** @class */ (function () {
             if (dropElement && dropElement.id === this.parent.rowDropSettings.targetID) {
                 var srcControl = dropElement.ej2_instances[0];
                 srcControl.rowDragAndDropModule.updateIcon(args.rows, rowIdx, args);
+                this.dropPosition = srcControl.rowDragAndDropModule.dropPosition;
             }
         }
         if (args.target && closest(args.target, '#' + tObj.rowDropSettings.targetID)) {

package/src/treegrid/base/treegrid.js

@@ -2766,7 +2766,9 @@ var TreeGrid = /** @class */ (function (_super) {
     };
     TreeGrid.prototype.mergeColumns = function (storedColumn, columns) {
         var persist2 = 'mergeColumns';
+        var mergedColumns = 'mergedColumns';
         this.grid["" + persist2].apply(this, [storedColumn, columns]);
+        this.grid["" + mergedColumns] = true;
     };
     TreeGrid.prototype.setFrozenCount = function () {
         var persist3 = 'setFrozenCount';
@@ -2777,7 +2779,7 @@ var TreeGrid = /** @class */ (function (_super) {
         this.grid["" + persist4].apply(this.grid, [columns]);
     };
     TreeGrid.prototype.isFrozenGrid = function () {
-        return this.grid.isFrozenGrid();
+        return this.grid.isFrozenGrid.apply(this);
     };
     TreeGrid.prototype.updateTreeGridModel = function () {
         this.setProperties({ filterSettings: getObject('properties', this.grid.filterSettings) }, true);