@syncfusion/ej2-gantt 19.4.54 → 20.1.47

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

@@ -483,7 +483,6 @@ class DateProcessor {
             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;
@@ -4082,6 +4081,7 @@ class GanttChart {
         this.chartTimelineContainer = null;
         this.rangeViewContainer =
             createElement('div', { className: rangeContainer });
+        this.rangeViewContainer.setAttribute("role", "RangeContainer");
         this.virtualRender = new VirtualContentRenderer(this.parent);
         this.addEventListener();
     }
@@ -4240,6 +4240,7 @@ class GanttChart {
     renderTimelineContainer() {
         this.chartTimelineContainer =
             createElement('div', { className: timelineHeaderContainer });
+        this.chartTimelineContainer.setAttribute("role", "TimelineHeader");
         this.chartElement.appendChild(this.chartTimelineContainer);
     }
     /**
@@ -4279,8 +4280,19 @@ class GanttChart {
         //empty row height
         const emptydivHeight = 36;
         const emptyHeight = this.parent.contentHeight === 0 ? this.parent.flatData.length > 1 ? emptydivHeight : 0 : this.parent.contentHeight;
-        this.chartBodyContent.style.height = formatUnit(emptyHeight);
-        //let element: HTMLElement = this.chartTimelineContainer.querySelector('.' + cls.timelineHeaderTableContainer);
+        let contentElement = this.parent.element.getElementsByClassName('e-chart-scroll-container e-content')[0];
+        if (emptyHeight >= contentElement['offsetHeight']) {
+            this.chartBodyContent.style.height = formatUnit(emptyHeight);
+        }
+        else {
+            let scrollHeight = this.parent.element.getElementsByClassName('e-chart-rows-container')[0]['offsetHeight'];
+            if (contentElement['offsetHeight'] >= scrollHeight) {
+                this.chartBodyContent.style.height = contentElement['offsetHeight'] - 17 + 'px';
+            }
+            else {
+                this.chartBodyContent.style.height = contentElement['offsetHeight'] + 'px';
+            }
+        } //let element: HTMLElement = this.chartTimelineContainer.querySelector('.' + cls.timelineHeaderTableContainer);
         this.chartBodyContent.style.width = formatUnit(this.parent.timelineModule.totalTimelineWidth);
         this.setVirtualHeight();
         this.parent.notify('updateHeight', {});
@@ -4312,7 +4324,21 @@ class GanttChart {
             if (this.chartBodyContent.clientHeight < this.chartBodyContainer.clientHeight) {
                 if (lastRow) {
                     addClass(lastRow.querySelectorAll('td'), 'e-lastrow');
-                    this.chartBodyContent.style.height = formatUnit(this.parent.contentHeight + 1);
+                    const emptydivHeight = 36;
+                    const emptyHeight = this.parent.contentHeight === 0 ? this.parent.flatData.length > 1 ? emptydivHeight : 0 : this.parent.contentHeight;
+                    let contentElement = this.parent.element.getElementsByClassName('e-chart-scroll-container e-content')[0];
+                    if (emptyHeight >= contentElement['offsetHeight']) {
+                        this.chartBodyContent.style.height = formatUnit(emptyHeight);
+                    }
+                    else {
+                        let scrollHeight = this.parent.element.getElementsByClassName('e-chart-rows-container')[0]['offsetHeight'];
+                        if (contentElement['offsetHeight'] >= scrollHeight) {
+                            this.chartBodyContent.style.height = contentElement['offsetHeight'] - 17 + 'px';
+                        }
+                        else {
+                            this.chartBodyContent.style.height = contentElement['offsetHeight'] + 'px';
+                        }
+                    }
                 }
             }
         }
@@ -4444,7 +4470,7 @@ class GanttChart {
             const target = e.target;
             const 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) {
@@ -4966,6 +4992,10 @@ class GanttChart {
                 $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) {
@@ -5008,7 +5038,7 @@ class GanttChart {
                     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);
                             const fmodule = getValue('focusModule', this.parent.treeGrid.grid);
@@ -5356,7 +5386,7 @@ class Timeline {
         const currentZoomingLevel = this.checkCurrentZoomingLevel();
         this.isZoomIn = isZoomIn;
         this.isZooming = true;
-        const currentLevel = isZoomIn ? currentZoomingLevel + 1 : currentZoomingLevel - 1;
+        let currentLevel = isZoomIn ? currentZoomingLevel + 1 : currentZoomingLevel - 1;
         if (this.parent.toolbarModule) {
             if (isZoomIn) {
                 if (currentLevel === this.parent.zoomingLevels[this.parent.zoomingLevels.length - 1].level) {
@@ -5375,6 +5405,9 @@ class Timeline {
                 }
             }
         }
+        currentLevel = this.parent.zoomingLevels.findIndex((tempLevel) => {
+            return tempLevel.level === currentLevel;
+        });
         let newTimeline = this.parent.zoomingLevels[currentLevel];
         const args = {
             requestType: isZoomIn ? 'beforeZoomIn' : 'beforeZoomOut',
@@ -6084,6 +6117,40 @@ class Timeline {
         } while ((startDate < endDate));
         return parentTh;
     }
+    updateTimelineAfterZooming(endDate, resized) {
+        let timeDiff;
+        let perDayWidth;
+        let totWidth;
+        let contentElement = document.getElementsByClassName('e-chart-scroll-container e-content')[0];
+        if (!isNullOrUndefined(contentElement)) {
+            let contentWidth = contentElement['offsetWidth'];
+            let contentHeight = contentElement['offsetHeight'];
+            let 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) {
+                let 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);
+                }
+            }
+        }
+    }
     getTimelineRoundOffEndDate(date) {
         const tierMode = this.topTier === 'None' ? this.bottomTier : this.topTier;
         const endDate = new Date(date.toString());
@@ -6098,6 +6165,9 @@ class Timeline {
                 endDate.setHours(24, 0, 0, 0);
             }
         }
+        if (this.isZooming || this.parent.isLoad) {
+            this.updateTimelineAfterZooming(endDate, false);
+        }
         return endDate;
     }
     /**
@@ -6167,7 +6237,6 @@ class Timeline {
         }
         return increment;
     }
-    ;
     /**
      * Method to find header cell was weekend or not
      *
@@ -6746,6 +6815,8 @@ class GanttTreeGrid {
     renderTreeGrid() {
         this.composeProperties();
         this.bindEvents();
+        const root = 'root';
+        this.parent.treeGrid[root] = this.parent[root] ? this.parent[root] : this.parent;
         this.parent.treeGrid.appendTo(this.treeGridElement);
         this.wireEvents();
     }
@@ -6809,7 +6880,7 @@ class GanttTreeGrid {
         const scrollWidth = this.getScrollbarWidth();
         const 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');
@@ -7835,7 +7906,7 @@ class ChartRows extends DateProcessor {
         this.milestoneHeight = 0;
         this.milesStoneRadius = 0;
         this.baselineTop = 0;
-        this.baselineHeight = 3;
+        this.baselineHeight = 8;
         this.touchLeftConnectorpoint = '';
         this.touchRightConnectorpoint = '';
         this.dropSplit = false;
@@ -7917,7 +7988,7 @@ class ChartRows extends DateProcessor {
      * @private
      */
     getIndicatorNode(indicator) {
-        const templateString = '<label class="' + label + ' ' + taskIndicatorDiv + '"  style="line-height:'
+        const 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);
@@ -7946,7 +8017,7 @@ class ChartRows extends DateProcessor {
         let childTaskbarNode = null;
         const data = this.templateData;
         if (this.childTaskbarTemplateFunction) {
-            childTaskbarNode = this.childTaskbarTemplateFunction(extend({ index: i }, data), this.parent, 'TaskbarTemplate', this.getTemplateID('TaskbarTemplate'), false, undefined, rootElement[0]);
+            childTaskbarNode = this.childTaskbarTemplateFunction(extend({ index: i }, data), this.parent, 'TaskbarTemplate', this.getTemplateID('TaskbarTemplate'), false, undefined, rootElement[0], this.parent.treeGrid['root']);
         }
         else {
             let labelString = '';
@@ -7990,9 +8061,9 @@ class ChartRows extends DateProcessor {
                 }
                 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>';
                 }
             }
@@ -8385,7 +8456,7 @@ class ChartRows extends DateProcessor {
         let milestoneNode = null;
         const data = this.templateData;
         if (this.milestoneTemplateFunction) {
-            milestoneNode = this.milestoneTemplateFunction(extend({ index: i }, data), this.parent, 'MilestoneTemplate', this.getTemplateID('MilestoneTemplate'), false, undefined, rootElement[0]);
+            milestoneNode = this.milestoneTemplateFunction(extend({ index: i }, data), this.parent, 'MilestoneTemplate', this.getTemplateID('MilestoneTemplate'), false, undefined, rootElement[0], this.parent.treeGrid['root']);
         }
         else {
             const template = '<div class="' + traceMilestone + '" style="position:absolute;">' +
@@ -8409,7 +8480,7 @@ class ChartRows extends DateProcessor {
      */
     getTaskBaselineNode() {
         const data = this.templateData;
-        const template = '<div class="' + baselineBar + ' ' + '" style="margin-top:' + this.baselineTop +
+        const 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>';
@@ -8423,9 +8494,10 @@ class ChartRows extends DateProcessor {
      */
     getMilestoneBaselineNode() {
         const data = this.templateData;
+        let baselineMilestoneHeight = this.parent.renderBaseline ? 5 : 2;
         const 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 +
@@ -8453,10 +8525,12 @@ class ChartRows extends DateProcessor {
      */
     getLeftLabelNode(i) {
         const leftLabelNode = this.leftLabelContainer();
-        leftLabelNode[0].setAttribute('aria-label', this.generateTaskLabelAriaLabel('left'));
+        if (this.generateTaskLabelAriaLabel('left') !== "") {
+            leftLabelNode[0].setAttribute('aria-label', this.generateTaskLabelAriaLabel('left'));
+        }
         let leftLabelTemplateNode = null;
         if (this.leftTaskLabelTemplateFunction) {
-            leftLabelTemplateNode = this.leftTaskLabelTemplateFunction(extend({ index: i }, this.templateData), this.parent, 'LeftLabelTemplate', this.getTemplateID('LeftLabelTemplate'), false, undefined, leftLabelNode[0]);
+            leftLabelTemplateNode = this.leftTaskLabelTemplateFunction(extend({ index: i }, this.templateData), this.parent, 'LeftLabelTemplate', this.getTemplateID('LeftLabelTemplate'), false, undefined, leftLabelNode[0], this.parent.treeGrid['root']);
         }
         else {
             const field = this.parent.labelSettings.leftLabel;
@@ -8467,14 +8541,18 @@ class ChartRows extends DateProcessor {
             }
         }
         if (leftLabelTemplateNode && leftLabelTemplateNode.length > 0) {
+            if (leftLabelTemplateNode[0]['data'] === 'null') {
+                leftLabelTemplateNode[0]['data'] = '';
+            }
             leftLabelNode[0].appendChild([].slice.call(leftLabelTemplateNode)[0]);
         }
         return leftLabelNode;
     }
     getLableText(labelString, labelDiv) {
+        let leftLabelHeight = this.parent.renderBaseline ? ((this.parent.rowHeight - this.taskBarHeight) / 2) : this.taskBarMarginTop;
         const templateString = createElement('div', {
             className: labelDiv, styles: 'height:' + (this.taskBarHeight) + 'px;' +
-                'margin-top:' + this.taskBarMarginTop + 'px;'
+                'margin-top:' + leftLabelHeight + 'px;'
         });
         const spanElem = createElement('span', { className: label });
         const property = this.parent.disableHtmlEncode ? 'textContent' : 'innerHTML';
@@ -8493,10 +8571,12 @@ class ChartRows extends DateProcessor {
      */
     getRightLabelNode(i) {
         const rightLabelNode = this.rightLabelContainer();
-        rightLabelNode[0].setAttribute('aria-label', this.generateTaskLabelAriaLabel('right'));
+        if (this.generateTaskLabelAriaLabel('right') !== "") {
+            rightLabelNode[0].setAttribute('aria-label', this.generateTaskLabelAriaLabel('right'));
+        }
         let rightLabelTemplateNode = null;
         if (this.rightTaskLabelTemplateFunction) {
-            rightLabelTemplateNode = this.rightTaskLabelTemplateFunction(extend({ index: i }, this.templateData), this.parent, 'RightLabelTemplate', this.getTemplateID('RightLabelTemplate'), false, undefined, rightLabelNode[0]);
+            rightLabelTemplateNode = this.rightTaskLabelTemplateFunction(extend({ index: i }, this.templateData), this.parent, 'RightLabelTemplate', this.getTemplateID('RightLabelTemplate'), false, undefined, rightLabelNode[0], this.parent.treeGrid['root']);
         }
         else {
             const field = this.parent.labelSettings.rightLabel;
@@ -8507,6 +8587,9 @@ class ChartRows extends DateProcessor {
             }
         }
         if (rightLabelTemplateNode && rightLabelTemplateNode.length > 0) {
+            if (rightLabelTemplateNode[0]['data'] === 'null') {
+                rightLabelTemplateNode[0]['data'] = '';
+            }
             rightLabelNode[0].appendChild([].slice.call(rightLabelTemplateNode)[0]);
         }
         return rightLabelNode;
@@ -8561,7 +8644,7 @@ class ChartRows extends DateProcessor {
         let parentTaskbarNode = null;
         const data = this.templateData;
         if (this.parentTaskbarTemplateFunction) {
-            parentTaskbarNode = this.parentTaskbarTemplateFunction(extend({ index: i }, data), this.parent, 'ParentTaskbarTemplate', this.getTemplateID('ParentTaskbarTemplate'), false, undefined, rootElement[0]);
+            parentTaskbarNode = this.parentTaskbarTemplateFunction(extend({ index: i }, data), this.parent, 'ParentTaskbarTemplate', this.getTemplateID('ParentTaskbarTemplate'), false, undefined, rootElement[0], this.parent.treeGrid['root']);
         }
         else {
             let labelString = '';
@@ -8603,8 +8686,10 @@ class ChartRows extends DateProcessor {
                 else {
                     labelDiv = this.createDivElement('<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 - 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]);
@@ -8633,10 +8718,10 @@ class ChartRows extends DateProcessor {
         const 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;
     }
     /**
@@ -8675,10 +8760,19 @@ class ChartRows extends DateProcessor {
     }
     isTemplate(template) {
         let result = false;
+        for (let i = 0; i < this.parent.ganttColumns.length; i++) {
+            if (template === this.parent.ganttColumns[i].field) {
+                result = true;
+                break;
+            }
+        }
         if (typeof template !== 'string' || template.indexOf('#') === 0 || template.indexOf('<') > -1
-            || template.indexOf('$') > -1) {
+            || template.indexOf('$') > -1 || !result) {
             result = true;
         }
+        else {
+            result = false;
+        }
         return result;
     }
     /**
@@ -8692,8 +8786,8 @@ class ChartRows extends DateProcessor {
     }
     leftLabelContainer() {
         const template = '<div class="' + ((this.leftTaskLabelTemplateFunction) ? leftLabelTempContainer :
-            leftLabelContainer) + ' ' + '" tabindex="-1" style="height:' +
-            (this.parent.rowHeight - 1) + 'px;width:' + this.taskNameWidth(this.templateData) + '"></div>';
+            leftLabelContainer) + ' ' + '" tabindex="-1" role="LeftLabel" style="height:' +
+            (this.parent.rowHeight - 2) + 'px;width:' + this.taskNameWidth(this.templateData) + '"></div>';
         return this.createDivElement(template);
     }
     taskbarContainer() {
@@ -8704,7 +8798,7 @@ class ChartRows extends DateProcessor {
         const 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 +
@@ -8715,26 +8809,26 @@ class ChartRows extends DateProcessor {
     }
     rightLabelContainer() {
         const template = '<div class="' + ((this.rightTaskLabelTemplateFunction) ? rightLabelTempContainer :
-            rightLabelContainer) + '" ' + ' tabindex="-1" style="left:' + this.getRightLabelLeft(this.templateData) + 'px;height:'
-            + (this.parent.rowHeight - 1) + 'px;"></div>';
+            rightLabelContainer) + '" ' + ' tabindex="-1" role="RightLabel" style="left:' + this.getRightLabelLeft(this.templateData) + 'px; height:'
+            + (this.parent.rowHeight - 2) + 'px;"></div>';
         return this.createDivElement(template);
     }
     childTaskbarLeftResizer() {
         const lResizerLeft = -(this.parent.isAdaptive ? 12 : 2);
         const 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);
     }
     childTaskbarRightResizer() {
         const rResizerLeft = this.parent.isAdaptive ? -2 : -10;
         const 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);
     }
     childTaskbarProgressResizer() {
         const 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>';
@@ -8932,10 +9026,13 @@ class ChartRows extends DateProcessor {
      * @private
      */
     initChartHelperPrivateVariable() {
+        let taskbarHeightValue = this.parent.renderBaseline ? 0.45 : 0.62;
+        let taskBarMarginTopValue = this.parent.renderBaseline ? 4 : 2;
+        let 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) {
             let height;
             if ((this.taskBarHeight + this.baselineHeight) <= this.parent.rowHeight) {
@@ -8946,11 +9043,11 @@ class ChartRows extends DateProcessor {
             }
             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));
     }
@@ -9144,6 +9241,7 @@ class ChartRows extends DateProcessor {
             const indicators = this.templateData.ganttProperties.indicators;
             for (let 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');
@@ -10362,7 +10460,7 @@ class ConnectorLine {
         for (let i = 0; i < childNodes.length; i++) {
             const innerChild = childNodes[i].childNodes;
             for (let j = 0; j < innerChild.length; j++) {
-                const ariaString = this.parent.connectorLineModule.generateAriaLabel(ariaConnector[i]);
+                const ariaString = 'Connector Line ' + this.parent.connectorLineModule.generateAriaLabel(ariaConnector[i]);
                 innerChild[j].setAttribute('aria-label', ariaString);
             }
         }
@@ -10619,7 +10717,11 @@ class ConnectorLine {
         let connectorContainer = '';
         const isVirtual = this.parent.virtualScrollModule && this.parent.enableVirtualization;
         const connectorLine$$1 = this.getPosition(data, this.getParentPosition(data), height);
-        const heightValue = isVirtual ? connectorLine$$1.height : height;
+        let isMilestoneValue = 0;
+        if (this.parent.renderBaseline) {
+            isMilestoneValue = (data.milestoneParent && data.milestoneChild) ? 0 : data.milestoneParent ? -5 : data.milestoneChild ? 5 : 0;
+        }
+        const heightValue = isVirtual ? connectorLine$$1.height : (height + isMilestoneValue);
         if (this.getParentPosition(data)) {
             connectorContainer = '<div id="ConnectorLine' + data.connectorLineId + '" style="background-color:black">';
             let div = '<div class="' + connectorLineContainer +
@@ -10647,7 +10749,7 @@ class ConnectorLine {
                 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 ?
@@ -10668,7 +10770,7 @@ class ConnectorLine {
             }
             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:' +
@@ -10699,7 +10801,7 @@ class ConnectorLine {
             }
             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) +
@@ -10729,7 +10831,7 @@ class ConnectorLine {
             }
             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;' +
@@ -10755,7 +10857,7 @@ class ConnectorLine {
             }
             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;
@@ -10768,7 +10870,7 @@ class ConnectorLine {
             }
             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;
@@ -10781,7 +10883,7 @@ class ConnectorLine {
             }
             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;' +
@@ -10802,7 +10904,7 @@ class ConnectorLine {
             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;' +
@@ -10819,7 +10921,7 @@ class ConnectorLine {
             }
             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) -
@@ -10843,7 +10945,7 @@ class ConnectorLine {
             }
             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:' +
@@ -10869,7 +10971,7 @@ class ConnectorLine {
             }
             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;
@@ -10892,7 +10994,7 @@ class ConnectorLine {
             }
             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) -
@@ -10921,7 +11023,7 @@ class ConnectorLine {
             }
             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) +
@@ -10949,7 +11051,7 @@ class ConnectorLine {
             }
             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;
@@ -10967,7 +11069,7 @@ class ConnectorLine {
             }
             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>';
@@ -10992,7 +11094,7 @@ class ConnectorLine {
             }
             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) +
@@ -11234,6 +11336,7 @@ class Splitter$1 {
                         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;
@@ -11515,6 +11618,7 @@ class Tooltip$1 {
      * @returns {void} .
      */
     updateTooltipPosition(args) {
+        args.element.style.visibility = 'visible';
         if (isNullOrUndefined(this.tooltipMouseEvent) || args.target.classList.contains('e-notes-info')) {
             return;
         }
@@ -11544,7 +11648,6 @@ class Tooltip$1 {
             tooltipPositionY = tooltipPositionY + 10;
         }
         args.element.style.top = tooltipPositionY + 'px';
-        args.element.style.visibility = 'visible';
     }
     /**
      * Method to get mouse pointor position
@@ -11586,9 +11689,16 @@ class Tooltip$1 {
         switch (elementType) {
             case 'milestone':
                 {
-                    const sDate = !isNullOrUndefined(data.startDate) ? '<tr><td class = "e-gantt-tooltip-label"> Date</td><td>:</td>' +
+                    let milestoneStartDate;
+                    if (args.target.className.includes('e-baseline-gantt-milestone') && !isNullOrUndefined(data.baselineStartDate)) {
+                        milestoneStartDate = data.baselineStartDate;
+                    }
+                    else if (!isNullOrUndefined(data.startDate)) {
+                        milestoneStartDate = data.startDate;
+                    }
+                    const 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;
@@ -12313,25 +12423,7 @@ let Gantt = class Gantt extends Component {
      * @returns {void} .
      */
     calculateDimensions() {
-        let settingsHeight;
-        if (typeof (this.height) !== 'number' && this.height.indexOf('%') !== -1 && (this.element.parentElement &&
-            !this.element.parentElement.style.height || this.element.parentElement.style.height.indexOf('%') !== -1)) {
-            let ganttHeight;
-            if (this.element.parentElement.style.height.indexOf('%') == -1) {
-                ganttHeight = Number(this.height.split("%")[0]);
-            }
-            else {
-                ganttHeight = Number(this.element.parentElement.style.height.split("%")[0]);
-            }
-            ganttHeight = (ganttHeight * window.innerHeight) / 100;
-            if (this.height === '100%') {
-                ganttHeight = ganttHeight - 16;
-            }
-            settingsHeight = this.validateDimentionValue(ganttHeight);
-        }
-        else {
-            settingsHeight = this.validateDimentionValue(this.height);
-        }
+        let settingsHeight = this.validateDimentionValue(this.height);
         let settingsWidth = this.validateDimentionValue(this.width);
         if (!isNullOrUndefined(this.width) && typeof (this.width) === 'string' && this.width.indexOf('%') !== -1) {
             settingsWidth = this.width;
@@ -12474,40 +12566,6 @@ let Gantt = class Gantt extends Component {
      */
     windowResize() {
         if (!isNullOrUndefined(this.element)) {
-            let settingsHeight;
-            if (this.height.indexOf('%') !== -1) {
-                let ganttHeight = Number(this.height.split("%")[0]);
-                if (this.element.parentElement && (this.element.parentElement.style.height)) {
-                    let containerHeight;
-                    if (this.element.parentElement.style.height.indexOf('%') == -1) {
-                        containerHeight = Number(this.element.parentElement.style.height.split("px")[0]);
-                        ganttHeight = (ganttHeight * containerHeight) / 100;
-                    }
-                    else {
-                        containerHeight = Number(this.element.parentElement.style.height.split("%")[0]);
-                        ganttHeight = (window.innerHeight * containerHeight) / 100;
-                    }
-                }
-                else {
-                    ganttHeight = Number(this.height.split("%")[0]);
-                    ganttHeight = (ganttHeight * window.innerHeight) / 100;
-                }
-                if (this.height === '100%') {
-                    ganttHeight = ganttHeight - 16;
-                }
-                let toolbarHeight = 0;
-                if (!isNullOrUndefined(this.toolbarModule) && !isNullOrUndefined(this.toolbarModule.element)) {
-                    toolbarHeight = this.toolbarModule.element.offsetHeight;
-                }
-                let contentHeight = ganttHeight - this.ganttChartModule.chartTimelineContainer.offsetHeight - toolbarHeight;
-                settingsHeight = this.validateDimentionValue(ganttHeight);
-                this.element.style.height = settingsHeight;
-                this.element.querySelectorAll('.e-content')[0]['style'].height = contentHeight + 'px';
-                this.element.querySelectorAll('.e-content')[2]['style'].height = contentHeight + 'px';
-            }
-            else {
-                settingsHeight = this.validateDimentionValue(this.height);
-            }
             this.updateContentHeight();
             this.ganttChartModule.updateWidthAndHeight(); // Updating chart scroll conatiner height for row mismatch
             this.treeGridModule.ensureScrollBar();
@@ -12852,6 +12910,18 @@ let Gantt = class Gantt extends Component {
      * @private
      */
     treeDataBound(args) {
+        this.element.getElementsByClassName('e-chart-root-container')[0]['style'].height = '100%';
+        let gridHeight = this.element.getElementsByClassName('e-gridcontent')[0]['style'].height;
+        let timelineContainer = this.element.getElementsByClassName('e-timeline-header-container')[0]['offsetHeight'];
+        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) && !isNullOrUndefined(this.toolbarModule.element)) {
+            this.splitterElement.style.height = 'calc(100% - ' + this.toolbarModule.element.offsetHeight + 'px)';
+        }
+        else {
+            this.splitterElement.style.height = '100%';
+        }
         if (this.isLoad) {
             this.updateCurrentViewData();
             if (!this.enableVirtualization) {
@@ -12871,8 +12941,7 @@ let Gantt = class Gantt extends Component {
                     removeClass(this.treeGrid.element.querySelectorAll('.e-headercell'), timelineSingleHeaderOuterDiv);
                     removeClass(this.treeGrid.element.querySelectorAll('.e-columnheader'), timelineSingleHeaderOuterDiv);
                 }
-                this.treeGrid.height = this.ganttHeight - toolbarHeight -
-                    this.treeGrid.grid.getHeaderContent().offsetHeight;
+                this.treeGrid.height = '100%';
                 this.notify('tree-grid-created', {});
                 this.createGanttPopUpElement();
                 this.hideSpinner();
@@ -13382,7 +13451,7 @@ let Gantt = class Gantt extends Component {
      */
     updateGridLineContainerHeight() {
         if (this.chartVerticalLineContainer) {
-            this.chartVerticalLineContainer.style.height = formatUnit(this.getContentHeight());
+            this.chartVerticalLineContainer.style.height = formatUnit(this.contentHeight);
         }
     }
     /**
@@ -15290,7 +15359,8 @@ class CellEdit {
             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;
@@ -19386,7 +19456,8 @@ class DialogEdit {
                 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;
@@ -23180,7 +23251,15 @@ class Edit$2 {
         }
         /* data Source update */
         if (!isNullOrUndefined(parentItem)) {
-            childIndex = parentItem.childRecords.indexOf(this.addRowSelectedItem);
+            if (rowPosition == 'Above') {
+                childIndex = parentItem.childRecords.indexOf(this.addRowSelectedItem);
+            }
+            else if (rowPosition == 'Below') {
+                childIndex = parentItem.childRecords.indexOf(this.addRowSelectedItem) + 1;
+            }
+            else {
+                childIndex = parentItem.childRecords.length;
+            }
             /*Child collection update*/
             parentItem.childRecords.splice(childIndex, 0, record);
             if ((this.parent.dataSource instanceof DataManager &&
@@ -23188,12 +23267,9 @@ class Edit$2 {
                 !isNullOrUndefined(this.parent.dataSource)) {
                 const child = this.parent.taskFields.child;
                 if (parentItem.taskData[child] && parentItem.taskData[child].length > 0) {
-                    if (rowPosition === 'Above') {
+                    if (rowPosition === 'Above' || rowPosition === 'Below') {
                         parentItem.taskData[child].splice(childIndex, 0, record.taskData);
                     }
-                    else if (rowPosition === 'Below') {
-                        parentItem.taskData[child].splice(childIndex + 1, 0, record.taskData);
-                    }
                     else {
                         parentItem.taskData[child].push(record.taskData);
                     }
@@ -23261,9 +23337,21 @@ class Edit$2 {
     refreshRecordInImmutableMode() {
         for (let i = 0; i < this.parent.modifiedRecords.length; i++) {
             const originalData = this.parent.modifiedRecords[i];
-            const dataId = this.parent.viewType === 'ProjectView' ?
-                originalData.ganttProperties.taskId : originalData.ganttProperties.rowUniqueID;
-            this.parent.treeGrid.grid.setRowData(dataId, originalData);
+            let treeIndex = this.parent.allowRowDragAndDrop ? 1 : 0;
+            let uniqueTaskID = this.parent.taskFields.id;
+            var originalIndex = this.parent.currentViewData.findIndex((data) => {
+                return (data[uniqueTaskID] == originalData[uniqueTaskID]);
+            });
+            if (this.parent.treeGrid.getRows()[originalIndex]) {
+                this.parent.treeGrid.renderModule.cellRender({
+                    data: originalData, cell: this.parent.treeGrid.getRows()[originalIndex].cells[this.parent.treeColumnIndex + treeIndex],
+                    column: this.parent.treeGrid.grid.getColumns()[this.parent.treeColumnIndex],
+                    requestType: 'rowDragAndDrop'
+                });
+                this.parent.treeGrid.renderModule.RowModifier({
+                    data: originalData, row: this.parent.treeGrid.getRows()[originalIndex], rowHeight: this.parent.rowHeight
+                });
+            }
         }
     }
     /**
@@ -23640,6 +23728,9 @@ class Edit$2 {
         }
         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();
@@ -24014,15 +24105,18 @@ class Edit$2 {
                 if (this.dropPosition === 'topSegment' || this.dropPosition === 'bottomSegment') {
                     draggedRec[this.parent.taskFields.parentID] = droppedRec[this.parent.taskFields.parentID];
                     draggedRec.taskData[this.parent.taskFields.parentID] = droppedRec[this.parent.taskFields.parentID];
+                    draggedRec.ganttProperties['parentId'] = droppedRec[this.parent.taskFields.parentID];
                 }
                 else {
                     draggedRec[this.parent.taskFields.parentID] = droppedRec[this.parent.taskFields.id];
                     draggedRec.taskData[this.parent.taskFields.parentID] = droppedRec[this.parent.taskFields.id];
+                    draggedRec.ganttProperties['parentId'] = droppedRec[this.parent.taskFields.id];
                 }
             }
             else {
                 draggedRec[this.parent.taskFields.parentID] = null;
                 draggedRec.taskData[this.parent.taskFields.parentID] = null;
+                draggedRec.ganttProperties['parentId'] = null;
             }
         }
     }
@@ -24875,6 +24969,9 @@ class Selection$1 {
         this.addRemoveClass(index);
         this.selectedRowIndexes = extend([], this.getSelectedRowIndexes(), [], true);
         this.parent.setProperties({ selectedRowIndex: -1 }, true);
+        if (this.selectedRowIndexes.length === 1) {
+            this.parent.setProperties({ selectedRowIndex: this.selectedRowIndexes[0] }, true);
+        }
         if (!isNullOrUndefined(this.parent.toolbarModule)) {
             this.parent.toolbarModule.refreshToolbarItems();
         }
@@ -25743,6 +25840,7 @@ class NonWorkingDay {
             this.nonworkingContainer = createElement('div', {
                 className: nonworkingContainer
             });
+            this.nonworkingContainer.setAttribute("role", "NonWorkingDays");
             this.parent.ganttChartModule.chartBodyContent.appendChild(this.nonworkingContainer);
         }
     }
@@ -25780,8 +25878,11 @@ class NonWorkingDay {
         let toDate;
         const container = createElement('div');
         const height = this.parent.contentHeight;
-        const scrollElement = this.parent.ganttChartModule.scrollElement;
-        const viewportHeight = parseInt(scrollElement.style.height, 10);
+        let toolbarHeight = 0;
+        if (!isNullOrUndefined(this.parent.toolbarModule)) {
+            toolbarHeight = this.parent.toolbarModule.element.offsetHeight;
+        }
+        const viewportHeight = this.parent.ganttHeight - toolbarHeight - this.parent.ganttChartModule.chartTimelineContainer.offsetHeight;
         for (let 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);
@@ -25874,9 +25975,12 @@ class NonWorkingDay {
         return container;
     }
     updateHolidayLabelHeight() {
-        const height = this.parent.contentHeight;
-        const scrollElement = this.parent.ganttChartModule.scrollElement;
-        const viewportHeight = parseInt(scrollElement.style.height, 10);
+        const height = this.parent.getContentHeight();
+        let toolbarHeight = 0;
+        if (!isNullOrUndefined(this.parent.toolbarModule) && !isNullOrUndefined(this.parent.toolbarModule.element)) {
+            toolbarHeight = this.parent.toolbarModule.element.offsetHeight;
+        }
+        const viewportHeight = this.parent.ganttHeight - toolbarHeight - this.parent.ganttChartModule.chartTimelineContainer.offsetHeight;
         const top = (viewportHeight < height) ? viewportHeight / 2 : height / 2;
         const labels = this.holidayContainer.querySelectorAll('.' + holidayLabel);
         for (let i = 0; i < labels.length; i++) {
@@ -25932,6 +26036,7 @@ class EventMarker$1 {
                 this.eventMarkersContainer = createElement('div', {
                     className: eventMarkersContainer
                 });
+                this.eventMarkersContainer.setAttribute("role", "EventMarker");
                 this.parent.ganttChartModule.chartBodyContent.appendChild(this.eventMarkersContainer);
             }
             this.eventMarkersContainer.innerHTML = '';
@@ -27102,19 +27207,31 @@ class RowDD$1 {
                         let data = gObj.flatData;
                         let startIndex;
                         let endIndex;
+                        let ganttData = this.parent.dataSource;
+                        let uniqueTaskID = this.parent.taskFields.id;
                         if (draggedRecord.index < droppedRecord.index) {
                             startIndex = draggedRecord.index;
-                            endIndex = droppedRecord.index;
+                            for (let i = 0; i < ganttData.length; i++) {
+                                let currentData = this.parent.currentViewData.filter(function (e) {
+                                    return e[uniqueTaskID] === ganttData[i][uniqueTaskID];
+                                })[0];
+                                if (currentData.index > droppedRecord.index) {
+                                    endIndex = currentData.index;
+                                    break;
+                                }
+                            }
                         }
                         else {
                             startIndex = droppedRecord.index;
-                            let rootChildRecord = draggedRecord;
-                            if (rootChildRecord.childRecords.length > 0) {
-                                do {
-                                    rootChildRecord = rootChildRecord.childRecords[rootChildRecord.childRecords.length - 1];
-                                } while (rootChildRecord.childRecords.length > 0);
+                            for (let i = 0; i < ganttData.length; i++) {
+                                let currentData = this.parent.currentViewData.filter(function (e) {
+                                    return e[uniqueTaskID] === ganttData[i][uniqueTaskID];
+                                })[0];
+                                if (currentData.index > draggedRecord.index) {
+                                    endIndex = currentData.index;
+                                    break;
+                                }
                             }
-                            endIndex = rootChildRecord.index;
                         }
                         for (let i = startIndex; i <= endIndex; i++) {
                             if (!isNullOrUndefined(data[i])) {