@syncfusion/ej2-gantt 23.1.39 → 23.1.42

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

@@ -4277,7 +4277,12 @@ class ChartScroll {
                 for (let i = 0; i < parent.currentViewData.length; i++) {
                     const tr = parent.chartRowsModule.ganttChartTableBody.childNodes[i];
                     if (tr['style'].display !== 'none' && parent.currentViewData[i].hasChildRecords && !parent.currentViewData[i].expanded) {
-                        parent.treeGrid.getRowByIndex(i)['style'].height = tr['style'].height;
+                        if (parent.ganttChartModule.isExpandAll || parent.ganttChartModule.isCollapseAll) {
+                            parent.treeGrid.getRowByIndex(i)['style'].height = tr['style'].height;
+                        }
+                        else {
+                            parent.treeGrid.getRows()[i]['style'].height = tr['style'].height;
+                        }
                     }
                 }
                 parent.contentHeight = parent.enableRtl ? parent['element'].getElementsByClassName('e-content')[2].children[0]['offsetHeight'] :
@@ -4780,8 +4785,14 @@ class GanttChart {
             this.parent.notify('chartMouseDown', e);
             this.parent.element.tabIndex = 0;
         }
-        if (this.parent.editSettings.allowEditing && this.parent.treeGrid.element.getElementsByClassName('e-editedbatchcell').length > 0) {
-            this.parent.treeGrid.endEdit();
+        let isTaskbarEdited = false;
+        if (this.parent.editSettings.allowTaskbarEditing && this.parent.element.querySelector('.e-left-resize-gripper')) {
+            isTaskbarEdited = true;
+        }
+        if (!isTaskbarEdited) {
+            if (this.parent.editSettings.allowEditing && this.parent.treeGrid.element.getElementsByClassName('e-editedbatchcell').length > 0) {
+                this.parent.treeGrid.endEdit();
+            }
         }
     }
     ganttChartMouseClick(e) {
@@ -4791,6 +4802,22 @@ class GanttChart {
         this.parent.notify('chartMouseClick', e);
     }
     ganttChartMouseUp(e) {
+        if (e.type === "touchend") {
+            var resizeCheck = this.parent.ganttChartModule.chartBodyContainer.querySelector('.e-taskbar-resize-div');
+            if (!isNullOrUndefined(resizeCheck)) {
+                resizeCheck.remove();
+            }
+            var Check = this.parent.ganttChartModule.chartBodyContainer.querySelector('.e-clone-taskbar') || this.parent.chartPane.querySelector('.e-clone-taskbar');
+            if (!isNullOrUndefined(Check)) {
+                var clonetbody = Check.parentElement;
+                var cloneTable = clonetbody.parentElement;
+                cloneTable.remove();
+            }
+            var falseline = this.parent.ganttChartModule.chartBodyContainer.querySelector('.e-gantt-false-line');
+            if (!isNullOrUndefined(falseline)) {
+                this.parent.editModule.taskbarEditModule.removeFalseLine(true);
+            }
+        }
         if (this.parent.editSettings.allowTaskbarEditing) {
             this.parent.notify('chartMouseUp', e);
         }
@@ -4814,22 +4841,6 @@ class GanttChart {
                 }
             }
         }
-        if (e.type === "touchend") {
-            var resizeCheck = this.parent.ganttChartModule.chartBodyContainer.querySelector('.e-taskbar-resize-div');
-            if (!isNullOrUndefined(resizeCheck)) {
-                resizeCheck.remove();
-            }
-            var Check = this.parent.ganttChartModule.chartBodyContainer.querySelector('.e-clone-taskbar');
-            if (!isNullOrUndefined(Check)) {
-                var clonetbody = Check.parentElement;
-                var cloneTable = clonetbody.parentElement;
-                cloneTable.remove();
-            }
-            var falseline = this.parent.ganttChartModule.chartBodyContainer.querySelector('.e-gantt-false-line');
-            if (!isNullOrUndefined(falseline)) {
-                this.parent.editModule.taskbarEditModule.removeFalseLine(true);
-            }
-        }
     }
     /**
      *
@@ -4883,6 +4894,9 @@ class GanttChart {
         if (!isNullOrUndefined(resizeCheck)) {
             resizeCheck.remove();
         }
+        if (this.parent.allowTaskbarDragAndDrop && this.parent.editModule && this.parent.editModule.taskbarEditModule) {
+            this.parent.editModule.taskbarEditModule['previousLeftValue'] = 0;
+        }
         if (this.parent.allowRowDragAndDrop) {
             const ganttDragElemet = this.parent.element.querySelector('.e-ganttdrag');
             if (ganttDragElemet) {
@@ -5029,6 +5043,14 @@ class GanttChart {
         if (this.parent.allowFiltering && this.parent.filterModule) {
             this.parent.filterModule.closeFilterOnContextClick(e.srcElement);
         }
+        if (this.parent.allowTaskbarDragAndDrop) {
+            let Check = this.parent.chartPane.querySelector('.e-clone-taskbar');
+            if (!isNullOrUndefined(Check)) {
+                let clonetbody = Check.parentElement;
+                let cloneTable = clonetbody.parentElement;
+                cloneTable.remove();
+            }
+        }
     }
     /**
      * Method to trigger while perform mouse move on Gantt.
@@ -10828,7 +10850,12 @@ class ChartRows extends DateProcessor {
         if (!tr) {
             tr = this.ganttChartTableBody.childNodes[rowIndex];
         }
-        tr['style'].height = this.parent.treeGrid.getRowByIndex(rowIndex)['style'].height = this.parent.rowHeight + 'px';
+        if (this.parent.ganttChartModule.isExpandAll || this.parent.ganttChartModule.isCollapseAll) {
+            tr['style'].height = this.parent.treeGrid.getRowByIndex(rowIndex)['style'].height = this.parent.rowHeight + 'px';
+        }
+        else {
+            tr['style'].height = this.parent.treeGrid.getRows()[rowIndex]['style'].height = this.parent.rowHeight + 'px';
+        }
         this.parent.contentHeight = treeGridContentHeight;
         let rowIDs = [];
         let rowCounts = 0;
@@ -10845,7 +10872,12 @@ class ChartRows extends DateProcessor {
                                 rowCounts++;
                                 tr.children[0]['style'].verticalAlign = 'baseline';
                                 tr.getElementsByClassName('e-taskbar-main-container')[k]['style'].marginTop = (rowCounts * this.parent.rowHeight) + this.taskBarMarginTop + 'px';
-                                tr['style'].height = this.parent.treeGrid.getRowByIndex(rowIndex)['style'].height = parseInt(tr['style'].height) + this.parent.rowHeight + 'px';
+                                if (this.parent.ganttChartModule.isExpandAll || this.parent.ganttChartModule.isCollapseAll) {
+                                    tr['style'].height = this.parent.treeGrid.getRowByIndex(rowIndex)['style'].height = parseInt(tr['style'].height) + this.parent.rowHeight + 'px';
+                                }
+                                else {
+                                    tr['style'].height = this.parent.treeGrid.getRows()[rowIndex]['style'].height = parseInt(tr['style'].height) + this.parent.rowHeight + 'px';
+                                }
                             }
                         }
                         else {
@@ -10878,7 +10910,12 @@ class ChartRows extends DateProcessor {
         if (index !== -1 && selectedItem) {
             const data = selectedItem;
             if (!this.parent.allowTaskbarOverlap && this.parent.viewType === 'ResourceView' && data.expanded) {
-                tr['style'].height = this.parent.treeGrid.getRowByIndex(index)['style'].height = this.parent.rowHeight + 'px';
+                if (this.parent.ganttChartModule.isExpandAll || this.parent.ganttChartModule.isCollapseAll) {
+                    tr['style'].height = this.parent.treeGrid.getRowByIndex(index)['style'].height = this.parent.rowHeight + 'px';
+                }
+                else {
+                    tr['style'].height = this.parent.treeGrid.getRows()[index]['style'].height = this.parent.rowHeight + 'px';
+                }
             }
             if (this.parent.viewType === 'ResourceView' && data.hasChildRecords && !data.expanded && this.parent.enableMultiTaskbar) {
                 tr.replaceChild(this.getResourceParent(data).childNodes[0], tr.childNodes[0]);
@@ -10939,8 +10976,14 @@ class ChartRows extends DateProcessor {
         addClass([cloneElement], 'collpse-parent-border');
         const id = tRow.querySelector('.' + taskBarMainContainer).getAttribute('rowUniqueId');
         const ganttData = this.parent.getRecordByID(id);
-        const mainTaskbar = (cloneElement.querySelector('.e-gantt-child-taskbar'));
-        if (this.parent.queryTaskbarInfo) {
+        if (!(isNullOrUndefined(ganttData)) && ganttData.ganttProperties.segments && ganttData.ganttProperties.segments.length > 0) {
+            const segmentedTasks = cloneElement.getElementsByClassName('e-segmented-taskbar');
+            for (var i = 0; i < segmentedTasks.length; i++) {
+                this.triggerQueryTaskbarInfoByIndex(segmentedTasks[i], ganttData);
+            }
+        }
+        else if (this.parent.queryTaskbarInfo) {
+            const mainTaskbar = (cloneElement.querySelector('.e-gantt-child-taskbar'));
             this.triggerQueryTaskbarInfoByIndex(mainTaskbar, ganttData);
         }
         let zIndex = "";
@@ -12459,7 +12502,9 @@ class ConnectorLine {
                     }
                 }
             }
-            heightValue = Math.abs(parentOverlapTopValue - childOverlapTopValue);
+            if (!this.parent.enableVirtualization) {
+                heightValue = Math.abs(parentOverlapTopValue - childOverlapTopValue);
+            }
         }
         if (this.parent.currentViewData[data.parentIndex] && this.parent.currentViewData[data.childIndex] && this.parent.allowParentDependency) {
             let fromRecordIsParent = this.parent.currentViewData[data.parentIndex].hasChildRecords;
@@ -12550,6 +12595,9 @@ class ConnectorLine {
                 d: this.arrowPath,
                 class: connectorLineArrow
             });
+            let outlineColor = (this.lineColor) && !(this.parent.enableCriticalPath) ? this.lineColor : '';
+            this.connectorPath.setAttribute('style', `stroke: ${outlineColor}`);
+            this.arrowlinePath.setAttribute('style', `fill: ${outlineColor}`);
             // Append the path element to the group element
             this.groupObject.appendChild(this.connectorPath);
             this.groupObject.appendChild(this.arrowlinePath);
@@ -18628,6 +18676,8 @@ class EditTooltip {
 class TaskbarEdit extends DateProcessor {
     constructor(ganttObj) {
         super(ganttObj);
+        this.leftValue = 0;
+        this.previousLeftValue = 0;
         this.isMouseDragged = false;
         this.dependencyCancel = false;
         this.editElement = null;
@@ -18639,7 +18689,7 @@ class TaskbarEdit extends DateProcessor {
         this.currentItemTop = 0;
         this.currentItemPrevTop = 0;
         this.topValue = 0;
-        this.draggedRecordMarginTop = 0;
+        this.draggedRecordMarginTop = '0px';
         this.parent = ganttObj;
         this.initPublicProp();
         this.wireEvents();
@@ -19109,17 +19159,6 @@ class TaskbarEdit extends DateProcessor {
             this.mouseDownY = this.dragMoveY = e.pageY - containerPosition.top +
                 this.parent.ganttChartModule.scrollObject.previousScroll.top;
         }
-        if (this.parent.viewType == "ResourceView" && this.parent.allowTaskbarDragAndDrop) {
-            let toolbarHeight = 0;
-            if (!isNullOrUndefined(this.parent.toolbarModule) && !isNullOrUndefined(this.parent.toolbarModule.element)) {
-                toolbarHeight = this.parent.toolbarModule.element.offsetHeight;
-            }
-            this.topValue = this.parent.getOffsetRect(event.target).top - this.parent.getOffsetRect(this.parent.element).top -
-                parseInt((closest(event.target, '.e-taskbar-main-container'))['style'].marginTop) -
-                this.parent.element.getElementsByClassName('e-timeline-header-container')[0]['offsetHeight'] -
-                toolbarHeight + document.getElementsByClassName('e-chart-scroll-container e-content')[0].scrollTop;
-            this.currentItemPrevTop = this.currentItemTop = this.topValue;
-        }
         if (this.taskBarEditAction === 'ConnectorPointLeftDrag' || this.taskBarEditAction === 'ConnectorPointRightDrag') {
             this.fromPredecessorText = this.taskBarEditAction === 'ConnectorPointLeftDrag' ? 'start' : 'finish';
             this.parent.connectorLineModule.tooltipTable.innerHTML = this.parent.connectorLineModule.getConnectorLineTooltipInnerTd(this.taskBarEditRecord.ganttProperties.taskName, this.fromPredecessorText, '', '');
@@ -19182,7 +19221,12 @@ class TaskbarEdit extends DateProcessor {
                     currentElement.parentElement.appendChild(this.taskbarElement);
                 }
                 else {
-                    currentElement.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.appendChild(this.taskbarElement);
+                    }
                 }
                 if (this.taskBarEditAction !== 'ProgressResizing') {
                     const rootElement = this.parent.ganttChartModule.chartBodyContainer.querySelectorAll(".e-chart-rows-container");
@@ -19264,26 +19308,40 @@ class TaskbarEdit extends DateProcessor {
                 this.triggerDependencyEvent(e);
                 this.drawFalseLine();
             }
-            if (this.parent.viewType == 'ResourceView' && this.parent.allowTaskbarDragAndDrop) {
-                if (this.dragMoveY > this.mouseMoveY) {
-                    this.mouseMoveY = this.dragMoveY - this.mouseMoveY;
-                    this.currentItemTop = this.currentItemTop - this.mouseMoveY;
-                }
-                else {
-                    this.mouseMoveY -= this.dragMoveY;
-                    this.currentItemTop = this.currentItemTop + this.mouseMoveY;
-                }
-                const containerPosition = this.parent.getOffsetRect(this.parent.ganttChartModule.chartBodyContainer);
-                if (this.parent.isAdaptive || e.touches) {
-                    this.dragMoveY = e.touches[0].pageY - containerPosition.top + this.parent.ganttChartModule.scrollObject.previousScroll.top;
+            if (this.parent.viewType == 'ResourceView' && this.parent.allowTaskbarDragAndDrop && this.taskBarEditAction !== 'LeftResizing' && this.taskBarEditAction !== 'RightResizing' && this.taskBarEditAction !== 'ProgressResizing') {
+                let parentClientRect = this.parent.getOffsetRect(this.parent.chartPane);
+                let coordinates = this.getCoordinate(e);
+                let position = { top: coordinates.pageY, left: coordinates.pageX };
+                let pos = { left: Math.abs(position.left - parentClientRect.left), top: position.top - parentClientRect.top };
+                let parentRecord = this.parent.getRecordByID(this.taskBarEditRecord.parentItem.taskId);
+                if (!this.parent.allowTaskbarOverlap && this.taskBarEditRecord.parentItem && !parentRecord.expanded) {
+                    let reduceHeight = 0;
+                    if (parseInt(this.editElement['style'].marginTop) > this.parent.rowHeight) {
+                        for (let 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;
+                    }
                 }
-                else {
-                    this.dragMoveY = e.pageY - containerPosition.top + this.parent.ganttChartModule.scrollObject.previousScroll.top;
+                this.topValue = pos.top;
+                this.leftValue = pos.left - (e.pageX - this.parent.getOffsetRect(this.taskBarEditElement).left) + (this.previousLeftValue !== 0 ? e.pageX - this.previousLeftValue : 0);
+                if (this.previousLeftValue == 0) {
+                    if (!this.parent.enableRtl) {
+                        this.leftValue = this.leftValue - this.parent.ganttChartModule.scrollObject.previousScroll.left + 4;
+                    }
+                    else {
+                        this.leftValue = this.leftValue + Math.abs(this.parent.ganttChartModule.scrollObject.previousScroll.left) + 4;
+                    }
                 }
-                this.topValue = this.currentItemTop;
-                this.currentItemPrevTop = (this.currentItemPrevTop === 0 ||
-                    this.topValue == this.currentItemTop) ? this.topValue :
-                    this.currentItemPrevTop;
+                this.previousLeftValue = e.pageX;
+            }
+            else {
+                this.leftValue = this.taskBarEditRecord.ganttProperties.left;
             }
             this.setItemPosition();
             this.updateEditedItem();
@@ -20171,7 +20229,7 @@ class TaskbarEdit extends DateProcessor {
                         }
                     }
                 }
-                taskBarMainContainer$$1.style.setProperty(position, (item.left) + 'px');
+                taskBarMainContainer$$1.style.setProperty(position, (this.parent.allowTaskbarDragAndDrop ? this.leftValue : (item.left)) + 'px');
                 taskBarMainContainer$$1.style.width = (width) + 'px';
                 if (segmentedTaskBarContainer && segmentConnectorPointRight) {
                     segmentConnectorPointRight.style.left = (this.parent.isAdaptive ? (width + 10) : (width + 2)) + 'px';
@@ -20191,7 +20249,7 @@ class TaskbarEdit extends DateProcessor {
                         segmentElement.style.width = (segment.width) + 'px';
                         if (i === 0) {
                             resizeLine.style.width = (segment.width) + "px";
-                            resizeLine.style.left = (segment.left + item.left) + "px";
+                            resizeLine.style.setProperty(position, (segment.left + item.left) + 'px');
                         }
                         if (this.parent.enableRtl) {
                             segmentElement.style.right = (segment.left) + 'px';
@@ -20203,7 +20261,7 @@ class TaskbarEdit extends DateProcessor {
                 }
                 if (this.taskBarEditAction === 'ChildDrag' && this.segmentIndex === 0) {
                     resizeLine.style.width = (width) + "px";
-                    resizeLine.style.left = (item.left) + "px";
+                    resizeLine.style.setProperty(position, item.left + 'px');
                     taskBarMainContainer$$1.style.setProperty("opacity", '.75');
                 }
             }
@@ -20217,7 +20275,7 @@ class TaskbarEdit extends DateProcessor {
             }
             if (this.taskBarEditAction === 'MilestoneDrag' || item.isMilestone) {
                 taskBarMainContainer$$1.style.setProperty(position, (item.left - (width / 2)) + 'px');
-                resizeLine.style.left = (item.left - (width / 2)) + 'px';
+                resizeLine.style.setProperty(position, (item.left - (width / 2)) + 'px');
                 resizeLine.style.width = (width) + "px";
             }
             else if (this.taskBarEditAction === 'ProgressResizing') {
@@ -20252,7 +20310,7 @@ class TaskbarEdit extends DateProcessor {
                 }
             }
             else if (this.taskBarEditAction === 'ParentDrag') {
-                resizeLine.style.left = (item.left) + 'px';
+                resizeLine.style.setProperty(position, item.left + 'px');
                 resizeLine.style.width = (width) + "px";
                 resizeLine.style.width = (item.width) + 'px';
                 if (!isNullOrUndefined(traceParentTaskBar$$1)) {
@@ -20265,13 +20323,13 @@ class TaskbarEdit extends DateProcessor {
             }
             else if (this.taskBarEditAction === 'ParentResizing') {
                 resizeLine.style.width = (item.width) + 'px';
-                resizeLine.style.left = item.left + 'px';
+                resizeLine.style.setProperty(position, item.left + 'px');
                 manualParentTaskbar.style.width = manualTaskbar.style.width = (item.width) + 'px';
                 manualParentRight.style.setProperty(position, item.width - manualParentLeft.offsetLeft + 'px');
             }
             else if (this.taskBarEditAction === 'ManualParentDrag') {
                 resizeLine.style.width = (item.width) + 'px';
-                resizeLine.style.left = item.left + 'px';
+                resizeLine.style.setProperty(position, item.left + 'px');
                 manualParentTaskbar.style.setProperty(position, item.left - item.autoLeft + 'px');
             }
             else {
@@ -20279,8 +20337,8 @@ class TaskbarEdit extends DateProcessor {
                     traceChildTaskBar$$1.style.width = (item.width) + 'px';
                     traceChildTaskBar$$1.style.left = (item.left) + 'px';
                     this.taskBarEditElement.style.width = (item.width) + 'px';
-                    this.taskBarEditElement.style.left = (item.left) + "px";
-                    resizeLine.style.left = (item.left) + 'px';
+                    this.taskBarEditElement.style.left = ((this.parent.allowTaskbarDragAndDrop ? this.leftValue : (item.left))) + "px";
+                    resizeLine.style.setProperty(position, item.left + 'px');
                     resizeLine.style.width = (item.width) + "px";
                 }
                 if (!isNullOrUndefined(traceChildProgressBar$$1)) {
@@ -20314,6 +20372,13 @@ class TaskbarEdit extends DateProcessor {
         if (this.taskBarEditAction && this.isMouseDragged) {
             if ((!this.dragMouseLeave && this.taskBarEditedAction) || (this.parent.viewType === 'ResourceView' &&
                 this.parent.allowTaskbarDragAndDrop)) {
+                if (e.type === 'touchmove' || e.type === 'touchstart' || e.type === 'touchend') {
+                    let coordinates = this.getCoordinate(e);
+                    this['droppedTarget'] = document.elementFromPoint(coordinates.pageX, coordinates.pageY);
+                }
+                else {
+                    this['droppedTarget'] = document.elementFromPoint(e.x, e.y);
+                }
                 this.taskBarEditedAction(e);
                 this.isMouseDragged = false;
             }
@@ -20424,7 +20489,7 @@ class TaskbarEdit extends DateProcessor {
         const args = extend({}, arg);
         const ganttRecord = args.data;
         const taskData = ganttRecord.ganttProperties;
-        const draggedRecIndex = this.parent.currentViewData.indexOf(ganttRecord);
+        const 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.rowDragAndDropModule) {
@@ -20432,45 +20497,13 @@ class TaskbarEdit extends DateProcessor {
                 if (flatRecordCol[this.taskBarEditRecord.parentItem.index] && ((this.parent.editedRecords.indexOf(flatRecordCol[this.taskBarEditRecord.parentItem.index]) === -1))) {
                     this.parent.editedRecords.push(flatRecordCol[this.taskBarEditRecord.parentItem.index]);
                 }
-                let ganttrec;
-                let resHeight = 0;
-                let rowCount = 0;
-                let childIndex;
-                let droppedRecord;
-                let treeGridrows = this.parent.treeGrid.getRows().length;
-                for (let i = 0; i < treeGridrows; i++) {
-                    if (resHeight < this.dragMoveY && this.parent.getRowByIndex(i).style.display !== 'none') {
-                        rowCount = i;
-                        resHeight = resHeight + parseInt(this.parent.getRowByIndex(i).style.height);
-                        if (!flatRecordCol[i].parentItem) {
-                            ganttrec = flatRecordCol[i];
-                        }
-                        else {
-                            ganttrec = this.parent.getRecordByID(flatRecordCol[i].parentItem.taskId);
-                        }
-                    }
-                }
-                let draggedRecordtaskbar = this.parent.getRowByIndex(draggedRecIndex).getElementsByClassName('e-taskbar-main-container');
-                let taskbarContainer = this.parent.getRowByIndex(rowCount).getElementsByClassName('e-taskbar-main-container');
-                for (let j = 0; j < taskbarContainer.length; j++) {
-                    if (taskbarContainer[j]['offsetTop'] < this.dragMoveY && draggedRecordtaskbar[0].getAttribute('rowuniqueid') !==
-                        taskbarContainer[j].getAttribute('rowuniqueid')) {
-                        this.draggedRecordMarginTop = taskbarContainer[j]['style'].marginTop;
-                        childIndex = taskbarContainer[j].getAttribute('rowuniqueid');
-                    }
-                }
-                if (childIndex) {
-                    droppedRecord = this.parent.currentViewData.filter((data) => {
-                        if (data['rowUniqueID'] === childIndex) {
-                            return data;
-                        }
-                        else {
-                            return null;
-                        }
-                    });
-                }
-                if (droppedRecord) {
-                    const droppedRecordIndex = this.parent.currentViewData.indexOf(droppedRecord[0]);
+                let droppedRecord = [];
+                this.draggedRecordMarginTop = this.taskBarEditElement.style.marginTop;
+                let row = closest(this.droppedTarget, 'tr.' + chartRow);
+                let recordIndex = parseInt(row.getAttribute('aria-rowindex'));
+                droppedRecord.push(this.parent.flatData[recordIndex]);
+                if (droppedRecord.length > 0) {
+                    const droppedRecordIndex = this.parent.flatData.indexOf(droppedRecord[0]);
                     let position = (droppedRecord[0].hasChildRecords || (!droppedRecord[0].parentItem &&
                         droppedRecord[0].childRecords.length == 0)) ? 'child' : 'below';
                     if (this.parent.rowDragAndDropModule) {
@@ -24704,6 +24737,13 @@ class Edit$2 {
                     if (ganttData.ganttProperties.baselineEndDate && ganttData.ganttProperties.baselineEndDate.getHours() === 0 && this.parent.defaultEndTime !== 86400) {
                         ganttObj.dataOperation.setTime(this.parent.defaultEndTime, ganttData.ganttProperties.baselineEndDate);
                     }
+                    if ((ganttData.ganttProperties.baselineStartDate && ganttData.ganttProperties.baselineEndDate &&
+                        (ganttData.ganttProperties.baselineStartDate.getTime() > ganttData.ganttProperties.baselineEndDate.getTime())) ||
+                        ((!isNullOrUndefined(ganttData.ganttProperties.baselineStartDate) && !isNullOrUndefined(ganttData.ganttProperties.startDate) && (ganttData.ganttProperties.baselineStartDate.getTime() === ganttData.ganttProperties.startDate.getTime()))
+                            && (!isNullOrUndefined(ganttData.ganttProperties.baselineEndDate) && !isNullOrUndefined(ganttData.ganttProperties.endDate) && (ganttData.ganttProperties.baselineEndDate.toLocaleDateString() === ganttData.ganttProperties.endDate.toLocaleDateString())) &&
+                            ganttData.ganttProperties.isMilestone)) {
+                        ganttData.ganttProperties.baselineEndDate = ganttData.ganttProperties.baselineStartDate;
+                    }
                     ganttObj.setRecordValue('baselineEndDate', ganttObj.dataOperation.checkBaselineEndDate(ganttData.ganttProperties.baselineEndDate), ganttData.ganttProperties, true);
                     ganttObj.setRecordValue('baselineLeft', ganttObj.dataOperation.calculateBaselineLeft(ganttData.ganttProperties), ganttData.ganttProperties, true);
                     ganttObj.setRecordValue('baselineWidth', ganttObj.dataOperation.calculateBaselineWidth(ganttData.ganttProperties), ganttData.ganttProperties, true);
@@ -25490,7 +25530,7 @@ class Edit$2 {
                 this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['endDate'] = rec[this.parent.taskFields.endDate];
             }
             if (this.parent.taskFields.duration !== null) {
-                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['duration'] = parseInt(rec[this.parent.taskFields.duration]);
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['duration'] = parseFloat(rec[this.parent.taskFields.duration]);
             }
             if (this.parent.taskFields.durationUnit !== null) {
                 this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['durationUnit'] = rec[this.parent.taskFields.durationUnit];
@@ -25579,6 +25619,9 @@ class Edit$2 {
             this.parent.editModule.dialogModule.previousResource = [];
         }
         if (!this.isTreeGridRefresh) {
+            if (this.parent.editSettings.allowEditing && this.parent.treeGrid.element.getElementsByClassName('e-editedbatchcell').length > 0) {
+                this.parent.treeGrid.endEdit();
+            }
             this.parent.chartRowsModule.refreshRecords(this.parent.editedRecords);
             if (this.parent.viewType === 'ResourceView' && !this.parent.allowTaskbarOverlap && this.parent.showOverAllocation) {
                 this.parent.contentHeight = this.parent['element'].getElementsByClassName('e-content')[0].children[0]['offsetHeight'];
@@ -27102,7 +27145,7 @@ class Edit$2 {
             args.data.ganttProperties['endDate'] = serverReturnedValue[this.parent.taskFields.endDate];
         }
         if (this.parent.taskFields.duration !== null) {
-            args.data.ganttProperties['duration'] = parseInt(serverReturnedValue[this.parent.taskFields.duration]);
+            args.data.ganttProperties['duration'] = parseFloat(serverReturnedValue[this.parent.taskFields.duration]);
         }
         if (this.parent.taskFields.durationUnit !== null) {
             args.data.ganttProperties['durationUnit'] = serverReturnedValue[this.parent.taskFields.durationUnit];
@@ -30740,8 +30783,8 @@ class CriticalPath {
                 if (record.ganttProperties.progress < 100) {
                     record.isCritical = true;
                     record.ganttProperties.isCritical = true;
-                    if (criticalPathIds.indexOf(parseInt(record.ganttProperties.taskId)) == -1) {
-                        criticalPathIds.push(parseInt(record.ganttProperties.taskId));
+                    if (criticalPathIds.indexOf(record.ganttProperties.taskId) == -1) {
+                        criticalPathIds.push(record.ganttProperties.taskId);
                     }
                 }
             }
@@ -30763,9 +30806,12 @@ class CriticalPath {
                     fromRecord.slack = record.slack;
                     fromRecord.isCritical = record.ganttProperties.isCritical;
                     fromRecord.ganttProperties.isCritical = record.ganttProperties.isCritical;
-                    if (criticalPathIds.indexOf(parseInt(fromRecord.ganttProperties.taskId)) == -1 && fromRecord.ganttProperties.isCritical && fromRecord.ganttProperties.progress < 100) {
+                    if (criticalPathIds.indexOf(fromRecord.ganttProperties.taskId) === -1 && fromRecord.ganttProperties.isCritical && fromRecord.ganttProperties.progress < 100) {
+                        criticalPathIds.push(fromRecord.ganttProperties.taskId);
                         this.validatedids.push(parseInt(fromRecord.ganttProperties.taskId));
-                        criticalPathIds.push(parseInt(fromRecord.ganttProperties.taskId));
+                        if (this.criticalTasks.indexOf(fromRecord) === -1) {
+                            this.criticalTasks.push(fromRecord);
+                        }
                     }
                     if (fromRecord.ganttProperties.predecessorsName) {
                         this.updateCriticalTasks(fromRecord, criticalPathIds);
@@ -30850,7 +30896,9 @@ class CriticalPath {
                 if (flatRecords[index].ganttProperties.progress < 100) {
                     flatRecords[index].isCritical = true;
                     flatRecords[index].ganttProperties.isCritical = true;
-                    this.criticalTasks.push(flatRecords[index]);
+                    if (this.criticalTasks.indexOf(flatRecords[index]) == -1) {
+                        this.criticalTasks.push(flatRecords[index]);
+                    }
                     if (criticalPathIds.indexOf(collection[x]['taskid']) === -1) {
                         criticalPathIds.push(collection[x]['taskid']);
                     }
@@ -32295,12 +32343,12 @@ class RowDD$1 {
     deleteSharedResourceTask() {
         for (let i = 0; i < this.parent.getTaskIds().length; i++) {
             if (this.parent.getTaskIds()[i] === 'T' + this.draggedRecord.ganttProperties.taskId) {
-                if (this.parent.getTaskByUniqueID(this.parent.currentViewData[i].parentItem.uniqueID).ganttProperties.taskName !== 'Unassigned Task') {
-                    this.removeRecords(this.parent.currentViewData[i]);
+                if (this.parent.getTaskByUniqueID(this.parent.flatData[i].parentItem.uniqueID).ganttProperties.taskName !== 'Unassigned Task') {
+                    this.removeRecords(this.parent.flatData[i]);
                 }
                 /* eslint-disable-next-line */
