@syncfusion/ej2-gantt 20.4.54 → 21.1.37

package/src/gantt/actions/edit.js

@@ -404,7 +404,7 @@ var Edit = /** @class */ (function () {
         for (var _i = 0, _b = Object.keys(data); _i < _b.length; _i++) {
             var key = _b[_i];
             if ([tasks.startDate, tasks.endDate, tasks.duration].indexOf(key) !== -1) {
-                if (isNullOrUndefined(data[key]) && !ganttObj.allowUnscheduledTasks) {
+                if (isNullOrUndefined(data["" + key]) && !ganttObj.allowUnscheduledTasks) {
                     continue;
                 }
                 if (isFromDialog) {
@@ -459,7 +459,7 @@ var Edit = /** @class */ (function () {
                 else if (key === tasks.name) {
                     ganttPropKey = 'taskName';
                 }
-                else if (key === tasks.segments) {
+                else if ((key === tasks.segments) && (!isNullOrUndefined(ganttData.ganttProperties.segments))) {
                     ganttPropKey = 'segments';
                     /* eslint-disable-next-line */
                     if (data && !isNullOrUndefined(data[this.parent.taskFields.segments]) && data[this.parent.taskFields.segments].length > 0) {
@@ -827,8 +827,10 @@ var Edit = /** @class */ (function () {
      */
     Edit.prototype.updateEditedTask = function (args) {
         var ganttRecord = args.data;
-        this.updateParentChildRecord(ganttRecord);
-        if (this.parent.isConnectorLineUpdate) {
+        if (this.parent.autoCalculateDateScheduling) {
+            this.updateParentChildRecord(ganttRecord);
+        }
+        if (this.parent.isConnectorLineUpdate && this.parent.autoCalculateDateScheduling) {
             /* validating predecessor for updated child items */
             for (var i = 0; i < this.validatedChildItems.length; i++) {
                 var child = this.validatedChildItems[i];
@@ -847,7 +849,7 @@ var Edit = /** @class */ (function () {
                 this.parent.predecessorModule.validatePredecessor(ganttRecord, [], '');
                 this.parent.predecessorModule.isValidatedParentTaskID = '';
             }
-            if (ganttRecord.hasChildRecords && this.parent.previousRecords[ganttRecord.uniqueID].ganttProperties.startDate &&
+            if (this.parent.allowParentDependency && ganttRecord.hasChildRecords && this.parent.previousRecords[ganttRecord.uniqueID].ganttProperties.startDate &&
                 (args.action === "DrawConnectorLine")) {
                 this.updateChildItems(ganttRecord);
             }
@@ -855,7 +857,9 @@ var Edit = /** @class */ (function () {
         }
         /** Update parent up-to zeroth level */
         if (ganttRecord.parentItem) {
-            this.parent.dataOperation.updateParentItems(ganttRecord, true);
+            if (this.parent.autoCalculateDateScheduling) {
+                this.parent.dataOperation.updateParentItems(ganttRecord, true);
+            }
             var parentData = this.parent.getRecordByID(ganttRecord.parentItem.taskId);
             if (!parentData.ganttProperties.predecessorsName) {
                 this.parent.predecessorModule.validatePredecessor(parentData, [], '');
@@ -1101,7 +1105,7 @@ var Edit = /** @class */ (function () {
             durationDiff = this.parent.dateValidationModule.getDuration(validStartDate, validEndDate, 'minute', true, false);
         }
         for (var i = 0; i < childRecords.length; i++) {
-            if ((!(this.parent.isUnscheduledTask(childRecords[i].ganttProperties))) && (childRecords[i].ganttProperties.isAutoSchedule)) {
+            if (childRecords[i].ganttProperties.isAutoSchedule) {
                 if (durationDiff > 0) {
                     var startDate = isScheduledTask(childRecords[i].ganttProperties) ?
                         childRecords[i].ganttProperties.startDate : childRecords[i].ganttProperties.startDate ?
@@ -1219,52 +1223,52 @@ var Edit = /** @class */ (function () {
         }
         for (var i = 0; i < eLength; i++) {
             if (e.changedRecords) {
-                rec = e.changedRecords[i];
+                rec = e.changedRecords[parseInt(i.toString(), 10)];
             }
             else {
-                rec = e[i];
+                rec = e[parseInt(i.toString(), 10)];
             }
             var _aLength = Object.keys(rec).length;
             for (var j = 0, _a = Object.keys(rec); j < _aLength; j++) {
-                var key = _a[j];
-                this.parent.editedRecords[i][key] = rec[key];
-                this.parent.editedRecords[i].taskData[key] = rec[key];
+                var key = _a[parseInt(j.toString(), 10)];
+                this.parent.editedRecords[parseInt(i.toString(), 10)]["" + key] = rec["" + key];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].taskData["" + key] = rec["" + key];
             }
             if (this.parent.taskFields.id !== null) {
-                this.parent.editedRecords[i].ganttProperties["taskId"] = rec[this.parent.taskFields.id];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['taskId'] = rec[this.parent.taskFields.id];
             }
             if (this.parent.taskFields.name !== null) {
-                this.parent.editedRecords[i].ganttProperties["taskName"] = rec[this.parent.taskFields.name];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['taskName'] = rec[this.parent.taskFields.name];
             }
             if (this.parent.taskFields.startDate !== null) {
-                this.parent.editedRecords[i].ganttProperties["startDate"] = rec[this.parent.taskFields.startDate];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['startDate'] = rec[this.parent.taskFields.startDate];
             }
             if (this.parent.taskFields.endDate !== null) {
-                this.parent.editedRecords[i].ganttProperties["endDate"] = rec[this.parent.taskFields.endDate];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['endDate'] = rec[this.parent.taskFields.endDate];
             }
             if (this.parent.taskFields.duration !== null) {
-                this.parent.editedRecords[i].ganttProperties["duration"] = parseInt(rec[this.parent.taskFields.duration]);
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['duration'] = parseInt(rec[this.parent.taskFields.duration]);
             }
             if (this.parent.taskFields.durationUnit !== null) {
-                this.parent.editedRecords[i].ganttProperties["durationUnit"] = rec[this.parent.taskFields.durationUnit];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['durationUnit'] = rec[this.parent.taskFields.durationUnit];
             }
             if (this.parent.taskFields.progress !== null) {
-                this.parent.editedRecords[i].ganttProperties["progress"] = rec[this.parent.taskFields.progress];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['progress'] = rec[this.parent.taskFields.progress];
             }
             if (this.parent.taskFields.dependency !== null) {
-                this.parent.editedRecords[i].ganttProperties["dependency"] = rec[this.parent.taskFields.dependency];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['dependency'] = rec[this.parent.taskFields.dependency];
             }
             if (this.parent.taskFields.parentID !== null) {
-                this.parent.editedRecords[i].ganttProperties["parentID"] = rec[this.parent.taskFields.parentID];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['parentID'] = rec[this.parent.taskFields.parentID];
             }
             if (this.parent.taskFields.baselineEndDate !== null) {
-                this.parent.editedRecords[i].ganttProperties["baselineEndDate"] = rec[this.parent.taskFields.baselineEndDate];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['baselineEndDate'] = rec[this.parent.taskFields.baselineEndDate];
             }
             if (this.parent.taskFields.baselineStartDate !== null) {
-                this.parent.editedRecords[i].ganttProperties["baselineStartDate"] = rec[this.parent.taskFields.baselineStartDate];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['baselineStartDate'] = rec[this.parent.taskFields.baselineStartDate];
             }
             if (this.parent.taskFields.resourceInfo !== null) {
-                this.parent.editedRecords[i].ganttProperties["resources"] = rec[this.parent.taskFields.resourceInfo];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['resources'] = rec[this.parent.taskFields.resourceInfo];
             }
         }
         this.saveSuccess(args);
@@ -1333,6 +1337,14 @@ var Edit = /** @class */ (function () {
         }
         if (!this.isTreeGridRefresh) {
             this.parent.chartRowsModule.refreshRecords(this.parent.editedRecords);
+            if (this.parent.viewType === 'ResourceView' && !this.parent.allowTaskbarOverlap && this.parent.showOverAllocation) {
+                this.parent.contentHeight = this.parent['element'].getElementsByClassName('e-content')[0].children[0]['offsetHeight'];
+                this.parent.ganttChartModule.chartBodyContent.style.height = this.parent.contentHeight + 'px';
+                this.parent.ganttChartModule.renderRangeContainer(this.parent.currentViewData);
+                if (this.parent.taskFields.dependency) {
+                    this.parent.ganttChartModule.reRenderConnectorLines();
+                }
+            }
             if (this.parent.isConnectorLineUpdate && !isNullOrUndefined(this.parent.connectorLineEditModule)) {
                 this.parent.updatedConnectorLineCollection = [];
                 this.parent.connectorLineIds = [];
@@ -2248,15 +2260,24 @@ var Edit = /** @class */ (function () {
                 if (parentTask && parentTask.ganttProperties.taskName !==
                     this_2.parent.localeObj.getConstant('unassignedTask') && isDuplicate.length === 0) {
                     this_2.checkWithUnassignedTask(updateUnAssignedResources_1[i]);
-                    if (parentTask) {
-                        this_2.parent.dataOperation.updateParentItems(updateUnAssignedResources_1[i].parentItem);
-                    }
                 }
                 else if (!parentTask && (!isDuplicate || isDuplicate.length === 0)) {
                     this_2.checkWithUnassignedTask(updateUnAssignedResources_1[i]);
-                    if (updateUnAssignedResources_1[i].parentItem && unassignedTask) {
-                        this_2.parent.dataOperation.updateParentItems(updateUnAssignedResources_1[i].parentItem);
+                }
+                unassignedTask = this_2.parent.flatData.filter(function (data) {
+                    return data.ganttProperties.taskName === _this.parent.localeObj.getConstant('unassignedTask');
+                })[0];
+                var parentItem = this_2.parent.currentViewData.filter(function (data) {
+                    if (data.ganttProperties.taskId == updateUnAssignedResources_1[i].ganttProperties.taskId && (!data.hasChildRecords && data.parentItem)
+                        && unassignedTask.uniqueID === data.parentItem.uniqueID) {
+                        return data;
                     }
+                    else {
+                        return null;
+                    }
+                });
+                if (parentItem[0]) {
+                    this_2.parent.dataOperation.updateParentItems(parentItem[0]);
                 }
             };
             var this_2 = this;
@@ -2866,7 +2887,7 @@ var Edit = /** @class */ (function () {
                 if (!isNullOrUndefined(ganttData)) {
                     _this.validateUpdateValues(args.newTaskData, ganttData, true);
                 }
-                if (!isNullOrUndefined(args.data[tempTaskID])) {
+                if (!isNullOrUndefined(args.data["" + tempTaskID])) {
                     if (args.data[tempTaskID] != args.data['ganttProperties']['taskId']) {
                         args.data['ganttProperties']['taskId'] = args.data[tempTaskID];
                         args.newTaskData[tempTaskID] = args.data[tempTaskID];

package/src/gantt/actions/filter.d.ts

@@ -4,7 +4,7 @@ import { Gantt } from '../base/gantt';
  */
 export declare class Filter {
     parent: Gantt;
-    private filterMenuElement;
+    filterMenuElement: HTMLElement;
     constructor(gantt: Gantt);
     private getModuleName;
     /**
@@ -39,6 +39,7 @@ export declare class Filter {
     private actionBegin;
     closeFilterOnContextClick(element: Element): void;
     private actionComplete;
+    private setPosition;
     private updateFilterMenuPosition;
     private removeEventListener;
     /**

package/src/gantt/actions/filter.js

@@ -1,5 +1,5 @@
 import { TreeGrid, Filter as TreeGridFilter } from '@syncfusion/ej2-treegrid';
-import { filterAfterOpen } from '@syncfusion/ej2-grids';
+import { filterAfterOpen, getFilterMenuPostion } from '@syncfusion/ej2-grids';
 import { getActualProperties, getCustomDateFormat } from '@syncfusion/ej2-grids';
 import { getValue, isNullOrUndefined, remove, createElement, addClass, closest, EventHandler } from '@syncfusion/ej2-base';
 import { TextBox } from '@syncfusion/ej2-inputs';
@@ -255,9 +255,95 @@ var Filter = /** @class */ (function () {
             }
         }
     };
+    Filter.prototype.setPosition = function (li, ul) {
+        var gridPos = this.parent.element.getBoundingClientRect();
+        var gridPosTop = gridPos.top;
+        var gridPosLeft = gridPos.left;
+        var parentNode;
+        var parentNodeTop;
+        var parentNodeLeft;
+        var paddingTop;
+        var paddingLeft;
+        var marginTop;
+        var marginLeft;
+        if (!isNullOrUndefined(this.parent.element.parentNode) && this.parent.element.parentNode['tagName'] != 'BODY') {
+            parentNode = this.parent.element.parentNode;
+            parentNodeTop = parentNode.getBoundingClientRect().top;
+            marginTop = parentNode.style.marginTop;
+            while (true) {
+                if (Math.abs(gridPosTop) > Math.abs(parentNodeTop)) {
+                    paddingTop = gridPosTop - parentNodeTop;
+                    break;
+                }
+                if (!isNullOrUndefined(this.parent.element.parentNode)) {
+                    parentNode = parentNode.parentNode;
+                    marginTop = parentNode.parentNode.style.marginTop;
+                }
+                parentNodeTop = parentNode.getBoundingClientRect().top;
+            }
+            parentNodeLeft = parentNode.getBoundingClientRect().left;
+            marginLeft = parentNode.style.marginLeft;
+            while (true) {
+                if (Math.abs(gridPosLeft) > Math.abs(parentNodeLeft)) {
+                    paddingLeft = gridPosLeft - parentNodeLeft;
+                    break;
+                }
+                if (!isNullOrUndefined(this.parent.element.parentNode)) {
+                    parentNode = parentNode.parentNode;
+                    marginLeft = parentNode.style.marginLeft;
+                }
+                parentNodeLeft = parentNode.getBoundingClientRect().left;
+            }
+        }
+        var liPos = li.getBoundingClientRect();
+        var left = liPos.right + window.scrollX;
+        var top = liPos.top + window.scrollY;
+        if (gridPos.right < (left + ul.offsetWidth)) {
+            if ((liPos.left - ul.offsetWidth) > gridPos.left) {
+                left = (liPos.left - ul.offsetWidth);
+            }
+            else {
+                left -= (left + ul.offsetWidth) - gridPos.right;
+            }
+        }
+        else {
+            if (!isNullOrUndefined(paddingTop) && !isNullOrUndefined(paddingLeft)) {
+                left = Math.abs(liPos.right - gridPos.left);
+                top = Math.abs(liPos.top - gridPos.top);
+            }
+        }
+        if (!isNullOrUndefined(paddingTop) && !isNullOrUndefined(paddingLeft)) {
+            ul.style.top = typeof (parseInt(marginTop)) === "string" ? (top + paddingTop + parseInt(marginTop)) + 'px' : (top + paddingTop) + 'px';
+            ul.style.left = typeof (parseInt(marginLeft)) === "string" ? (left + paddingLeft + parseInt(marginLeft) + 8) + 'px' : (left + paddingLeft) + 'px';
+        }
+        else {
+            ul.style.top = top + 'px';
+            ul.style.left = left + 'px';
+        }
+    };
     Filter.prototype.updateFilterMenuPosition = function (element, args) {
         addClass([element], 'e-gantt');
-        document.querySelector('#' + this.parent.treeGrid.grid.element.id).appendChild(element);
+        document.querySelector('#' + this.parent.controlId).appendChild(element);
+        var targetElement;
+        if (this.parent.showColumnMenu) {
+            targetElement = document.querySelector('#treeGrid' + this.parent.controlId + '_gridcontrol_colmenu_Filter');
+            element.style.zIndex = targetElement.parentElement.style.zIndex;
+            if (this.parent.treeGrid.filterSettings.type === 'Menu') {
+                this.setPosition(targetElement, getValue('filterModel.dlgObj.element', args));
+            }
+            else {
+                this.setPosition(targetElement, getValue('filterModel.dialogObj.element', args));
+            }
+        }
+        else {
+            targetElement = this.parent.treeGrid.grid.getColumnHeaderByField(args.columnName).querySelector('.e-filtermenudiv');
+            if (this.parent.treeGrid.filterSettings.type === 'Menu') {
+                getFilterMenuPostion(targetElement, getValue('filterModel.dlgObj', args));
+            }
+            else {
+                getFilterMenuPostion(targetElement, getValue('filterModel.dialogObj', args));
+            }
+        }
         if (this.parent.treeGrid.filterSettings.type === 'Menu') {
             element.querySelector('.e-valid-input').focus();
         }

package/src/gantt/actions/keyboard.js

@@ -230,7 +230,6 @@ var FocusModule = /** @class */ (function () {
                     var top_1 = containerPosition.top + (containerPosition.height / 2);
                     var left = containerPosition.left + (containerPosition.width / 2);
                     this.setActiveElement(e.target);
-                    // eslint-disable-next-line security/detect-non-literal-fs-filename
                     contextMenu.open(top_1, left);
                     e.preventDefault();
                     break;

package/src/gantt/actions/pdf-export.d.ts

@@ -11,6 +11,8 @@ export declare class PdfExport {
     private pdfDocument;
     gantt: PdfGantt;
     isPdfExport: boolean;
+    private isBlob;
+    private blobPromise;
     /**
      * @param {Gantt} parent .
      * @hidden
@@ -34,7 +36,7 @@ export declare class PdfExport {
      * @param {object} pdfDoc .
      * @returns {Promise<Object>} .
      */
-    export(pdfExportProperties?: PdfExportProperties, isMultipleExport?: boolean, pdfDoc?: Object): Promise<Object>;
+    export(pdfExportProperties?: PdfExportProperties, isMultipleExport?: boolean, pdfDoc?: Object, isBlob?: boolean): Promise<Object>;
     private exportWithData;
     private processExport;
     private processSectionExportProperties;

package/src/gantt/actions/pdf-export.js

@@ -45,8 +45,9 @@ var PdfExport = /** @class */ (function () {
      * @param {object} pdfDoc .
      * @returns {Promise<Object>} .
      */
-    PdfExport.prototype.export = function (pdfExportProperties, isMultipleExport, pdfDoc) {
+    PdfExport.prototype.export = function (pdfExportProperties, isMultipleExport, pdfDoc, isBlob) {
         var _this = this;
+        this.isBlob = isBlob;
         var args = {
             requestType: 'beforePdfExport',
             ganttObject: this.parent,
@@ -90,7 +91,7 @@ var PdfExport = /** @class */ (function () {
             this.pdfDocument = new PdfDocument();
         }
         this.processExport(data, pdfExportProperties, isMultipleExport).then(function () {
-            _this.parent.trigger('pdfExportComplete', {});
+            _this.parent.trigger('pdfExportComplete', _this.isBlob ? { promise: _this.blobPromise } : {});
             if (!isNullOrUndefined(_this.parent.loadingIndicator) && _this.parent.loadingIndicator.indicatorType === "Shimmer") {
                 _this.parent.hideMaskRow();
             }
@@ -116,12 +117,17 @@ var PdfExport = /** @class */ (function () {
             var layouter = _this.gantt.drawGrid(pdfPage, 0, 0, format);
             _this.gantt.drawChart(layouter);
             if (!isMultipleExport) {
-                // save the PDF
-                if (!isNullOrUndefined(pdfExportProperties) && pdfExportProperties.fileName) {
-                    _this.pdfDocument.save(pdfExportProperties.fileName);
+                if (!_this.isBlob) {
+                    // save the PDF
+                    if (!isNullOrUndefined(pdfExportProperties) && pdfExportProperties.fileName) {
+                        _this.pdfDocument.save(pdfExportProperties.fileName);
+                    }
+                    else {
+                        _this.pdfDocument.save('Export.pdf');
+                    }
                 }
                 else {
-                    _this.pdfDocument.save('Export.pdf');
+                    _this.blobPromise = _this.pdfDocument.save();
                 }
                 _this.pdfDocument.destroy();
             }

package/src/gantt/actions/rowdragdrop.js

@@ -348,7 +348,7 @@ var RowDD = /** @class */ (function () {
                         parentUniqueID = this.droppedRecord.uniqueID;
                     }
                     else {
-                        parentUniqueID = this.droppedRecord.parentItem.uniqueID;
+                        parentUniqueID = this.droppedRecord.parentItem ? this.droppedRecord.parentItem.uniqueID : this.droppedRecord.uniqueID;
                     }
                     var droppedParentItem = this.parent.getTaskByUniqueID(parentUniqueID);
                     var editedObj = {};
@@ -375,7 +375,7 @@ var RowDD = /** @class */ (function () {
                         this.updateSharedResourceTask();
                     }
                 }
-                if (this.parent.taskFields.dependency) {
+                if (this.parent.taskFields.dependency && this.parent.allowParentDependency) {
                     var isValidPredecessor = true;
                     var draggedParent = void 0;
                     var toParent_1;

package/src/gantt/actions/selection.js

@@ -307,7 +307,10 @@ var Selection = /** @class */ (function () {
             var rIndex = parseInt(selectedRow.getAttribute('aria-rowindex'), 10);
             var isToggle = this.parent.selectionSettings.enableToggle;
             if (this.parent.selectionSettings.type === 'Single' || (!this.isMultiCtrlRequest && !this.isMultiShiftRequest)) {
-                this.selectRow(rIndex, isToggle);
+                if (!this.parent.allowTaskbarDragAndDrop || (this.parent.allowTaskbarDragAndDrop && (this.parent.rowDragAndDropModule &&
+                    !this.parent.rowDragAndDropModule['draggedRecord']))) {
+                    this.selectRow(rIndex, isToggle);
+                }
             }
             else {
                 if (this.isMultiShiftRequest) {
@@ -351,7 +354,7 @@ var Selection = /** @class */ (function () {
     };
     Selection.prototype.addRemoveClass = function (records) {
         if (typeof (records) == "number") {
-            records = Array.from(String(records), function (num) { return Number(num); });
+            records = [records];
         }
         var ganttRow = [].slice.call(this.parent.ganttChartModule.chartBodyContent.querySelector('tbody').children);
         var _loop_1 = function (i) {

package/src/gantt/actions/taskbar-edit.d.ts

@@ -47,6 +47,11 @@ export declare class TaskbarEdit extends DateProcessor {
     private elementOffsetHeight;
     segmentIndex: number;
     private targetElement;
+    currentItemTop: number;
+    currentItemPrevTop: number;
+    topValue: number;
+    draggedRecordMarginTop: number;
+    dragMoveY: number;
     constructor(ganttObj?: Gantt);
     private wireEvents;
     /**

package/src/gantt/actions/taskbar-edit.js

@@ -42,6 +42,10 @@ var TaskbarEdit = /** @class */ (function (_super) {
         _this.elementOffsetWidth = 0;
         _this.elementOffsetHeight = 0;
         _this.segmentIndex = -1;
+        _this.currentItemTop = 0;
+        _this.currentItemPrevTop = 0;
+        _this.topValue = 0;
+        _this.draggedRecordMarginTop = 0;
         _this.parent = ganttObj;
         _this.initPublicProp();
         _this.wireEvents();
@@ -284,7 +288,9 @@ var TaskbarEdit = /** @class */ (function (_super) {
                         if (!isNullOrUndefined(parentRecord) && !parentRecord.expanded) {
                             this.prevZIndex = (this.taskBarEditElement).style.zIndex;
                             (this.taskBarEditElement).style.zIndex = '1000';
-                            addClass([this.taskBarEditElement.querySelector('.e-gantt-child-taskbar')], 'e-collapsed-taskbar-drag');
+                            if (this.taskBarEditElement.querySelector('.e-gantt-child-taskbar')) {
+                                addClass([this.taskBarEditElement.querySelector('.e-gantt-child-taskbar')], 'e-collapsed-taskbar-drag');
+                            }
                         }
                     }
                 }
@@ -448,9 +454,20 @@ var TaskbarEdit = /** @class */ (function (_super) {
                     this.parent.ganttChartModule.scrollObject.previousScroll.left;
             }
             this.tooltipPositionX = this.mouseDownX;
-            this.mouseDownY = e.pageY - containerPosition.top +
+            this.mouseDownY = this.dragMoveY = e.pageY - containerPosition.top +
                 this.parent.ganttChartModule.scrollObject.previousScroll.top;
         }
+        if (this.parent.viewType == "ResourceView" && this.parent.allowTaskbarDragAndDrop) {
+            var toolbarHeight = 0;
+            if (!isNullOrUndefined(this.parent.toolbarModule) && !isNullOrUndefined(this.parent.toolbarModule.element)) {
+                toolbarHeight = this.parent.toolbarModule.element.offsetHeight;
+            }
+            this.topValue = this.parent.getOffsetRect(event.target).top - this.parent.getOffsetRect(this.parent.element).top -
+                parseInt((closest(event.target, '.e-taskbar-main-container'))['style'].marginTop) -
+                this.parent.element.getElementsByClassName('e-timeline-header-container')[0]['offsetHeight'] -
+                toolbarHeight + document.getElementsByClassName('e-chart-scroll-container e-content')[0].scrollTop;
+            this.currentItemPrevTop = this.currentItemTop = this.topValue;
+        }
         if (this.taskBarEditAction === 'ConnectorPointLeftDrag' || this.taskBarEditAction === 'ConnectorPointRightDrag') {
             this.fromPredecessorText = this.taskBarEditAction === 'ConnectorPointLeftDrag' ? 'start' : 'finish';
             this.parent.connectorLineModule.tooltipTable.innerHTML = this.parent.connectorLineModule.getConnectorLineTooltipInnerTd(this.taskBarEditRecord.ganttProperties.taskName, this.fromPredecessorText, '', '');
@@ -582,6 +599,22 @@ var TaskbarEdit = /** @class */ (function (_super) {
                     this.drawFalseLine();
                 }
             }
+            if (this.parent.viewType == 'ResourceView' && this.parent.allowTaskbarDragAndDrop) {
+                if (this.dragMoveY > this.mouseMoveY) {
+                    this.mouseMoveY = this.dragMoveY - this.mouseMoveY;
+                    this.currentItemTop = this.currentItemTop - this.mouseMoveY;
+                }
+                else {
+                    this.mouseMoveY -= this.dragMoveY;
+                    this.currentItemTop = this.currentItemTop + this.mouseMoveY;
+                }
+                var containerPosition = this.parent.getOffsetRect(this.parent.ganttChartModule.chartBodyContainer);
+                this.dragMoveY = e.pageY - containerPosition.top + this.parent.ganttChartModule.scrollObject.previousScroll.top;
+                this.topValue = this.currentItemTop;
+                this.currentItemPrevTop = (this.currentItemPrevTop === 0 ||
+                    this.topValue == this.currentItemTop) ? this.topValue :
+                    this.currentItemPrevTop;
+            }
             this.setItemPosition();
             this.updateEditedItem();
             this.editTooltip.updateTooltip(this.segmentIndex);
@@ -661,12 +694,12 @@ var TaskbarEdit = /** @class */ (function (_super) {
                 this.timerCount = this.parent.ganttChartModule.scrollObject.previousScroll.left;
                 this.startScrollTimer('left');
             }
-            else if (isConnectorLineEdit && ((mouseY + 80) >
+            else if (((mouseY + 80) >
                 containerPosition.top + this.parent.ganttChartModule.chartBodyContainer.offsetHeight)) {
                 this.timerCount = this.parent.ganttChartModule.scrollObject.previousScroll.top;
                 this.startScrollTimer('bottom');
             }
-            else if (isConnectorLineEdit && ((mouseY - 20) < containerPosition.top)) {
+            else if (((mouseY - 20) < containerPosition.top)) {
                 this.timerCount = this.parent.ganttChartModule.scrollObject.previousScroll.top;
                 this.startScrollTimer('top');
             }
@@ -1452,6 +1485,11 @@ var TaskbarEdit = /** @class */ (function (_super) {
                 taskBarMainContainer.style.width = (width) + 'px';
                 leftLabelContainer.style.width = (item.left) + 'px';
                 taskBarMainContainer.style.setProperty(position, (item.left) + 'px');
+                if (this.parent.viewType === 'ResourceView' && this.parent.allowTaskbarDragAndDrop && this.parent.rowDragAndDropModule &&
+                    (this.taskBarEditAction === 'ChildDrag' || this.taskBarEditAction === 'MilestoneDrag')) {
+                    taskBarMainContainer.style.setProperty('top', (this.topValue) + 'px');
+                    taskBarMainContainer.style.zIndex = '4';
+                }
                 if (this.taskBarEditAction === 'LeftResizing' && this.segmentIndex === 0) {
                     var parent_1 = this.taskBarEditElement.parentElement;
                     var segmentedTasks = parent_1.getElementsByClassName('e-segmented-taskbar');
@@ -1564,7 +1602,8 @@ var TaskbarEdit = /** @class */ (function (_super) {
         this.previousMouseMove = null;
         this.editTooltip.showHideTaskbarEditTooltip(false, this.segmentIndex);
         if (this.taskBarEditAction && this.isMouseDragged) {
-            if (!this.dragMouseLeave && this.taskBarEditedAction) {
+            if ((!this.dragMouseLeave && this.taskBarEditedAction) || (this.parent.viewType === 'ResourceView' &&
+                this.parent.allowTaskbarDragAndDrop)) {
                 this.taskBarEditedAction(e);
                 this.isMouseDragged = false;
             }
@@ -1673,6 +1712,65 @@ var TaskbarEdit = /** @class */ (function (_super) {
         var args = extend({}, arg);
         var ganttRecord = args.data;
         var taskData = ganttRecord.ganttProperties;
+        var draggedRecIndex = this.parent.currentViewData.indexOf(ganttRecord);
+        if ((args.taskBarEditAction === 'MilestoneDrag' || args.taskBarEditAction === 'ChildDrag') && this.parent.viewType === "ResourceView"
+            && this.parent.allowTaskbarDragAndDrop && this.dragMoveY > 0) {
+            if (this.parent.rowDragAndDropModule) {
+                var flatRecordCol = this.parent.currentViewData;
+                if (flatRecordCol[this.taskBarEditRecord.parentItem.index] && ((this.parent.editedRecords.indexOf(flatRecordCol[this.taskBarEditRecord.parentItem.index]) === -1))) {
+                    this.parent.editedRecords.push(flatRecordCol[this.taskBarEditRecord.parentItem.index]);
+                }
+                var ganttrec = void 0;
+                var resHeight = 0;
+                var rowCount = 0;
+                var childIndex_1;
+                var droppedRecord = void 0;
+                var treeGridrows = this.parent.treeGrid.getRows().length;
+                for (var i = 0; i < treeGridrows; i++) {
+                    if (resHeight < this.dragMoveY && this.parent.getRowByIndex(i).style.display !== 'none') {
+                        rowCount = i;
+                        resHeight = resHeight + parseInt(this.parent.getRowByIndex(i).style.height);
+                        if (!flatRecordCol[i].parentItem) {
+                            ganttrec = flatRecordCol[i];
+                        }
+                        else {
+                            ganttrec = this.parent.getRecordByID(flatRecordCol[i].parentItem.taskId);
+                        }
+                    }
+                }
+                var draggedRecordtaskbar = this.parent.getRowByIndex(draggedRecIndex).getElementsByClassName('e-taskbar-main-container');
+                var taskbarContainer = this.parent.getRowByIndex(rowCount).getElementsByClassName('e-taskbar-main-container');
+                for (var j = 0; j < taskbarContainer.length; j++) {
+                    if (taskbarContainer[j]['offsetTop'] < this.dragMoveY && draggedRecordtaskbar[0].getAttribute('rowuniqueid') !==
+                        taskbarContainer[j].getAttribute('rowuniqueid')) {
+                        this.draggedRecordMarginTop = taskbarContainer[j]['style'].marginTop;
+                        childIndex_1 = taskbarContainer[j].getAttribute('rowuniqueid');
+                    }
+                }
+                if (childIndex_1) {
+                    droppedRecord = this.parent.currentViewData.filter(function (data) {
+                        if (data['rowUniqueID'] === childIndex_1) {
+                            return data;
+                        }
+                        else {
+                            return null;
+                        }
+                    });
+                }
+                if (droppedRecord) {
+                    var droppedRecordIndex = this.parent.currentViewData.indexOf(droppedRecord[0]);
+                    var position = (droppedRecord[0].hasChildRecords || (!droppedRecord[0].parentItem &&
+                        droppedRecord[0].childRecords.length == 0)) ? 'child' : 'below';
+                    if (this.parent.rowDragAndDropModule) {
+                        this.parent.rowDragAndDropModule.reorderRows([draggedRecIndex], droppedRecordIndex, position);
+                    }
+                    this.dragMoveY = 0;
+                }
+            }
+            if (this.parent.viewType === 'ResourceView' && this.parent.showOverAllocation) {
+                this.parent.ganttChartModule.renderOverAllocationContainer();
+            }
+        }
         if (args.taskBarEditAction === 'ProgressResizing') {
             if (args.previousData.progress !== taskData.progress) {
                 this.parent.setRecordValue('progress', this.getProgressPercent(taskData.width, taskData.progressWidth), taskData, true);
@@ -1864,14 +1962,20 @@ var TaskbarEdit = /** @class */ (function (_super) {
             }
             if ((this.parent.virtualScrollModule && this.parent.enableVirtualization &&
                 !this.elementOffsetLeft) || !this.parent.enableVirtualization) {
-                if (this.taskBarEditElement.children[0].classList.contains('e-manualparent-main-container')) {
-                    this.elementOffsetLeft = this.taskBarEditElement.children[0]['offsetLeft'] + this.taskBarEditElement.offsetLeft;
-                    this.elementOffsetTop = ((this.taskBarEditElement.offsetTop - 5) + this.taskBarEditElement.children[0]['offsetTop']) + scrollTop;
-                }
-                else {
+                if (!this.parent.allowParentDependency) {
                     this.elementOffsetLeft = this.taskBarEditElement.offsetLeft;
                     this.elementOffsetTop = this.taskBarEditElement.offsetTop + scrollTop;
                 }
+                else {
+                    if (this.taskBarEditElement.children[0].classList.contains('e-manualparent-main-container')) {
+                        this.elementOffsetLeft = this.taskBarEditElement.children[0]['offsetLeft'] + this.taskBarEditElement.offsetLeft;
+                        this.elementOffsetTop = ((this.taskBarEditElement.offsetTop - 5) + this.taskBarEditElement.children[0]['offsetTop']) + scrollTop;
+                    }
+                    else {
+                        this.elementOffsetLeft = this.taskBarEditElement.offsetLeft;
+                        this.elementOffsetTop = this.taskBarEditElement.offsetTop + scrollTop;
+                    }
+                }
                 this.elementOffsetWidth = this.taskBarEditElement.offsetWidth;
                 this.elementOffsetHeight = this.taskBarEditElement.offsetHeight;
             }