@syncfusion/ej2-treegrid 28.1.35 → 28.1.37

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 28.1.35
+*  version : 28.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@28.1.33",
+  "_id": "@syncfusion/ej2-treegrid@28.1.35",
   "_inBundle": false,
-  "_integrity": "sha512-pKNPTjhcdgALe90uah1G7EyMWdyQruUiOcjzpNuuyS9O+9hCcy57+hYeWiQJKSeZA05bZqy0Cxavw1bgggWJsw==",
+  "_integrity": "sha512-Q5c06EcQrvl+LNF3gMT44GSZ6AVf7FCJmkb48NVrSis0QAVzl9tukvge9li+rTPAr3jw6tARAylImqm8R61XMQ==",
   "_location": "/@syncfusion/ej2-treegrid",
   "_phantomChildren": {},
   "_requested": {
@@ -18,14 +18,13 @@
   },
   "_requiredBy": [
     "/",
-    "/@syncfusion/ej2",
     "/@syncfusion/ej2-angular-treegrid",
     "/@syncfusion/ej2-gantt",
     "/@syncfusion/ej2-react-treegrid",
     "/@syncfusion/ej2-vue-treegrid"
   ],
-  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-28.1.33.tgz",
-  "_shasum": "204c0174a1a8d076426213031dc3d9d5457509f0",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-28.1.35.tgz",
+  "_shasum": "a7c0525faceee9d3be1788eb4bdd9b1802e61668",
   "_spec": "@syncfusion/ej2-treegrid@*",
   "_where": "/jenkins/workspace/elease-automation_release_28.1.1/packages/included",
   "author": {
@@ -38,7 +37,7 @@
   "dependencies": {
     "@syncfusion/ej2-base": "~28.1.33",
     "@syncfusion/ej2-data": "~28.1.33",
-    "@syncfusion/ej2-grids": "~28.1.35",
+    "@syncfusion/ej2-grids": "~28.1.37",
     "@syncfusion/ej2-popups": "~28.1.33"
   },
   "deprecated": false,
@@ -76,6 +75,6 @@
     "url": "git+https://github.com/syncfusion/ej2-treegrid.git"
   },
   "typings": "index.d.ts",
-  "version": "28.1.35",
+  "version": "28.1.37",
   "sideEffects": false
 }

package/src/treegrid/base/treegrid.js

