@syncfusion/ej2-treegrid 21.1.38 → 21.1.41

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

@@ -1535,9 +1535,10 @@ class Render {
                 args.row.style.display = 'none';
             }
         }
+        const dragStartData = 'dragStartData';
         const 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) {
             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')) {
@@ -4326,6 +4327,22 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             if (requestType === 'reorder') {
                 this.notify('getColumnIndex', {});
             }
+            if (requestType === 'filterbeforeopen' && args.columnName && this.filterSettings.hierarchyMode !== 'None') {
+                for (let j = 0; j < this.columns.length; j++) {
+                    const fields = 'field';
+                    if (this.columns[parseInt(j.toString(), 10)][`${fields}`] === args.columnName) {
+                        const taskFields = [];
+                        for (let i = 0; i < this.grid.currentViewData.length; i++) {
+                            const fieldValue = this.grid.currentViewData[parseInt(i.toString(), 10)][args.columnName];
+                            if (taskFields.indexOf(fieldValue) === -1) {
+                                taskFields.push(fieldValue);
+                            }
+                        }
+                        args['filterModel'].options.dataSource = taskFields.map((name) => ({ [args.columnName]: name }));
+                        args['filterModel'].options.filteredColumns = args['filterModel'].options.filteredColumns.filter((col) => col.field === args.columnName);
+                    }
+                }
+            }
             if (isRemoteData(this) && this.enableVirtualization) {
                 if (args.requestType === 'virtualscroll') {
                     this.query.expand('VirtualScrollingAction');