@syncfusion/ej2-gantt 19.4.56 → 20.1.50

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

@@ -484,7 +484,6 @@ var DateProcessor = /** @__PURE__ @class */ (function () {
             tDuration = this.parent.editModule.taskbarEditModule.sumOfDuration(ganttProperties.segments);
         }
         else {
-            // eslint-disable-next-line
             if (!isNullOrUndefined(ganttProperties.startDate) && !isNullOrUndefined(ganttProperties.endDate) &&
                 (ganttProperties.startDate).getTime() === (ganttProperties.endDate).getTime() && !isNullOrUndefined(ganttData.taskData[this.parent.taskFields.milestone])) {
                 tDuration = 1;
@@ -4130,6 +4129,7 @@ var GanttChart = /** @__PURE__ @class */ (function () {
         this.chartTimelineContainer = null;
         this.rangeViewContainer =
             createElement('div', { className: rangeContainer });
+        this.rangeViewContainer.setAttribute("role", "RangeContainer");
         this.virtualRender = new VirtualContentRenderer(this.parent);
         this.addEventListener();
     }
@@ -4284,6 +4284,7 @@ var GanttChart = /** @__PURE__ @class */ (function () {
     GanttChart.prototype.renderTimelineContainer = function () {
         this.chartTimelineContainer =
             createElement('div', { className: timelineHeaderContainer });
+        this.chartTimelineContainer.setAttribute("role", "TimelineHeader");
         this.chartElement.appendChild(this.chartTimelineContainer);
     };
     /**
@@ -4324,7 +4325,7 @@ var GanttChart = /** @__PURE__ @class */ (function () {
         var emptydivHeight = 36;
         var emptyHeight = this.parent.contentHeight === 0 ? this.parent.flatData.length > 1 ? emptydivHeight : 0 : this.parent.contentHeight;
         var contentElement = this.parent.element.getElementsByClassName('e-chart-scroll-container e-content')[0];
-        if (emptyHeight >= contentElement['offsetHeight']) {
+        if (emptyHeight >= contentElement['offsetHeight'] || this.parent.height === 'auto') {
             this.chartBodyContent.style.height = formatUnit(emptyHeight);
         }
         else {
@@ -4335,8 +4336,7 @@ var GanttChart = /** @__PURE__ @class */ (function () {
             else {
                 this.chartBodyContent.style.height = contentElement['offsetHeight'] + 'px';
             }
-        }
-        //let element: HTMLElement = this.chartTimelineContainer.querySelector('.' + cls.timelineHeaderTableContainer);
+        } //let element: HTMLElement = this.chartTimelineContainer.querySelector('.' + cls.timelineHeaderTableContainer);
         this.chartBodyContent.style.width = formatUnit(this.parent.timelineModule.totalTimelineWidth);
         this.setVirtualHeight();
         this.parent.notify('updateHeight', {});
@@ -4514,7 +4514,7 @@ var GanttChart = /** @__PURE__ @class */ (function () {
             var target = e.target;
             var isOnTaskbarElement = e.target.classList.contains(taskBarMainContainer)
                 || closest(e.target, '.' + taskBarMainContainer);
-            if (closest(target, '.e-gantt-parent-taskbar')) {
+            if (closest(target, '.e-gantt-parent-taskbar') && !this.parent.editSettings.allowEditing) {
                 this.chartExpandCollapseRequest(e);
             }
             else if (!isOnTaskbarElement && this.parent.autoFocusTasks) {
@@ -5038,6 +5038,10 @@ var GanttChart = /** @__PURE__ @class */ (function () {
                 $target.classList.contains('e-headercell') || $target.closest('.e-segmented-taskbar')) {
                 e.preventDefault();
             }
+            if (isTab && $target.classList.contains('e-rowdragdrop')) {
+                this.parent.treeGrid.grid.notify('key-pressed', e);
+                return;
+            }
             if ($target.classList.contains('e-rowcell') && (nextElement && nextElement.classList.contains('e-rowcell')) ||
                 $target.classList.contains('e-headercell')) { // eslint-disable-line                                                                                                                                                                                                                                    
                 if (isTab) {
@@ -5080,7 +5084,7 @@ var GanttChart = /** @__PURE__ @class */ (function () {
                     else {
                         this.manageFocus($target, 'remove', true);
                     }
-                    if (nextElement.classList.contains('e-rowcell')) {
+                    if (nextElement.classList.contains('e-rowcell') && $target.nextElementSibling) {
                         if (!$target.classList.contains('e-rowcell')) {
                             this.parent.treeGrid.grid.notify('key-pressed', e);
                             var fmodule = getValue('focusModule', this.parent.treeGrid.grid);
@@ -6179,6 +6183,40 @@ var Timeline = /** @__PURE__ @class */ (function () {
         } while ((startDate < endDate));
         return parentTh;
     };
+    Timeline.prototype.updateTimelineAfterZooming = function (endDate, resized) {
+        var timeDiff;
+        var perDayWidth;
+        var totWidth;
+        var contentElement = document.getElementsByClassName('e-chart-scroll-container e-content')[0];
+        if (!isNullOrUndefined(contentElement)) {
+            var contentWidth = contentElement['offsetWidth'];
+            var contentHeight = contentElement['offsetHeight'];
+            var scrollHeight = document.getElementsByClassName('e-chart-rows-container')[0]['offsetHeight'];
+            timeDiff = Math.abs(this.timelineStartDate.getTime() - endDate.getTime());
+            timeDiff = timeDiff / (1000 * 3600 * 24);
+            if (this.bottomTier === 'None') {
+                perDayWidth = this.getPerDayWidth(this.customTimelineSettings.timelineUnitSize, this.customTimelineSettings.topTier.count, this.topTier);
+            }
+            else {
+                perDayWidth = this.getPerDayWidth(this.customTimelineSettings.timelineUnitSize, this.customTimelineSettings.bottomTier.count, this.bottomTier);
+            }
+            if (contentHeight < scrollHeight) {
+                totWidth = (perDayWidth * timeDiff) + 17;
+            }
+            else {
+                totWidth = (perDayWidth * timeDiff);
+            }
+            if (contentWidth >= totWidth) {
+                var widthDiff = contentWidth - totWidth;
+                widthDiff = Math.round(widthDiff / perDayWidth);
+                endDate.setDate(endDate.getDate() + widthDiff);
+                this.parent.timelineModule.timelineEndDate = endDate;
+                if (resized) {
+                    this.parent.updateProjectDates(this.timelineStartDate, this.timelineEndDate, this.parent.isTimelineRoundOff);
+                }
+            }
+        }
+    };
     Timeline.prototype.getTimelineRoundOffEndDate = function (date) {
         var tierMode = this.topTier === 'None' ? this.bottomTier : this.topTier;
         var endDate = new Date(date.toString());
@@ -6193,6 +6231,9 @@ var Timeline = /** @__PURE__ @class */ (function () {
                 endDate.setHours(24, 0, 0, 0);
             }
         }
+        if (this.isZooming || this.parent.isLoad) {
+            this.updateTimelineAfterZooming(endDate, false);
+        }
         return endDate;
     };
     /**
@@ -6262,7 +6303,6 @@ var Timeline = /** @__PURE__ @class */ (function () {
         }
         return increment;
     };
-    
     /**
      * Method to find header cell was weekend or not
      *
@@ -6844,6 +6884,8 @@ var GanttTreeGrid = /** @__PURE__ @class */ (function () {
     GanttTreeGrid.prototype.renderTreeGrid = function () {
         this.composeProperties();
         this.bindEvents();
+        var root = 'root';
+        this.parent.treeGrid[root] = this.parent[root] ? this.parent[root] : this.parent;
         this.parent.treeGrid.appendTo(this.treeGridElement);
         this.wireEvents();
     };
@@ -6907,7 +6949,7 @@ var GanttTreeGrid = /** @__PURE__ @class */ (function () {
         var scrollWidth = this.getScrollbarWidth();
         var isMobile = /Android|Mac|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
         if (scrollWidth !== 0) {
-            content.style.cssText += 'width: calc(100% + ' + scrollWidth + 'px);';
+            content.style.cssText += 'width: calc(100% + ' + (scrollWidth + 1) + 'px);';
         }
         else {
             content.classList.add('e-gantt-scroll-padding');
@@ -8251,7 +8293,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         _this.milestoneHeight = 0;
         _this.milesStoneRadius = 0;
         _this.baselineTop = 0;
-        _this.baselineHeight = 3;
+        _this.baselineHeight = 8;
         _this.touchLeftConnectorpoint = '';
         _this.touchRightConnectorpoint = '';
         _this.dropSplit = false;
@@ -8334,7 +8376,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
      * @private
      */
     ChartRows.prototype.getIndicatorNode = function (indicator) {
-        var templateString = '<label class="' + label + ' ' + taskIndicatorDiv + '"  style="line-height:'
+        var templateString = '<label class="' + label + ' ' + taskIndicatorDiv + '" role="LabelIndicator" style="line-height:'
             + (this.parent.rowHeight) + 'px;' +
             'left:' + this.getIndicatorleft(indicator.date) + 'px;"><i class="' + indicator.iconClass + '"></i> </label>';
         return this.createDivElement(templateString);
@@ -8385,10 +8427,10 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                     'border-bottom-right-radius:' + this.getBorderRadius(data.ganttProperties) + 'px;">' +
                     '</div>');
             }
+            var tempDiv = createElement('div');
             if (this.taskLabelTemplateFunction && !isNullOrUndefined(progressDiv) && progressDiv.length > 0) {
                 var taskLabelTemplateNode = this.taskLabelTemplateFunction(extend({ index: i }, data), this.parent, 'TaskLabelTemplate', this.getTemplateID('TaskLabelTemplate'), false, undefined, progressDiv[0]);
                 if (taskLabelTemplateNode && taskLabelTemplateNode.length > 0) {
-                    var tempDiv = createElement('div');
                     tempDiv.appendChild(taskLabelTemplateNode[0]);
                     labelString = tempDiv.innerHTML;
                 }
@@ -8398,6 +8440,9 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                 labelString = labelString === 'isCustomTemplate' ? this.parent.labelSettings.taskLabel : labelString;
             }
             if (labelString !== 'null') {
+                if (this.getTaskLabel(this.parent.labelSettings.taskLabel) === 'isCustomTemplate') {
+                    labelString = '';
+                }
                 if (isNaN(parseInt(labelString))) {
                     taskLabel$$1 = '<span class="' + taskLabel + '" style="line-height:' +
                         (this.taskBarHeight - 1) + 'px; text-align: left;' +
@@ -8407,9 +8452,9 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                 }
                 else {
                     taskLabel$$1 = '<span class="' + taskLabel + '" style="line-height:' +
-                        (this.taskBarHeight - 1) + 'px; text-align:' + (this.parent.viewType === 'ResourceView' ? 'left;' : ';') +
-                        'display:' + (this.parent.viewType === 'ResourceView' ? 'inline-flex;' : ';') +
-                        'width:' + (this.parent.viewType === 'ResourceView' ? (data.ganttProperties.width - 10) : '') + 'px; height:' +
+                        (this.taskBarHeight - 1) + 'px;' + (this.parent.viewType === 'ResourceView' ? 'text-align: left;' : '') +
+                        +(this.parent.viewType === 'ResourceView' ? 'display:inline-flex;' : '') +
+                        +(this.parent.viewType === 'ResourceView' ? (data.ganttProperties.width - 10) : '') + 'px; height:' +
                         this.taskBarHeight + 'px;">' + labelString + '</span>';
                 }
             }
@@ -8435,7 +8480,16 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                 (isNullOrUndefined(data.ganttProperties.segments) || (!isNullOrUndefined(data.ganttProperties.segments) &&
                     data.ganttProperties.segments.length === 0))) {
                 if (template !== '' && !isNullOrUndefined(progressDiv) && progressDiv.length > 0) {
-                    progressDiv[0].appendChild([].slice.call(this.createDivElement(template))[0]);
+                    var templateElement = this.createDivElement(template)[0];
+                    templateElement.appendChild(tempDiv);
+                    progressDiv[0].appendChild(templateElement);
+                    var childLabel = this.parent.labelSettings.taskLabel;
+                    if (progressDiv[0].querySelectorAll('.e-task-label')[0].textContent !== '' &&
+                        !this.isTemplate(childLabel))
+                        progressDiv[0].querySelectorAll('.e-task-label')[0].children[0].remove();
+                    if (progressDiv[0].querySelectorAll('.e-task-label')[0].textContent == '' &&
+                        childLabel && !childLabel['elementRef'])
+                        progressDiv[0].querySelectorAll('.e-task-label')[0].textContent = childLabel;
                 }
                 if (!isNullOrUndefined(taskbarInnerDiv) && taskbarInnerDiv.length > 0) {
                     taskbarInnerDiv[0].appendChild([].slice.call(progressDiv)[0]);
@@ -8826,7 +8880,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
      */
     ChartRows.prototype.getTaskBaselineNode = function () {
         var data = this.templateData;
-        var template = '<div class="' + baselineBar + ' ' + '" style="margin-top:' + this.baselineTop +
+        var template = '<div class="' + baselineBar + ' ' + '" role="BaselineBar" style="margin-top:' + this.baselineTop +
             'px;left:' + data.ganttProperties.baselineLeft + 'px;' +
             'width:' + data.ganttProperties.baselineWidth + 'px;height:' +
             this.baselineHeight + 'px;' + (this.baselineColor ? 'background-color: ' + this.baselineColor + ';' : '') + '"></div>';
@@ -8840,9 +8894,10 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
      */
     ChartRows.prototype.getMilestoneBaselineNode = function () {
         var data = this.templateData;
+        var baselineMilestoneHeight = this.parent.renderBaseline ? 5 : 2;
         var template = '<div class="' + baselineMilestoneContainer + ' ' + '" style="' +
             'left:' + (data.ganttProperties.baselineLeft - this.milesStoneRadius) + 'px;' +
-            'margin-top:' + (-Math.floor(this.parent.rowHeight - this.milestoneMarginTop) + 2) +
+            'margin-top:' + (-Math.floor(this.parent.rowHeight - this.milestoneMarginTop) + baselineMilestoneHeight) +
             'px">' + '<div class="' + baselineMilestoneDiv + '">' + '<div class="' + baselineMilestoneDiv +
             ' ' + baselineMilestoneTop + '"  ' +
             'style="top:' + (-this.milestoneHeight) + 'px;border-right:' + this.milesStoneRadius +
@@ -8870,7 +8925,9 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
      */
     ChartRows.prototype.getLeftLabelNode = function (i) {
         var leftLabelNode = this.leftLabelContainer();
-        leftLabelNode[0].setAttribute('aria-label', this.generateTaskLabelAriaLabel('left'));
+        if (this.generateTaskLabelAriaLabel('left') !== "") {
+            leftLabelNode[0].setAttribute('aria-label', this.generateTaskLabelAriaLabel('left'));
+        }
         var leftLabelTemplateNode = null;
         if (this.leftTaskLabelTemplateFunction) {
             leftLabelTemplateNode = this.leftTaskLabelTemplateFunction(extend({ index: i }, this.templateData), this.parent, 'LeftLabelTemplate', this.getTemplateID('LeftLabelTemplate'), false, undefined, leftLabelNode[0], this.parent.treeGrid['root']);
@@ -8892,9 +8949,10 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         return leftLabelNode;
     };
     ChartRows.prototype.getLableText = function (labelString, labelDiv) {
+        var leftLabelHeight = this.parent.renderBaseline ? ((this.parent.rowHeight - this.taskBarHeight) / 2) : this.taskBarMarginTop;
         var templateString = createElement('div', {
             className: labelDiv, styles: 'height:' + (this.taskBarHeight) + 'px;' +
-                'margin-top:' + this.taskBarMarginTop + 'px;'
+                'margin-top:' + leftLabelHeight + 'px;'
         });
         var spanElem = createElement('span', { className: label });
         var property = this.parent.disableHtmlEncode ? 'textContent' : 'innerHTML';
@@ -8913,7 +8971,9 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
      */
     ChartRows.prototype.getRightLabelNode = function (i) {
         var rightLabelNode = this.rightLabelContainer();
-        rightLabelNode[0].setAttribute('aria-label', this.generateTaskLabelAriaLabel('right'));
+        if (this.generateTaskLabelAriaLabel('right') !== "") {
+            rightLabelNode[0].setAttribute('aria-label', this.generateTaskLabelAriaLabel('right'));
+        }
         var rightLabelTemplateNode = null;
         if (this.rightTaskLabelTemplateFunction) {
             rightLabelTemplateNode = this.rightTaskLabelTemplateFunction(extend({ index: i }, this.templateData), this.parent, 'RightLabelTemplate', this.getTemplateID('RightLabelTemplate'), false, undefined, rightLabelNode[0], this.parent.treeGrid['root']);
@@ -9003,10 +9063,10 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                 'width:' + data.ganttProperties.progressWidth + 'px;' +
                 'border-top-right-radius:' + this.getBorderRadius(data) + 'px;' +
                 'border-bottom-right-radius:' + this.getBorderRadius(data) + 'px;height:100%;"></div>');
+            var div = createElement('div');
             if (this.taskLabelTemplateFunction) {
                 var parentTaskLabelNode = this.taskLabelTemplateFunction(extend({ index: i }, data), this.parent, 'TaskLabelTemplate', this.getTemplateID('TaskLabelTemplate'), false, undefined, progressBarInnerDiv[0]);
                 if (parentTaskLabelNode && parentTaskLabelNode.length > 0) {
-                    var div = createElement('div');
                     div.appendChild(parentTaskLabelNode[0]);
                     labelString = div.innerHTML;
                 }
@@ -9016,21 +9076,35 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                 labelString = labelString === 'isCustomTemplate' ? this.parent.labelSettings.taskLabel : labelString;
             }
             if (labelString !== 'null') {
+                if (this.getTaskLabel(this.parent.labelSettings.taskLabel) === 'isCustomTemplate') {
+                    labelString = '';
+                }
                 if (isNaN(parseInt(labelString))) {
-                    labelDiv = this.createDivElement('<span class="' + taskLabel + '" style="line-height:' +
+                    labelDiv = '<span class="' + taskLabel + '" style="line-height:' +
                         (this.taskBarHeight - 1) + 'px; text-align: left;' +
                         'display:' + 'inline-block;' +
                         'width:' + (data.ganttProperties.width - 10) + 'px; height:' +
-                        this.taskBarHeight + 'px;">' + labelString + '</span>');
+                        this.taskBarHeight + 'px;">' + labelString + '</span>';
                 }
                 else {
-                    labelDiv = this.createDivElement('<span class="' +
+                    labelDiv = '<span class="' +
                         taskLabel + '" style="line-height:' +
-                        (this.taskBarHeight - 1) + 'px; display:' + (this.parent.viewType === 'ResourceView' ? 'inline-flex;' : ';') + 'width:' +
-                        (this.parent.viewType === 'ResourceView' ? (data.ganttProperties.width - 10) : ';') + 'px; height:' +
-                        this.taskBarHeight + 'px;">' + labelString + '</span>');
+                        (this.taskBarHeight - 1) + 'px;' + (this.parent.viewType === 'ResourceView' ? 'display:inline-flex;' : '') +
+                        (this.parent.viewType === 'ResourceView' ? 'width:' + (data.ganttProperties.width - 10) : '') + 'px; height:' +
+                        (this.taskBarHeight - 1) + 'px;' + (this.parent.viewType === 'ResourceView' ? 'display: inline-flex;' : '') +
+                        (this.parent.viewType === 'ResourceView' ? 'width:' + (data.ganttProperties.width - 10) : '') + 'px; height:' +
+                        this.taskBarHeight + 'px;">' + labelString + '</span>';
                 }
-                progressBarInnerDiv[0].appendChild([].slice.call(labelDiv)[0]);
+                var labelElement = this.createDivElement(labelDiv)[0];
+                labelElement.appendChild(div);
+                progressBarInnerDiv[0].appendChild(labelElement);
+                var parentLabel = this.parent.labelSettings.taskLabel;
+                if (progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent !== '' &&
+                    !this.isTemplate(parentLabel))
+                    progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].children[0].remove();
+                if (progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent == '' &&
+                    parentLabel && !parentLabel['elementRef'])
+                    progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent = parentLabel;
             }
             var milestoneTemplate = '<div class="' + parentMilestone + '" style="position:absolute;">' +
                 '<div class="' + parentMilestoneTop + '" style="border-right-width:' +
@@ -9056,10 +9130,10 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         var className = (this.parent.gridLines === 'Horizontal' || this.parent.gridLines === 'Both') ?
             'e-chart-row-border' : '';
         table.innerHTML = '<tr class="' + this.getRowClassName(this.templateData) + ' ' + chartRow + '"' +
-            'style="display:' + this.getExpandDisplayProp(this.templateData) + ';height:' +
+            'role="ChartRow" style="display:' + this.getExpandDisplayProp(this.templateData) + ';height:' +
             this.parent.rowHeight + 'px;">' +
             '<td class="' + chartRowCell + ' ' + className
-            + '" style="width:' + this.parent.timelineModule.totalTimelineWidth + 'px;"></td></tr>';
+            + '" role="ChartCell" style="width:' + this.parent.timelineModule.totalTimelineWidth + 'px;"></td></tr>';
         return table.childNodes;
     };
     /**
@@ -9124,7 +9198,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
     };
     ChartRows.prototype.leftLabelContainer = function () {
         var template = '<div class="' + ((this.leftTaskLabelTemplateFunction) ? leftLabelTempContainer :
-            leftLabelContainer) + ' ' + '" tabindex="-1" style="height:' +
+            leftLabelContainer) + ' ' + '" tabindex="-1" role="LeftLabel" style="height:' +
             (this.parent.rowHeight - 2) + 'px;width:' + this.taskNameWidth(this.templateData) + '"></div>';
         return this.createDivElement(template);
     };
@@ -9136,7 +9210,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         var template = '<div class="' + taskBarMainContainer + ' ' +
             this.parent.getUnscheduledTaskClass(data.ganttProperties) + ' ' +
             ((data.ganttProperties.cssClass) ? data.ganttProperties.cssClass : '') + '" ' +
-            ' tabindex="-1" style="' + ((data.ganttProperties.isMilestone && !manualParent) ?
+            ' tabindex="-1" role="TaskBar" style="' + ((data.ganttProperties.isMilestone && !manualParent) ?
             ('width:' + this.milestoneHeight + 'px;height:' +
                 this.milestoneHeight + 'px;margin-top:' + this.milestoneMarginTop + 'px;left:' + (data.ganttProperties.left -
                 (this.milestoneHeight / 2)) + 'px;') : ('width:' + data.ganttProperties.width +
@@ -9147,26 +9221,26 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
     };
     ChartRows.prototype.rightLabelContainer = function () {
         var template = '<div class="' + ((this.rightTaskLabelTemplateFunction) ? rightLabelTempContainer :
-            rightLabelContainer) + '" ' + ' tabindex="-1" style="left:' + this.getRightLabelLeft(this.templateData) + 'px;height:'
+            rightLabelContainer) + '" ' + ' tabindex="-1" role="RightLabel" style="left:' + this.getRightLabelLeft(this.templateData) + 'px; height:'
             + (this.parent.rowHeight - 2) + 'px;"></div>';
         return this.createDivElement(template);
     };
     ChartRows.prototype.childTaskbarLeftResizer = function () {
         var lResizerLeft = -(this.parent.isAdaptive ? 12 : 2);
         var template = '<div class="' + taskBarLeftResizer + ' ' + icon + '"' +
-            ' style="left:' + lResizerLeft + 'px;height:' + (this.taskBarHeight) + 'px;"></div>';
+            ' role="LeftResizer" style="left:' + lResizerLeft + 'px;height:' + (this.taskBarHeight) + 'px;"></div>';
         return this.createDivElement(template);
     };
     ChartRows.prototype.childTaskbarRightResizer = function () {
         var rResizerLeft = this.parent.isAdaptive ? -2 : -10;
         var template = '<div class="' + taskBarRightResizer + ' ' + icon + '"' +
-            ' style="left:' + (this.templateData.ganttProperties.width + rResizerLeft) + 'px;' +
+            ' role="RightResizer" style="left:' + (this.templateData.ganttProperties.width + rResizerLeft) + 'px;' +
             'height:' + (this.taskBarHeight) + 'px;"></div>';
         return this.createDivElement(template);
     };
     ChartRows.prototype.childTaskbarProgressResizer = function () {
         var template = '<div class="' + childProgressResizer + '"' +
-            ' style="left:' + (this.templateData.ganttProperties.progressWidth - 6) + 'px;margin-top:' +
+            ' role="ProgressResizer" style="left:' + (this.templateData.ganttProperties.progressWidth - 6) + 'px;margin-top:' +
             (this.taskBarHeight - 4) + 'px;"><div class="' + progressBarHandler + '"' +
             '><div class="' + progressHandlerElement + '"></div>' +
             '<div class="' + progressBarHandlerAfter + '"></div></div>';
@@ -9364,10 +9438,13 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
      * @private
      */
     ChartRows.prototype.initChartHelperPrivateVariable = function () {
+        var taskbarHeightValue = this.parent.renderBaseline ? 0.45 : 0.62;
+        var taskBarMarginTopValue = this.parent.renderBaseline ? 4 : 2;
+        var milestoneHeightValue = this.parent.renderBaseline ? 1.13 : 0.82;
         this.baselineColor = !isNullOrUndefined(this.parent.baselineColor) &&
             this.parent.baselineColor !== '' ? this.parent.baselineColor : null;
         this.taskBarHeight = isNullOrUndefined(this.parent.taskbarHeight) || this.parent.taskbarHeight >= this.parent.rowHeight ?
-            Math.floor(this.parent.rowHeight * 0.62) : this.parent.taskbarHeight; // 0.62 -- Standard Ratio.
+            Math.floor(this.parent.rowHeight * taskbarHeightValue) : this.parent.taskbarHeight; // 0.62 -- Standard Ratio.
         if (this.parent.renderBaseline) {
             var height = void 0;
             if ((this.taskBarHeight + this.baselineHeight) <= this.parent.rowHeight) {
@@ -9378,11 +9455,11 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
             }
             this.taskBarHeight = height;
         }
-        this.milestoneHeight = Math.floor(this.taskBarHeight * 0.82); // 0.82 -- Standard Ratio.
-        this.taskBarMarginTop = Math.floor((this.parent.rowHeight - this.taskBarHeight) / 2);
+        this.milestoneHeight = Math.floor(this.taskBarHeight * milestoneHeightValue); // 0.82 -- Standard Ratio.
+        this.taskBarMarginTop = Math.floor((this.parent.rowHeight - this.taskBarHeight) / taskBarMarginTopValue);
         this.milestoneMarginTop = Math.floor((this.parent.rowHeight - this.milestoneHeight) / 2);
         this.milesStoneRadius = Math.floor((this.milestoneHeight) / 2);
-        this.baselineTop = -(Math.floor((this.parent.rowHeight - (this.taskBarHeight + this.taskBarMarginTop))) - 1);
+        this.baselineTop = -(Math.floor((this.parent.rowHeight - (this.taskBarHeight + this.taskBarMarginTop))) - 4);
         this.connectorPointWidth = this.parent.isAdaptive ? Math.round(this.taskBarHeight / 2) : 8;
         this.connectorPointMargin = Math.floor((this.taskBarHeight / 2) - (this.connectorPointWidth / 2));
     };
@@ -9576,6 +9653,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
             var indicators = this.templateData.ganttProperties.indicators;
             for (var indicatorIndex = 0; indicatorIndex < indicators.length; indicatorIndex++) {
                 taskIndicatorNode = this.getIndicatorNode(indicators[indicatorIndex]);
+                taskIndicatorNode[0].setAttribute('aria-label', indicators[indicatorIndex].name);
                 if (indicators[indicatorIndex].name.indexOf('$') > -1 || indicators[indicatorIndex].name.indexOf('#') > -1) {
                     taskIndicatorTextFunction = this.templateCompiler(indicators[indicatorIndex].name);
                     taskIndicatorTextNode = taskIndicatorTextFunction(extend({ index: i }, this.templateData), this.parent, 'indicatorLabelText');
@@ -9854,6 +9932,18 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
     };
     ChartRows.prototype.getResourceParent = function (record) {
         var chartRows = this.parent.ganttChartModule.getChartRows();
+        //Below code is for rendering taskbartemplate in resource view with multi taskbar
+        if (this.parent.initialChartRowElements) {
+            for (var j = 0; j <= this.parent.initialChartRowElements.length; j++) {
+                if (!isNullOrUndefined(chartRows[j])) {
+                    if (!isNullOrUndefined(chartRows[j].childNodes[0].childNodes[1].childNodes[2]) &&
+                        !isNullOrUndefined(this.parent.initialChartRowElements[j].childNodes[0].childNodes[1].childNodes[2])) {
+                        // eslint-disable-next-line
+                        chartRows[j].childNodes[0].childNodes[1].childNodes[2]['innerHTML'] = this.parent.initialChartRowElements[j].childNodes[0].childNodes[1].childNodes[2]['innerHTML'];
+                    }
+                }
+            }
+        }
         this.templateData = record;
         var parentTrNode = this.getTableTrNode();
         var leftLabelNode = this.leftLabelContainer();
@@ -10800,7 +10890,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
         for (var i = 0; i < childNodes.length; i++) {
             var innerChild = childNodes[i].childNodes;
             for (var j = 0; j < innerChild.length; j++) {
-                var ariaString = this.parent.connectorLineModule.generateAriaLabel(ariaConnector[i]);
+                var ariaString = 'Connector Line ' + this.parent.connectorLineModule.generateAriaLabel(ariaConnector[i]);
                 innerChild[j].setAttribute('aria-label', ariaString);
             }
         }
@@ -11057,7 +11147,11 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
         var connectorContainer = '';
         var isVirtual = this.parent.virtualScrollModule && this.parent.enableVirtualization;
         var connectorLine$$1 = this.getPosition(data, this.getParentPosition(data), height);
-        var heightValue = isVirtual ? connectorLine$$1.height : height;
+        var isMilestoneValue = 0;
+        if (this.parent.renderBaseline) {
+            isMilestoneValue = (data.milestoneParent && data.milestoneChild) ? 0 : data.milestoneParent ? -5 : data.milestoneChild ? 5 : 0;
+        }
+        var heightValue = isVirtual ? connectorLine$$1.height : (height + isMilestoneValue);
         if (this.getParentPosition(data)) {
             connectorContainer = '<div id="ConnectorLine' + data.connectorLineId + '" style="background-color:black">';
             var div = '<div class="' + connectorLineContainer +
@@ -11085,7 +11179,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                 this.getBorderStyles('top', this.lineStroke) + 'position:relative;"></div>';
             if (this.getParentPosition(data) === 'FSType1') {
                 div = div + 'left:' + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FSType1">';
                 div = div + eLine;
                 div = div + 'left:' + (isMilestoneParent ? -1 : 0) + 'px;width:' + (isMilestoneParent ?
@@ -11106,7 +11200,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FSType2') {
                 div = div + 'left:' + data.parentLeft + 'px;top:' + (isVirtual ? connectorLine$$1.top : ((data.parentIndex * data.rowHeight) +
-                    this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FSType2">';
                 div = div + eLine;
                 div = div + 'left:' + (isMilestoneParent ? data.parentWidth - 1 : data.parentWidth) + 'px;width:' +
@@ -11137,7 +11231,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FSType3') {
                 div = div + 'left:' + (data.childLeft - 20) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FSType3">';
                 div = div + rightArrow;
                 div = div + 'left:10px;' + this.getBorderStyles('left', 10) +
@@ -11167,7 +11261,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FSType4') {
                 div = div + 'left:' + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FSType4">';
                 div = div + rightArrow;
                 div = div + 'left:' + (data.childLeft - (data.parentLeft + data.parentWidth + 10)) + 'px;' +
@@ -11193,7 +11287,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SSType4') {
                 div = div + 'left:' + (data.parentLeft - 10) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SSType4">';
                 div = div + rightArrow;
                 div = div + 'left:' + (data.childLeft - data.parentLeft) + 'px;' + duplicateStingTwo;
@@ -11206,7 +11300,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SSType3') {
                 div = div + 'left:' + (data.childLeft - 20) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SSType3">';
                 div = div + rightArrow;
                 div = div + 'left:10px;' + duplicateStingTwo;
@@ -11219,7 +11313,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SSType2') {
                 div = div + 'left:' + setInnerElementLeftSSType2 + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SSType2">';
                 div = div + eLine;
                 div = div + 'width:' + (setInnerChildWidthSSType2 + 1) + 'px;' +
@@ -11240,7 +11334,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             if (this.getParentPosition(data) === 'SSType1') {
                 div = div + 'left:' + (data.childLeft - 20) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
                     ((data.parentIndex * data.rowHeight) +
-                        this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1))) + 'px;' +
+                        this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SSType1">';
                 div = div + eLine;
                 div = div + 'width:' + (data.parentLeft - data.childLeft + 21) + 'px;' +
@@ -11257,7 +11351,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType1') {
                 div = div + 'left:' + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FFType1">';
                 div = div + eLine;
                 div = div + 'left:' + (isMilestoneParent ? (((data.parentLeft + data.parentWidth) -
@@ -11281,7 +11375,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType2') {
                 div = div + 'left:' + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FFType2">';
                 div = div + eLine;
                 div = div + (isMilestoneParent ? 'left:-1px;' : '') + 'width:' +
@@ -11307,7 +11401,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType3') {
                 div = div + 'left:' + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FFType3">';
                 div = div + duplicateStingOne;
                 div = div + eLine;
@@ -11330,7 +11424,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType4') {
                 div = div + 'left:' + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FFType4">';
                 div = div + leftArrow;
                 div = div + ('left:' + ((data.childLeft + data.childWidth) -
@@ -11359,7 +11453,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType4') {
                 div = div + 'left:' + (data.parentLeft - 10) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;width:1px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;width:1px;' +
                     'height:' + heightValue + 'px;position:absolute" data-connectortype="SFType4">';
                 div = div + duplicateStingFour + 'top:' + (-5 - this.lineStroke + (this.lineStroke - 1)) + 'px;' +
                     'border-bottom-width:' + (5 + this.lineStroke) +
@@ -11387,7 +11481,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType3') {
                 div = div + 'left:' + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SFType3">';
                 div = div + duplicateStingOne;
                 div = div + eLine;
@@ -11405,7 +11499,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType1') {
                 div = div + 'left:' + (data.parentLeft - 10) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SFType1">';
                 div = div + eLine;
                 div = div + 'width:11px;' + this.getBorderStyles('top', this.lineStroke) + 'position:relative;"></div>';
@@ -11430,7 +11524,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType2') {
                 div = div + 'left:' + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SFType2">';
                 div = div + eLine;
                 div = div + 'left:' + (((data.parentLeft) - (data.childLeft + data.childWidth)) - 10) +
@@ -11674,6 +11768,7 @@ var Splitter$1 = /** @__PURE__ @class */ (function () {
                         _this.splitterObject.paneSettings[1].size = null;
                         _this.splitterObject.paneSettings[1].size = _this.getSpliterPositionInPercentage(_this.splitterPreviousPositionChart);
                     }
+                    _this.parent.timelineModule.updateTimelineAfterZooming(_this.parent.timelineModule.timelineEndDate, true);
                     callBackPromise.resolve(splitterResizedArgs);
                 });
                 return callBackPromise;
@@ -11956,6 +12051,7 @@ var Tooltip$1 = /** @__PURE__ @class */ (function () {
      * @returns {void} .
      */
     Tooltip$$1.prototype.updateTooltipPosition = function (args) {
+        args.element.style.visibility = 'visible';
         if (isNullOrUndefined(this.tooltipMouseEvent) || args.target.classList.contains('e-notes-info')) {
             return;
         }
@@ -11985,7 +12081,6 @@ var Tooltip$1 = /** @__PURE__ @class */ (function () {
             tooltipPositionY = tooltipPositionY + 10;
         }
         args.element.style.top = tooltipPositionY + 'px';
-        args.element.style.visibility = 'visible';
     };
     /**
      * Method to get mouse pointor position
@@ -12027,9 +12122,16 @@ var Tooltip$1 = /** @__PURE__ @class */ (function () {
         switch (elementType) {
             case 'milestone':
                 {
-                    var sDate = !isNullOrUndefined(data.startDate) ? '<tr><td class = "e-gantt-tooltip-label"> Date</td><td>:</td>' +
+                    var milestoneStartDate = void 0;
+                    if (args.target.className.includes('e-baseline-gantt-milestone') && !isNullOrUndefined(data.baselineStartDate)) {
+                        milestoneStartDate = data.baselineStartDate;
+                    }
+                    else if (!isNullOrUndefined(data.startDate)) {
+                        milestoneStartDate = data.startDate;
+                    }
+                    var sDate = !isNullOrUndefined(milestoneStartDate) ? '<tr><td class = "e-gantt-tooltip-label"> Date</td><td>:</td>' +
                         '<td class = "e-gantt-tooltip-value">' +
-                        this.parent.getFormatedDate(data.startDate, this.parent.getDateFormat()) + '</td></tr>' : '';
+                        this.parent.getFormatedDate(milestoneStartDate, this.parent.getDateFormat()) + '</td></tr>' : '';
                     content$$1 = '<table class = "e-gantt-tooltiptable"><tbody>' +
                         taskName + sDate + '</tbody></table>';
                     break;
@@ -13265,7 +13367,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
         gridHeight = 'calc(100% - ' + timelineContainer + 'px)';
         // eslint-disable-next-line
         this.element.getElementsByClassName('e-chart-scroll-container e-content')[0]['style'].height = 'calc(100% - ' + timelineContainer + 'px)';
-        if (!isNullOrUndefined(this.toolbarModule)) {
+        if (!isNullOrUndefined(this.toolbarModule) && !isNullOrUndefined(this.toolbarModule.element)) {
             this.splitterElement.style.height = 'calc(100% - ' + this.toolbarModule.element.offsetHeight + 'px)';
         }
         else {
@@ -13302,6 +13404,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
             this.getCurrentRecords(args);
         }
         this.notify('recordsUpdated', {});
+        this.initialChartRowElements = this.ganttChartModule.getChartRows();
         this.isLoad = false;
         this.trigger('dataBound', args);
     };
@@ -13801,7 +13904,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
      */
     Gantt.prototype.updateGridLineContainerHeight = function () {
         if (this.chartVerticalLineContainer) {
-            this.chartVerticalLineContainer.style.height = formatUnit(this.getContentHeight());
+            this.chartVerticalLineContainer.style.height = formatUnit(this.contentHeight);
         }
     };
     /**
@@ -15712,7 +15815,8 @@ var CellEdit = /** @__PURE__ @class */ (function () {
             args.cancel = true;
             return;
         }
-        if (data.hasChildRecords && (field === taskSettings.endDate || field === taskSettings.duration
+        if (data.hasChildRecords && ((field === taskSettings.endDate && ((!isNullOrUndefined(data['isManual']) &&
+            data['isManual'] == false) || this.parent.taskMode == 'Auto')) || field === taskSettings.duration
             || field === taskSettings.dependency || field === taskSettings.progress
             || field === taskSettings.work || field === 'taskType')) {
             args.cancel = true;
@@ -18682,6 +18786,13 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
         dialogModel.target = document.body;
         dialogModel.close = this.dialogClose.bind(this);
         dialogModel.closeOnEscape = true;
+        dialogModel.beforeClose = function (args) {
+            if (args.closedBy == "escape") {
+                if (args.event.name == "key-pressed" && args.event.target.nodeName == 'INPUT') {
+                    args.cancel = true;
+                }
+            }
+        };
         dialogModel.open = function (args) {
             var dialogElement = getValue('element', args);
             var generalTabElement = dialogElement.querySelector('#' + _this.parent.element.id + 'GeneralTabContainer');
@@ -18967,6 +19078,8 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
         }
         else if (id === ganttObj.element.id + 'NotesTabContainer') {
             document.getElementById(id).ej2_instances[0].refresh();
+            var notesTabElement = document.querySelector('#' + this.parent.element.id + 'NotesTabContainer');
+            notesTabElement.style.overflow = 'scroll';
         }
         else if (id === ganttObj.element.id + 'SegmentsTabContainer') {
             if (isNullOrUndefined(this.beforeOpenArgs.rowData.ganttProperties.startDate)) {
@@ -19854,7 +19967,8 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
                 disabled = true;
             }
             if (this.editedRecord.hasChildRecords) {
-                if (column.field === this.parent.taskFields.endDate || column.field === this.parent.taskFields.duration ||
+                if ((column.field === this.parent.taskFields.endDate && ((!isNullOrUndefined(this.editedRecord['isManual']) &&
+                    this.editedRecord['isManual'] == false) || this.parent.taskMode == 'Auto')) || column.field === this.parent.taskFields.duration ||
                     column.field === this.parent.taskFields.progress || column.field === this.parent.taskFields.work ||
                     column.field === 'taskType') {
                     disabled = true;
@@ -23697,14 +23811,20 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
             }
             else {
                 childIndex = parentItem.childRecords.length;
-            } /*Child collection update*/
+            }
+            /*Child collection update*/
             parentItem.childRecords.splice(childIndex, 0, record);
             if ((this.parent.dataSource instanceof DataManager &&
                 isNullOrUndefined(parentItem.taskData[this.parent.taskFields.parentID])) ||
                 !isNullOrUndefined(this.parent.dataSource)) {
                 var child = this.parent.taskFields.child;
                 if (parentItem.taskData[child] && parentItem.taskData[child].length > 0) {
-                    parentItem.taskData[child].splice(childIndex, 0, record.taskData);
+                    if (rowPosition === 'Above' || rowPosition === 'Below') {
+                        parentItem.taskData[child].splice(childIndex, 0, record.taskData);
+                    }
+                    else {
+                        parentItem.taskData[child].push(record.taskData);
+                    }
                 }
                 else {
                     parentItem.taskData[child] = [];
@@ -24165,6 +24285,9 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
         }
         this.addSuccess(args);
         args = this.constructTaskAddedEventArgs(cAddedRecord, args.modifiedRecords, 'add');
+        if (this.dialogModule.isAddNewResource && !this.parent.isEdit && this.parent.taskFields.work) {
+            this.parent.dataOperation.updateWorkWithDuration(cAddedRecord[0]);
+        }
         this.parent.trigger('actionComplete', args);
         if (this.dialogModule.dialog && !this.dialogModule.dialogObj.isDestroyed) {
             this.dialogModule.dialogObj.hide();
@@ -25091,11 +25214,13 @@ var Filter$1 = /** @__PURE__ @class */ (function () {
         // ...
     };
     Filter$$1.prototype.closeFilterOnContextClick = function (element) {
+        var datePickerElement = document.querySelector('body > div.e-datepicker');
+        var dateTimePickerElement = document.querySelector('body > div.e-datetimepicker');
         if (this.filterMenuElement && document.body.contains(this.filterMenuElement)) {
             var ganttElement = closest(element, '#' + this.parent.element.id)
                 || element.querySelector('#' + this.parent.element.id);
-            if ((!(this.filterMenuElement.contains(element)) && !isNullOrUndefined(ganttElement)) || element.nodeName === 'HTML'
-                || ((element.nodeName === 'DIV') && (!element.classList.contains('e-day')))) {
+            if ((!(this.filterMenuElement.contains(element)) && !isNullOrUndefined(ganttElement)) || (!(this.filterMenuElement.contains(element)) && (isNullOrUndefined(datePickerElement))
+                && (isNullOrUndefined(dateTimePickerElement)) && ((element.nodeName === 'DIV') || (element.nodeName === 'HTML')))) {
                 remove(this.filterMenuElement);
                 this.parent.treeGrid.grid.notify('filter-menu-close', { isOpen: false });
                 this.filterMenuElement = null;
@@ -26298,6 +26423,7 @@ var NonWorkingDay = /** @__PURE__ @class */ (function () {
             this.nonworkingContainer = createElement('div', {
                 className: nonworkingContainer
             });
+            this.nonworkingContainer.setAttribute("role", "NonWorkingDays");
             this.parent.ganttChartModule.chartBodyContent.appendChild(this.nonworkingContainer);
         }
     };
@@ -26335,8 +26461,11 @@ var NonWorkingDay = /** @__PURE__ @class */ (function () {
         var toDate;
         var container = createElement('div');
         var height = this.parent.contentHeight;
-        var scrollElement = this.parent.ganttChartModule.scrollElement;
-        var viewportHeight = parseInt(scrollElement.style.height, 10);
+        var toolbarHeight = 0;
+        if (!isNullOrUndefined(this.parent.toolbarModule)) {
+            toolbarHeight = this.parent.toolbarModule.element.offsetHeight;
+        }
+        var viewportHeight = this.parent.ganttHeight - toolbarHeight - this.parent.ganttChartModule.chartTimelineContainer.offsetHeight;
         for (var i = 0; i < this.parent.holidays.length; i++) {
             if (this.parent.holidays[i].from && this.parent.holidays[i].to) {
                 fromDate = this.parent.dateValidationModule.getDateFromFormat(this.parent.holidays[i].from);
@@ -26429,9 +26558,12 @@ var NonWorkingDay = /** @__PURE__ @class */ (function () {
         return container;
     };
     NonWorkingDay.prototype.updateHolidayLabelHeight = function () {
-        var height = this.parent.contentHeight;
-        var scrollElement = this.parent.ganttChartModule.scrollElement;
-        var viewportHeight = parseInt(scrollElement.style.height, 10);
+        var height = this.parent.getContentHeight();
+        var toolbarHeight = 0;
+        if (!isNullOrUndefined(this.parent.toolbarModule) && !isNullOrUndefined(this.parent.toolbarModule.element)) {
+            toolbarHeight = this.parent.toolbarModule.element.offsetHeight;
+        }
+        var viewportHeight = this.parent.ganttHeight - toolbarHeight - this.parent.ganttChartModule.chartTimelineContainer.offsetHeight;
         var top = (viewportHeight < height) ? viewportHeight / 2 : height / 2;
         var labels = this.holidayContainer.querySelectorAll('.' + holidayLabel);
         for (var i = 0; i < labels.length; i++) {
@@ -26488,6 +26620,7 @@ var EventMarker$1 = /** @__PURE__ @class */ (function () {
                 this.eventMarkersContainer = createElement('div', {
                     className: eventMarkersContainer
                 });
+                this.eventMarkersContainer.setAttribute("role", "EventMarker");
                 this.parent.ganttChartModule.chartBodyContent.appendChild(this.eventMarkersContainer);
             }
             this.eventMarkersContainer.innerHTML = '';
@@ -27571,10 +27704,12 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
             }
         }
         if (!args.cancel) {
-            args.cancel = true;
             args.requestType = 'beforeDrop';
             this.parent.trigger('actionBegin', args);
-            this.dropRows(args, true); // method to update the data collections based on drop action
+            if (!args.cancel) {
+                this.dropRows(args, true); // method to update the data collections based on drop action
+                args.cancel = true;
+            }
         }
     };
     RowDD$$1.prototype.dropRows = function (args, isByMethod) {
@@ -27671,33 +27806,55 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
                         var data_1 = gObj.flatData;
                         var startIndex = void 0;
                         var endIndex = void 0;
+                        var ganttData_1 = this_1.parent.dataSource;
+                        var uniqueTaskID_1 = this_1.parent.taskFields.id;
                         if (draggedRecord.index < droppedRecord.index) {
                             startIndex = draggedRecord.index;
-                            endIndex = droppedRecord.index;
+                            var _loop_2 = function (i_1) {
+                                var currentData = this_1.parent.currentViewData.filter(function (e) {
+                                    return e[uniqueTaskID_1] === ganttData_1[i_1][uniqueTaskID_1];
+                                })[0];
+                                if (currentData.index > droppedRecord.index) {
+                                    endIndex = currentData.index;
+                                    return "break";
+                                }
+                            };
+                            for (var i_1 = 0; i_1 < ganttData_1.length; i_1++) {
+                                var state_2 = _loop_2(i_1);
+                                if (state_2 === "break")
+                                    break;
+                            }
                         }
                         else {
                             startIndex = droppedRecord.index;
-                            var rootChildRecord = draggedRecord;
-                            if (rootChildRecord.childRecords.length > 0) {
-                                do {
-                                    rootChildRecord = rootChildRecord.childRecords[rootChildRecord.childRecords.length - 1];
-                                } while (rootChildRecord.childRecords.length > 0);
+                            var _loop_3 = function (i_2) {
+                                var currentData = this_1.parent.currentViewData.filter(function (e) {
+                                    return e[uniqueTaskID_1] === ganttData_1[i_2][uniqueTaskID_1];
+                                })[0];
+                                if (currentData.index > draggedRecord.index) {
+                                    endIndex = currentData.index;
+                                    return "break";
+                                }
+                            };
+                            for (var i_2 = 0; i_2 < ganttData_1.length; i_2++) {
+                                var state_3 = _loop_3(i_2);
+                                if (state_3 === "break")
+                                    break;
                             }
-                            endIndex = rootChildRecord.index;
                         }
-                        var _loop_2 = function (i_1) {
-                            if (!isNullOrUndefined(data_1[i_1])) {
-                                data_1[i_1].index = i_1;
-                                if (!isNullOrUndefined(data_1[i_1].parentItem)) {
+                        var _loop_4 = function (i_3) {
+                            if (!isNullOrUndefined(data_1[i_3])) {
+                                data_1[i_3].index = i_3;
+                                if (!isNullOrUndefined(data_1[i_3].parentItem)) {
                                     var updatedParent = data_1.filter(function (e) {
-                                        return e.uniqueID === data_1[i_1].parentUniqueID;
+                                        return e.uniqueID === data_1[i_3].parentUniqueID;
                                     })[0];
-                                    data_1[i_1].parentItem.index = updatedParent.index;
+                                    data_1[i_3].parentItem.index = updatedParent.index;
                                 }
                             }
                         };
-                        for (var i_1 = startIndex; i_1 <= endIndex; i_1++) {
-                            _loop_2(i_1);
+                        for (var i_3 = startIndex; i_3 <= endIndex; i_3++) {
+                            _loop_4(i_3);
                         }
                     }
                     gObj.rowDragAndDropModule.refreshDataSource();