@syncfusion/ej2-treegrid 21.1.38 → 21.1.41

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

@@ -1669,9 +1669,10 @@ var Render = /** @__PURE__ @class */ (function () {
                 args.row.style.display = 'none';
             }
         }
+        var dragStartData = 'dragStartData';
         var draggedRecord = 'draggedRecord';
-        if (!isNullOrUndefined(this.parent.rowDragAndDropModule) && !isNullOrUndefined(this.parent.rowDragAndDropModule["" + draggedRecord])
-            && this.parent.getContentTable().scrollHeight <= this.parent.getContent().clientHeight) {
+        if (this.parent.rowDragAndDropModule && this.parent.grid.rowDragAndDropModule && (this.parent.grid.rowDragAndDropModule["" + dragStartData] ||
+            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')) {
@@ -4600,6 +4601,25 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             if (requestType === 'reorder') {
                 _this.notify('getColumnIndex', {});
             }
+            if (requestType === 'filterbeforeopen' && args.columnName && _this.filterSettings.hierarchyMode !== 'None') {
+                for (var j = 0; j < _this.columns.length; j++) {
+                    var fields = 'field';
+                    if (_this.columns[parseInt(j.toString(), 10)]["" + fields] === args.columnName) {
+                        var taskFields = [];
+                        for (var i = 0; i < _this.grid.currentViewData.length; i++) {
+                            var fieldValue = _this.grid.currentViewData[parseInt(i.toString(), 10)][args.columnName];
+                            if (taskFields.indexOf(fieldValue) === -1) {
+                                taskFields.push(fieldValue);
+                            }
+                        }
+                        args['filterModel'].options.dataSource = taskFields.map(function (name) {
+                            var _a;
+                            return (_a = {}, _a[args.columnName] = name, _a);
+                        });
+                        args['filterModel'].options.filteredColumns = args['filterModel'].options.filteredColumns.filter(function (col) { return col.field === args.columnName; });
+                    }
+                }
+            }
             if (isRemoteData(_this) && _this.enableVirtualization) {
                 if (args.requestType === 'virtualscroll') {
                     _this.query.expand('VirtualScrollingAction');