@syncfusion/ej2-treegrid 19.3.44 → 19.3.48

package/src/treegrid/base/treegrid.js

@@ -441,7 +441,8 @@ var TreeGrid = /** @class */ (function (_super) {
                 member: 'ExcelExport', args: [this]
             });
         }
-        if (this.frozenColumns || this.frozenRows || this.getFrozenColumns() || this.grid.getFrozenLeftColumnsCount() || this.grid.getFrozenRightColumnsCount()) {
+        if (this.frozenColumns || this.frozenRows || this.getFrozenColumns() ||
+            this.grid.getFrozenLeftColumnsCount() || this.grid.getFrozenRightColumnsCount()) {
             modules.push({
                 member: 'freeze', args: [this]
             });
@@ -662,6 +663,7 @@ var TreeGrid = /** @class */ (function (_super) {
         this.grid.allowSorting = this.allowSorting;
         this.grid.allowFiltering = this.allowFiltering;
         this.grid.enableVirtualization = this.enableVirtualization;
+        this.grid.enableColumnVirtualization = this.enableColumnVirtualization;
         this.grid.enableInfiniteScrolling = this.enableInfiniteScrolling;
         this.grid.infiniteScrollSettings = this.infiniteScrollSettings;
         this.grid.width = this.width;
@@ -1023,6 +1025,10 @@ var TreeGrid = /** @class */ (function (_super) {
                 && (_this.grid.filterSettings.columns.length === 0 || _this.grid.searchSettings.key.length === 0)) {
                 _this.notify('clearFilters', { flatData: _this.grid.dataSource });
                 _this.grid.setProperties({ dataSource: _this.dataResults.result }, true);
+                if (isNullOrUndefined(_this.grid['changedProperties'].dataSource)) {
+                    _this.grid.renderModule.data.dataManager = _this.grid.dataSource instanceof DataManager ? _this.grid.dataSource :
+                        (isNullOrUndefined(_this.grid.dataSource) ? new DataManager() : new DataManager(_this.grid.dataSource));
+                }
             }
             var callBackPromise = new Deferred();
             _this.trigger(events.actionBegin, args, function (actionArgs) {
@@ -1048,7 +1054,7 @@ var TreeGrid = /** @class */ (function (_super) {
                 _this.notify(events.batchSave, args);
             }
             _this.notify('updateGridActions', args);
-            if (args.requestType === 'save' && _this.aggregates.map(function (ag) { return ag.showChildSummary == true; }).length) {
+            if (args.requestType === 'save' && _this.aggregates.map(function (ag) { return ag.showChildSummary === true; }).length) {
                 _this.grid.refresh();
             }
             _this.trigger(events.actionComplete, args);
@@ -1344,6 +1350,9 @@ var TreeGrid = /** @class */ (function (_super) {
                 case 'enableVirtualization':
                     this.grid.enableVirtualization = this.enableVirtualization;
                     break;
+                case 'enableColumnVirtualization':
+                    this.grid.enableColumnVirtualization = this.enableColumnVirtualization;
+                    break;
                 case 'toolbar':
                     this.grid.toolbar = this.getGridToolbar();
                     break;
@@ -1567,6 +1576,11 @@ var TreeGrid = /** @class */ (function (_super) {
         if (isNullOrUndefined(this.grid)) {
             return;
         }
+        if (!isNullOrUndefined(this.rowDropSettings.targetID) &&
+            isNullOrUndefined(document.getElementById(this.grid.rowDropSettings.targetID))) {
+            document.getElementById(this.rowDropSettings.targetID).id = this.grid.rowDropSettings.targetID;
+            this.rowDropSettings.targetID = this.grid.rowDropSettings.targetID;
+        }
         _super.prototype.dataBind.call(this);
         this.grid.dataBind();
     };
@@ -1578,7 +1592,7 @@ var TreeGrid = /** @class */ (function (_super) {
      */
     TreeGrid.prototype.getPersistData = function () {
         var keyEntity = ['pageSettings', 'sortSettings',
-            'filterSettings', 'columns', 'searchSettings', 'selectedRowIndex'];
+            'filterSettings', 'columns', 'searchSettings', 'selectedRowIndex', 'treeColumnIndex'];
         var ignoreOnPersist = {
             pageSettings: ['template', 'pageSizes', 'pageSizeMode', 'enableQueryString', 'totalRecordsCount', 'pageCount'],
             filterSettings: ['type', 'mode', 'showFilterBarStatus', 'immediateModeDelay', 'ignoreAccent', 'hierarchyMode'],
@@ -1589,9 +1603,9 @@ var TreeGrid = /** @class */ (function (_super) {
             'commandTemplate', 'commands', 'dataSource'];
         for (var i = 0; i < keyEntity.length; i++) {
             var currentObject = this[keyEntity[i]];
-            for (var _i = 0, _a = ignoreOnPersist[keyEntity[i]]; _i < _a.length; _i++) {
-                var val = _a[_i];
-                delete currentObject[val];
+            for (var k = 0, val = ignoreOnPersist[keyEntity[i]]; (!isNullOrUndefined(val) && k < val.length); k++) {
+                var objVal = val[k];
+                delete currentObject[objVal];
             }
         }
         this.ignoreInArrays(ignoreOnColumn, this.columns);
@@ -1994,6 +2008,16 @@ var TreeGrid = /** @class */ (function (_super) {
     TreeGrid.prototype.getColumnIndexByField = function (field) {
         return this.grid.getColumnIndexByField(field);
     };
+    TreeGrid.prototype.getVirtualColIndexByUid = function (uid) {
+        var columnModel = 'columnModel';
+        var index = iterateArrayOrObject(this.grid[columnModel], function (item, index) {
+            if (item.uid === uid) {
+                return index;
+            }
+            return undefined;
+        })[0];
+        return !isNullOrUndefined(index) ? index : -1;
+    };
     /**
      * Gets a column index by UID.
      *
@@ -2022,18 +2046,20 @@ var TreeGrid = /** @class */ (function (_super) {
             temp = this.columnModel[this.treeColumnIndex].template;
             field = this.columnModel[this.treeColumnIndex].field;
         }
-        this.columnModel = [];
         var stackedHeader = false;
         var gridColumn;
-        for (var i = 0; i < gridColumns.length; i++) {
-            gridColumn = {};
-            for (var _i = 0, _a = Object.keys(gridColumns[i]); _i < _a.length; _i++) {
-                var prop = _a[_i];
-                gridColumn[prop] = gridColumns[i][prop];
-            }
-            this.columnModel.push(new Column(gridColumn));
-            if (field === this.columnModel[i].field && (!isNullOrUndefined(temp) && temp !== '')) {
-                this.columnModel[i].template = temp;
+        if (!this.enableColumnVirtualization || (this.enableColumnVirtualization && this.columnModel.length === gridColumns.length)) {
+            this.columnModel = [];
+            for (var i = 0; i < gridColumns.length; i++) {
+                gridColumn = {};
+                for (var _i = 0, _a = Object.keys(gridColumns[i]); _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    gridColumn[prop] = gridColumns[i][prop];
+                }
+                this.columnModel.push(new Column(gridColumn));
+                if (field === this.columnModel[i].field && (!isNullOrUndefined(temp) && temp !== '')) {
+                    this.columnModel[i].template = temp;
+                }
             }
         }
         var merge = 'deepMerge';
@@ -2405,7 +2431,7 @@ var TreeGrid = /** @class */ (function (_super) {
             var row = getObject('rows', rec);
             var record = getObject('records', rec);
             for (var i = 0; i < record.length; i++) {
-                if (record[i].parentItem != undefined) {
+                if (record[i].parentItem !== undefined) {
                     var pindex = this.flatData[record[i].parentItem.index].index;
                     if (this.flatData[pindex].expanded === false) {
                         record.push(this.flatData[pindex]);
@@ -3370,6 +3396,9 @@ var TreeGrid = /** @class */ (function (_super) {
     __decorate([
         Property(false)
     ], TreeGrid.prototype, "enableVirtualization", void 0);
+    __decorate([
+        Property(false)
+    ], TreeGrid.prototype, "enableColumnVirtualization", void 0);
     __decorate([
         Property(false)
     ], TreeGrid.prototype, "enableInfiniteScrolling", void 0);

package/src/treegrid/renderer/render.js

@@ -96,7 +96,15 @@ var Render = /** @class */ (function () {
         else {
             index = data.index;
         }
-        if (grid.getColumnIndexByUid(args.column.uid) === this.parent.treeColumnIndex && (args.requestType === 'add' || args.requestType
+        var columnIndex;
+        var getVirtualColIndexByUid = 'getVirtualColIndexByUid';
+        if (this.parent.enableColumnVirtualization && !this.parent.initialRender) {
+            columnIndex = this.parent[getVirtualColIndexByUid](args.column.uid);
+        }
+        else {
+            columnIndex = grid.getColumnIndexByUid(args.column.uid);
+        }
+        if (columnIndex === this.parent.treeColumnIndex && (args.requestType === 'add' || args.requestType
             === 'rowDragAndDrop' || args.requestType === 'delete' || isNullOrUndefined(args.cell.querySelector('.e-treecell')))) {
             var container = createElement('div', { className: 'e-treecolumn-container' });
             var emptyExpandIcon = createElement('span', {

package/src/treegrid/renderer/virtual-row-model-generator.d.ts

@@ -10,6 +10,7 @@ export declare class TreeVirtualRowModelGenerator extends VirtualRowModelGenerat
     constructor(parent: IGrid);
     addEventListener(): void;
     private getDatas;
+    private getDataInfo;
     generateRows(data: Object[], notifyArgs?: NotifyArgs): Row<Column>[];
     checkAndResetCache(action: string): boolean;
 }

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

@@ -34,7 +34,19 @@ var TreeVirtualRowModelGenerator = /** @class */ (function (_super) {
     TreeVirtualRowModelGenerator.prototype.getDatas = function (args) {
         this.visualData = args.data;
     };
+    TreeVirtualRowModelGenerator.prototype.getDataInfo = function () {
+        return _super.prototype.getData.call(this);
+    };
     TreeVirtualRowModelGenerator.prototype.generateRows = function (data, notifyArgs) {
+        var info = this.getDataInfo();
+        if (!isNullOrUndefined(notifyArgs.virtualInfo)) {
+            if (notifyArgs.virtualInfo.direction !== 'right' && notifyArgs.virtualInfo.direction !== 'left') {
+                notifyArgs.virtualInfo.blockIndexes = info.blockIndexes;
+            }
+            else {
+                notifyArgs.virtualInfo.blockIndexes = this.getBlockIndexes(notifyArgs.virtualInfo.page);
+            }
+        }
         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)) {
             return _super.prototype.generateRows.call(this, data, notifyArgs);

package/src/treegrid/renderer/virtual-tree-content-render.d.ts

@@ -49,6 +49,7 @@ export declare class VirtualTreeContentRenderer extends VirtualContentRenderer {
     private restoreNewRow;
     private getData;
     private onActionComplete;
+    private onEnteredAction;
     scrollListeners(scrollArgs: ScrollArg): void;
     appendContent(target: HTMLElement, newChild: DocumentFragment, e: NotifyArgs): void;
     removeEventListener(): void;
@@ -58,7 +59,7 @@ export declare class TreeInterSectionObserver extends InterSectionObserver {
     private newPos;
     private lastPos;
     private timer;
-    observes(callback: Function): void;
+    observes(callback: Function, onEnterCallback: Function): void;
     private clear;
     private virtualScrollHandlers;
 }

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

@@ -16,7 +16,7 @@ import { VirtualContentRenderer } from '@syncfusion/ej2-grids';
 import { InterSectionObserver } from '@syncfusion/ej2-grids';
 import { TreeVirtualRowModelGenerator } from '../renderer/virtual-row-model-generator';
 import * as events from '../base/constant';
-import { isNullOrUndefined, EventHandler, getValue, setValue, Browser } from '@syncfusion/ej2-base';
+import { isNullOrUndefined, EventHandler, getValue, setValue, Browser, debounce } from '@syncfusion/ej2-base';
 import { DataManager } from '@syncfusion/ej2-data';
 import { isCountRequired } from '../utils';
 var VirtualTreeContentRenderer = /** @class */ (function (_super) {
@@ -88,9 +88,9 @@ var VirtualTreeContentRenderer = /** @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[action]('data-ready', this.onDataReady, this);
-            //this.parent[action]('refresh-virtual-block', this.refreshContentRows, this);
+            this.parent[action]('refresh-virtual-block', this.refreshContentRows, this);
             this.fn = function () {
-                _this.observers.observes(function (scrollArgs) { return _this.scrollListeners(scrollArgs); });
+                _this.observers.observes(function (scrollArgs) { return _this.scrollListeners(scrollArgs); }, _this.onEnteredAction());
                 _this.parent.off('content-ready', _this.fn);
             };
             this.parent.addEventListener('dataBound', this.dataBoundEvent.bind(this));
@@ -122,7 +122,9 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
             && this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || !isCountRequired(this.parent)) {
             if (!isNullOrUndefined(e.count)) {
                 this.totalRecords = e.count;
-                getValue('virtualEle', this).setVirtualHeight(this.parent.getRowHeight() * e.count, '100%');
+                if (!this.parent.enableColumnVirtualization) {
+                    getValue('virtualEle', this).setVirtualHeight(this.parent.getRowHeight() * e.count, '100%');
+                }
             }
             if ((!isNullOrUndefined(e.requestType) && e.requestType.toString() === 'collapseAll') || this.isDataSourceChanged) {
                 this.contents.scrollTop = 0;
@@ -180,6 +182,10 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
             return;
         }
         var selectVirtualRow = 'selectVirtualRow';
+        var containerRect = 'containerRect';
+        if (isNullOrUndefined(this.observer[containerRect])) {
+            this.observer[containerRect] = this.observers[containerRect];
+        }
         _super.prototype[selectVirtualRow].call(this, args);
     };
     VirtualTreeContentRenderer.prototype.refreshCell = function (rowObj) {
@@ -286,15 +292,39 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
         var actionComplete = 'actionComplete';
         _super.prototype[actionComplete].call(this, args);
     };
+    VirtualTreeContentRenderer.prototype.onEnteredAction = function () {
+        var _this = this;
+        return function (element, current, direction, e, isWheel, check) {
+            var directVirtualRender = 'directVirtualRender';
+            if (!_this.parent[directVirtualRender]) { // with this property, columns are rendered without debouncing on horizontal scroll.
+                var preventEvent = 'preventEvent';
+                if (Browser.isIE && !isWheel && check && !_this[preventEvent]) {
+                    _this.parent.showSpinner();
+                }
+                var xAxis = current.axis === 'X';
+                var x = _this.getColumnOffset(xAxis ? _this.vgenerator.getColumnIndexes()[0] - 1 : _this.prevInfo.columnIndexes[0]
+                    - 1);
+                if (xAxis) {
+                    var idx = Object.keys(_this.vgenerator.cOffsets).length - _this.prevInfo.columnIndexes.length;
+                    var maxLeft = _this.vgenerator.cOffsets[idx - 1];
+                    x = x > maxLeft ? maxLeft : x; //TODO: This fix horizontal scrollbar jumping issue in column virtualization.
+                }
+                _this.virtualEle.adjustTable(x, _this.translateY);
+                if (_this.parent.enableColumnVirtualization) {
+                    _this.header.virtualEle.adjustTable(x, 0);
+                }
+            }
+        };
+    };
     VirtualTreeContentRenderer.prototype.scrollListeners = function (scrollArgs) {
         var info = scrollArgs.sentinel;
-        var outBuffer = 10; //this.parent.pageSettings.pageSize - Math.ceil(this.parent.pageSettings.pageSize / 1.5);
+        var outBuffer = this.parent.pageSettings.pageSize - Math.ceil(this.parent.pageSettings.pageSize / 2);
         var content = this.parent.getContent().querySelector('.e-content');
         var scrollHeight = outBuffer * this.parent.getRowHeight();
         var upScroll = (scrollArgs.offset.top - this.translateY) < 0;
         var downScroll = Math.ceil(scrollArgs.offset.top - this.translateY) >= scrollHeight;
         var selectedRowIndex = 'selectedRowIndex';
-        if (upScroll) {
+        if (upScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left')) {
             var vHeight = +(this.parent.height.toString().indexOf('%') < 0 ? this.parent.height :
                 this.parent.element.getBoundingClientRect().height);
             var index = (~~(content.scrollTop / this.parent.getRowHeight())
@@ -331,7 +361,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                     scrollArgs.offset.top - (outBuffer * height) + 10 : 0;
             }
         }
-        else if (downScroll) {
+        else if (downScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left')) {
             var nextSetResIndex = ~~(content.scrollTop / this.parent.getRowHeight());
             var isLastBlock = (this[selectedRowIndex] + this.parent.pageSettings.pageSize) < this.totalRecords ? false : true;
             if (!isNullOrUndefined(this[selectedRowIndex]) && this[selectedRowIndex] !== -1 &&
@@ -352,14 +382,17 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                 this.translateY = scrollArgs.offset.top;
             }
         }
-        if ((downScroll && (scrollArgs.offset.top < (this.parent.getRowHeight() * this.totalRecords)))
-            || (upScroll)) {
-            var viewInfo = getValue('getInfoFromView', this).apply(this, [scrollArgs.direction, info, scrollArgs.offset]);
+        if (((downScroll && (scrollArgs.offset.top < (this.parent.getRowHeight() * this.totalRecords)))
+            || (upScroll)) || (scrollArgs.direction === 'right' || scrollArgs.direction === 'left')) {
+            var viewInfo = this.currentInfo = getValue('getInfoFromView', this).apply(this, [scrollArgs.direction, info, scrollArgs.offset]);
             this.previousInfo = viewInfo;
+            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);
-            viewInfo.event = viewInfo.event === 'refresh-virtual-block' ? 'model-changed' : viewInfo.event;
-            this.parent.notify(viewInfo.event, { requestType: 'virtualscroll', focusElement: scrollArgs.focusElement });
+            if (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left') {
+                viewInfo.event = viewInfo.event === 'refresh-virtual-block' ? 'model-changed' : viewInfo.event;
+            }
+            this.parent.notify(viewInfo.event, { requestType: 'virtualscroll', virtualInfo: viewInfo, focusElement: scrollArgs.focusElement });
         }
     };
     VirtualTreeContentRenderer.prototype.appendContent = function (target, newChild, e) {
@@ -376,7 +409,14 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                 getValue('currentInfo', this) : e.virtualInfo;
             var cBlock = (info.columnIndexes[0]) - 1;
             var cOffset = this.getColumnOffset(cBlock);
-            this.virtualEle.setWrapperWidth(null, (Browser.isIE || Browser.info.name === 'edge'));
+            var width = void 0;
+            if (this.parent.enableColumnVirtualization) {
+                this.header.virtualEle.adjustTable(cOffset, 0);
+                var cIndex = info.columnIndexes;
+                width = this.getColumnOffset(cIndex[cIndex.length - 1]) - this.getColumnOffset(cIndex[0] - 1) + '';
+                this.header.virtualEle.setWrapperWidth(width);
+            }
+            this.virtualEle.setWrapperWidth(width, (Browser.isIE || Browser.info.name === 'edge'));
             target = this.parent.createElement('tbody');
             target.appendChild(newChild);
             var replace = 'replaceWith';
@@ -388,8 +428,12 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                 this.isExpandCollapse = false;
             }
             setValue('prevInfo', this.previousInfo ? this.previousInfo : info, this);
+            if (e.requestType === 'virtualscroll' && e.virtualInfo.sentinelInfo.axis === 'X') {
+                this.parent.notify(events.autoCol, {});
+            }
             var focusCell = 'focusCell';
             var restoreAdd = 'restoreAdd';
+            var ensureSelectedRowPosition = 'ensureSelectedRowPosition';
             _super.prototype[focusCell].call(this, e);
             var isAdd = 'isAdd';
             if (this[isAdd] && !this.parent.getContent().querySelector('.e-content').querySelector('.e-addedrow')) {
@@ -405,6 +449,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
             }
             this.restoreEditState();
             _super.prototype[restoreAdd].call(this);
+            _super.prototype[ensureSelectedRowPosition].call(this);
         }
     };
     VirtualTreeContentRenderer.prototype.removeEventListener = function () {
@@ -441,28 +486,34 @@ var TreeInterSectionObserver = /** @class */ (function (_super) {
         _this.timer = 0;
         return _this;
     }
-    TreeInterSectionObserver.prototype.observes = function (callback) {
+    TreeInterSectionObserver.prototype.observes = function (callback, onEnterCallback) {
         var containerRect = 'containerRect';
         _super.prototype[containerRect] = getValue('options', this).container.getBoundingClientRect();
-        EventHandler.add(getValue('options', this).container, 'scroll', this.virtualScrollHandlers(callback), this);
+        EventHandler.add(getValue('options', this).container, 'scroll', this.virtualScrollHandlers(callback, onEnterCallback), this);
     };
     TreeInterSectionObserver.prototype.clear = function () {
         this.lastPos = null;
     };
-    TreeInterSectionObserver.prototype.virtualScrollHandlers = function (callback) {
+    TreeInterSectionObserver.prototype.virtualScrollHandlers = function (callback, onEnterCallback) {
         var _this = this;
-        var prevTop = 0;
-        var prevLeft = 0;
+        var delay = Browser.info.name === 'chrome' ? 200 : 100;
+        var options = 'options';
+        var movableEle = 'movableEle';
+        var element = 'element';
+        var fromWheel = 'fromWheel';
+        var debounced100 = debounce(callback, delay);
+        var debounced50 = debounce(callback, 50);
+        this[options].prevTop = this[options].prevLeft = 0;
         return function (e) {
-            var scrollTop = e.target.scrollTop;
-            var scrollLeft = e.target.scrollLeft;
-            var direction = prevTop < scrollTop ? 'down' : 'up';
-            direction = prevLeft === scrollLeft ? direction : prevLeft < scrollLeft ? 'right' : 'left';
-            prevTop = scrollTop;
-            prevLeft = scrollLeft;
-            var current = getValue('sentinelInfo', _this)[direction];
+            var top = _this[options].movableContainer ? _this[options].container.scrollTop : e.target.scrollTop;
+            var left = _this[options].movableContainer ? _this[options].scrollbar.scrollLeft : e.target.scrollLeft;
+            var direction = _this[options].prevTop < top ? 'down' : 'up';
+            direction = _this[options].prevLeft === left ? direction : _this[options].prevLeft < left ? 'right' : 'left';
+            _this[options].prevTop = top;
+            _this[options].prevLeft = left;
+            var current = _this.sentinelInfo[direction];
             var delta = 0;
-            _this.newPos = scrollTop;
+            _this.newPos = top;
             if (_this.lastPos != null) { // && newPos < maxScroll
                 delta = _this.newPos - _this.lastPos;
             }
@@ -471,19 +522,35 @@ var TreeInterSectionObserver = /** @class */ (function (_super) {
                 clearTimeout(_this.timer);
             }
             _this.timer = setTimeout(_this.clear, 0);
-            /*if (this.options.axes.indexOf(current.axis) === -1) {
-            return;
-        }*/
-            /*if(delta > 45 || delta < -45){
-          this.isWheeling = true;
-        }*/
             if ((delta > 100 || delta < -100) && (e && e.preventDefault)) {
                 e.returnValue = false;
                 e.preventDefault();
             }
-            callback({ direction: direction, isWheel: _this.isWheeling,
-                sentinel: current, offset: { top: scrollTop, left: scrollLeft },
-                focusElement: document.activeElement });
+            if (_this[options].axes.indexOf(current.axis) === -1) {
+                return;
+            }
+            var check = _this.check(direction);
+            if (current.entered && current.axis === 'X') {
+                if (_this[movableEle] && (direction === 'right' || direction === 'left')) {
+                    onEnterCallback(_this[movableEle], current, direction, { top: top, left: left }, _this[fromWheel], check);
+                }
+                else {
+                    onEnterCallback(_this[element], current, direction, { top: top, left: left }, _this[fromWheel], check);
+                }
+            }
+            if (check) {
+                var fn = debounced100;
+                if (current.axis === 'X') {
+                    fn = debounced50;
+                    fn({ direction: direction, sentinel: current, offset: { top: top, left: left },
+                        focusElement: document.activeElement });
+                }
+                else {
+                    callback({ direction: direction, sentinel: current, offset: { top: top, left: left },
+                        focusElement: document.activeElement });
+                }
+            }
+            _this[fromWheel] = false;
         };
     };
     return TreeInterSectionObserver;

package/styles/bootstrap-dark.css

@@ -270,7 +270,7 @@
 
 .e-treegrid .e-treecell {
   display: table-cell;
-  line-height: 10px;
+  line-height: normal;
 }
 
 .e-treegrid .e-grid.e-wrap .e-rowcell .e-treecolumn-container {

package/styles/bootstrap.css

@@ -271,7 +271,7 @@
 
 .e-treegrid .e-treecell {
   display: table-cell;
-  line-height: 10px;
+  line-height: normal;
 }
 
 .e-treegrid .e-grid.e-wrap .e-rowcell .e-treecolumn-container {

package/styles/bootstrap4.css

@@ -77,6 +77,11 @@
   background: transparent;
 }
 
+.e-input-group.e-control-wrapper.e-ddl.e-readonly .e-input[readonly],
+.e-float-input.e-control-wrapper.e-ddl.e-readonly input[readonly] {
+  background: #e9ecef;
+}
+
 .e-input-group:not(.e-disabled) .e-control.e-dropdownlist ~ .e-ddl-icon:active,
 .e-input-group:not(.e-disabled) .e-control.e-dropdownlist ~ .e-ddl-icon:hover,
 .e-control.e-dropdownlist .e-input-group:not(.e-disabled) .e-ddl-icon:active,
@@ -306,7 +311,7 @@
 
 .e-treegrid .e-treecell {
   display: table-cell;
-  line-height: 10px;
+  line-height: normal;
 }
 
 .e-treegrid .e-grid.e-wrap .e-rowcell .e-treecolumn-container {