-                if (!isNullOrUndefined(this.parent.currentViewData[i].parentItem && this.updateParentRecords.indexOf(this.parent.currentViewData[i].parentItem) !== -1)) {
-                    this.updateParentRecords.push(this.parent.currentViewData[i].parentItem);
+                if (!isNullOrUndefined(this.parent.flatData[i].parentItem && this.updateParentRecords.indexOf(this.parent.flatData[i].parentItem) !== -1)) {
+                    this.updateParentRecords.push(this.parent.flatData[i].parentItem);
                 }
             }
         }
@@ -32324,7 +32372,7 @@ class RowDD$1 {
                 this.parent.editModule.updateGanttProperties(this.draggedRecord, this.parent.flatData[i]);
                 this.parent.dataOperation.updateTaskData(this.parent.flatData[i]);
                 /* eslint-disable-next-line */
-                if (!isNullOrUndefined(this.parent.flatData[i].parentItem && this.updateParentRecords.indexOf(this.parent.currentViewData[i].parentItem) !== -1)) {
+                if (!isNullOrUndefined(this.parent.flatData[i].parentItem && this.updateParentRecords.indexOf(this.parent.flatData[i].parentItem) !== -1)) {
                     this.updateParentRecords.push(this.parent.flatData[i].parentItem);
                 }
             }
@@ -32755,7 +32803,7 @@ class RowDD$1 {
                 }
                 const data = [];
                 for (let i = 0; i < fromIndexes.length; i++) {
-                    data[i] = this.parent.updatedRecords[fromIndexes[i]];
+                    data[i] = this.parent.flatData[fromIndexes[i]];
                 }
                 const isByMethod = true;
                 const args = {
@@ -35113,10 +35161,10 @@ class ExportHelper {
             this.parent.predecessorModule.createConnectorLinesCollection();
             this.parent.updatedConnectorLineCollection.forEach((data) => {
                 const predecessor = this.gantt.predecessor.add();
-                predecessor.parentLeft = data.parentLeft;
-                predecessor.childLeft = data.childLeft;
-                predecessor.parentWidth = data.parentWidth;
-                predecessor.childWidth = data.childWidth;
+                predecessor.parentLeft = pointToPixel(data.parentLeft);
+                predecessor.childLeft = pointToPixel(data.childLeft);
+                predecessor.parentWidth = pointToPixel(data.parentWidth);
+                predecessor.childWidth = pointToPixel(data.childWidth);
                 predecessor.parentIndex = data.parentIndex;
                 predecessor.childIndex = data.childIndex;
                 predecessor.rowHeight = data.rowHeight;
@@ -35199,8 +35247,8 @@ class ExportHelper {
         flatData.forEach((data) => {
             const taskbar = this.gantt.taskbar.add();
             const ganttProp = data.ganttProperties;
-            taskbar.left = ganttProp.left;
-            taskbar.width = ganttProp.width;
+            taskbar.left = pointToPixel(ganttProp.left);
+            taskbar.width = pointToPixel(ganttProp.width);
             if (taskbar.left < 0) {
                 taskbar.width = taskbar.width + taskbar.left;
                 taskbar.left = 0;
@@ -35241,8 +35289,8 @@ class ExportHelper {
             taskbar.isMilestone = ganttProp.isMilestone;
             taskbar.baselineStartDate = ganttProp.baselineStartDate;
             taskbar.baselineEndDate = ganttProp.baselineEndDate;
-            taskbar.baselineLeft = ganttProp.baselineLeft;
-            taskbar.baselineWidth = ganttProp.baselineWidth;
+            taskbar.baselineLeft = pointToPixel(ganttProp.baselineLeft);
+            taskbar.baselineWidth = pointToPixel(ganttProp.baselineWidth);
             taskbar.milestoneColor = new PdfColor(this.ganttStyle.taskbar.milestoneColor);
             taskbar.isParentTask = data.hasChildRecords;
             if (ganttProp.isMilestone) {
@@ -35258,9 +35306,9 @@ class ExportHelper {
                 taskbar.taskLabel = data[this.parent.labelSettings.taskLabel].toString();
             }
             const reduceLeft = ganttProp.isMilestone ? Math.floor(this.parent.chartRowsModule.taskBarHeight / 2) + 33 : 33; // 33 indicates default timeline cell width
-            taskbar.rightTaskLabel.left = ganttProp.left + ganttProp.width + reduceLeft; // right label left value
+            taskbar.rightTaskLabel.left = pointToPixel(ganttProp.left) + pointToPixel(ganttProp.width) + reduceLeft; // right label left value
             taskbar.fontFamily = this.ganttStyle.fontFamily;
-            taskbar.progressWidth = ganttProp.progressWidth;
+            taskbar.progressWidth = pointToPixel(ganttProp.progressWidth);
             taskbar.labelColor = new PdfColor(this.ganttStyle.label.fontColor);
             taskbar.progressFontColor = new PdfColor(this.ganttStyle.taskbar.progressFontColor);
             if (taskbar.isParentTask) {