@syncfusion/ej2-gantt 22.2.5 → 22.2.7

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

@@ -3952,6 +3952,7 @@ class TaskProcessor extends DateProcessor {
                     this.parent.setRecordValue('progress', Math.floor(parentProgress), parentProp, true);
                     this.parent.setRecordValue('totalProgress', totalProgress, parentProp, true);
                     this.parent.setRecordValue('totalDuration', totalDuration, parentProp, true);
+                    this.parent.setRecordValue('autoDuration', parentProp.duration, parentProp, true);
                     if (!parentProp.isAutoSchedule) {
                         this.parent.setRecordValue('autoDuration', this.calculateAutoDuration(parentProp), parentProp, true);
                         this.updateAutoWidthLeft(parentData);
@@ -4505,6 +4506,9 @@ class GanttChart {
         }
         this.updateWidthAndHeight();
         this.parent.notify('selectRowByIndex', {});
+        if (this.parent.timelineModule.isZoomToFit) {
+            this.parent.timelineModule.processZoomToFit();
+        }
     }
     /**
      * @param {IGanttData[]} records .
@@ -6110,8 +6114,7 @@ class Timeline {
             this.parent.showSpinner();
         }
         this.changeTimelineSettings(newTimeline);
-        this.isZoomToFit = false;
-        this.parent.isTimelineRoundOff = this.isZoomToFit ? false : isNullOrUndefined(this.parent.projectStartDate) ? true : false;
+        this.parent.isTimelineRoundOff = isNullOrUndefined(this.parent.projectStartDate) ? true : false;
     }
     bottomTierCellWidthCalc(mode, zoomLevel, date) {
         let convertedMilliSeconds;
@@ -8003,8 +8006,16 @@ class GanttTreeGrid {
                 this.parent.getDateFormat().toLowerCase().indexOf('hh') !== -1 ? 'datetimepickeredit' : 'datepickeredit';
             column.format = column.format ? column.format : { type: 'date', format: this.parent.getDateFormat() };
             column.width = column.width ? column.width : 150;
-            if (!column.edit || (column.edit && !column.edit.create)) {
-                column.edit = { params: { renderDayCell: this.parent.renderWorkingDayCell.bind(this.parent) } };
+            if (column.edit && column.edit.params) {
+                column.edit.params['renderDayCell'] = this.parent.renderWorkingDayCell.bind(this.parent);
+            }
+            else {
+                if (column.edit) {
+                    column.edit.params = { renderDayCell: this.parent.renderWorkingDayCell.bind(this.parent) };
+                }
+                else {
+                    column.edit = { params: { renderDayCell: this.parent.renderWorkingDayCell.bind(this.parent) } };
+                }
             }
         }
         else if (taskSettings.endDate === column.field) {
@@ -8018,8 +8029,16 @@ class GanttTreeGrid {
             column.editType = column.editType ? column.editType :
                 this.parent.getDateFormat().toLowerCase().indexOf('hh') !== -1 ? 'datetimepickeredit' : 'datepickeredit';
             column.width = column.width ? column.width : 150;
-            if (!column.edit || (column.edit && !column.edit.create)) {
-                column.edit = { params: { renderDayCell: this.parent.renderWorkingDayCell.bind(this.parent) } };
+            if (column.edit && column.edit.params) {
+                column.edit.params['renderDayCell'] = this.parent.renderWorkingDayCell.bind(this.parent);
+            }
+            else {
+                if (column.edit) {
+                    column.edit.params = { renderDayCell: this.parent.renderWorkingDayCell.bind(this.parent) };
+                }
+                else {
+                    column.edit = { params: { renderDayCell: this.parent.renderWorkingDayCell.bind(this.parent) } };
+                }
             }
         }
         else if (taskSettings.duration === column.field) {
@@ -9064,7 +9083,7 @@ class ChartRows extends DateProcessor {
                 childTaskbarNode = this.createDivElement(template);
             }
         }
-        if (this.parent.enableRtl && childTaskbarNode[0] && childTaskbarNode[0].querySelector('.e-task-label')) {
+        if (this.parent.enableRtl && !isNullOrUndefined(childTaskbarNode) && childTaskbarNode[0] && childTaskbarNode[0].querySelector('.e-task-label')) {
             childTaskbarNode[0].querySelector('.e-task-label').style.marginLeft = '15px';
             childTaskbarNode[0].querySelector('.e-task-label').style.marginRight = '8px';
             if (childTaskbarNode[0].querySelector('.e-gantt-child-progressbar')) {
@@ -9446,8 +9465,8 @@ class ChartRows extends DateProcessor {
             milestoneNode = this.milestoneTemplateFunction(extend({ index: i }, data), this.parent, 'MilestoneTemplate', this.getTemplateID('MilestoneTemplate'), false, undefined, rootElement[0], this.parent.treeGrid['root']);
         }
         else {
-            const template = '<div class="' + traceMilestone + '" style="width:' + ((this.parent.renderBaseline ? this.taskBarHeight - 3 : this.taskBarHeight - 7)) + 'px;height:' +
-                ((this.parent.renderBaseline ? this.taskBarHeight - 3 : this.taskBarHeight - 7)) + 'px;position:absolute;transform: rotate(45deg);top:' + (this.parent.rowHeight > 40 ? 0 : 2) + 'px;left:' + (this.parent.renderBaseline ? 2 : 1) + 'px;"> </div>';
+            const template = '<div class="' + traceMilestone + '" style="width:' + ((this.parent.renderBaseline ? this.taskBarHeight : this.taskBarHeight - 6)) + 'px;height:' +
+                ((this.parent.renderBaseline ? this.taskBarHeight : this.taskBarHeight - 6)) + 'px;position:absolute;transform: rotate(45deg);top:' + (this.parent.rowHeight > 40 ? 0 : 1) + 'px;left:' + 1 + 'px;"> </div>';
             milestoneNode = this.createDivElement(template);
         }
         return milestoneNode;
@@ -9475,9 +9494,9 @@ class ChartRows extends DateProcessor {
     getMilestoneBaselineNode() {
         const data = this.templateData;
         let baselineMilestoneHeight = this.parent.renderBaseline ? 5 : 2;
-        const template = '<div class="' + baselineMilestoneContainer + '" style="width:' + ((this.parent.renderBaseline ? this.taskBarHeight - 5 : this.taskBarHeight - 10) + 2) + 'px;height:' +
-            ((this.parent.renderBaseline ? this.taskBarHeight - 5 : this.taskBarHeight - 10) + 2) + 'px;position:absolute;transform:rotate(45deg);' + (this.parent.enableRtl ? 'right:' : 'left:') + (this.parent.enableRtl ? (data.ganttProperties.left -
-            (this.milestoneHeight / 2) + 3) : (data.ganttProperties.baselineLeft - (this.milestoneHeight / 2) + 2)) + 'px;' + (this.baselineColor ? 'background-color: ' + this.baselineColor + ';' : '') + 'margin-top:' + ((-Math.floor(this.parent.rowHeight - this.milestoneMarginTop) + baselineMilestoneHeight) + 3) + 'px"> </div>';
+        const template = '<div class="' + baselineMilestoneContainer + '" style="width:' + ((this.parent.renderBaseline ? this.taskBarHeight : this.taskBarHeight - 10)) + 'px;height:' +
+            ((this.parent.renderBaseline ? this.taskBarHeight : this.taskBarHeight - 10)) + 'px;position:absolute;transform:rotate(45deg);' + (this.parent.enableRtl ? 'right:' : 'left:') + (this.parent.enableRtl ? (data.ganttProperties.left -
+            (this.milestoneHeight / 2) + 3) : (data.ganttProperties.left - (this.milestoneHeight / 2) + 1)) + 'px;' + (this.baselineColor ? 'background-color: ' + this.baselineColor + ';' : '') + 'margin-top:' + ((-Math.floor(this.parent.rowHeight - this.milestoneMarginTop) + baselineMilestoneHeight) + 2) + 'px"> </div>';
         return this.createDivElement(template);
     }
     /**
@@ -10162,6 +10181,12 @@ class ChartRows extends DateProcessor {
             this.ganttChartTableBody.replaceChildren(...dupChartBody.childNodes);
             this.parent.initialChartRowElements = this.parent.ganttChartModule.getChartRows();
         }
+        if (this.parent.enableCriticalPath && this.parent.criticalPathModule) {
+            var criticalModule = this.parent.criticalPathModule;
+            if (criticalModule.criticalPathCollection) {
+                this.parent.criticalPathModule.criticalConnectorLine(criticalModule.criticalPathCollection, criticalModule.detailPredecessorCollection, true, criticalModule.predecessorCollectionTaskIds);
+            }
+        }
         this.parent.renderTemplates();
         this.triggerQueryTaskbarInfo();
         this.parent.modifiedRecords = [];
@@ -10176,6 +10201,7 @@ class ChartRows extends DateProcessor {
                 }
             }
         }
+        this.parent.isGanttChartRendered = true;
         this.parent.renderTemplates();
     }
     /**
@@ -11840,8 +11866,6 @@ class ConnectorLine {
             connectorObj.connectorLineId = 'parent' + parentId + 'child' + childId;
             connectorObj.milestoneParent = parentGanttRecord.isMilestone ? true : false;
             connectorObj.milestoneChild = childGanttRecord.isMilestone ? true : false;
-            connectorObj.isManualParent = (!(this.parent.flatData[parentIndex].ganttProperties.isAutoSchedule) && this.parent.flatData[parentIndex].hasChildRecords);
-            connectorObj.isManualChild = (!(this.parent.flatData[childIndex].ganttProperties.isAutoSchedule) && this.parent.flatData[childIndex].hasChildRecords);
             connectorObj.parentEndPoint = connectorObj.parentLeft + connectorObj.parentWidth;
             connectorObj.childEndPoint = connectorObj.childLeft + connectorObj.childWidth;
             if (isNullOrUndefined(isScheduledTask(parentGanttRecord)) || isNullOrUndefined(isScheduledTask(childGanttRecord))) {
@@ -12145,6 +12169,8 @@ class ConnectorLine {
             isMilestoneValue = (data.milestoneParent && data.milestoneChild) ? 0 : data.milestoneParent ? -5 : data.milestoneChild ? 5 : 0;
         }
         let heightValue = isVirtual ? connectorLine$$1.height : (height + isMilestoneValue);
+        let borderTopWidth = 0;
+        let addTop = 0;
         let parentOverlapTopValue = 0;
         let childOverlapTopValue = 0;
         let count = 0;
@@ -12181,30 +12207,56 @@ class ConnectorLine {
             }
             if (isValid) {
                 if (((fromRecordIsParent && !fromRecordIsManual) && (toRecordIsParent && !toRecordIsManual))) {
-                    
+                    addTop = -11;
                 }
                 else if (!((fromRecordIsParent && !fromRecordIsManual) && (toRecordIsParent && !toRecordIsManual))) {
                     if (data.childIndex > data.parentIndex) {
-                        
+                        if (!fromRecordIsParent && toRecordIsParent) {
+                            borderTopWidth = -11;
+                        }
+                        else {
+                            borderTopWidth = 11;
+                            addTop = -11;
+                        }
                     }
                     else {
-                        
+                        if ((fromRecordIsParent && !toRecordIsParent)) {
+                            borderTopWidth = -11;
+                        }
+                        else {
+                            borderTopWidth = 11;
+                            addTop = -11;
+                        }
                     }
                 }
                 if (this.parent.currentViewData[data.parentIndex].ganttProperties.isMilestone) {
                     if (data.parentIndex > data.childIndex) {
-                        
+                        addTop = -11;
+                        borderTopWidth = 12;
                     }
                     else if (data.type === 'SS' || data.type === 'FF') {
-                        
+                        addTop = -5;
                     }
                 }
                 else if (this.parent.currentViewData[data.childIndex].ganttProperties.isMilestone) {
                     if (data.parentIndex > data.childIndex) {
-                        
+                        addTop = 5;
+                        borderTopWidth = -10;
                     }
-                    else if (data.type === 'SS' || data.type === 'FF') {
-                        
+                    else if (data.parentIndex < data.childIndex) {
+                        if (data.type === 'SS' || data.type === 'FF') {
+                            addTop = -10;
+                        }
+                    }
+                }
+                else {
+                    if (data.parentIndex < data.childIndex && fromRecordIsManual && !toRecordIsManual) {
+                        addTop = 0;
+                        borderTopWidth = -11;
+                    }
+                    else if (data.childIndex < data.parentIndex && !fromRecordIsManual && toRecordIsManual) {
+                        addTop = 0;
+                        borderTopWidth = -11;
                     }
                 }
             }
@@ -12237,127 +12289,110 @@ class ConnectorLine {
             if (this.getParentPosition(data) === 'FSType1') {
                 this.taskLineValue = data.milestoneChild ? 1 : 0;
                 this.x1 = data.parentEndPoint + (data.milestoneParent ? -1 : (data.milestoneChild ? -1 : 0));
-                this.x2 = data.milestoneParent ? ((((data.childLeft - (data.parentEndPoint + 10)) + 1) - 10) + 1) : (((data.childLeft - (data.parentEndPoint + 10))) - 10);
-                this.y1 = this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneParent)) + ((data.isManualParent && data.isManualChild) ? -10 : 0);
-                this.y2 = heightValue + this.taskLineValue;
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + this.x1 + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + (this.x1 + this.x2) + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + (this.x1 + this.x2) + " " + (this.y1 + this.y2) +
-                    " L " + (this.x1 + this.x2 + 11) + " " + (this.y1 + this.y2);
-                this.arrowPath = "M " + (this.x1 + this.x2 + 18) + " " + (this.y1 + this.y2 + this.manualChild) +
-                    " L " + (this.x1 + this.x2 + 11) + " " + (this.y1 + this.y2 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + (this.x1 + this.x2 + 11) + " " + (this.y1 + this.y2 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.x2 = data.milestoneParent ? ((((data.childLeft - (data.parentLeft + data.parentWidth + 10)) + this.lineStroke) - 10) + 1) : (((data.childLeft - (data.parentLeft + data.parentWidth + 10)) + this.lineStroke) - 10);
+                this.y1 = (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue));
+                this.y2 = heightValue + this.taskLineValue + borderTopWidth - this.lineStroke;
+                this.connectorLinePath = "M " + this.x1 + " " + (this.y1) + " L " + (this.x1 + this.x2) + " " + (this.y1) + " L " + (this.x1 + this.x2) + " " + (this.y1 + this.y2) +
+                    " L " + (this.x1 + this.x2 + 12) + " " + (this.y1 + this.y2);
+                this.arrowPath = "M " + (this.x1 + this.x2 + 20) + " " + (this.y1 + this.y2) +
+                    " L " + (this.x1 + this.x2 + 12) + " " + (this.y1 + this.y2 - (4 + this.lineStroke)) +
+                    " L " + (this.x1 + this.x2 + 12) + " " + (this.y1 + this.y2 + 4) + " Z";
             }
             if (this.getParentPosition(data) === 'FSType2') {
-                this.taskLineValue = data.milestoneChild ? 1 : 0;
-                this.x1 = data.parentLeft + (data.milestoneChild ? -1 : 0);
-                this.x2 = data.parentWidth + (data.milestoneParent ? 1 : 0);
+                this.x1 = data.parentLeft;
+                this.x2 = data.parentWidth + (data.milestoneParent ? -1 : 0);
                 this.x3 = this.x2 + (data.milestoneParent ? 11 : 10);
                 this.x4 = data.parentWidth - ((data.parentEndPoint - data.childLeft) + 20);
-                this.y1 = this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneParent)) + ((data.isManualParent && data.isManualChild) ? -10 : 0);
-                this.y2 = heightValue - this.getconnectorLineGap(data) + this.taskLineValue;
+                this.y1 = (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue));
+                this.y2 = heightValue + borderTopWidth - this.getconnectorLineGap(data) - this.lineStroke;
                 this.y3 = this.getconnectorLineGap(data);
-                this.y4 = this.y1 + this.y2 - ((this.y1 + this.y2) % data.rowHeight);
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + (this.x1 + this.x2) + " " + (this.y1 + this.manualParent + this.manualChild) + " " + " L " + (this.x1 + this.x3) + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + (this.x1 + this.x3) + " " + this.y4 +
-                    " L " + (this.x1 + this.x4) + " " + this.y4 + " L " + (this.x1 + this.x4) + " " + (this.y1 + this.y2 + this.y3) + " L " + (this.x1 + this.x4 + 11) + " " + (this.y1 + this.y2 + this.y3);
-                this.arrowPath = "M " + (this.x1 + this.x4 + 18) + " " + (this.y1 + this.y2 + this.y3 + this.manualChild) +
-                    " L " + (this.x1 + this.x4 + 11) + " " + (this.y1 + this.y2 + this.y3 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + (this.x1 + this.x4 + 11) + " " + (this.y1 + this.y2 + this.y3 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.y4 = (!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (this.y1 + this.y2 - ((this.y1 + this.y2) % data.rowHeight)));
+                this.connectorLinePath = "M " + (this.x1 + this.x2) + " " + (this.y1) + " " + " L " + (this.x1 + this.x3) + " " + (this.y1) + " L " + (this.x1 + this.x3) + " " + this.y4 +
+                    " L " + (this.x1 + this.x4) + " " + this.y4 + " L " + (this.x1 + this.x4) + " " + (this.y1 + this.y2 + this.y3) + " L " + (this.x1 + this.x4 + 12) + " " + (this.y1 + this.y2 + this.y3);
+                this.arrowPath = "M " + (this.x1 + this.x4 + 20) + " " + (this.y1 + this.y2 + this.y3) +
+                    " L " + (this.x1 + this.x4 + 12) + " " + (this.y1 + this.y2 + this.y3 - (4 + this.lineStroke)) +
+                    " L " + (this.x1 + this.x4 + 12) + " " + (this.y1 + this.y2 + this.y3 + 4 + this.lineStroke) + " Z";
             }
             if (this.getParentPosition(data) === 'FSType3') {
                 this.taskLineValue = data.milestoneChild ? 1 : 0;
-                this.point1 = this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.childIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneChild));
+                this.point1 = (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue));
                 this.x1 = (data.childLeft + (data.milestoneChild ? -1 : 0) + (data.milestoneParent ? 1 : 0)) - 20;
                 this.x2 = (data.parentEndPoint - data.childLeft) + 30;
-                this.y1 = this.point1 + ((data.isManualParent && data.isManualChild) ? -10 : 0);
-                this.y2 = this.point1 + heightValue - this.getconnectorLineGap(data) + this.taskLineValue + (this.parent.renderBaseline ? (data.milestoneChild ? -10 : 0) : 0);
-                this.y3 = this.getconnectorLineGap(data) + (this.parent.renderBaseline ? (data.milestoneParent ? 10 : 0) : 0);
+                this.y1 = this.point1 + (this.parent.renderBaseline ? (data.milestoneChild && !(data.milestoneParent) ? 11 : data.milestoneParent && !(data.milestoneChild) ? -12 : 0) : 0);
+                this.y2 = this.point1 + heightValue + borderTopWidth - this.getconnectorLineGap(data) - this.lineStroke + this.taskLineValue;
+                this.y3 = this.getconnectorLineGap(data);
                 this.y4 = this.y2 - (this.y2 % data.rowHeight);
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + (this.x1 + 12) + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x1 + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x1 + " " + this.y4 +
+                this.connectorLinePath = "M " + (this.x1 + 12) + " " + (this.y1) + " L " + this.x1 + " " + (this.y1) + " L " + this.x1 + " " + this.y4 +
                     " L " + (this.x1 + this.x2) + " " + this.y4 + " L " + (this.x1 + this.x2) + " " + (this.y2 + this.y3) + " L " + (this.x1 + this.x2 - 12) + " " + (this.y2 + this.y3);
-                this.arrowPath = "M " + (this.x1 + 18) + " " + (this.y1 + this.manualChild) +
-                    " L " + (this.x1 + 11) + " " + (this.y1 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + (this.x1 + 11) + " " + (this.y1 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.arrowPath = "M " + (this.x1 + 20) + " " + (this.y1) +
+                    " L " + (this.x1 + 12) + " " + (this.y1 - (4 + this.lineStroke)) +
+                    " L " + (this.x1 + 12) + " " + (this.y1 + 4 + this.lineStroke) + " Z";
             }
             if (this.getParentPosition(data) === 'FSType4') {
-                this.point1 = this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.childIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneChild));
+                this.point1 = (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1)));
                 this.taskLineValue = this.parent.renderBaseline ? this.taskLineValue : 0;
                 this.x1 = data.parentEndPoint + (data.milestoneChild ? -1 : 0) + (data.milestoneParent ? 1 : 0);
                 this.x2 = data.childLeft - data.parentEndPoint - 20;
-                this.y1 = this.point1 + (data.milestoneChild ? 1 : 0) + ((data.isManualParent && data.isManualChild) ? -10 : 0);
-                this.y2 = this.point1 + heightValue + this.taskLineValue + (this.parent.renderBaseline ? (data.milestoneParent ? 10 : 0) : 0);
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + (this.x1 + this.x2 + 11) + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + (this.x1 + this.x2) + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + (this.x1 + this.x2) + " " + this.y2 +
+                this.y1 = this.point1 + (data.milestoneChild ? -1 : 0);
+                this.y2 = this.point1 + heightValue + borderTopWidth - this.lineStroke + 1 + this.taskLineValue + (this.parent.renderBaseline ? (data.milestoneChild && !(data.milestoneParent) ? -12 : data.milestoneParent && !(data.milestoneChild) ? 11 : 0) : 0);
+                this.connectorLinePath = "M " + (this.x1 + this.x2 + 12) + " " + (this.y1) + " L " + (this.x1 + this.x2) + " " + (this.y1) + " L " + (this.x1 + this.x2) + " " + this.y2 +
                     " L " + this.x1 + " " + this.y2;
-                this.arrowPath = "M " + (this.x1 + this.x2 + 18) + " " + (this.y1 + this.manualChild) +
-                    " L " + (this.x1 + this.x2 + 11) + " " + (this.y1 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + (this.x1 + this.x2 + 11) + " " + (this.y1 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.arrowPath = "M " + (this.x1 + this.x2 + 20) + " " + (this.y1) +
+                    " L " + (this.x1 + this.x2 + 12) + " " + (this.y1 - (4 + this.lineStroke)) +
+                    " L " + (this.x1 + this.x2 + 12) + " " + (this.y1 + 4 + this.lineStroke) + " Z";
             }
             if (this.getParentPosition(data) === 'SSType4') {
                 this.taskLineValue = this.parent.renderBaseline ? this.taskLineValue : 0;
-                this.point1 = heightValue + this.taskLineValue;
-                this.point2 = this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.childIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneChild));
-                this.x1 = data.parentLeft - 8;
+                this.point1 = heightValue + this.taskLineValue + borderTopWidth;
+                this.point2 = (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1)));
+                this.x1 = data.parentLeft - 10;
                 this.x2 = data.childLeft - data.parentLeft;
-                this.y1 = this.point2 + (data.milestoneChild ? 1 : 0) + ((data.isManualParent && data.isManualChild) ? -10 : 0);
-                this.y2 = this.y1 + this.point1 + (this.parent.renderBaseline ? (data.milestoneParent ? 10 : 0) : 0);
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + (this.x1 + this.x2) + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x1 + " " + (this.y1 + this.manualParent + this.manualChild) +
+                this.y1 = this.point2 + (data.milestoneChild ? 1 : 0);
+                this.y2 = this.y1 + this.point1 + (this.parent.renderBaseline ? (data.milestoneParent && !(data.milestoneChild) ? 10 : data.milestoneChild && !(data.milestoneParent) ? -13 : 0) : 0);
+                this.connectorLinePath = "M " + (this.x1 + this.x2) + " " + (this.y1) + " L " + this.x1 + " " + (this.y1) +
                     " L " + this.x1 + " " + this.y2 + " L " + (this.x1 + 10) + " " + this.y2;
-                this.arrowPath = "M " + (this.x1 + this.x2 + 8) + " " + (this.y1 + this.manualChild) +
-                    " L " + (this.x1 + this.x2) + " " + (this.y1 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + (this.x1 + this.x2) + " " + (this.y1 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.arrowPath = "M " + (this.x1 + this.x2 + 8) + " " + (this.y1) +
+                    " L " + (this.x1 + this.x2) + " " + (this.y1 - (4 + this.lineStroke)) +
+                    " L " + (this.x1 + this.x2) + " " + (this.y1 + 4 + this.lineStroke) + " Z";
             }
             if (this.getParentPosition(data) === 'SSType3') {
                 this.taskLineValue = this.parent.renderBaseline ? this.taskLineValue : data.milestoneChild ? 1 : 0;
-                this.point1 = heightValue + this.taskLineValue;
+                this.point1 = heightValue + this.taskLineValue + borderTopWidth - (this.lineStroke - 1);
                 this.x1 = data.childLeft - 20;
-                this.y1 = (data.milestoneChild ? 1 : 0) + ((this.parent.enableVirtualization ? rowPositionHeight : (!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.childIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneChild))) + ((data.isManualParent && data.isManualChild) ? -10 : 0);
+                this.y1 = (data.milestoneChild ? 1 : 0) + (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1)));
                 this.x2 = data.parentLeft - data.childLeft + 21;
-                this.y2 = this.y1 + this.point1 + (this.parent.renderBaseline ? (data.milestoneChild ? -11 : data.milestoneParent ? 10 : 0) : 0);
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + (this.x1 + 12) + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x1 + " " + (this.y1 + this.manualParent + this.manualChild) +
+                this.y2 = this.y1 + this.point1 + (this.parent.renderBaseline ? (data.milestoneChild && !(data.milestoneParent) ? -11 : data.milestoneParent && !(data.milestoneChild) ? 10 : 0) : 0);
+                this.connectorLinePath = "M " + (this.x1 + 12) + " " + (this.y1) + " L " + this.x1 + " " + (this.y1) +
                     " L " + this.x1 + " " + this.y2 + " L " + (this.x1 + this.x2) + " " + this.y2;
-                this.arrowPath = "M " + (this.x1 + 20) + " " + (this.y1 + this.manualChild) +
-                    " L " + (this.x1 + 12) + " " + (this.y1 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + (this.x1 + 12) + " " + (this.y1 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.arrowPath = "M " + (this.x1 + 20) + " " + (this.y1) +
+                    " L " + (this.x1 + 12) + " " + (this.y1 - (4 + this.lineStroke)) +
+                    " L " + (this.x1 + 12) + " " + (this.y1 + 4 + this.lineStroke) + " Z";
             }
             if (this.getParentPosition(data) === 'SSType2') {
                 this.taskLineValue = this.parent.renderBaseline ? this.taskLineValue : data.milestoneChild ? 1 : 0;
-                this.point1 = heightValue + this.taskLineValue;
+                this.point1 = heightValue + this.taskLineValue + borderTopWidth - this.lineStroke;
                 this.x1 = setInnerElementLeftSSType2;
                 this.x2 = setInnerChildWidthSSType2 + 1;
-                this.y1 = this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneParent)) + ((data.isManualParent && data.isManualChild) ? -10 : 0);
+                this.y1 = (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1)));
                 this.y2 = this.y1 + this.point1;
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + (this.x1 + this.x2) + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x1 + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x1 + " " + this.y2 +
+                this.connectorLinePath = "M " + (this.x1 + this.x2) + " " + (this.y1) + " L " + this.x1 + " " + (this.y1) + " L " + this.x1 + " " + this.y2 +
                     " L " + (this.x1 + setInnerElementWidthSSType2) + " " + this.y2;
-                this.arrowPath = "M " + (this.x1 + setInnerElementWidthSSType2 + 8) + " " + (this.y2 + this.manualChild) +
-                    " L " + (this.x1 + setInnerElementWidthSSType2) + " " + (this.y2 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + (this.x1 + setInnerElementWidthSSType2) + " " + (this.y2 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.arrowPath = "M " + (this.x1 + setInnerElementWidthSSType2 + 8) + " " + (this.y2) +
+                    " L " + (this.x1 + setInnerElementWidthSSType2) + " " + (this.y2 - (4 + this.lineStroke)) +
+                    " L " + (this.x1 + setInnerElementWidthSSType2) + " " + (this.y2 + 4 + this.lineStroke) + " Z";
             }
             if (this.getParentPosition(data) === 'SSType1') {
                 this.taskLineValue = this.parent.renderBaseline ? this.taskLineValue : data.milestoneChild ? 1 : 0;
-                this.point1 = heightValue + this.taskLineValue;
+                this.point1 = heightValue + this.taskLineValue + borderTopWidth - this.lineStroke;
                 this.x1 = data.childLeft - 20;
                 this.x2 = data.parentLeft - data.childLeft + 21;
-                this.y1 = this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneParent)) + +((data.isManualParent && data.isManualChild) ? -10 : 0);
+                this.y1 = (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1)));
                 this.y2 = this.y1 + this.point1;
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + (this.x1 + this.x2) + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x1 + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x1 + " " + this.y2 +
+                this.connectorLinePath = "M " + (this.x1 + this.x2) + " " + (this.y1) + " L " + this.x1 + " " + (this.y1) + " L " + this.x1 + " " + this.y2 +
                     " L " + (this.x1 + 12) + " " + this.y2;
-                this.arrowPath = "M " + (this.x1 + 20) + " " + (this.y2 + this.manualChild) +
-                    " L " + (this.x1 + 12) + " " + (this.y2 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + (this.x1 + 12) + " " + (this.y2 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.arrowPath = "M " + (this.x1 + 20) + " " + (this.y2) +
+                    " L " + (this.x1 + 12) + " " + (this.y2 - (4 + this.lineStroke)) +
+                    " L " + (this.x1 + 12) + " " + (this.y2 + 4 + this.lineStroke) + " Z";
             }
             if (this.getParentPosition(data) === 'FFType1') {
                 this.taskLineValue = this.parent.renderBaseline ? this.taskLineValue : (data.milestoneChild ? 1 : 0);
@@ -12365,30 +12400,26 @@ class ConnectorLine {
                 this.x2 = data.parentEndPoint + (data.milestoneParent ? -1 : 0);
                 this.x3 = data.milestoneParent ? 22 : 21;
                 this.x4 = data.milestoneChild ? 4 : 8;
-                this.y1 = this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneParent)) + ((data.isManualParent && data.isManualChild) ? -10 : 0);
-                this.y2 = heightValue + this.taskLineValue;
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + this.x2 + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + (this.x2 + this.x3) + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + (this.x2 + this.x3) + " " + (this.y1 + this.y2) +
+                this.y1 = (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1)));
+                this.y2 = heightValue + this.taskLineValue + borderTopWidth - this.lineStroke;
+                this.connectorLinePath = "M " + this.x2 + " " + (this.y1) + " L " + (this.x2 + this.x3) + " " + (this.y1) + " L " + (this.x2 + this.x3) + " " + (this.y1 + this.y2) +
                     " L " + (this.x1 + this.x4) + " " + (this.y1 + this.y2);
-                this.arrowPath = "M " + this.x1 + " " + (this.y1 + this.y2 + this.manualChild) +
-                    " L " + (this.x1 + 8) + " " + (this.y1 + this.y2 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + (this.x1 + 8) + " " + (this.y1 + this.y2 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.arrowPath = "M " + this.x1 + " " + (this.y1 + this.y2) +
+                    " L " + (this.x1 + 8) + " " + (this.y1 + this.y2 - (4 + this.lineStroke)) +
+                    " L " + (this.x1 + 8) + " " + (this.y1 + this.y2 + 4 + this.lineStroke) + " Z";
             }
             if (this.getParentPosition(data) === 'FFType2') {
                 this.taskLineValue = this.parent.renderBaseline ? this.taskLineValue : (data.milestoneChild ? 1 : 0);
                 this.x1 = data.parentEndPoint;
                 this.x2 = data.childEndPoint + (data.milestoneParent ? 22 : 21);
                 this.x3 = data.childEndPoint + (data.milestoneChild ? 9 : 8);
-                this.y1 = this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneParent)) + ((data.isManualParent && data.isManualChild) ? -10 : 0);
-                this.y2 = heightValue + this.taskLineValue;
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + this.x1 + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x2 + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x2 + " " + (this.y1 + this.y2) +
+                this.y1 = (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(data.milestoneParent) - (this.lineStroke - 1)));
+                this.y2 = heightValue + this.taskLineValue + borderTopWidth - this.lineStroke;
+                this.connectorLinePath = "M " + this.x1 + " " + (this.y1) + " L " + this.x2 + " " + (this.y1) + " L " + this.x2 + " " + (this.y1 + this.y2) +
                     " L " + this.x3 + " " + (this.y1 + this.y2);
-                this.arrowPath = "M " + (this.x3 - 8) + " " + (this.y1 + this.y2 + this.manualChild) +
-                    " L " + this.x3 + " " + (this.y1 + this.y2 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + this.x3 + " " + (this.y1 + this.y2 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.arrowPath = "M " + (this.x3 - 8) + " " + (this.y1 + this.y2) +
+                    " L " + this.x3 + " " + (this.y1 + this.y2 - (4 + this.lineStroke)) +
+                    " L " + this.x3 + " " + (this.y1 + this.y2 + 4 + this.lineStroke) + " Z";
             }
             if (this.getParentPosition(data) === 'FFType3') {
                 this.taskLineValue = this.parent.renderBaseline ? this.taskLineValue : 0;
@@ -12396,98 +12427,86 @@ class ConnectorLine {
                 this.x2 = this.x1 + (data.milestoneChild ? 4 : 8);
                 this.x3 = data.parentEndPoint - data.childEndPoint + (data.milestoneChild ? 16 : 10);
                 this.x4 = data.parentEndPoint + (data.milestoneParent ? -1 : 0);
-                this.y1 = this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.childIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneChild)) + ((data.isManualParent && data.isManualChild) ? -10 : 0);
-                this.y2 = heightValue + this.taskLineValue + (this.parent.renderBaseline ? (data.milestoneParent ? 10 : 0) : 0);
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + this.x2 + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + (this.x2 + this.x3) + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + (this.x2 + this.x3) + " " + (this.y1 + this.y2) +
+                this.y1 = (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1)));
+                this.y2 = heightValue + this.taskLineValue + borderTopWidth - this.lineStroke + (this.parent.renderBaseline ? (data.milestoneParent && !(data.milestoneChild) ? 10 : data.milestoneChild && !(data.milestoneParent) ? -11 : 0) : 0);
+                this.connectorLinePath = "M " + this.x2 + " " + (this.y1) + " L " + (this.x2 + this.x3) + " " + (this.y1) + " L " + (this.x2 + this.x3) + " " + (this.y1 + this.y2) +
                     " L " + this.x4 + " " + (this.y1 + this.y2);
-                this.arrowPath = "M " + this.x1 + " " + (this.y1 + this.manualChild) +
-                    " L " + (this.x1 + 8) + " " + (this.y1 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + (this.x1 + 8) + " " + (this.y1 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.arrowPath = "M " + this.x1 + " " + (this.y1) +
+                    " L " + (this.x1 + 8) + " " + (this.y1 - (4 + this.lineStroke)) +
+                    " L " + (this.x1 + 8) + " " + (this.y1 + 4 + this.lineStroke) + " Z";
             }
             if (this.getParentPosition(data) === 'FFType4') {
                 this.taskLineValue = this.parent.renderBaseline ? this.taskLineValue : 0;
                 this.x1 = data.parentEndPoint;
                 this.x2 = data.childEndPoint + (data.milestoneChild ? 7 : 8);
                 this.x3 = this.x2 + (data.milestoneChild ? 12 : 11);
-                this.y1 = this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.childIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneChild)) + ((data.isManualParent && data.isManualChild) ? -10 : 0);
-                this.y2 = heightValue + this.taskLineValue + +(this.parent.renderBaseline ? (data.milestoneParent ? 10 : 0) : 0);
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + this.x2 + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x3 + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x3 + " " + (this.y1 + this.y2) +
+                this.y1 = (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1)));
+                this.y2 = heightValue + this.taskLineValue + borderTopWidth + (this.parent.renderBaseline ? (data.milestoneParent && !(data.milestoneChild) ? 10 : data.milestoneChild && !(data.milestoneParent) ? -12 : 0) : 0) - this.lineStroke + 1;
+                this.connectorLinePath = "M " + this.x2 + " " + (this.y1) + " L " + this.x3 + " " + (this.y1) + " L " + this.x3 + " " + (this.y1 + this.y2) +
                     " L " + this.x1 + " " + (this.y1 + this.y2);
-                this.arrowPath = "M " + (this.x2 - 8) + " " + (this.y1 + this.manualChild) +
-                    " L " + this.x2 + " " + (this.y1 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + this.x2 + " " + (this.y1 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.arrowPath = "M " + (this.x2 - 8) + " " + (this.y1) +
+                    " L " + this.x2 + " " + (this.y1 - (4 + this.lineStroke)) +
+                    " L " + this.x2 + " " + (this.y1 + 4 + this.lineStroke) + " Z";
             }
             if (this.getParentPosition(data) === 'SFType4') {
                 this.taskLineValue = this.parent.renderBaseline ? this.taskLineValue : (data.milestoneChild ? -1 : 0);
-                this.point1 = heightValue - this.getconnectorLineGap(data) + this.taskLineValue;
-                this.point2 = this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.childIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneChild));
+                this.point1 = (this.taskLineValue + heightValue + borderTopWidth - this.getconnectorLineGap(data) - (this.lineStroke - 1));
+                this.point2 = (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue));
                 this.x1 = data.parentLeft - 10;
                 this.x2 = this.x1 + ((data.childEndPoint - data.parentLeft) + 18);
                 this.x3 = this.x2 + (data.milestoneChild ? 16 : 11);
-                this.y1 = this.point2 + (data.milestoneChild ? 1 : 0) + ((data.isManualParent && data.isManualChild) ? -10 : 0);
-                this.y2 = this.y1 + this.point1 + (this.parent.renderBaseline ? (data.milestoneChild ? -11 : 0) : 0);
-                this.y3 = this.getconnectorLineGap(data) + (this.parent.renderBaseline ? (data.milestoneParent ? 10 : 0) : 0);
+                this.y1 = this.point2 + (data.milestoneChild ? 2 : 0) + (this.parent.renderBaseline ? (data.milestoneParent ? -5 : 0) : 0);
+                this.y2 = this.y1 + this.point1 + (this.parent.renderBaseline ? (data.milestoneChild && !(data.milestoneParent) ? -9 : data.milestoneParent && !(data.milestoneChild) ? 9 : 0) : 0);
+                this.y3 = this.getconnectorLineGap(data);
                 this.y4 = this.y2 - (this.y2 % data.rowHeight);
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + this.x2 + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x3 + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x3 + " " + this.y4 + " L " + this.x1 + " " + this.y4 +
+                this.connectorLinePath = "M " + this.x2 + " " + (this.y1) + " L " + this.x3 + " " + (this.y1) + " L " + this.x3 + " " + this.y4 + " L " + this.x1 + " " + this.y4 +
                     " L " + this.x1 + " " + (this.y2 + this.y3) + " L " + (this.x1 + 11) + " " + (this.y2 + this.y3);
-                this.arrowPath = "M " + (this.x2 - 8) + " " + (this.y1 + this.manualChild) +
-                    " L " + this.x2 + " " + (this.y1 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + this.x2 + " " + (this.y1 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.arrowPath = "M " + (this.x2 - 8) + " " + (this.y1) +
+                    " L " + this.x2 + " " + (this.y1 - (4 + this.lineStroke)) +
+                    " L " + this.x2 + " " + (this.y1 + 4 + this.lineStroke) + " Z";
             }
             if (this.getParentPosition(data) === 'SFType3') {
                 this.taskLineValue = this.parent.renderBaseline ? this.taskLineValue : 0;
-                this.point1 = (data.parentLeft - (data.childEndPoint + (data.milestoneParent ? 25 : 20))) + 1 + (this.parent.renderBaseline ? (data.milestoneParent ? 5 : 0) : 0);
-                this.point2 = this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.childIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneChild));
+                this.point1 = (data.parentLeft - (data.childEndPoint + (data.milestoneParent ? 23 : 20))) + 1;
+                this.point2 = (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1)));
                 this.x1 = data.childEndPoint;
                 this.x2 = this.x1 + (data.milestoneChild ? 9 : 8);
                 this.x3 = this.x2 + (data.milestoneChild ? 17 : 11);
-                this.y1 = this.point2 + ((data.isManualParent && data.isManualChild) ? -10 : 0);
-                this.y2 = this.y1 + heightValue + this.taskLineValue + (this.parent.renderBaseline ? (data.milestoneParent ? 10 : 0) : 0);
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + this.x2 + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x3 + " " + (this.y1 + this.manualParent + this.manualChild) +
+                this.y1 = this.point2;
+                this.y2 = this.y1 + heightValue + borderTopWidth - (this.lineStroke - 1) + this.taskLineValue + (this.parent.renderBaseline ? (data.milestoneChild && !(data.milestoneParent) ? -12 : data.milestoneParent && !(data.milestoneChild) ? 10 : 0) : 0);
+                this.connectorLinePath = "M " + this.x2 + " " + (this.y1) + " L " + this.x3 + " " + (this.y1) +
                     " L " + this.x3 + " " + this.y2 + " L " + (this.x3 + this.point1) + " " + this.y2;
-                this.arrowPath = "M " + (this.x2 - 8) + " " + (this.y1 + this.manualChild) +
-                    " L " + this.x2 + " " + (this.y1 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + this.x2 + " " + (this.y1 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.arrowPath = "M " + (this.x2 - 8) + " " + (this.y1) +
+                    " L " + this.x2 + " " + (this.y1 - (4 + this.lineStroke)) +
+                    " L " + this.x2 + " " + (this.y1 + 4 + this.lineStroke) + " Z";
             }
             if (this.getParentPosition(data) === 'SFType1') {
                 this.taskLineValue = this.parent.renderBaseline ? this.taskLineValue : data.milestoneChild ? 1 : 0;
-                this.point1 = heightValue - this.getconnectorLineGap(data) + this.taskLineValue;
+                this.point1 = heightValue + borderTopWidth - this.getconnectorLineGap(data) + this.taskLineValue - this.lineStroke;
                 this.point2 = this.getconnectorLineGap(data);
                 this.x1 = data.parentLeft - 10;
-                this.y1 = this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneParent)) + +((data.isManualParent && data.isManualChild) ? -10 : 0);
+                this.y1 = (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue));
                 this.x2 = (data.childEndPoint - data.parentLeft) + 31;
                 this.y2 = this.y1 + this.point1;
                 this.x3 = (data.childEndPoint - data.parentLeft) + 18;
                 this.y3 = this.y2 - (this.y2 % data.rowHeight);
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + (this.x1 + 11) + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x1 + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + this.x1 + " " + this.y3 +
+                this.connectorLinePath = "M " + (this.x1 + 11) + " " + (this.y1) + " L " + this.x1 + " " + (this.y1) + " L " + this.x1 + " " + this.y3 +
                     " L " + (this.x1 + this.x2) + " " + this.y3 + " L " + (this.x1 + this.x2) + " " + (this.y2 + this.point2) + " L " + (this.x1 + this.x3) + " " + (this.y2 + this.point2);
-                this.arrowPath = "M " + (this.x1 + this.x3 - 8) + " " + (this.y2 + this.point2 + this.manualChild) +
-                    " L " + (this.x1 + this.x3) + " " + (this.y2 + this.point2 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + (this.x1 + this.x3) + " " + (this.y2 + this.point2 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.arrowPath = "M " + (this.x1 + this.x3 - 8) + " " + (this.y2 + this.point2) +
+                    " L " + (this.x1 + this.x3) + " " + (this.y2 + this.point2 - (4 + this.lineStroke)) +
+                    " L " + (this.x1 + this.x3) + " " + (this.y2 + this.point2 + 4 + this.lineStroke) + " Z";
             }
             if (this.getParentPosition(data) === 'SFType2') {
                 this.taskLineValue = this.parent.renderBaseline ? this.taskLineValue : 0;
                 this.x1 = data.childEndPoint;
-                this.y1 = this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + this.getTaskbarMidpoint(data.milestoneParent)) + +((data.isManualParent && data.isManualChild) ? -10 : 0);
+                this.y1 = (this.parent.enableVirtualization ? rowPositionHeight : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1)));
                 this.x2 = (data.parentLeft - data.childEndPoint);
-                this.y2 = this.y1 + heightValue + this.taskLineValue;
-                this.manualParent = (data.isManualParent && !data.isManualChild ? -10 : 0);
-                this.manualChild = (data.isManualChild && !data.isManualParent ? -10 : 0);
-                this.connectorLinePath = "M " + (this.x1 + this.x2 + 1) + " " + (this.y1 + this.manualParent + this.manualChild) + " L " + (this.x1 + this.x2 - 10) + " " + (this.y1 + this.manualParent + this.manualChild) +
+                this.y2 = this.y1 + heightValue + this.taskLineValue + borderTopWidth - this.lineStroke;
+                this.connectorLinePath = "M " + (this.x1 + this.x2 + 1) + " " + (this.y1) + " L " + (this.x1 + this.x2 - 10) + " " + (this.y1) +
                     " L " + (this.x1 + this.x2 - 10) + " " + this.y2 + " L " + (this.x1 + 8) + " " + this.y2;
-                this.arrowPath = "M " + this.x1 + " " + (this.y2 + this.manualChild) +
-                    " L " + (this.x1 + 8) + " " + (this.y2 - (4 + this.lineStroke) + this.manualChild) +
-                    " L " + (this.x1 + 8) + " " + (this.y2 + 4 + this.lineStroke + this.manualChild) + " Z";
+                this.arrowPath = "M " + this.x1 + " " + (this.y2) +
+                    " L " + (this.x1 + 8) + " " + (this.y2 - (4 + this.lineStroke)) +
+                    " L " + (this.x1 + 8) + " " + (this.y2 + 4 + this.lineStroke) + " Z";
             }
             this.connectorPath.setAttribute("d", this.connectorLinePath);
             this.arrowlinePath.setAttribute("d", this.arrowPath);
@@ -19312,7 +19331,16 @@ class TaskbarEdit extends DateProcessor {
                 }
                 else {
                     if (this.mouseMoveX < (item.left + segment.left)) {
-                        segment.width = this.parent.perDayWidth;
+                        var segmentWidth = (this.parent.timelineModule.isSingleTier &&
+                            (this.parent.timelineModule.customTimelineSettings.bottomTier.unit === "Hour" ||
+                                this.parent.timelineModule.customTimelineSettings.topTier.unit === "Hour" ||
+                                this.parent.timelineModule.customTimelineSettings.bottomTier.unit === "Minutes" ||
+                                this.parent.timelineModule.customTimelineSettings.topTier.unit === "Minutes")) ||
+                            (this.parent.timelineModule.customTimelineSettings.bottomTier.unit === "Hour" ||
+                                this.parent.timelineModule.customTimelineSettings.bottomTier.unit === "Minutes") ?
+                            this.parent.timelineModule.customTimelineSettings.timelineUnitSize :
+                            this.parent.perDayWidth;
+                        segment.width = segmentWidth;
                     }
                 }
             }
@@ -26611,7 +26639,7 @@ class Edit$2 {
                         /* tslint:disable-next-line */
                         const query = this.parent.query instanceof Query ? this.parent.query : new Query();
                         const adaptor = data.adaptor;
-                        if (!(adaptor instanceof WebApiAdaptor && adaptor instanceof ODataAdaptor) || data.dataSource.batchUrl) {
+                        if (!(adaptor instanceof WebApiAdaptor && adaptor instanceof ODataAdaptor && adaptor instanceof ODataV4Adaptor) || data.dataSource.batchUrl) {
                             /* tslint:disable-next-line */
                             const crud = data.saveChanges(updatedData, this.parent.taskFields.id, null, query);
                             crud.then((e) => {
@@ -26746,6 +26774,9 @@ class Edit$2 {
             else if (ganttColumns[i].field === 'taskType') {
                 tempRecord[fieldName] = this.parent.taskType;
             }
+            else if (ganttColumns[i].field === taskSettingsFields.milestone) {
+                tempRecord[fieldName] = null;
+            }
             else {
                 tempRecord[this.parent.ganttColumns[i].field] = '';
             }
@@ -30124,7 +30155,7 @@ class CriticalPath {
             }
             const predecessorLength = flatRecords[index].ganttProperties.predecessor;
             const noSlackValue = 0 + ' ' + flatRecords[index].ganttProperties.durationUnit;
-            for (let i = 0; i < predecessorLength.length; i++) {
+            for (let i = predecessorLength.length - 1; i >= 0; i--) {
                 let toID;
                 if (this.parent.viewType === 'ProjectView') {
                     toID = this.parent.ids.indexOf(predecessorLength[i].to);
@@ -30135,8 +30166,19 @@ class CriticalPath {
                 let dateDifference;
                 const currentData = flatRecords[index].ganttProperties;
                 if (predecessorLength[i].type === 'FS') {
-                    /* eslint-disable-next-line */
-                    dateDifference = this.parent.dataOperation.getDuration(currentData.endDate, flatRecords[toID].ganttProperties.startDate, currentData.durationUnit, currentData.isAutoSchedule, currentData.isMilestone);
+                    if (predecessorLength[i].to != currentData.taskId.toString() || this.parent.viewType === 'ResourceView') {
+                        /* eslint-disable-next-line */
+                        dateDifference = this.parent.dataOperation.getDuration(currentData.endDate, flatRecords[toID].ganttProperties.startDate, currentData.durationUnit, currentData.isAutoSchedule, currentData.isMilestone);
+                    }
+                    else {
+                        toID = this.parent.ids.indexOf(predecessorLength[i].from);
+                        /* eslint-disable-next-line */
+                        dateDifference = this.parent.dataOperation.getDuration(flatRecords[toID].ganttProperties.endDate, currentData.startDate, currentData.durationUnit, currentData.isAutoSchedule, currentData.isMilestone);
+                        if (dateDifference === 0 && index !== toID && flatRecords[index].slack == noSlackValue) {
+                            flatRecords[toID].slack = flatRecords[index].slack;
+                            flatRecords[toID].ganttProperties.slack = flatRecords[index].slack;
+                        }
+                    }
                     if (dateDifference === 0 && index !== toID && flatRecords[index].slack !== noSlackValue) {
                         flatRecords[index].slack = flatRecords[toID].slack;
                         flatRecords[index].ganttProperties.slack = flatRecords[toID].slack;