@@ -620,8 +620,10 @@ var TreeGrid = /** @class */ (function (_super) {
         var freezePresent = this.injectedModules.filter(function (e) {
             return e.prototype.getModuleName() === 'freeze';
         });
+        var hasFreezeProp = Array.isArray(this.columns) &&
+            this.columns.some(function (col) { return !!col.freeze; });
         if ((this.frozenColumns || this.frozenRows || this.getFrozenColumns() ||
-            this.grid.getFrozenLeftColumnsCount() || this.grid.getFrozenRightColumnsCount()) && freezePresent.length > 0) {
+            hasFreezeProp) && freezePresent.length > 0) {
             modules.push({
                 member: 'freeze', args: [this],
                 name: 'Freeze'
@@ -3025,6 +3027,7 @@ var TreeGrid = /** @class */ (function (_super) {
     };
     // Internal method to handle the rows expand
     TreeGrid.prototype.expandRows = function (row, record, parentRec) {
+        var initialTotalRecordsCount = this.grid.totalDataRecordsCount;
         this.expandCollapse('expand', row, record);
         var children = 'Children';
         if (!(isRemoteData(this) && !isOffline(this)) && (!isCountRequired(this) || !isNullOrUndefined(record["" + children]))) {
@@ -3045,6 +3048,18 @@ var TreeGrid = /** @class */ (function (_super) {
                 this.trigger(events.expanded, expandArgs);
             }
         }
+        if (this.enableVirtualization) {
+            var index = this.grid.currentViewData.indexOf(record);
+            var expandedRow = isNullOrUndefined(row) ? this.getRows()[parseInt(index.toString(), 10)] : row;
+            if (!isNullOrUndefined(expandedRow)) {
+                var rowIndex = +expandedRow.getAttribute('data-rowindex');
+                var outBuffer = this.grid.pageSettings.pageSize - Math.ceil(this.grid.pageSettings.pageSize / 2);
+                var lastBlockIdx = initialTotalRecordsCount - outBuffer;
+                if (rowIndex > lastBlockIdx) {
+                    this.grid.getContent().firstElementChild.scrollTop = rowIndex * this.grid.getRowHeight();
+                }
+            }
+        }
     };
     TreeGrid.prototype.expandCollapseAllChildren = function (record, action, key, level) {
         if ((!isNullOrUndefined(key) && record[this.getPrimaryKeyFieldNames()[0]] !== key) ||
@@ -3160,6 +3175,18 @@ var TreeGrid = /** @class */ (function (_super) {
                     this.grid.getContent().firstElementChild.scrollBy(0, this.grid.getRowHeight());
                 }
             }
+            if (this.enableVirtualization) {
+                var index = this.grid.currentViewData.indexOf(record);
+                var collapsedRow = isNullOrUndefined(row) ? this.getRows()[parseInt(index.toString(), 10)] : row;
+                if (!isNullOrUndefined(collapsedRow)) {
+                    var rowIndex = +collapsedRow.getAttribute('data-rowindex');
+                    var outBuffer = this.grid.pageSettings.pageSize - Math.ceil(this.grid.pageSettings.pageSize / 2);
+                    var lastBlockIdx = this.grid.totalDataRecordsCount - outBuffer;
+                    if (rowIndex > lastBlockIdx) {
+                        this.grid.getContent().firstElementChild.scrollBy(0, (rowIndex - lastBlockIdx) * this.grid.getRowHeight());
+                    }
+                }
+            }
         }
     };
     TreeGrid.prototype.updateExpandStateMapping = function (record, state) {

package/src/treegrid/renderer/virtual-row-model-generator.js

@@ -15,7 +15,7 @@ import { VirtualRowModelGenerator } from '@syncfusion/ej2-grids';
 import * as events from '../base/constant';
 import { isNullOrUndefined } from '@syncfusion/ej2-base';
 import { DataManager } from '@syncfusion/ej2-data';
-import { isCountRequired } from '../utils';
+import { isCountRequired, isRemoteData } from '../utils';
 /**
  * RowModelGenerator is used to generate grid data rows.
  *
@@ -50,8 +50,7 @@ var TreeVirtualRowModelGenerator = /** @class */ (function (_super) {
         if (!isNullOrUndefined(notifyArgs.virtualInfo)) {
             if (notifyArgs.virtualInfo.direction !== 'right' && notifyArgs.virtualInfo.direction !== 'left') {
                 if (!((this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
-                    && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent))
-                    || notifyArgs.virtualInfo.blockIndexes.length === 1) {
+                    && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent) || isRemoteData(this.parent))) {
                     notifyArgs.virtualInfo.blockIndexes = info.blockIndexes;
                 }
             }
@@ -60,7 +59,7 @@ var TreeVirtualRowModelGenerator = /** @class */ (function (_super) {
             }
         }
         if ((this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
-            && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent)) {
+            && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent) || isRemoteData(this.parent)) {
             return _super.prototype.generateRows.call(this, data, notifyArgs);
         }
         else {
@@ -81,7 +80,7 @@ var TreeVirtualRowModelGenerator = /** @class */ (function (_super) {
         var clear = ['paging', 'refresh', 'sorting', 'filtering', 'searching', 'reorder',
             'save', 'delete'].some(function (value) { return action === value; });
         if ((this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
-            && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent)) {
+            && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent) || isRemoteData(this.parent)) {
             var model = 'model';
             var currentPage = this["" + model].currentPage;
             if (clear) {

package/src/treegrid/renderer/virtual-tree-content-render.js

@@ -19,7 +19,7 @@ import { TreeVirtualRowModelGenerator } from '../renderer/virtual-row-model-gene
 import * as events from '../base/constant';
 import { isNullOrUndefined, EventHandler, getValue, setValue, Browser, debounce } from '@syncfusion/ej2-base';
 import { DataManager } from '@syncfusion/ej2-data';
-import { isCountRequired } from '../utils';
+import { isCountRequired, isRemoteData } from '../utils';
 var VirtualTreeContentRenderer = /** @class */ (function (_super) {
     __extends(VirtualTreeContentRenderer, _super);
     function VirtualTreeContentRenderer(parent, locator) {
@@ -218,7 +218,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
     VirtualTreeContentRenderer.prototype.dataBoundEvent = function () {
         var dataBoundEve = 'dataBound';
         var initialRowTop = 'initialRowTop';
-        if (this.parent.getRows().length && !isNullOrUndefined(this.parent.getRowByIndex(0)) && !this["" + initialRowTop]) {
+        if (!isNullOrUndefined(this.parent.getRows()) && this.parent.getRows().length && !isNullOrUndefined(this.parent.getRowByIndex(0)) && !this["" + initialRowTop]) {
             var rowTop = this.parent.getRowByIndex(0).getBoundingClientRect().top;
             var gridTop = this.parent.element.getBoundingClientRect().top;
             if (rowTop > 0) {
@@ -410,7 +410,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
             content = this.parent.getContent().querySelector('.e-content');
         }
         var scrollHeight = outBuffer * rowHeight;
-        var upScroll = (scrollArgs.offset.top - this.translateY) < 0;
+        var upScroll = (scrollArgs.offset.top - this.translateY) < 0 && this.activeKey !== 'downArrow';
         var downScroll = Math.ceil(scrollArgs.offset.top - this.translateY) + rowHeight >= scrollHeight;
         var selectedRowIndex = 'selectedRowIndex';
         var currentViewData = this.parent.currentViewData;
@@ -435,7 +435,8 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                 this.startIndex = (this.startIndex - remains) < 0 ? 0 : (this.startIndex - remains);
             }
             if (currentViewData.length && (currentViewData[0]["" + indexValue] >= this.parent.pageSettings.pageSize / 2) &&
-                ((currentViewData[0]["" + indexValue] - this.startIndex) < (this.parent.pageSettings.pageSize / 2)) && this.parent.selectionModule.isRowSelected) {
+                ((currentViewData[0]["" + indexValue] - this.startIndex) < (this.parent.pageSettings.pageSize / 2)) &&
+                this.parent.selectionModule && this.parent.selectionModule.isRowSelected) {
                 this.startIndex = currentViewData[0]["" + indexValue] - (this.parent.pageSettings.pageSize / 2);
                 this.endIndex = this.startIndex + this.parent.pageSettings.pageSize;
             }
@@ -492,7 +493,8 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                 this.startIndex = lastIndex - (this.parent.pageSettings.pageSize / 2);
             }
             if (currentViewData.length && this.startIndex > currentViewData[0]["" + indexValue] &&
-                ((this.startIndex - currentViewData[0]["" + indexValue]) < (this.parent.pageSettings.pageSize / 2)) && this.parent.selectionModule.isRowSelected) {
+                ((this.startIndex - currentViewData[0]["" + indexValue]) < (this.parent.pageSettings.pageSize / 2)) &&
+                this.parent.selectionModule && this.parent.selectionModule.isRowSelected) {
                 this.startIndex = currentViewData[0]["" + indexValue] + (this.parent.pageSettings.pageSize / 2);
             }
             if (this.parent.root.isSelfReference) {
@@ -521,12 +523,27 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                 }
             }
         }
-        if (((downScroll && (scrollArgs.offset.top < (rowHeight * this.totalRecords)))
+        if (isRemoteData(this.parent) || ((downScroll && (scrollArgs.offset.top < (rowHeight * this.totalRecords)))
             || (upScroll)) || (scrollArgs.direction === 'right' || scrollArgs.direction === 'left') ||
             ((this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
                 && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') && (downScroll || upScroll) || isCountRequired(this.parent))) {
             var viewInfo = this.currentInfo = getValue('getInfoFromView', this).apply(this, [scrollArgs.direction, info, scrollArgs.offset]);
             this.previousInfo = viewInfo;
+            if (this.prevInfo && ((info.axis === 'Y' && this.prevInfo.blockIndexes.toString() === viewInfo.blockIndexes.toString())
+                || ((info.axis === 'X' && this.prevInfo.columnIndexes.toString() === viewInfo.columnIndexes.toString())
+                    || (this.parent.isFrozenGrid() && this.parent.getVisibleFrozenLeftCount() >= viewInfo.columnIndexes[0]
+                        && this.prevInfo.columnIndexes.toString().includes(viewInfo.columnIndexes.toString()))))) {
+                this.parent.removeMaskRow();
+                this.parent.notify('removeGanttShimmer', { requestType: 'hideShimmer' });
+                if (Browser.isIE) {
+                    this.parent.hideSpinner();
+                }
+                this.requestType = this.requestType === 'virtualscroll' ? this['empty'] : this.requestType;
+                if (info.axis === 'Y') {
+                    this['restoreEdit']();
+                }
+                return;
+            }
             this.parent.setColumnIndexesInView(this.parent.enableColumnVirtualization ? viewInfo.columnIndexes : []);
             var page = viewInfo.loadNext && !viewInfo.loadSelf ? viewInfo.nextInfo.page : viewInfo.page;
             this.parent.setProperties({ pageSettings: { currentPage: page } }, true);
@@ -553,7 +570,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
     };
     VirtualTreeContentRenderer.prototype.appendContent = function (target, newChild, e) {
         if ((this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
-            && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent)) {
+            && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent) || isRemoteData(this.parent)) {
             if (getValue('isExpandCollapse', e)) {
                 this.isRemoteExpand = true;
             }

package/src/treegrid/utils.d.ts

@@ -5,7 +5,7 @@ import { ITreeData } from './base/interface';
  * @param {TreeGrid} parent - Tree Grid instance
  * @returns {boolean} - Specifies whether remote data binding
  */
-export declare function isRemoteData(parent: TreeGrid): boolean;
+export declare function isRemoteData(parent: TreeGrid | IGrid): boolean;
 /**
  * @param {TreeGrid | IGrid} parent - Tree Grid or Grid instance
  * @returns {boolean} - Returns whether custom binding

package/styles/bds-lite.css

@@ -374,7 +374,8 @@
 .e-treegrid .e-icons.e-none::before {
   content: "";
 }
-.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowdragdrop.e-childborder:first-child:not(.e-dropbottom) {
+.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowdragdrop.e-childborder:first-child:not(.e-dropbottom, .e-droptop),
+.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowcell.e-childborder:first-child:not(.e-dropbottom, .e-droptop) {
   border-left: 2px solid var(--color-sf-brand-primary);
 }
 .e-treegrid .e-grid:not(.e-grid-min-height) .e-gridcontent tr.e-row.e-summaryrow .e-rowcell:empty {
@@ -459,17 +460,6 @@
 .e-treegrid .e-checkselection .e-movablecontent .e-rowcell {
   line-height: 21px;
 }
-.e-treegrid .e-treegridexpand,
-.e-treegrid .e-treegridcollapse {
-  color: var(--color-sf-fg-secondary);
-  cursor: pointer;
-  font-size: 18px;
-  height: 18px;
-  padding: 0;
-  text-align: center;
-  vertical-align: text-bottom;
-  width: 16px;
-}
 .e-treegrid .e-treecell {
   display: table-cell;
   line-height: normal;
@@ -700,6 +690,20 @@
   border-bottom-color: var(--color-sf-brand-primary);
 }
 
+.e-treegrid .e-treegridexpand,
+.e-treegrid .e-treegridcollapse,
+.e-grid .e-treegridexpand,
+.e-grid .e-treegridcollapse {
+  color: var(--color-sf-fg-secondary);
+  cursor: pointer;
+  font-size: 18px;
+  height: 18px;
+  padding: 0;
+  text-align: center;
+  vertical-align: text-bottom;
+  width: 16px;
+}
+
 .e-treelistgrid.e-print-grid-layout .e-icons.e-none::before {
   content: "";
 }

package/styles/bds.css

@@ -374,7 +374,8 @@
 .e-treegrid .e-icons.e-none::before {
   content: "";
 }
-.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowdragdrop.e-childborder:first-child:not(.e-dropbottom) {
+.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowdragdrop.e-childborder:first-child:not(.e-dropbottom, .e-droptop),
+.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowcell.e-childborder:first-child:not(.e-dropbottom, .e-droptop) {
   border-left: 2px solid var(--color-sf-brand-primary);
 }
 .e-treegrid .e-grid:not(.e-grid-min-height) .e-gridcontent tr.e-row.e-summaryrow .e-rowcell:empty {
@@ -459,17 +460,6 @@
 .e-treegrid .e-checkselection .e-movablecontent .e-rowcell {
   line-height: 21px;
 }
-.e-treegrid .e-treegridexpand,
-.e-treegrid .e-treegridcollapse {
-  color: var(--color-sf-fg-secondary);
-  cursor: pointer;
-  font-size: 18px;
-  height: 18px;
-  padding: 0;
-  text-align: center;
-  vertical-align: text-bottom;
-  width: 16px;
-}
 .e-treegrid .e-treecell {
   display: table-cell;
   line-height: normal;
@@ -700,6 +690,20 @@
   border-bottom-color: var(--color-sf-brand-primary);
 }
 
+.e-treegrid .e-treegridexpand,
+.e-treegrid .e-treegridcollapse,
+.e-grid .e-treegridexpand,
+.e-grid .e-treegridcollapse {
+  color: var(--color-sf-fg-secondary);
+  cursor: pointer;
+  font-size: 18px;
+  height: 18px;
+  padding: 0;
+  text-align: center;
+  vertical-align: text-bottom;
+  width: 16px;
+}
+
 .e-treelistgrid.e-print-grid-layout .e-icons.e-none::before {
   content: "";
 }

package/styles/bootstrap-dark-lite.css

@@ -107,10 +107,6 @@
   content: "\e35d";
 }
 
-.e-treegrid .e-treegridexpand::before,
-.e-treegrid .e-treegridcollapse::before {
-  content: "\e22f";
-}
 .e-treegrid .e-toolbar-item .e-expand::before {
   content: "\e558";
 }
@@ -124,6 +120,13 @@
   content: "\e35d";
 }
 
+.e-treegrid .e-treegridexpand::before,
+.e-treegrid .e-treegridcollapse::before,
+.e-grid .e-treegridexpand::before,
+.e-grid .e-treegridcollapse::before {
+  content: "\e22f";
+}
+
 .e-treelistgrid.e-print-grid-layout .e-treegridexpand::before,
 .e-treelistgrid.e-print-grid-layout .e-treegridcollapse::before {
   content: "\e22f";
@@ -132,7 +135,8 @@
 .e-treegrid .e-icons.e-none::before {
   content: "";
 }
-.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowdragdrop.e-childborder:first-child:not(.e-dropbottom) {
+.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowdragdrop.e-childborder:first-child:not(.e-dropbottom, .e-droptop),
+.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowcell.e-childborder:first-child:not(.e-dropbottom, .e-droptop) {
   border-left: 1px solid #0070f0;
 }
 .e-treegrid .e-grid:not(.e-grid-min-height) .e-gridcontent tr.e-row.e-summaryrow .e-rowcell:empty {
@@ -217,17 +221,6 @@
 .e-treegrid .e-checkselection .e-movablecontent .e-rowcell {
   line-height: 21px;
 }
-.e-treegrid .e-treegridexpand,
-.e-treegrid .e-treegridcollapse {
-  color: #f0f0f0;
-  cursor: pointer;
-  font-size: 10px;
-  height: 16px;
-  padding: 0;
-  text-align: center;
-  vertical-align: text-bottom;
-  width: 16px;
-}
 .e-treegrid .e-treecell {
   display: table-cell;
   line-height: normal;
@@ -458,6 +451,20 @@
   border-bottom-color: #0070f0;
 }
 
+.e-treegrid .e-treegridexpand,
+.e-treegrid .e-treegridcollapse,
+.e-grid .e-treegridexpand,
+.e-grid .e-treegridcollapse {
+  color: #f0f0f0;
+  cursor: pointer;
+  font-size: 10px;
+  height: 16px;
+  padding: 0;
+  text-align: center;
+  vertical-align: text-bottom;
+  width: 16px;
+}
+
 .e-treelistgrid.e-print-grid-layout .e-icons.e-none::before {
   content: "";
 }

package/styles/bootstrap-dark.css

@@ -107,10 +107,6 @@
   content: "\e35d";
 }
 
-.e-treegrid .e-treegridexpand::before,
-.e-treegrid .e-treegridcollapse::before {
-  content: "\e22f";
-}
 .e-treegrid .e-toolbar-item .e-expand::before {
   content: "\e558";
 }
@@ -124,6 +120,13 @@
   content: "\e35d";
 }
 
+.e-treegrid .e-treegridexpand::before,
+.e-treegrid .e-treegridcollapse::before,
+.e-grid .e-treegridexpand::before,
+.e-grid .e-treegridcollapse::before {
+  content: "\e22f";
+}
+
 .e-treelistgrid.e-print-grid-layout .e-treegridexpand::before,
 .e-treelistgrid.e-print-grid-layout .e-treegridcollapse::before {
   content: "\e22f";
@@ -132,7 +135,8 @@
 .e-treegrid .e-icons.e-none::before {
   content: "";
 }
-.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowdragdrop.e-childborder:first-child:not(.e-dropbottom) {
+.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowdragdrop.e-childborder:first-child:not(.e-dropbottom, .e-droptop),
+.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowcell.e-childborder:first-child:not(.e-dropbottom, .e-droptop) {
   border-left: 1px solid #0070f0;
 }
 .e-treegrid .e-grid:not(.e-grid-min-height) .e-gridcontent tr.e-row.e-summaryrow .e-rowcell:empty {
@@ -217,17 +221,6 @@
 .e-treegrid .e-checkselection .e-movablecontent .e-rowcell {
   line-height: 21px;
 }
-.e-treegrid .e-treegridexpand,
-.e-treegrid .e-treegridcollapse {
-  color: #f0f0f0;
-  cursor: pointer;
-  font-size: 10px;
-  height: 16px;
-  padding: 0;
-  text-align: center;
-  vertical-align: text-bottom;
-  width: 16px;
-}
 .e-treegrid .e-treecell {
   display: table-cell;
   line-height: normal;
@@ -458,6 +451,20 @@
   border-bottom-color: #0070f0;
 }
 
+.e-treegrid .e-treegridexpand,
+.e-treegrid .e-treegridcollapse,
+.e-grid .e-treegridexpand,
+.e-grid .e-treegridcollapse {
+  color: #f0f0f0;
+  cursor: pointer;
+  font-size: 10px;
+  height: 16px;
+  padding: 0;
+  text-align: center;
+  vertical-align: text-bottom;
+  width: 16px;
+}
+
 .e-treelistgrid.e-print-grid-layout .e-icons.e-none::before {
   content: "";
 }

package/styles/bootstrap-lite.css

@@ -107,9 +107,17 @@
   content: "\e35d";
 }
 
-.e-treegrid .e-treegridexpand::before,
-.e-treegrid .e-treegridcollapse::before {
-  content: "\e22f";
+.e-treegrid .e-toolbar-item .e-expand::before {
+  content: "\e558";
+}
+.e-treegrid .e-toolbar-item .e-collapse::before {
+  content: "\e557";
+}
+.e-treegrid .e-toolbar-item .e-indent::before {
+  content: "\e33f";
+}
+.e-treegrid .e-toolbar-item .e-outdent::before {
+  content: "\e35d";
 }
 .e-treegrid .e-toolbar-item .e-expand::before {
   content: "\e558";
@@ -124,6 +132,13 @@
   content: "\e35d";
 }
 
+.e-treegrid .e-treegridexpand::before,
+.e-treegrid .e-treegridcollapse::before,
+.e-grid .e-treegridexpand::before,
+.e-grid .e-treegridcollapse::before {
+  content: "\e22f";
+}
+
 .e-treelistgrid.e-print-grid-layout .e-treegridexpand::before,
 .e-treelistgrid.e-print-grid-layout .e-treegridcollapse::before {
   content: "\e22f";
@@ -132,7 +147,8 @@
 .e-treegrid .e-icons.e-none::before {
   content: "";
 }
-.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowdragdrop.e-childborder:first-child:not(.e-dropbottom) {
+.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowdragdrop.e-childborder:first-child:not(.e-dropbottom, .e-droptop),
+.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowcell.e-childborder:first-child:not(.e-dropbottom, .e-droptop) {
   border-left: 1px solid #317ab9;
 }
 .e-treegrid .e-grid:not(.e-grid-min-height) .e-gridcontent tr.e-row.e-summaryrow .e-rowcell:empty {
@@ -220,17 +236,6 @@
 .e-treegrid .e-checkselection .e-movablecontent .e-rowcell {
   line-height: 21px;
 }
-.e-treegrid .e-treegridexpand,
-.e-treegrid .e-treegridcollapse {
-  color: #333;
-  cursor: pointer;
-  font-size: 10px;
-  height: 16px;
-  padding: 0;
-  text-align: center;
-  vertical-align: text-bottom;
-  width: 16px;
-}
 .e-treegrid .e-treecell {
   display: table-cell;
   line-height: normal;
@@ -461,6 +466,20 @@
   border-bottom-color: #317ab9;
 }
 
+.e-treegrid .e-treegridexpand,
+.e-treegrid .e-treegridcollapse,
+.e-grid .e-treegridexpand,
+.e-grid .e-treegridcollapse {
+  color: #333;
+  cursor: pointer;
+  font-size: 10px;
+  height: 16px;
+  padding: 0;
+  text-align: center;
+  vertical-align: text-bottom;
+  width: 16px;
+}
+
 .e-treelistgrid.e-print-grid-layout .e-icons.e-none::before {
   content: "";
 }

package/styles/bootstrap.css

@@ -107,9 +107,17 @@
   content: "\e35d";
 }
 
-.e-treegrid .e-treegridexpand::before,
-.e-treegrid .e-treegridcollapse::before {
-  content: "\e22f";
+.e-treegrid .e-toolbar-item .e-expand::before {
+  content: "\e558";
+}
+.e-treegrid .e-toolbar-item .e-collapse::before {
+  content: "\e557";
+}
+.e-treegrid .e-toolbar-item .e-indent::before {
+  content: "\e33f";
+}
+.e-treegrid .e-toolbar-item .e-outdent::before {
+  content: "\e35d";
 }
 .e-treegrid .e-toolbar-item .e-expand::before {
   content: "\e558";
@@ -124,6 +132,13 @@
   content: "\e35d";
 }
 
+.e-treegrid .e-treegridexpand::before,
+.e-treegrid .e-treegridcollapse::before,
+.e-grid .e-treegridexpand::before,
+.e-grid .e-treegridcollapse::before {
+  content: "\e22f";
+}
+
 .e-treelistgrid.e-print-grid-layout .e-treegridexpand::before,
 .e-treelistgrid.e-print-grid-layout .e-treegridcollapse::before {
   content: "\e22f";
@@ -132,7 +147,8 @@
 .e-treegrid .e-icons.e-none::before {
   content: "";
 }
-.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowdragdrop.e-childborder:first-child:not(.e-dropbottom) {
+.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowdragdrop.e-childborder:first-child:not(.e-dropbottom, .e-droptop),
+.e-treegrid .e-grid.e-default.e-draggable:not(.e-rtl) tr td.e-rowcell.e-childborder:first-child:not(.e-dropbottom, .e-droptop) {
   border-left: 1px solid #317ab9;
 }
 .e-treegrid .e-grid:not(.e-grid-min-height) .e-gridcontent tr.e-row.e-summaryrow .e-rowcell:empty {
@@ -220,17 +236,6 @@
 .e-treegrid .e-checkselection .e-movablecontent .e-rowcell {
   line-height: 21px;
 }
-.e-treegrid .e-treegridexpand,
-.e-treegrid .e-treegridcollapse {
-  color: #333;
-  cursor: pointer;
-  font-size: 10px;
-  height: 16px;
-  padding: 0;
-  text-align: center;
-  vertical-align: text-bottom;
-  width: 16px;
-}
 .e-treegrid .e-treecell {
   display: table-cell;
   line-height: normal;
@@ -461,6 +466,20 @@
   border-bottom-color: #317ab9;
 }
 
+.e-treegrid .e-treegridexpand,
+.e-treegrid .e-treegridcollapse,
+.e-grid .e-treegridexpand,
+.e-grid .e-treegridcollapse {
+  color: #333;
+  cursor: pointer;
+  font-size: 10px;
+  height: 16px;
+  padding: 0;
+  text-align: center;
+  vertical-align: text-bottom;
+  width: 16px;
+}
+
 .e-treelistgrid.e-print-grid-layout .e-icons.e-none::before {
   content: "";
 }