@syncfusion/ej2-gantt 23.2.7 → 24.1.43

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

@@ -22,7 +22,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { isNullOrUndefined, createElement, extend, addClass, remove, removeClass, closest, merge } from '@syncfusion/ej2-base';
+import { isNullOrUndefined, createElement, extend, addClass, remove, removeClass, closest, merge, classList, getValue } from '@syncfusion/ej2-base';
 import { parentsUntil } from '../base/utils';
 import { DateProcessor } from '../base/date-processor';
 import * as cls from '../base/css-constants';
@@ -48,6 +48,9 @@ var TaskbarEdit = /** @class */ (function (_super) {
         _this.currentItemPrevTop = 0;
         _this.topValue = 0;
         _this.draggedRecordMarginTop = '0px';
+        _this.isClonedElement = false;
+        _this.updatePosition = false;
+        _this.tooltipValue = 0;
         _this.parent = ganttObj;
         _this.initPublicProp();
         _this.wireEvents();
@@ -293,7 +296,12 @@ var TaskbarEdit = /** @class */ (function (_super) {
                 addClass([resizeElement], 'e-taskbar-resize-div');
                 resizeElement.style.setProperty("width", ganttprop.width + "px");
                 var currentindex = this.editElement.getAttribute('data-segment-index');
-                resizeElement.style.setProperty("left", ((!isNullOrUndefined(ganttprop.segments) ? parentleft + ganttprop.segments[Number(currentindex)].left + "px" : (ganttprop.left) + "px")));
+                if (!isNullOrUndefined(ganttprop.segments) && this.parent.allowTaskbarDragAndDrop && this.taskBarEditAction !== 'LeftResizing' && this.taskBarEditAction !== 'RightResizing' && this.taskBarEditAction !== 'ProgressResizing') {
+                    resizeElement.style.setProperty("left", ((!isNullOrUndefined(ganttprop.segments) ? parentleft + "px" : (ganttprop.left) + "px")));
+                }
+                else {
+                    resizeElement.style.setProperty("left", ((!isNullOrUndefined(ganttprop.segments) ? parentleft + ganttprop.segments[Number(currentindex)].left + "px" : (ganttprop.left) + "px")));
+                }
                 var resizeTable = this.parent.createElement('table');
                 var resizetableBody = this.parent.createElement("tbody");
                 resizetableBody.appendChild(resizeElement);
@@ -304,11 +312,21 @@ var TaskbarEdit = /** @class */ (function (_super) {
                     var cloneTaskBar = this.editElement.parentElement.cloneNode(true);
                 }
                 else {
-                    var cloneTaskBar = this.editElement.cloneNode(true);
+                    if (this.segmentIndex !== -1 && this.parent.allowTaskbarDragAndDrop && this.taskBarEditAction !== 'LeftResizing' && this.taskBarEditAction !== 'RightResizing' && this.taskBarEditAction !== 'ProgressResizing') {
+                        var cloneTaskBar = this.editElement.parentElement.cloneNode(true);
+                    }
+                    else {
+                        var cloneTaskBar = this.editElement.cloneNode(true);
+                    }
                 }
                 if (!Check) {
                     addClass([cloneTaskBar], 'e-clone-taskbar');
                     cloneTaskBar.style.setProperty("position", "absolute");
+                    if (currentRecord.hasChildRecords && !currentRecord.ganttProperties.isAutoSchedule) {
+                        var containerPosition = this.parent.getOffsetRect(this.parent.ganttChartModule.chartBodyContainer);
+                        var taskbarPosition = this.parent.getOffsetRect(this.editElement);
+                        cloneTaskBar.style.setProperty(this.parent.enableRtl ? "right" : "left", Math.abs(taskbarPosition.left - containerPosition.left + Math.abs(this.parent.ganttChartModule.scrollElement.scrollLeft)) + "px");
+                    }
                     cloneTaskBar.style.setProperty("top", 0 + "px");
                     createTable = this.parent.createElement('table');
                     var tableBody = this.parent.createElement("tbody");
@@ -484,7 +502,7 @@ var TaskbarEdit = /** @class */ (function (_super) {
             action = 'ManualParentDrag';
         }
         else if (data) {
-            action = data.hasChildRecords ? this.parent.taskMode === 'Auto' ? 'ParentDrag' : ''
+            action = data.hasChildRecords ? 'ParentDrag'
                 : data.ganttProperties.isMilestone ? 'MilestoneDrag' : 'ChildDrag';
         }
         return action;
@@ -540,6 +558,125 @@ var TaskbarEdit = /** @class */ (function (_super) {
             this.taskBarEditElement.setAttribute('aria-grabbed', 'true');
         }
     };
+    TaskbarEdit.prototype.removeFirstBorder = function (element) {
+        var canremove = this.parent.rowDragAndDropModule['dropPosition'] === 'bottomSegment';
+        if (this.parent.element.getElementsByClassName('e-firstrow-border').length > 0 && element &&
+            (element.getAttribute('data-rowindex') !== 0 || canremove)) {
+            this.parent.element.getElementsByClassName('e-firstrow-border')[0].remove();
+        }
+    };
+    ;
+    TaskbarEdit.prototype.removeLastBorder = function (element) {
+        var isEmptyRow = element && (element.classList.contains('e-emptyrow') || element.classList.contains('e-columnheader')
+            || element.classList.contains('e-detailrow'));
+        var islastRowIndex;
+        if (this.parent.enableVirtualization) {
+            islastRowIndex = element && !isEmptyRow &&
+                this.parent.treeGrid.getRows()[this.parent.treeGrid.getCurrentViewRecords().length - 1].getAttribute('data-uid') !==
+                    element.getAttribute('data-uid');
+        }
+        else {
+            islastRowIndex = element && !isEmptyRow &&
+                this.parent.treeGrid.getRowByIndex(this.parent.treeGrid.getCurrentViewRecords().length - 1).getAttribute('data-uid') !==
+                    element.getAttribute('data-uid');
+        }
+        var canremove = islastRowIndex || this.parent.rowDragAndDropModule['dropPosition'] === 'topSegment';
+        if (this.parent.element.getElementsByClassName('e-lastrow-border').length > 0 && element && (islastRowIndex || canremove)) {
+            this.parent.element.getElementsByClassName('e-lastrow-border')[0].remove();
+        }
+    };
+    ;
+    TaskbarEdit.prototype.removetopOrBottomBorder = function () {
+        var border;
+        border = [].slice.call(this.parent.element.querySelectorAll('.e-dropbottom, .e-droptop'));
+        if (border.length) {
+            this.addRemoveClasses(border, false, 'e-dropbottom');
+            this.addRemoveClasses(border, false, 'e-droptop');
+        }
+    };
+    ;
+    TaskbarEdit.prototype.topOrBottomBorder = function (target) {
+        var rowElement;
+        if (this.parent.enableVirtualization) {
+            var gridElement = this.parent.treeGrid.getRows().filter(function (data) {
+                return data.getAttribute('data-rowindex') === target.getAttribute('data-rowindex');
+            })[0];
+            var index = this.parent.treeGrid.getRows().indexOf(gridElement);
+            rowElement = this.parent.getRowByIndex(index).children;
+        }
+        else {
+            rowElement = this.parent.getRowByIndex(parseInt(target.getAttribute('data-rowindex'))).children;
+            ;
+        }
+        if (rowElement) {
+            if (this.parent.rowDragAndDropModule['dropPosition'] === 'above') {
+                this.addRemoveClasses(rowElement, true, 'e-droptop');
+                if (this.parent.element.getElementsByClassName('e-lastrow-dragborder').length > 0) {
+                    this.parent.element.getElementsByClassName('e-lastrow-dragborder')[0].remove();
+                }
+            }
+            if (this.parent.rowDragAndDropModule['dropPosition'] === 'below') {
+                this.addRemoveClasses(rowElement, true, 'e-dropbottom');
+            }
+        }
+    };
+    ;
+    TaskbarEdit.prototype.removeChildBorder = function () {
+        var borderElem;
+        borderElem = [].slice.call(this.parent.element.querySelectorAll('.e-childborder'));
+        if (borderElem.length > 0) {
+            this.addRemoveClasses(borderElem, false, 'e-childborder');
+        }
+    };
+    ;
+    TaskbarEdit.prototype.addRemoveClasses = function (cells, add, className) {
+        for (var i = 0, len = cells.length; i < len; i++) {
+            if (add) {
+                cells[parseInt(i.toString(), 10)].classList.add(className);
+            }
+            else {
+                cells[parseInt(i.toString(), 10)].classList.remove(className);
+            }
+        }
+    };
+    ;
+    TaskbarEdit.prototype.addErrorElem = function () {
+        var dragelem = document.getElementsByClassName('e-clone-taskbar')[0];
+        var errorelem = document.querySelectorAll('.e-errorelem').length;
+        if (!errorelem) {
+            var ele = document.createElement('div');
+            classList(ele, ['e-errorcontainer'], []);
+            classList(ele, ['e-icons', 'e-errorelem'], []);
+            if (this.taskBarEditRecord.ganttProperties.segments && this.taskBarEditRecord.ganttProperties.segments.length > 0) {
+                ele.style.paddingTop = this.parent.taskbarHeight + 'px';
+            }
+            dragelem.appendChild(ele);
+        }
+    };
+    TaskbarEdit.prototype.removeErrorElem = function () {
+        var errorelem = document.querySelector('.e-errorelem');
+        if (errorelem) {
+            errorelem.remove();
+        }
+    };
+    ;
+    TaskbarEdit.prototype.ensurePosition = function (draggedRecords, currentRecord) {
+        var _this = this;
+        draggedRecords.filter(function (draggedRecord) {
+            if (draggedRecord.hasChildRecords && !isNullOrUndefined(draggedRecord.childRecords)) {
+                var valid = draggedRecord.childRecords.indexOf(currentRecord);
+                if (valid === -1) {
+                    _this.ensurePosition(draggedRecord.childRecords, currentRecord);
+                }
+                else {
+                    _this.parent.rowDragAndDropModule['dropPosition'] = 'Invalid';
+                    _this.addErrorElem();
+                    return;
+                }
+            }
+        });
+    };
+    ;
     /**
      * To handle mouse move action in chart
      *
@@ -570,7 +707,29 @@ var TaskbarEdit = /** @class */ (function (_super) {
         this.mouseMoveY = e.pageY - containerPosition.top +
             this.parent.ganttChartModule.scrollObject.previousScroll.top;
         this.dragMouseLeave = false;
-        this.isMouseDragCheck();
+        var cancel = false;
+        if (this.taskBarEditAction === 'ChildDrag' || this.taskBarEditAction === 'ParentDrag' || this.taskBarEditAction === 'ManualParentDrag' || this.taskBarEditAction === 'MilestoneDrag') {
+            var ganttRowElement = void 0;
+            if (this.parent.enableVirtualization) {
+                var index = this.parent.currentViewData.indexOf(this.taskBarEditRecord);
+                ganttRowElement = this.parent.getRowByIndex(index);
+            }
+            else {
+                ganttRowElement = this.parent.getRowByIndex(this.taskBarEditRecord.index);
+            }
+            var eventArgs = {
+                cancel: cancel,
+                cloneElement: this.taskbarElement,
+                data: this.taskBarEditRecord,
+                target: event.target,
+                rows: ganttRowElement
+            };
+            this.parent.trigger('rowDrag', eventArgs);
+            cancel = eventArgs['cancel'];
+        }
+        if (!cancel) {
+            this.isMouseDragCheck();
+        }
         if (this.isMouseDragged && this.taskBarEditAction) {
             event.preventDefault();
             if (!isNullOrUndefined(this.taskbarElement) && !isNullOrUndefined(this.editElement) && (this.taskBarEditAction !== "ConnectorPointRightDrag" && this.taskBarEditAction !== "ConnectorPointLeftDrag") && !(this.parent.viewType === 'ResourceView' && this.currentData.hasChildRecords)) {
@@ -578,7 +737,12 @@ var TaskbarEdit = /** @class */ (function (_super) {
                 currentElement.style.setProperty("position", "absolute");
                 if ((this.taskBarEditAction === 'ChildDrag' || this.taskBarEditAction === 'LeftResizing') && !isNullOrUndefined(this.currentIndex) && !isNullOrUndefined(this.currentIndex) ? Number(this.currentIndex) === 0 : false) {
                     this.taskbarElement.childNodes[0].childNodes[0].style.setProperty("top", currentElement.parentElement.offsetTop + "px");
-                    currentElement.parentElement.appendChild(this.taskbarElement);
+                    if (this.parent.allowTaskbarDragAndDrop && this.taskBarEditAction !== 'LeftResizing' && this.taskBarEditAction !== 'RightResizing' && this.taskBarEditAction !== 'ProgressResizing') {
+                        this.parent.chartPane.getElementsByClassName('e-gantt-chart')[0].appendChild(this.taskbarElement);
+                    }
+                    else {
+                        currentElement.parentElement.appendChild(this.taskbarElement);
+                    }
                 }
                 else {
                     if (this.parent.allowTaskbarDragAndDrop && this.taskBarEditAction !== 'LeftResizing' && this.taskBarEditAction !== 'RightResizing' && this.taskBarEditAction !== 'ProgressResizing') {
@@ -593,6 +757,157 @@ var TaskbarEdit = /** @class */ (function (_super) {
                     rootElement[0].appendChild(this.taskbarResizer);
                 }
             }
+            if (this.parent.allowTaskbarDragAndDrop && (this.taskBarEditAction === "ChildDrag" || this.taskBarEditAction === "ParentDrag" ||
+                this.taskBarEditAction === "MilestoneDrag" || this.taskBarEditAction === "ManualParentDrag")) {
+                var taskbarPosition = this.parent.getOffsetRect(this.taskBarEditElement);
+                var left = (!isNullOrUndefined(document.body.className) && document.body.className.includes("e-bigger")) ? 12 : 0;
+                var pointerLeft = (3 + this.parent.chartRowsModule.connectorPointWidth + left);
+                var xValue = void 0;
+                if (this.parent.enableRtl) {
+                    xValue = Math.abs(taskbarPosition.left + pointerLeft + 1);
+                }
+                else {
+                    xValue = Math.abs(taskbarPosition.left - pointerLeft - 1);
+                }
+                if (!this.isClonedElement && !this.parent.enableRtl) {
+                    xValue = xValue - this.parent.ganttChartModule.scrollElement.scrollLeft;
+                    this.isClonedElement = true;
+                }
+                var rowPositionHeight = 0;
+                this.parent.rowDragAndDropModule['dropPosition'] = undefined;
+                var target = void 0;
+                var yValue = void 0;
+                if (event.type === 'touchmove' || event.type === 'touchstart' || event.type === 'touchend') {
+                    yValue = event['changedTouches'][0].pageY;
+                }
+                else {
+                    yValue = event.y;
+                }
+                if (this.parent.enableRtl) {
+                    target = document.elementFromPoint(this.parent.ganttChartModule.chartBodyContainer.offsetWidth, yValue);
+                    if (target.classList.contains('e-taskbar-resize-div')) {
+                        target = document.elementFromPoint(this.parent.ganttChartModule.chartBodyContainer.offsetWidth - target['offsetWidth'], yValue);
+                    }
+                }
+                else {
+                    target = document.elementFromPoint(xValue, yValue);
+                }
+                var draggedTreeGridRowElement = void 0;
+                if (this.parent.enableVirtualization) {
+                    if (!this.draggedTreeGridRowElement) {
+                        var currentElement = this.editElement.parentElement;
+                        draggedTreeGridRowElement = currentElement.parentElement;
+                        this.draggedTreeGridRowElement = draggedTreeGridRowElement;
+                        this.draggedTreeGridRowHeight = this.draggedTreeGridRowElement.offsetHeight;
+                    }
+                }
+                else {
+                    draggedTreeGridRowElement = this.parent.treeGrid.getRows()[this.taskBarEditRecord.index];
+                    this.draggedTreeGridRowElement = draggedTreeGridRowElement;
+                    if (this.parent.viewType === 'ResourceView') {
+                        if (this.taskBarEditRecord.parentItem && !isNullOrUndefined(this.parent.getRowByID(this.taskBarEditRecord.parentItem.taskId))) {
+                            this.draggedTreeGridRowHeight = this.parent.getRowByID(this.taskBarEditRecord.parentItem.taskId).offsetHeight;
+                        }
+                        else {
+                            var currentElement = this.editElement.parentElement;
+                            this.draggedTreeGridRowElement = currentElement.parentElement;
+                            this.draggedTreeGridRowHeight = this.draggedTreeGridRowElement.offsetHeight;
+                        }
+                    }
+                    else {
+                        this.draggedTreeGridRowHeight = this.draggedTreeGridRowElement.offsetHeight;
+                    }
+                }
+                var chartRowElement_1;
+                if (target) {
+                    chartRowElement_1 = closest(target, 'tr.' + cls.chartRow);
+                }
+                if (chartRowElement_1) {
+                    var droppedTreeGridRowElement = void 0;
+                    if (this.parent.enableVirtualization) {
+                        droppedTreeGridRowElement = this.parent.treeGrid.getRows().filter(function (data) {
+                            return data.getAttribute('data-rowindex') === chartRowElement_1.getAttribute('data-rowindex');
+                        })[0];
+                    }
+                    else {
+                        droppedTreeGridRowElement = this.parent.treeGrid.getRows()[parseInt(chartRowElement_1.getAttribute('data-rowindex'))];
+                    }
+                    this.removeFirstBorder(droppedTreeGridRowElement);
+                    this.removeLastBorder(droppedTreeGridRowElement);
+                    if (!isNullOrUndefined(droppedTreeGridRowElement) && droppedTreeGridRowElement.getAttribute('data-uid') === this.draggedTreeGridRowElement.getAttribute('data-uid')
+                        || !parentsUntil(target, 'e-chart-rows-container')) {
+                        this.parent.rowDragAndDropModule['dropPosition'] = 'Invalid';
+                        this.addErrorElem();
+                    }
+                    var tObj = this.parent;
+                    var rowTop = 0;
+                    var toolHeight = tObj.toolbarModule ?
+                        this.parent.toolbarModule.element.offsetHeight : 0;
+                    var positionOffSet = this.parent.getOffsetRect(tObj.element);
+                    var contentHeight = tObj.treeGrid.getHeaderContent().offsetHeight + positionOffSet.top + toolHeight;
+                    var scrollTop = tObj.treeGrid.getContent().firstElementChild.scrollTop;
+                    if (!isNullOrUndefined(droppedTreeGridRowElement)) {
+                        rowPositionHeight = droppedTreeGridRowElement.offsetTop - scrollTop;
+                    }
+                    if (this.parent.enableVirtualization) {
+                        rowTop = this.parent.getOffsetRect(droppedTreeGridRowElement).top;
+                    }
+                    else {
+                        rowTop = rowPositionHeight + contentHeight;
+                    }
+                    var rowBottom = rowTop + this.draggedTreeGridRowHeight;
+                    var difference = rowBottom - rowTop;
+                    var divide = difference / 3;
+                    var topRowSegment = rowTop + divide;
+                    var middleRowSegment = topRowSegment + divide;
+                    var bottomRowSegment = middleRowSegment + divide;
+                    var posy = (event.type === 'mousemove') ? event.pageY : ((!isNullOrUndefined(event['changedTouches'])) ? event['changedTouches'][0].pageY : null);
+                    var isTopSegment = posy <= topRowSegment;
+                    var isMiddleRowSegment = (posy > topRowSegment && posy <= middleRowSegment);
+                    var isBottomRowSegment = (posy > middleRowSegment && posy <= bottomRowSegment);
+                    if (isTopSegment || isMiddleRowSegment || isBottomRowSegment) {
+                        var rowElement = void 0;
+                        if (this.parent.enableVirtualization) {
+                            var index = this.parent.treeGrid.getRows().indexOf(droppedTreeGridRowElement);
+                            rowElement = this.parent.getRowByIndex(index);
+                        }
+                        else {
+                            rowElement = this.parent.getRowByIndex(parseInt(droppedTreeGridRowElement.getAttribute('data-rowindex')));
+                        }
+                        var rowIndex = getValue('rowIndex', rowElement);
+                        var droppedTreeGridRecord = this.parent.flatData[rowIndex];
+                        var isValid = true;
+                        if (this.parent.viewType === 'ResourceView' && !this.taskBarEditRecord.hasChildRecords && !droppedTreeGridRecord.hasChildRecords && this.taskBarEditRecord.parentItem.taskId === droppedTreeGridRecord.parentItem.taskId) {
+                            isValid = false;
+                        }
+                        if (droppedTreeGridRecord) {
+                            this.ensurePosition([this.taskBarEditRecord], droppedTreeGridRecord);
+                        }
+                        if (isValid) {
+                            if (isTopSegment && this.parent.rowDragAndDropModule['dropPosition'] !== 'Invalid') {
+                                this.parent.rowDragAndDropModule['dropPosition'] = 'above';
+                                this.removeChildBorder();
+                                this.removeErrorElem();
+                                this.removetopOrBottomBorder();
+                                this.topOrBottomBorder(rowElement);
+                            }
+                            if (isMiddleRowSegment && this.parent.rowDragAndDropModule['dropPosition'] !== 'Invalid') {
+                                this.parent.rowDragAndDropModule['dropPosition'] = 'child';
+                                this.removetopOrBottomBorder();
+                                this.addRemoveClasses(rowElement.children, true, 'e-childborder');
+                            }
+                            if (isBottomRowSegment && this.parent.rowDragAndDropModule['dropPosition'] !== 'Invalid') {
+                                this.parent.rowDragAndDropModule['dropPosition'] = 'below';
+                                this.removetopOrBottomBorder();
+                                this.removeErrorElem();
+                                this.removeChildBorder();
+                                this.removeFirstBorder(droppedTreeGridRowElement);
+                                this.topOrBottomBorder(droppedTreeGridRowElement);
+                            }
+                        }
+                    }
+                }
+            }
             var args_1 = {
                 cancel: false,
                 requestType: 'taskbarediting',
@@ -669,43 +984,64 @@ var TaskbarEdit = /** @class */ (function (_super) {
                 this.triggerDependencyEvent(e);
                 this.drawFalseLine();
             }
-            if (this.parent.viewType == 'ResourceView' && this.parent.allowTaskbarDragAndDrop && this.taskBarEditAction !== 'LeftResizing' && this.taskBarEditAction !== 'RightResizing' && this.taskBarEditAction !== 'ProgressResizing') {
+            if (this.parent.allowTaskbarDragAndDrop && this.taskBarEditAction !== 'LeftResizing' && this.taskBarEditAction !== 'RightResizing' && this.taskBarEditAction !== 'ProgressResizing') {
                 var parentClientRect = this.parent.getOffsetRect(this.parent.chartPane);
                 var coordinates = this.getCoordinate(e);
                 var position = { top: coordinates.pageY, left: coordinates.pageX };
                 var pos = { left: Math.abs(position.left - parentClientRect.left), top: position.top - parentClientRect.top };
-                var parentRecord = this.parent.getRecordByID(this.taskBarEditRecord.parentItem.taskId);
-                if (!this.parent.allowTaskbarOverlap && this.taskBarEditRecord.parentItem && !parentRecord.expanded) {
-                    var reduceHeight = 0;
-                    if (parseInt(this.editElement['style'].marginTop) > this.parent.rowHeight) {
-                        for (var i = 0; i < parentRecord.childRecords.length; i++) {
-                            if (parentRecord.childRecords[i].ganttProperties.taskId !== this.taskBarEditRecord.ganttProperties.taskId) {
-                                reduceHeight = reduceHeight + this.parent.rowHeight;
-                            }
-                            else {
-                                break;
+                if (this.parent.viewType === 'ResourceView' && this.parent.enableMultiTaskbar) {
+                    var parentRecord = this.parent.getRecordByID(this.taskBarEditRecord.parentItem.taskId);
+                    if (!this.parent.allowTaskbarOverlap && this.taskBarEditRecord.parentItem && !parentRecord.expanded) {
+                        var reduceHeight = 0;
+                        if (parseInt(this.editElement['style'].marginTop) > this.parent.rowHeight) {
+                            for (var i = 0; i < parentRecord.childRecords.length; i++) {
+                                if (parentRecord.childRecords[i].ganttProperties.taskId !== this.taskBarEditRecord.ganttProperties.taskId) {
+                                    reduceHeight = reduceHeight + this.parent.rowHeight;
+                                }
+                                else {
+                                    break;
+                                }
                             }
+                            pos.top = pos.top - reduceHeight;
                         }
-                        pos.top = pos.top - reduceHeight;
                     }
                 }
                 this.topValue = pos.top;
-                this.leftValue = pos.left - (e.pageX - this.parent.getOffsetRect(this.taskBarEditElement).left) + (this.previousLeftValue !== 0 ? e.pageX - this.previousLeftValue : 0);
+                var xValue = void 0;
+                var yValue = void 0;
+                if (e.type === 'touchmove' || e.type === 'touchstart' || e.type === 'touchend') {
+                    xValue = e['changedTouches'][0].pageX;
+                    yValue = e['changedTouches'][0].pageY;
+                }
+                else {
+                    xValue = e.pageX;
+                    yValue = e.pageY;
+                }
+                if (this.parent.enableRtl) {
+                    this.leftValue = pos.left - Math.abs(xValue - (this.parent.getOffsetRect(this.taskBarEditElement).left)) - (this.previousLeftValue !== 0 ? xValue - this.previousLeftValue : 0);
+                }
+                else {
+                    this.leftValue = pos.left - (xValue - this.parent.getOffsetRect(this.taskBarEditElement).left) + (this.previousLeftValue !== 0 ? xValue - this.previousLeftValue : 0);
+                }
                 if (this.previousLeftValue == 0) {
                     if (!this.parent.enableRtl) {
-                        this.leftValue = this.leftValue - this.parent.ganttChartModule.scrollObject.previousScroll.left + 4;
+                        this.leftValue = this.leftValue - this.parent.ganttChartModule.scrollObject.previousScroll.left;
                     }
                     else {
-                        this.leftValue = this.leftValue + Math.abs(this.parent.ganttChartModule.scrollObject.previousScroll.left) + 4;
+                        this.leftValue = this.leftValue - (this.parent.ganttChartModule.scrollObject.previousScroll.left);
+                        if (this.parent.ganttChartModule.scrollObject.previousScroll.left == 0) {
+                            this.leftValue = this.leftValue - 60;
+                        }
                     }
                 }
-                this.previousLeftValue = e.pageX;
+                this.previousLeftValue = xValue;
             }
             else {
                 this.leftValue = this.taskBarEditRecord.ganttProperties.left;
             }
             this.setItemPosition();
             this.updateEditedItem();
+            this.tooltipValue = (e.type === 'touchmove' || e.type === 'touchstart' || e.type === 'touchend') ? e['changedTouches'][0].pageX : e.pageX;
             this.editTooltip.updateTooltip(this.segmentIndex);
             if (isMouseClick) {
                 this.taskBarEditedAction(e);
@@ -750,7 +1086,7 @@ var TaskbarEdit = /** @class */ (function (_super) {
         var isConnectorLineEdit = (this.taskBarEditAction === 'ConnectorPointLeftDrag' ||
             this.taskBarEditAction === 'ConnectorPointRightDrag') ?
             true : false;
-        if ((this.taskBarEditRecord.ganttProperties.width > 3 && !(this.taskBarEditAction === 'ProgressResizing' &&
+        if (((this.taskBarEditRecord.ganttProperties.width > 3 || this.taskBarEditRecord.ganttProperties.isMilestone) && !(this.taskBarEditAction === 'ProgressResizing' &&
             (this.taskBarEditRecord.ganttProperties.progress === 0 || this.taskBarEditRecord.ganttProperties.progress === 100))) ||
             isConnectorLineEdit) {
             var mouseX = 0;
@@ -813,8 +1149,9 @@ var TaskbarEdit = /** @class */ (function (_super) {
                 _this.timerCount = Math.abs(_this.timerCount);
             }
             if (direction === 'right') {
-                _this.timerCount = (_this.timerCount + 1) >= _this.parent.timelineModule.totalTimelineWidth ?
-                    _this.parent.timelineModule.totalTimelineWidth : (_this.timerCount + 1);
+                var timelineWidth = _this.parent.enableTimelineVirtualization ? _this.parent.timelineModule.wholeTimelineWidth : _this.parent.timelineModule.totalTimelineWidth;
+                _this.timerCount = (_this.timerCount + 1) >= timelineWidth ?
+                    timelineWidth : (_this.timerCount + 1);
             }
             else if (direction === 'bottom') {
                 _this.timerCount = _this.timerCount + 1;
@@ -854,6 +1191,7 @@ var TaskbarEdit = /** @class */ (function (_super) {
     // eslint-disable-next-line
     TaskbarEdit.prototype.enableDragging = function (e) {
         var item = this.taskBarEditRecord.ganttProperties;
+        var timelineWidth = this.parent.enableTimelineVirtualization ? this.parent.timelineModule.wholeTimelineWidth : this.parent.timelineModule.totalTimelineWidth;
         var differenceWidth = 0;
         if (this.taskBarEditElement.classList.contains('e-segmented-taskbar') &&
             !this.taskBarEditElement.classList.contains('e-segment-first')) {
@@ -880,8 +1218,8 @@ var TaskbarEdit = /** @class */ (function (_super) {
             }
             else {
                 left = segment.left < (previousSegment.left + previousSegment.width) ? (previousSegment.left + previousSegment.width) :
-                    (item.left + segment.width + segment.left) >= this.parent.timelineModule.totalTimelineWidth ?
-                        (this.parent.timelineModule.totalTimelineWidth - segment.width) : segment.left;
+                    (item.left + segment.width + segment.left) >= timelineWidth ?
+                        (timelineWidth - segment.width) : segment.left;
             }
             segment.left = left;
             this.parent.setRecordValue('segments', segments, item, true);
@@ -898,8 +1236,8 @@ var TaskbarEdit = /** @class */ (function (_super) {
                 differenceWidth = this.mouseMoveX - this.mouseDownX;
                 this.parent.setRecordValue('left', this.previousItem.left + differenceWidth, item, true);
             }
-            var left = item.left < 0 ? 0 : (item.left + item.width) >= this.parent.timelineModule.totalTimelineWidth ?
-                (this.parent.timelineModule.totalTimelineWidth - item.width) : item.left;
+            var left = item.left < 0 ? 0 : (item.left + item.width) >= timelineWidth ?
+                (timelineWidth - item.width) : item.left;
             this.parent.setRecordValue('left', left, item, true);
         }
     };
@@ -1514,7 +1852,7 @@ var TaskbarEdit = /** @class */ (function (_super) {
         pStartDate.setTime(pStartDate.getTime() + (left * milliSecondsPerPixel));
         /* To render the milestone in proper date while editing */
         if (isMilestone && !isNullOrUndefined(property.predecessorsName) && property.predecessorsName !== '') {
-            //   pStartDate.setDate(pStartDate.getDate()-1);
+            pStartDate.setDate(pStartDate.getDate() - 1);
             this.parent.dateValidationModule.setTime(this.parent.defaultEndTime, pStartDate);
             pStartDate = this.parent.dateValidationModule.checkStartDate(pStartDate, property, true);
         }
@@ -1524,9 +1862,9 @@ var TaskbarEdit = /** @class */ (function (_super) {
             if (this.parent.isInDst(new Date(this.parent.timelineModule.timelineStartDate.toString())) && !this.parent.isInDst(pStartDate)) {
                 pStartDate.setTime(pStartDate.getTime() + (60 * 60 * 1000));
             }
-            // else if (!this.parent.isInDst(new Date(this.parent.timelineModule.timelineStartDate.toString())) && this.parent.isInDst(pStartDate)) {
-            //     pStartDate.setTime(pStartDate.getTime() - (60 * 60 * 1000));
-            // }
+            else if (!this.parent.isInDst(new Date(this.parent.timelineModule.timelineStartDate.toString())) && this.parent.isInDst(pStartDate)) {
+                pStartDate.setTime(pStartDate.getTime() - (60 * 60 * 1000));
+            }
         }
         return pStartDate;
     };
@@ -1539,7 +1877,7 @@ var TaskbarEdit = /** @class */ (function (_super) {
     TaskbarEdit.prototype.setItemPosition = function () {
         if (!isNullOrUndefined(this.editElement)) {
             var currentElement = this.editElement.parentElement;
-            if (this.parent.viewType == 'ResourceView' && this.parent.allowTaskbarDragAndDrop && this.taskBarEditAction === 'ChildDrag') {
+            if (this.parent.allowTaskbarDragAndDrop && this.taskBarEditAction === 'ChildDrag') {
                 currentElement.style.position = null;
             }
             else {
@@ -1556,9 +1894,17 @@ var TaskbarEdit = /** @class */ (function (_super) {
             rightResizer = this.parent.isAdaptive ? (segment.width - 2) : (segment.width - 10);
         }
         this.taskBarEditElement.style.setProperty("opacity", '.75');
-        var taskBarMainContainer = (!this.taskBarEditElement.classList.contains(cls.taskBarMainContainer)) ? ((this.taskBarEditAction === 'ChildDrag' || this.taskBarEditAction === 'LeftResizing') && this.segmentIndex === 0) ? this.taskBarEditElement.parentElement : closest(this.taskBarEditElement, 'tr.' + cls.chartRow)
-            .querySelector('.' + cls.taskBarMainContainer) : this.taskBarEditElement;
-        var segmentedTaskBarContainer = this.taskBarEditElement.classList.contains('e-segmented-taskbar');
+        var taskBarMainContainer;
+        if (this.parent.allowTaskbarDragAndDrop && !item.isAutoSchedule && this.taskBarEditRecord.hasChildRecords) {
+            taskBarMainContainer = this.taskBarEditElement;
+        }
+        else {
+            taskBarMainContainer = (!this.taskBarEditElement.classList.contains(cls.taskBarMainContainer)) ? ((this.taskBarEditAction === 'ChildDrag' ||
+                this.taskBarEditAction === 'LeftResizing') && this.segmentIndex === 0) ? this.taskBarEditElement.parentElement : closest(this.taskBarEditElement, 'tr.' + cls.chartRow)
+                .querySelector('.' + cls.taskBarMainContainer) : this.taskBarEditElement;
+        }
+        var segmentedTaskBarContainer = (this.taskBarEditElement.classList.contains('e-segmented-taskbar') ||
+            this.taskBarEditElement.querySelector('.e-segmented-taskbar')) ? true : false;
         var traceChildProgressBar = this.taskBarEditElement.querySelector('.' + cls.traceChildProgressBar);
         var traceChildTaskBar = this.taskBarEditElement.querySelector('.' + cls.traceChildTaskBar);
         var childProgressResizer = this.taskBarEditElement.querySelector('.' + cls.childProgressResizer);
@@ -1572,13 +1918,20 @@ var TaskbarEdit = /** @class */ (function (_super) {
         var manualParentRight = this.taskBarEditElement.querySelector('.' + cls.manualParentRightResizer);
         var manualParentLeft = this.taskBarEditElement.querySelector('.' + cls.manualParentLeftResizer);
         var resizeLine = this.parent.ganttChartModule.chartBodyContainer.querySelector('.e-taskbar-resize-div');
+        if (this.parent.allowTaskbarDragAndDrop && !this.updatePosition) {
+            this.leftValue = this.leftValue + 30;
+            this.updatePosition = true;
+        }
         if (this.taskBarEditAction !== 'ConnectorPointRightDrag' &&
             this.taskBarEditAction !== 'ConnectorPointLeftDrag') {
             if (this.taskBarEditAction !== 'ParentResizing' && this.taskBarEditAction !== 'ManualParentDrag') {
                 if (segmentedTaskBarContainer && !isNullOrUndefined(item.segments)
                     && (this.taskBarEditAction === 'RightResizing' || this.segmentIndex !== 0)) {
                     if (!isNullOrUndefined(resizeLine)) {
-                        resizeLine.style.width = (segment.width) + "px";
+                        if (!this.parent.allowTaskbarDragAndDrop || (this.parent.allowTaskbarDragAndDrop && this.parent.rowDragAndDropModule && this.taskBarEditAction !== 'ChildDrag' &&
+                            this.taskBarEditAction !== 'ParentDrag')) {
+                            resizeLine.style.width = (segment.width) + "px";
+                        }
                     }
                     this.taskBarEditElement.style.width = (segment.width) + 'px';
                     if (this.parent.enableRtl) {
@@ -1587,7 +1940,10 @@ var TaskbarEdit = /** @class */ (function (_super) {
                     else {
                         this.taskBarEditElement.style.left = (segment.left) + 'px';
                         if (!isNullOrUndefined(resizeLine)) {
-                            resizeLine.style.left = (segment.left + this.editElement.parentElement.offsetLeft) + "px";
+                            if (!this.parent.allowTaskbarDragAndDrop || (this.parent.allowTaskbarDragAndDrop && this.parent.rowDragAndDropModule && this.taskBarEditAction !== 'ChildDrag'
+                                && this.taskBarEditAction !== 'ParentDrag')) {
+                                resizeLine.style.left = (segment.left + this.editElement.parentElement.offsetLeft) + "px";
+                            }
                         }
                     }
                 }
@@ -1596,9 +1952,10 @@ var TaskbarEdit = /** @class */ (function (_super) {
                 if (segmentedTaskBarContainer && segmentConnectorPointRight) {
                     segmentConnectorPointRight.style.left = (this.parent.isAdaptive ? (width + 10) : (width + 2)) + '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');
+                if (this.parent.allowTaskbarDragAndDrop && this.parent.rowDragAndDropModule && this.taskBarEditAction !== 'LeftResizing' &&
+                    this.taskBarEditAction !== 'RightResizing' && this.taskBarEditAction !== 'ProgressResizing') {
+                    var addTop = this.parent.taskbarHeight / 2;
+                    taskBarMainContainer.style.setProperty('top', (this.topValue + addTop) + 'px');
                     taskBarMainContainer.style.zIndex = '4';
                 }
                 if (this.taskBarEditAction === 'LeftResizing' && this.segmentIndex === 0) {
@@ -1621,7 +1978,7 @@ var TaskbarEdit = /** @class */ (function (_super) {
                         }
                     }
                 }
-                if (this.taskBarEditAction === 'ChildDrag' && this.segmentIndex === 0) {
+                if (this.taskBarEditAction === 'ChildDrag' && (this.segmentIndex === 0 || (this.segmentIndex !== -1 && this.parent.allowTaskbarDragAndDrop))) {
                     resizeLine.style.width = (width) + "px";
                     resizeLine.style.setProperty(position, item.left + 'px');
                     taskBarMainContainer.style.setProperty("opacity", '.75');
@@ -1636,7 +1993,7 @@ var TaskbarEdit = /** @class */ (function (_super) {
                 }
             }
             if (this.taskBarEditAction === 'MilestoneDrag' || item.isMilestone) {
-                taskBarMainContainer.style.setProperty(position, (item.left - (width / 2)) + 'px');
+                taskBarMainContainer.style.setProperty(position, (this.parent.allowTaskbarDragAndDrop ? this.leftValue : (item.left - (width / 2))) + 'px');
                 resizeLine.style.setProperty(position, (item.left - (width / 2)) + 'px');
                 resizeLine.style.width = (width) + "px";
             }
@@ -1693,6 +2050,11 @@ var TaskbarEdit = /** @class */ (function (_super) {
                 resizeLine.style.width = (item.width) + 'px';
                 resizeLine.style.setProperty(position, item.left + 'px');
                 manualParentTaskbar.style.setProperty(position, item.left - item.autoLeft + 'px');
+                if (this.parent.allowTaskbarDragAndDrop) {
+                    manualParentTaskbar.style.setProperty(position, this.leftValue + 'px');
+                    manualParentTaskbar.style.setProperty('top', (this.topValue) + 'px');
+                    manualParentTaskbar.style.zIndex = '4';
+                }
             }
             else {
                 if (!isNullOrUndefined(traceChildTaskBar) && !segmentedTaskBarContainer) {
@@ -1719,6 +2081,15 @@ var TaskbarEdit = /** @class */ (function (_super) {
                 }
             }
         }
+        if (this.parent.allowTaskbarDragAndDrop && (this.taskBarEditAction === 'ChildDrag' || this.taskBarEditAction === 'ParentDrag' || this.taskBarEditAction === 'ManualParentDrag' || this.taskBarEditAction === 'MilestoneDrag')) {
+            var resizeValue = this.parent.enableRtl ? parseInt(resizeLine.style.right) : parseInt(resizeLine.style.left);
+            if (this.parent.enableRtl) {
+                resizeLine.style.right = (resizeValue - 30) + 'px';
+            }
+            else {
+                resizeLine.style.left = (resizeValue + 30) + 'px';
+            }
+        }
     };
     /**
      * To handle mouse up event in chart
@@ -1732,14 +2103,31 @@ var TaskbarEdit = /** @class */ (function (_super) {
         this.previousMouseMove = null;
         this.editTooltip.showHideTaskbarEditTooltip(false, this.segmentIndex);
         if (this.taskBarEditAction && this.isMouseDragged) {
-            if ((!this.dragMouseLeave && this.taskBarEditedAction) || (this.parent.viewType === 'ResourceView' &&
-                this.parent.allowTaskbarDragAndDrop)) {
+            if ((!this.dragMouseLeave && this.taskBarEditedAction) || (this.parent.allowTaskbarDragAndDrop)) {
                 if (e.type === 'touchmove' || e.type === 'touchstart' || e.type === 'touchend') {
                     var coordinates = this.getCoordinate(e);
                     this['droppedTarget'] = document.elementFromPoint(coordinates.pageX, coordinates.pageY);
                 }
                 else {
-                    this['droppedTarget'] = document.elementFromPoint(e.x, e.y);
+                    if (this.taskBarEditRecord.hasChildRecords && !this.taskBarEditRecord.ganttProperties.isAutoSchedule) {
+                        var taskbarPosition = this.parent.getOffsetRect(this.taskBarEditElement);
+                        var left = (!isNullOrUndefined(document.body.className) && document.body.className.includes("e-bigger")) ? 12 : 0;
+                        var pointerLeft = (3 + this.parent.chartRowsModule.connectorPointWidth + left);
+                        var xValue = void 0;
+                        if (this.parent.enableRtl) {
+                            xValue = Math.abs(taskbarPosition.left + pointerLeft + 1);
+                        }
+                        else {
+                            xValue = Math.abs(Math.abs(taskbarPosition.left - pointerLeft - 1) - this.parent.ganttChartModule.scrollElement.scrollLeft);
+                        }
+                        this['droppedTarget'] = document.elementFromPoint(xValue, e.y);
+                    }
+                    else {
+                        this['droppedTarget'] = document.elementFromPoint(e.x, e.y);
+                    }
+                    if (this['droppedTarget'] && this['droppedTarget'].classList.contains('e-span-label')) {
+                        this['droppedTarget'] = document.elementFromPoint(e.x + this['droppedTarget']['offsetWidth'], e.y);
+                    }
                 }
                 this.taskBarEditedAction(e);
                 this.isMouseDragged = false;
@@ -1852,27 +2240,54 @@ var TaskbarEdit = /** @class */ (function (_super) {
         var ganttRecord = args.data;
         var taskData = ganttRecord.ganttProperties;
         var draggedRecIndex = this.parent.flatData.indexOf(ganttRecord);
-        if ((args.taskBarEditAction === 'MilestoneDrag' || args.taskBarEditAction === 'ChildDrag') && this.parent.viewType === "ResourceView"
-            && this.parent.allowTaskbarDragAndDrop && this.dragMoveY > 0) {
+        if (this.parent.allowTaskbarDragAndDrop && this.dragMoveY > 0 && ((this.parent.viewType === 'ResourceView' && !ganttRecord.hasChildRecords) || this.parent.viewType === 'ProjectView')) {
             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))) {
+                if (this.taskBarEditRecord.parentItem && 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 droppedRecord = [];
+                this.removeChildBorder();
+                this.removeErrorElem();
+                this.removetopOrBottomBorder();
+                var droppedRecord = void 0;
+                this.updatePosition = false;
                 this.draggedRecordMarginTop = this.taskBarEditElement.style.marginTop;
                 var row = closest(this.droppedTarget, 'tr.' + cls.chartRow);
-                var recordIndex = parseInt(row.getAttribute('aria-rowindex'));
-                droppedRecord.push(this.parent.flatData[recordIndex]);
-                if (droppedRecord.length > 0) {
-                    var droppedRecordIndex = this.parent.flatData.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);
+                if (row) {
+                    var recordIndex = parseInt(row.getAttribute('data-rowindex'));
+                    droppedRecord = this.parent.flatData[recordIndex];
+                    var droppedParentRecordIndex = this.parent.getRootParent(droppedRecord, 0).index;
+                    var draggedParentRecordIndex = this.parent.getRootParent(this.taskBarEditRecord, 0).index;
+                    var e = {
+                        cancel: false,
+                        data: this.taskBarEditRecord,
+                        fromIndex: this.taskBarEditRecord.index,
+                        dropIndex: droppedRecord.index,
+                        dropPosition: this.parent.rowDragAndDropModule['dropPosition'],
+                        dropRecord: droppedRecord,
+                    };
+                    this.parent.trigger('rowDrop', e);
+                    if (!e['cancel'] && droppedRecord && recordIndex !== draggedRecIndex && ((droppedParentRecordIndex !== draggedParentRecordIndex || (this.taskBarEditRecord.hasChildRecords && droppedRecord.hasChildRecords)) || !this.taskBarEditRecord.hasChildRecords)) {
+                        var droppedRecordIndex = this.parent.flatData.indexOf(droppedRecord);
+                        var position = void 0;
+                        if (this.parent.viewType === 'ProjectView') {
+                            position = this.parent.rowDragAndDropModule['dropPosition'];
+                        }
+                        else {
+                            position = (droppedRecord.hasChildRecords || (!droppedRecord.parentItem &&
+                                droppedRecord.childRecords.length == 0)) ? 'child' : this.parent.rowDragAndDropModule['dropPosition'];
+                        }
+                        if (this.parent.rowDragAndDropModule) {
+                            if (this.parent.viewType === 'ResourceView' && (position === 'child' && !droppedRecord.hasChildRecords)) {
+                                position = 'Invalid';
+                                this.parent.rowDragAndDropModule['dropPosition'] = 'Invalid';
+                            }
+                            this.parent.rowDragAndDropModule.reorderRows([draggedRecIndex], droppedRecordIndex, position);
+                        }
+                        this.dragMoveY = 0;
                     }
-                    this.dragMoveY = 0;
                 }
+                this.isClonedElement = false;
             }
             if (this.parent.viewType === 'ResourceView' && this.parent.showOverAllocation) {
                 this.parent.ganttChartModule.renderOverAllocationContainer();
@@ -1912,35 +2327,55 @@ var TaskbarEdit = /** @class */ (function (_super) {
                     cEndDate.setHours(cEndDate.getHours() + 1);
                 }
                 else {
+                    cStartDate.setDate(cStartDate.getDate());
+                    cEndDate.setDate(cEndDate.getDate());
+                }
+                if (this.parent.includeWeekend) {
                     sDate.setHours(0, 0, 0, 0);
                     eDate.setHours(0, 0, 0, 0);
                     cStartDate.setDate(cStartDate.getDate() - 1);
                     cEndDate.setDate(cEndDate.getDate() + 1);
                     cStartDate.setHours(0, 0, 0, 0);
                     cEndDate.setHours(0, 0, 0, 0);
+                    if (cStartDate.getTime() <= eDate.getTime() && !isNullOrUndefined(previousSegment) && !isNullOrUndefined(segment)) {
+                        var segmentIndexes_1 = [
+                            { 'firstSegmentIndex': previousSegment.segmentIndex, 'secondSegmentIndex': segment.segmentIndex }
+                        ];
+                        this.parent.chartRowsModule.mergeTask(ganttProp.taskId, segmentIndexes_1);
+                    }
+                    else if (cEndDate.getTime() >= sDate.getTime() && this.segmentIndex !== segments.length - 1) {
+                        var segmentIndexes_2 = [
+                            { 'firstSegmentIndex': segment.segmentIndex, 'secondSegmentIndex': nextSegment.segmentIndex }
+                        ];
+                        this.parent.chartRowsModule.mergeTask(ganttProp.taskId, segmentIndexes_2);
+                    }
+                    else if (cEndDate.getTime() >= sDate.getTime()) {
+                        segment.endDate.setDate(this.parent.cloneProjectEndDate.getDate() - 1);
+                        segment.startDate = this.parent.dataOperation.getStartDate(segment.endDate, segment.duration, ganttProp.durationUnit, ganttProp);
+                        // eslint-disable-next-line
+                        for (var i = segments.length - 2; i >= 0; i++) {
+                            var segment_5 = segments[i];
+                            var eDate_1 = segment_5.endDate;
+                            eDate_1.setDate(eDate_1.getDate() - segment_5.offsetDuration);
+                            segment_5.endDate = eDate_1;
+                            segment_5.startDate = this.parent.dataOperation.getStartDate(segment_5.endDate, segment_5.duration, ganttProp.durationUnit, ganttProp);
+                        }
+                    }
                 }
-                if (cStartDate.getTime() <= eDate.getTime() && !isNullOrUndefined(previousSegment) && !isNullOrUndefined(segment)) {
-                    var segmentIndexes = [
-                        { 'firstSegmentIndex': previousSegment.segmentIndex, 'secondSegmentIndex': segment.segmentIndex }
-                    ];
-                    this.parent.chartRowsModule.mergeTask(ganttProp.taskId, segmentIndexes);
-                }
-                else if (cEndDate.getTime() >= sDate.getTime() && this.segmentIndex !== segments.length - 1) {
-                    var segmentIndexes = [
-                        { 'firstSegmentIndex': segment.segmentIndex, 'secondSegmentIndex': nextSegment.segmentIndex }
-                    ];
-                    this.parent.chartRowsModule.mergeTask(ganttProp.taskId, segmentIndexes);
-                }
-                else if (cEndDate.getTime() >= sDate.getTime()) {
-                    segment.endDate.setDate(this.parent.cloneProjectEndDate.getDate() - 1);
-                    segment.startDate = this.parent.dataOperation.getStartDate(segment.endDate, segment.duration, ganttProp.durationUnit, ganttProp);
-                    // eslint-disable-next-line
-                    for (var i = segments.length - 2; i >= 0; i++) {
-                        var segment_5 = segments[i];
-                        var eDate_1 = segment_5.endDate;
-                        eDate_1.setDate(eDate_1.getDate() - segment_5.offsetDuration);
-                        segment_5.endDate = eDate_1;
-                        segment_5.startDate = this.parent.dataOperation.getStartDate(segment_5.endDate, segment_5.duration, ganttProp.durationUnit, ganttProp);
+                else {
+                    //Hits while dragging taskbar toward right & taskbar rightside resizing:
+                    if (cEndDate.getTime() <= sDate.getTime() && this.segmentIndex !== segments.length - 1 && !this.parent.includeWeekend && this.parent.dataOperation.getDuration((this.parent.dataOperation.checkStartDate(cEndDate, taskData, false)), sDate, taskData.durationUnit, false, false) === 0) {
+                        var segmentIndexes = [
+                            { 'firstSegmentIndex': segment.segmentIndex, 'secondSegmentIndex': nextSegment.segmentIndex }
+                        ];
+                        this.parent.chartRowsModule.mergeTask(ganttProp.taskId, segmentIndexes);
+                    }
+                    //Hits while dragging taskbar toward left & taskbar leftside resizing:
+                    else if (cStartDate.getTime() >= eDate.getTime() && !isNullOrUndefined(previousSegment) && !isNullOrUndefined(segment) && !this.parent.includeWeekend && this.parent.dataOperation.getDuration((this.parent.dataOperation.checkEndDate(cStartDate, taskData, false)), eDate, taskData.durationUnit, false, false) === 0) {
+                        var segmentIndexes = [
+                            { 'firstSegmentIndex': previousSegment.segmentIndex, 'secondSegmentIndex': segment.segmentIndex }
+                        ];
+                        this.parent.chartRowsModule.mergeTask(ganttProp.taskId, segmentIndexes);
                     }
                 }
             }