@syncfusion/ej2-gantt 22.2.11 → 23.1.36

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

@@ -511,7 +511,7 @@ var DateProcessor = /** @__PURE__ @class */ (function () {
         }
         else {
             if ((!isNullOrUndefined(this.parent.taskFields.milestone)) && (!isNullOrUndefined(ganttProperties.startDate)) && !isNullOrUndefined(ganttProperties.endDate) &&
-                (ganttProperties.startDate).getTime() === (ganttProperties.endDate).getTime() && !isNullOrUndefined(ganttData.taskData[this.parent.taskFields.milestone])) {
+                (ganttProperties.startDate).getTime() === (ganttProperties.endDate).getTime() && (ganttData.taskData[this.parent.taskFields.milestone] === false)) {
                 tDuration = 1;
             }
             else {
@@ -1536,8 +1536,8 @@ var DateProcessor = /** @__PURE__ @class */ (function () {
         }
         if (!editArgs) {
             this.prevProjectStartDate = this.parent.cloneProjectStartDate;
-            this.parent.cloneProjectStartDate = minStartDate ? minStartDate : new Date(projectStartDate.getTime());
-            this.parent.cloneProjectEndDate = maxEndDate ? maxEndDate : new Date(projectEndDate.getTime());
+            this.parent.cloneProjectStartDate = minStartDate ? (!this.parent.timelineModule.isZoomToFit) ? (!isNullOrUndefined(projectStartDate)) ? new Date(projectStartDate.getTime()) : minStartDate : minStartDate : new Date(projectStartDate.getTime());
+            this.parent.cloneProjectEndDate = maxEndDate ? (!this.parent.timelineModule.isZoomToFit) ? (!isNullOrUndefined(projectEndDate)) ? new Date(projectEndDate.getTime()) : maxEndDate : maxEndDate : new Date(projectEndDate.getTime());
         }
         else {
             setValue('minStartDate', minStartDate, editArgs);
@@ -1656,7 +1656,9 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
         dataManager.executeQuery(queryManager).then(function (e) {
             _this.dataArray = e.result;
             _this.processTimeline();
-            _this.cloneDataSource();
+            if (_this.parent.loadChildOnDemand || (!_this.parent.loadChildOnDemand && !(_this.parent.taskFields.hasChildMapping))) {
+                _this.cloneDataSource();
+            }
             _this.parent.renderGantt(isChange);
         }).catch(function (e) {
             // Trigger action failure event
@@ -1695,6 +1697,9 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
             var data = [];
             for (var i = 0; i < this.dataArray.length; i++) {
                 var tempData = this.dataArray[i];
+                if (tempData['parentItem']) {
+                    delete tempData['parentItem'];
+                }
                 data.push(extend({}, {}, tempData, true));
                 if (!isNullOrUndefined(tempData[taskIdMapping])) {
                     this.taskIds.push(tempData[taskIdMapping].toString());
@@ -1704,7 +1709,12 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
                 this.parent.setProperties({ taskFields: { child: 'Children' } }, true);
             }
             this.constructDataSource(data);
-            hierarchicalData = this.hierarchyData;
+            if (!this.parent.loadChildOnDemand && this.parent.taskFields.hasChildMapping && this.hierarchyData.length === 0) {
+                hierarchicalData = this.dataArray;
+            }
+            else {
+                hierarchicalData = this.hierarchyData;
+            }
         }
         else {
             hierarchicalData = this.dataArray;
@@ -1926,7 +1936,12 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
         if (!isNullOrUndefined(data[taskSettings.id])) {
             id = data[taskSettings.id];
             name = data[taskSettings.name];
-            this.addTaskData(ganttData, data, isLoad);
+            if (!this.parent.loadChildOnDemand && taskSettings.hasChildMapping && data['taskData']) {
+                ganttData['taskData'] = data['taskData'];
+            }
+            else {
+                this.addTaskData(ganttData, data, isLoad);
+            }
         }
         else if (!isNullOrUndefined(data[resourceFields.id])) {
             id = data[resourceFields.id];
@@ -1964,6 +1979,9 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
         this.parent.setRecordValue('notes', notes, ganttProperties, true);
         this.parent.setRecordValue('cssClass', data[taskSettings.cssClass], ganttProperties, true);
         this.parent.setRecordValue('parentItem', this.getCloneParent(parentItem), ganttData);
+        if (!this.parent.loadChildOnDemand && taskSettings.hasChildMapping && this.parent.currentViewData.length > 0) {
+            this.parent.setRecordValue('parentItem', ganttData.parentItem, this.parent.currentViewData[this.taskIds.indexOf(data[taskSettings.id].toString())]);
+        }
         var parentUniqId = ganttData.parentItem ? ganttData.parentItem.uniqueID : null;
         this.parent.setRecordValue('parentUniqueID', parentUniqId, ganttData);
         if (this.parent.viewType === 'ResourceView' && !isNullOrUndefined(taskSettings.parentID)
@@ -1971,7 +1989,12 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
             this.parent.setRecordValue('parentId', ganttData.parentItem.taskId, ganttProperties, true);
         }
         this.parent.setRecordValue('level', level, ganttData);
-        this.parent.setRecordValue('uniqueID', getUid(this.parent.element.id + '_data_'), ganttData);
+        if (!this.parent.loadChildOnDemand && taskSettings.hasChildMapping && data['uniqueID']) {
+            this.parent.setRecordValue('uniqueID', data['uniqueID'], ganttData);
+        }
+        else {
+            this.parent.setRecordValue('uniqueID', getUid(this.parent.element.id + '_data_'), ganttData);
+        }
         this.parent.setRecordValue('uniqueID', ganttData.uniqueID, ganttProperties, true);
         this.parent.setRecordValue('childRecords', [], ganttData);
         if (this.parent.dataSource instanceof Object && isCountRequired(this.parent) &&
@@ -1986,7 +2009,12 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
             }
         }
         else {
-            this.parent.setRecordValue('hasChildRecords', false, ganttData);
+            if (!this.parent.loadChildOnDemand && taskSettings.hasChildMapping && ganttData.taskData[taskSettings.hasChildMapping]) {
+                this.parent.setRecordValue('hasChildRecords', true, ganttData);
+            }
+            else {
+                this.parent.setRecordValue('hasChildRecords', false, ganttData);
+            }
         }
         if (ganttData.hasChildRecords) {
             this.parent.setRecordValue('autoStartDate', ganttData.ganttProperties.startDate, ganttProperties);
@@ -2599,7 +2627,12 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
         }
         else {
             this.updateDurationValue(duration, ganttProperties);
-            this.calculateEndDate(ganttData);
+            if (this.parent.autoCalculateDateScheduling) {
+                this.calculateEndDate(ganttData);
+            }
+            else {
+                this.parent.setRecordValue('endDate', endDate, ganttProperties, true);
+            }
         }
     };
     /**
@@ -3097,17 +3130,15 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
         else {
             hierarchicalData = this.parent.dataSource;
         }
-        this.parent.flatData.map(function (data) {
-            hierarchicalData.map(function (record) {
-                if (data.ganttProperties.taskId === record[_this.parent.taskFields.id]) {
-                    if (!isNullOrUndefined(_this.parent.taskFields.startDate)) {
-                        task[_this.parent.taskFields.endDate] = record[_this.parent.taskFields.endDate];
-                    }
-                    if (!isNullOrUndefined(_this.parent.taskFields.endDate)) {
-                        task[_this.parent.taskFields.endDate] = record[_this.parent.taskFields.endDate];
-                    }
+        hierarchicalData.map(function (record) {
+            if (task.ganttProperties.taskId === record[_this.parent.taskFields.id]) {
+                if (!isNullOrUndefined(_this.parent.taskFields.startDate)) {
+                    task[_this.parent.taskFields.startDate] = record[_this.parent.taskFields.startDate];
                 }
-            });
+                if (!isNullOrUndefined(_this.parent.taskFields.endDate)) {
+                    task[_this.parent.taskFields.endDate] = record[_this.parent.taskFields.endDate];
+                }
+            }
         });
     };
     TaskProcessor.prototype.getWorkInHour = function (work, workUnit) {
@@ -3149,7 +3180,9 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
                 this.setRecordDate(ganttData, ganttProperties.endDate, dataMapping.endDate);
             }
             if (dataMapping.duration) {
-                this.setRecordDuration(ganttData, dataMapping.duration);
+                if (!isNullOrUndefined(dataMapping.milestone) && !ganttData.taskData[dataMapping.milestone]) {
+                    this.setRecordDuration(ganttData, dataMapping.duration);
+                }
             }
             if (dataMapping.durationUnit) {
                 data[dataMapping.durationUnit] = ganttProperties.durationUnit;
@@ -3384,7 +3417,7 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
      */
     TaskProcessor.prototype.updateDurationValue = function (duration, ganttProperties) {
         var tempDuration = this.getDurationValue(duration);
-        if (!isNaN(getValue('duration', tempDuration))) {
+        if (!isNaN(getValue('duration', tempDuration)) && !(this.parent.viewType === "ResourceView" && tempDuration["duration"] === 0)) {
             this.parent.setRecordValue('duration', getValue('duration', tempDuration), ganttProperties, true);
         }
         if (!isNullOrUndefined(getValue('durationUnit', tempDuration))) {
@@ -3768,7 +3801,14 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
      * @private
      */
     TaskProcessor.prototype.reUpdateGanttDataPosition = function () {
-        var flatData = this.parent.flatData;
+        var flatData;
+        if (this.parent.pdfExportModule && this.parent.pdfExportModule.isPdfExport && this.parent.pdfExportModule.helper.exportProps &&
+            this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth) {
+            flatData = this.parent.pdfExportModule.helper.beforeSinglePageExport['cloneFlatData'];
+        }
+        else {
+            flatData = this.parent.flatData;
+        }
         var length = flatData.length;
         for (var i = 0; i < length; i++) {
             var data = flatData[i];
@@ -3895,6 +3935,7 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
      * @private
      */
     TaskProcessor.prototype.updateParentItems = function (cloneParent, isParent) {
+        var _this = this;
         var parentData = isParent ? cloneParent : this.parent.getParentTask(cloneParent);
         var deleteUpdate = false;
         var ganttProp = parentData.ganttProperties;
@@ -3903,8 +3944,8 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
                 var previousStartDate = ganttProp.isAutoSchedule ? ganttProp.startDate : ganttProp.autoStartDate;
                 var previousEndDate = ganttProp.isAutoSchedule ? ganttProp.endDate :
                     ganttProp.autoEndDate;
-                var childRecords = parentData.childRecords;
-                var childLength = childRecords.length;
+                var childRecords_1 = parentData.childRecords;
+                var childLength = childRecords_1.length;
                 var totalDuration = 0;
                 var progressValues = {};
                 var minStartDate = null;
@@ -3913,38 +3954,43 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
                 var totalProgress = 0;
                 var childCompletedWorks = 0;
                 var childData = void 0;
-                for (var count = 0; count < childLength; count++) {
-                    childData = childRecords[count];
-                    if (this.parent.isOnDelete && childData.isDelete) {
-                        if (childLength === 1 && this.parent.viewType === 'ProjectView') {
+                var _loop_6 = function (count) {
+                    if (!this_4.parent.loadChildOnDemand && this_4.parent.taskFields.hasChildMapping) {
+                        childData = this_4.parent.currentViewData.filter(function (item) { return item.ganttProperties.taskId === childRecords_1[count][_this.parent.taskFields.id]; })[0];
+                    }
+                    else {
+                        childData = childRecords_1[count];
+                    }
+                    if (this_4.parent.isOnDelete && childData.isDelete) {
+                        if (childLength === 1 && this_4.parent.viewType === 'ProjectView') {
                             deleteUpdate = true;
                         }
-                        continue;
+                        return "continue";
                     }
-                    var startDate = this.getValidStartDate(childData.ganttProperties);
+                    var startDate = this_4.getValidStartDate(childData.ganttProperties);
                     if (parentData.hasChildRecords && !ganttProp.isAutoSchedule && !isNullOrUndefined(childData.ganttProperties.autoStartDate)) {
                         startDate = childData.ganttProperties.autoStartDate;
                     }
-                    var endDate = this.getValidEndDate(childData.ganttProperties);
+                    var endDate = this_4.getValidEndDate(childData.ganttProperties);
                     if (parentData.hasChildRecords && !ganttProp.isAutoSchedule && !isNullOrUndefined(childData.ganttProperties.autoEndDate)) {
                         endDate = childData.ganttProperties.autoEndDate;
                     }
                     if (isNullOrUndefined(minStartDate)) {
-                        minStartDate = this.getDateFromFormat(startDate);
+                        minStartDate = this_4.getDateFromFormat(startDate);
                     }
                     if (isNullOrUndefined(maxEndDate)) {
-                        maxEndDate = this.getDateFromFormat(endDate);
+                        maxEndDate = this_4.getDateFromFormat(endDate);
                     }
-                    if (!isNullOrUndefined(endDate) && this.compareDates(endDate, maxEndDate) === 1) {
-                        maxEndDate = this.getDateFromFormat(endDate);
+                    if (!isNullOrUndefined(endDate) && this_4.compareDates(endDate, maxEndDate) === 1) {
+                        maxEndDate = this_4.getDateFromFormat(endDate);
                     }
-                    if (!isNullOrUndefined(startDate) && this.compareDates(startDate, minStartDate) === -1) {
-                        minStartDate = this.getDateFromFormat(startDate);
+                    if (!isNullOrUndefined(startDate) && this_4.compareDates(startDate, minStartDate) === -1) {
+                        minStartDate = this_4.getDateFromFormat(startDate);
                     }
                     if (!childData.ganttProperties.isMilestone && isScheduledTask(childData.ganttProperties)) {
-                        progressValues = this.getParentProgress(childData);
+                        progressValues = this_4.getParentProgress(childData);
                         totalProgress += getValue('totalProgress', progressValues);
-                        if (childData[this.parent.taskFields.duration] < 1) {
+                        if (childData[this_4.parent.taskFields.duration] < 1) {
                             totalDuration += getValue('totalDuration', progressValues);
                             totalDuration = Number(totalDuration.toFixed(4));
                         }
@@ -3956,6 +4002,10 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
                         milestoneCount++;
                     }
                     childCompletedWorks += childData.ganttProperties.work;
+                };
+                var this_4 = this;
+                for (var count = 0; count < childLength; count++) {
+                    _loop_6(count);
                 }
                 if (!deleteUpdate) {
                     var taskCount = void 0;
@@ -4448,6 +4498,7 @@ var GanttChart = /** @__PURE__ @class */ (function () {
     function GanttChart(parent) {
         this.isExpandCollapseFromChart = false;
         this.isExpandAll = false;
+        this.isCollapseAll = false;
         this.isGanttElement = false;
         this.parent = parent;
         this.chartTimelineContainer = null;
@@ -4793,6 +4844,42 @@ var GanttChart = /** @__PURE__ @class */ (function () {
         if (this.parent.editSettings.allowTaskbarEditing) {
             this.parent.notify('chartMouseUp', e);
         }
+        if (!this.parent.editSettings.allowEditing) {
+            var isTaskbarEdited = false;
+            if (this.parent.editSettings.allowTaskbarEditing &&
+                getValue('editModule.taskbarEditModule.isMouseDragged', this.parent) &&
+                getValue('editModule.taskbarEditModule.taskBarEditAction', this.parent)) {
+                isTaskbarEdited = true;
+            }
+            if (!isTaskbarEdited) {
+                /** Expand/collapse action */
+                var target = e.target;
+                var isOnTaskbarElement = e.target.classList.contains(taskBarMainContainer)
+                    || closest(e.target, '.' + taskBarMainContainer);
+                if (closest(target, '.e-gantt-parent-taskbar') && !this.parent.editSettings.allowEditing) {
+                    this.chartExpandCollapseRequest(e);
+                }
+                else if (!isOnTaskbarElement && this.parent.autoFocusTasks) {
+                    this.scrollToTarget(e); /** Scroll to task */
+                }
+            }
+        }
+        if (e.type === "touchend") {
+            var resizeCheck = this.parent.ganttChartModule.chartBodyContainer.querySelector('.e-taskbar-resize-div');
+            if (!isNullOrUndefined(resizeCheck)) {
+                resizeCheck.remove();
+            }
+            var Check = this.parent.ganttChartModule.chartBodyContainer.querySelector('.e-clone-taskbar');
+            if (!isNullOrUndefined(Check)) {
+                var clonetbody = Check.parentElement;
+                var cloneTable = clonetbody.parentElement;
+                cloneTable.remove();
+            }
+            var falseline = this.parent.ganttChartModule.chartBodyContainer.querySelector('.e-gantt-false-line');
+            if (!isNullOrUndefined(falseline)) {
+                this.parent.editModule.taskbarEditModule.removeFalseLine(true);
+            }
+        }
     };
     /**
      *
@@ -5184,13 +5271,27 @@ var GanttChart = /** @__PURE__ @class */ (function () {
      * @private
      */
     GanttChart.prototype.collapsedGanttRow = function (args) {
+        var _this = this;
         if ((isNullOrUndefined(args['gridRow']) && this.parent.enableVirtualization) || isNullOrUndefined(args['chartRow'])) {
             return;
         }
-        var record = getValue('data', args);
+        var record;
+        if (!this.parent.loadChildOnDemand && this.parent.taskFields.hasChildMapping) {
+            record = this.parent.currentViewData.filter(function (item) { return item.ganttProperties[_this.parent.taskFields.id] === args['data'][_this.parent.taskFields.id]; })[0];
+        }
+        else {
+            record = getValue('data', args);
+        }
         if (this.isExpandCollapseFromChart) {
             this.expandCollapseChartRows('collapse', getValue('chartRow', args), record, null);
-            this.parent.treeGrid.collapseRow(getValue('gridRow', args), record);
+            var idField_1 = this.parent.taskFields.id;
+            if (!this.parent.loadChildOnDemand && this.parent.taskFields.hasChildMapping) {
+                var gridRec = this.parent.treeGrid.getCurrentViewRecords().filter(function (item) { return item[idField_1] == args['data'][idField_1]; })[0];
+                this.parent.treeGrid.collapseRow(getValue('gridRow', args), gridRec);
+            }
+            else {
+                this.parent.treeGrid.collapseRow(getValue('gridRow', args), record);
+            }
             this.isExpandCollapseFromChart = false;
         }
         else {
@@ -5235,13 +5336,27 @@ var GanttChart = /** @__PURE__ @class */ (function () {
      * @private
      */
     GanttChart.prototype.expandedGanttRow = function (args) {
+        var _this = this;
         if ((isNullOrUndefined(args['gridRow']) && this.parent.enableVirtualization) || isNullOrUndefined(args['chartRow'])) {
             return;
         }
-        var record = getValue('data', args);
+        var record;
+        if (!this.parent.loadChildOnDemand && this.parent.taskFields.hasChildMapping) {
+            record = this.parent.currentViewData.filter(function (item) { return item.ganttProperties.taskId == args['data'][_this.parent.taskFields.id]; })[0];
+        }
+        else {
+            record = getValue('data', args);
+        }
         if (this.isExpandCollapseFromChart) {
             this.expandCollapseChartRows('expand', getValue('chartRow', args), record, null);
-            this.parent.treeGrid.expandRow(getValue('gridRow', args), record);
+            var idField_2 = this.parent.taskFields.id;
+            if (!this.parent.loadChildOnDemand && this.parent.taskFields.hasChildMapping) {
+                var gridRec = this.parent.treeGrid.getCurrentViewRecords().filter(function (item) { return item[idField_2] == args['data'][idField_2]; })[0];
+                this.parent.treeGrid.expandRow(getValue('gridRow', args), gridRec);
+            }
+            else {
+                this.parent.treeGrid.expandRow(getValue('gridRow', args), record);
+            }
             this.isExpandCollapseFromChart = false;
         }
         else {
@@ -5340,9 +5455,11 @@ var GanttChart = /** @__PURE__ @class */ (function () {
             this.parent.treeGrid.expandAll();
         }
         else {
+            this.isCollapseAll = true;
             this.parent.treeGrid.collapseAll();
         }
         this.isExpandAll = false;
+        this.isCollapseAll = false;
     };
     /**
      * Public method to expand particular level of rows.
@@ -5825,7 +5942,7 @@ var GanttChart = /** @__PURE__ @class */ (function () {
                     childElement = element;
                 }
             }
-            if (element.classList.contains('e-right-label-temp-container') || element.classList.contains('e-left-label-temp-container') || element.classList.contains('e-indicator-span')) {
+            if (element.classList.contains('e-right-label-temp-container') || element.classList.contains('e-left-label-temp-container') || element.classList.contains('e-indicator-span') || element.classList.contains("e-timeline-header-container")) {
                 if (focus === 'add') {
                     element.setAttribute('tabIndex', '0');
                     addClass([element], 'e-active-container');
@@ -5889,7 +6006,13 @@ var GanttChart = /** @__PURE__ @class */ (function () {
                 recordIndex = this.parent.flatData.indexOf(record);
             }
             else {
-                recordIndex = this.parent.currentViewData.indexOf(record);
+                if (this.parent.pdfExportModule && this.parent.pdfExportModule.helper.exportProps && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings &&
+                    this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth && this.parent.pdfExportModule.isPdfExport) {
+                    recordIndex = this.parent.ids.indexOf(record.ganttProperties.taskId.toString());
+                }
+                else {
+                    recordIndex = this.parent.currentViewData.indexOf(record);
+                }
             }
         }
         return recordIndex;
@@ -5976,7 +6099,9 @@ var Timeline = /** @__PURE__ @class */ (function () {
      */
     Timeline.prototype.refreshTimelineByTimeSpan = function () {
         this.validateTimelineProp();
-        this.parent.ganttChartModule.chartTimelineContainer.innerHTML = '';
+        if (!this.parent.pdfExportModule || (this.parent.pdfExportModule && !this.parent.pdfExportModule.isPdfExport) || (this.parent.pdfExportModule && this.parent.pdfExportModule.isPdfExport && this.parent.pdfExportModule.helper.exportProps && !this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth)) {
+            this.parent.ganttChartModule.chartTimelineContainer.innerHTML = '';
+        }
         this.createTimelineSeries();
     };
     /**
@@ -6293,7 +6418,10 @@ var Timeline = /** @__PURE__ @class */ (function () {
         this.customTimelineSettings.topTier.format = this.validateFormat(this.topTier, this.customTimelineSettings.topTier.format);
         this.customTimelineSettings.weekStartDay = this.customTimelineSettings.weekStartDay >= 0 &&
             this.customTimelineSettings.weekStartDay <= 6 ? this.customTimelineSettings.weekStartDay : 0;
-        this.checkCurrentZoomingLevel();
+        if (!(this.parent.pdfExportModule && this.parent.pdfExportModule.helper.exportProps &&
+            this.parent.pdfExportModule.isPdfExport && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth)) {
+            this.checkCurrentZoomingLevel();
+        }
     };
     /**
      * To find the current zooming level of the Gantt control.
@@ -6540,13 +6668,15 @@ var Timeline = /** @__PURE__ @class */ (function () {
             table = createElement('table', { className: timelineHeaderTableContainer, styles: 'display: block;' });
             thead = createElement('thead', { className: timelineHeaderTableBody, styles: 'display:block; border-collapse:collapse' });
             tr = createElement('tr', { innerHTML: this.createTimelineTemplate(tier) });
-            td = createElement('th');
-            div = createElement('div', { styles: 'width: 20px' });
-            td.appendChild(div);
-            tr.appendChild(td);
-            thead.appendChild(tr);
-            table.appendChild(thead);
-            this.parent.ganttChartModule.chartTimelineContainer.appendChild(table);
+            if (!this.parent.pdfExportModule || (this.parent.pdfExportModule && !this.parent.pdfExportModule.isPdfExport) || (this.parent.pdfExportModule && this.parent.pdfExportModule.isPdfExport && this.parent.pdfExportModule.helper.exportProps && !this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth)) {
+                td = createElement('th');
+                div = createElement('div', { styles: 'width: 20px' });
+                td.appendChild(div);
+                tr.appendChild(td);
+                thead.appendChild(tr);
+                table.appendChild(thead);
+                this.parent.ganttChartModule.chartTimelineContainer.appendChild(table);
+            }
             tier = 'bottomTier';
             tr = null;
         }
@@ -7380,13 +7510,16 @@ var Timeline = /** @__PURE__ @class */ (function () {
             this.parent.updateProjectDates(args.projectStartDate, args.ProjectEndDate, args.isTimelineRoundOff, isFrom);
             if (type === 'prevTimeSpan' && isFrom === 'publicMethod') {
                 this.parent.ganttChartModule.updateScrollLeft(0);
+                this.parent.timelineModule.isZoomToFit = false;
             }
             else if (type === 'nextTimeSpan' && isFrom === 'publicMethod') {
                 this.parent.ganttChartModule.updateScrollLeft(this.parent.timelineModule.totalTimelineWidth);
+                this.parent.timelineModule.isZoomToFit = false;
             }
             else if (type === 'nextTimeSpan' && isFrom === 'TaskbarEditing') {
                 var currentScrollLeft = document.getElementsByClassName('e-chart-scroll-container e-content')[0].scrollLeft;
                 this.parent.element.querySelector('.e-timeline-header-container').scrollLeft = currentScrollLeft;
+                this.parent.timelineModule.isZoomToFit = false;
             }
             this.parent.timelineModule.timeSpanActionEvent('actionComplete', type, isFrom);
         }
@@ -7585,6 +7718,11 @@ var GanttTreeGrid = /** @__PURE__ @class */ (function () {
         this.wireEvents();
     };
     GanttTreeGrid.prototype.composeProperties = function () {
+        this.parent.treeGrid.hasChildMapping = this.parent.taskFields.hasChildMapping;
+        this.parent.treeGrid.loadChildOnDemand = this.parent.loadChildOnDemand;
+        this.parent.treeGrid['isFromGantt'] = true;
+        this.parent.treeGrid.parentIdMapping = this.parent.taskFields.parentID;
+        this.parent.treeGrid.idMapping = this.parent.taskFields.id;
         this.parent.treeGrid.showColumnMenu = this.parent.showColumnMenu;
         this.parent.treeGrid.enableCollapseAll = this.parent.collapseAllParentTasks;
         this.parent.treeGrid.columnMenuItems = this.parent.columnMenuItems;
@@ -7601,8 +7739,14 @@ var GanttTreeGrid = /** @__PURE__ @class */ (function () {
             this.parent.treeGrid.dataSource = { result: this.parent.flatData, count: count };
         }
         else {
-            this.parent.treeGrid.hasChildMapping = null;
-            this.parent.treeGrid.dataSource = this.parent.flatData;
+            if (!this.parent.treeGrid.loadChildOnDemand && this.parent.taskFields.hasChildMapping) {
+                this.parent.autoCalculateDateScheduling = false;
+                this.parent.treeGrid.dataSource = this.parent.dataSource;
+            }
+            else {
+                this.parent.treeGrid.hasChildMapping = null;
+                this.parent.treeGrid.dataSource = this.parent.flatData;
+            }
         }
         this.parent.treeGrid.expandStateMapping = this.parent.taskFields.expandState;
         var isGantt = 'isGantt';
@@ -7763,7 +7907,7 @@ var GanttTreeGrid = /** @__PURE__ @class */ (function () {
                 collapsedArgs = this.createExpandCollapseArgs(args, null);
                 this.parent.ganttChartModule.collapsedGanttRow(collapsedArgs);
             }
-            if (this.parent.viewType === 'ResourceView' && !this.parent.allowTaskbarOverlap && collapsedArgs['gridRow']) {
+            if (this.parent.viewType === 'ResourceView' && !this.parent.allowTaskbarOverlap && !this.parent.ganttChartModule.isCollapseAll && collapsedArgs['gridRow']) {
                 collapsedArgs['gridRow'].style.height = collapsedArgs['chartRow'].style.height;
                 this.parent.contentHeight = this.parent.enableRtl ? this.parent['element'].getElementsByClassName('e-content')[2].children[0]['offsetHeight'] :
                     this.parent['element'].getElementsByClassName('e-content')[0].children[0]['offsetHeight'];
@@ -7793,7 +7937,7 @@ var GanttTreeGrid = /** @__PURE__ @class */ (function () {
                 expandedArgs = this.createExpandCollapseArgs(args, null);
                 this.parent.ganttChartModule.expandedGanttRow(expandedArgs);
             }
-            if (this.parent.viewType === 'ResourceView' && !this.parent.allowTaskbarOverlap && args['row']) {
+            if (this.parent.viewType === 'ResourceView' && !this.parent.allowTaskbarOverlap && !this.parent.ganttChartModule.isExpandAll && args['row']) {
                 args['row'].style.height = this.parent.rowHeight + 'px';
                 this.parent.contentHeight = this.parent.enableRtl ? this.parent['element'].getElementsByClassName('e-content')[2].children[0]['offsetHeight'] :
                     this.parent['element'].getElementsByClassName('e-content')[0].children[0]['offsetHeight'];
@@ -8363,6 +8507,9 @@ var GanttTreeGrid = /** @__PURE__ @class */ (function () {
         if (!isNullOrUndefined(ganttProp)) {
             return this.parent.dataOperation.getDurationString(ganttProp.duration, ganttProp.durationUnit);
         }
+        else if (!this.parent.loadChildOnDemand && this.parent.taskFields.hasChildMapping) {
+            return this.parent.dataOperation.getDurationString(parseInt(data[this.parent.taskFields.duration]), this.parent.durationUnit);
+        }
         return '';
     }; // eslint-disable-next-line
     GanttTreeGrid.prototype.resourceValueAccessor = function (field, data, column) {
@@ -8399,12 +8546,7 @@ var GanttTreeGrid = /** @__PURE__ @class */ (function () {
     };
     GanttTreeGrid.prototype.updateScrollTop = function (args) {
         var newScrollTop;
-        if (getValue('top', args) > (this.parent.flatData.length * this.parent.rowHeight)) {
-            newScrollTop = getValue('top', args) - document.getElementsByClassName('e-chart-scroll-container e-content')[0]['offsetHeight'];
-        }
-        else {
-            newScrollTop = getValue('top', args);
-        }
+        newScrollTop = getValue('top', args);
         this.treeGridElement.querySelector('.e-content').scrollTop = newScrollTop;
         this.previousScroll.top = this.treeGridElement.querySelector('.e-content').scrollTop;
     };
@@ -8931,6 +9073,9 @@ var TaskFields = /** @__PURE__ @class */ (function (_super) {
     __decorate$12([
         Property(null)
     ], TaskFields.prototype, "parentID", void 0);
+    __decorate$12([
+        Property(null)
+    ], TaskFields.prototype, "hasChildMapping", void 0);
     __decorate$12([
         Property(null)
     ], TaskFields.prototype, "startDate", void 0);
@@ -9547,16 +9692,16 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         return splitTasks;
     };
     ChartRows.prototype.getSplitTaskbarLeftResizerNode = function () {
-        var lResizerLeft = -(this.parent.isAdaptive ? 12 : 2);
+        var lResizerLeft = (!isNullOrUndefined(document.body.className) && document.body.className.includes("e-bigger")) ? 5 : -2;
         var template = '<div class="' + taskBarLeftResizer + ' ' + icon + '"' +
-            ' style="' + (this.parent.enableRtl ? 'right:' : 'left:') + lResizerLeft + 'px;height:' + (this.taskBarHeight) + 'px;"></div>';
+            ' style="' + (this.parent.enableRtl ? 'right:' : 'left:') + lResizerLeft + 'px;height:' + (this.taskBarHeight) + 'px;z-index:1"></div>';
         return template;
     };
     ChartRows.prototype.getSplitTaskbarRightResizerNode = function (segment) {
-        var rResizerLeft = this.parent.isAdaptive ? -2 : -10;
+        var rResizerLeft = (!isNullOrUndefined(document.body.className) && document.body.className.includes("e-bigger")) ? -17 : -10;
         var template = '<div class="' + taskBarRightResizer + ' ' + icon + '"' +
             ' style="' + (this.parent.enableRtl ? 'right:' : 'left:') + (segment.width + rResizerLeft) + 'px;' +
-            'height:' + (this.taskBarHeight) + 'px;"></div>';
+            'height:' + (this.taskBarHeight) + 'px;z-index:1"></div>';
         return template;
     };
     ChartRows.prototype.getSplitProgressResizerNode = function (segment) {
@@ -9881,7 +10026,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         }
         else {
             var template = '<div class="' + traceMilestone + '" style="width:' + ((this.parent.renderBaseline ? this.taskBarHeight : this.taskBarHeight - 6)) + 'px;height:' +
-                ((this.parent.renderBaseline ? this.taskBarHeight : this.taskBarHeight - 6)) + 'px;position:absolute;transform: rotate(45deg);top:' + (this.parent.rowHeight > 40 ? 0 : 1) + 'px;left:' + 1 + 'px;"> </div>';
+                ((this.parent.renderBaseline ? this.taskBarHeight : this.taskBarHeight - 6)) + 'px;position:absolute;transform: rotate(45deg);left:' + 1 + 'px;"> </div>';
             milestoneNode = this.createDivElement(template);
         }
         return milestoneNode;
@@ -10259,16 +10404,16 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         return this.createDivElement(template);
     };
     ChartRows.prototype.childTaskbarLeftResizer = function () {
-        var lResizerLeft = -(this.parent.isAdaptive ? 12 : 2);
+        var lResizerLeft = (!isNullOrUndefined(document.body.className) && document.body.className.includes("e-bigger")) ? 5 : -2;
         var template = '<div class="' + taskBarLeftResizer + ' ' + icon + '"' +
-            'style="' + (this.parent.enableRtl ? 'right:' : 'left:') + lResizerLeft + 'px;height:' + (this.taskBarHeight) + 'px;"></div>';
+            'style="' + (this.parent.enableRtl ? 'right:' : 'left:') + lResizerLeft + 'px;height:' + (this.taskBarHeight) + 'px;z-index:1"></div>';
         return this.createDivElement(template);
     };
     ChartRows.prototype.childTaskbarRightResizer = function () {
-        var rResizerLeft = this.parent.isAdaptive ? -2 : -10;
+        var rResizerLeft = (!isNullOrUndefined(document.body.className) && document.body.className.includes("e-bigger")) ? -17 : -10;
         var template = '<div class="' + taskBarRightResizer + ' ' + icon + '"' +
             'style="' + (this.parent.enableRtl ? 'right:' : 'left:') + (this.templateData.ganttProperties.width + rResizerLeft) + 'px;' +
-            'height:' + (this.taskBarHeight) + 'px;"></div>';
+            'height:' + (this.taskBarHeight) + 'px;z-index:1"></div>';
         return this.createDivElement(template);
     };
     ChartRows.prototype.childTaskbarProgressResizer = function () {
@@ -10282,8 +10427,10 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
     };
     ChartRows.prototype.getLeftPointNode = function () {
         var data = this.templateData;
-        var pointerLeft = -((this.parent.isAdaptive ? 14 : 2) + this.connectorPointWidth);
-        var mileStoneLeft = -(this.connectorPointWidth + 2);
+        var left = (!isNullOrUndefined(document.body.className) && document.body.className.includes("e-bigger")) ? 12 : 0;
+        var mileStoneLeftValue = (!isNullOrUndefined(document.body.className) && document.body.className.includes("e-bigger")) ? 6 : 3;
+        var pointerLeft = -(3 + this.connectorPointWidth + left);
+        var mileStoneLeft = -(this.connectorPointWidth + 4 + mileStoneLeftValue);
         var pointerTop = Math.floor(this.milesStoneRadius - (this.connectorPointWidth / 2));
         var marginTop;
         if ((!this.templateData.ganttProperties.isAutoSchedule && this.templateData.hasChildRecords) && this.parent.allowParentDependency) {
@@ -10302,7 +10449,8 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
     };
     ChartRows.prototype.getRightPointNode = function () {
         var data = this.templateData;
-        var pointerRight = this.parent.isAdaptive ? 10 : -2;
+        var right = (!isNullOrUndefined(document.body.className) && document.body.className.includes("e-bigger")) ? -12 : 0;
+        var pointerRight = -(3 + right);
         var pointerTop = Math.floor(this.milesStoneRadius - (this.connectorPointWidth / 2));
         var marginTop;
         if ((!this.templateData.ganttProperties.isAutoSchedule && this.templateData.hasChildRecords) && this.parent.allowParentDependency) {
@@ -10312,7 +10460,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
             marginTop = 'margin-top:' + this.connectorPointMargin + 'px';
         }
         var template = '<div class="' + rightConnectorPointOuterDiv + '" style="' +
-            ((data.ganttProperties.isMilestone) ? ('left:' + (this.milestoneHeight - 2) + 'px;margin-top:' +
+            ((data.ganttProperties.isMilestone) ? ('left:' + ((!isNullOrUndefined(document.body.className) && document.body.className.includes("e-bigger")) ? (this.milestoneHeight + 5) : this.milestoneHeight - 2) + 'px;margin-top:' +
                 pointerTop + 'px;') : ('left:' + (data.ganttProperties.width + pointerRight) + 'px;' + marginTop + ';')) + '">' +
             '<div class="' + connectorPointRight + ' ' + this.parent.getUnscheduledTaskClass(data.ganttProperties) +
             '" style="width:' + this.connectorPointWidth + 'px;height:' + this.connectorPointWidth + 'px;">' +
@@ -10485,7 +10633,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
      * @private
      */
     ChartRows.prototype.initChartHelperPrivateVariable = function () {
-        var taskbarHeightValue = this.parent.renderBaseline ? 0.45 : 0.62;
+        var taskbarHeightValue = this.parent.renderBaseline ? 0.45 : ((!isNullOrUndefined(document.body.className) && document.body.className.includes("e-bigger")) ? 0.7 : 0.62);
         var taskBarMarginTopValue = this.parent.renderBaseline ? 4 : 2;
         var milestoneHeightValue = this.parent.renderBaseline ? 1.13 : 0.82;
         this.baselineColor = !isNullOrUndefined(this.parent.baselineColor) &&
@@ -10507,8 +10655,8 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         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))) - 4);
-        this.connectorPointWidth = this.parent.isAdaptive ? Math.round(this.taskBarHeight / 2) : 10;
-        this.connectorPointMargin = Math.floor((this.taskBarHeight / 2) - (this.connectorPointWidth / 2)) - 1;
+        this.connectorPointWidth = this.parent.isAdaptive ? Math.round(this.taskBarHeight / 2) : 8;
+        this.connectorPointMargin = Math.floor((this.taskBarHeight / 2) - (this.connectorPointWidth / 2));
     };
     /**
      * Function used to refresh Gantt rows.
@@ -10794,11 +10942,24 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
      * @private
      */
     ChartRows.prototype.setAriaRowIndex = function (tempTemplateData, tRow) {
+        var _this = this;
         var dataSource = this.parent.treeGrid.getCurrentViewRecords();
         var visualData = this.parent.virtualScrollModule && this.parent.enableVirtualization ?
             getValue('virtualScrollModule.visualData', this.parent.treeGrid) : dataSource;
-        var index = visualData.indexOf(tempTemplateData);
-        tRow.setAttribute('aria-rowindex', index.toString());
+        var index;
+        if (!this.parent.loadChildOnDemand && this.parent.taskFields.hasChildMapping) {
+            var gridData = this.parent.treeGrid.grid.contentModule['rows'];
+            var data = gridData.filter(function (x) {
+                if (x['data'][_this.parent.taskFields.id] === tempTemplateData.ganttProperties.taskId) {
+                    return x;
+                }
+            })[0];
+            tRow.setAttribute('aria-rowindex', data['index'].toString());
+        }
+        else {
+            index = visualData.indexOf(tempTemplateData);
+            tRow.setAttribute('aria-rowindex', index.toString());
+        }
     };
     /**
      * To trigger query taskbar info event.
@@ -11174,8 +11335,11 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                 this.triggerQueryTaskbarInfoByIndex(tr, data);
             }
             var dataId = this.parent.viewType === 'ProjectView' ? data.ganttProperties.taskId : data.ganttProperties.rowUniqueID;
-            this.parent.treeGrid.grid.setRowData(dataId, data);
-            if (this.parent.viewType === 'ResourceView' && data.hasChildRecords && !data.expanded && this.parent.enableMultiTaskbar && !this.parent.allowTaskbarOverlap) {
+            if (!this.parent.ganttChartModule.isExpandAll && !this.parent.ganttChartModule.isCollapseAll) {
+                this.parent.treeGrid.grid.setRowData(dataId, data);
+            }
+            if (this.parent.viewType === 'ResourceView' && data.hasChildRecords && !data.expanded && this.parent.enableMultiTaskbar && !this.parent.allowTaskbarOverlap &&
+                !this.parent.ganttChartModule.isCollapseAll && !this.parent.ganttChartModule.isExpandAll) {
                 this.updateDragDropRecords(selectedItem, tr);
             }
             if (this.parent.viewType === 'ResourceView' && data.hasChildRecords && this.parent.showOverAllocation && !this.parent.allowTaskbarOverlap) {
@@ -11369,6 +11533,7 @@ var Dependency = /** @__PURE__ @class */ (function () {
         this.parentRecord = [];
         this.parentIds = [];
         this.parentPredecessors = [];
+        this.validatedParentIds = [];
         this.parent = gantt;
         this.dateValidateModule = this.parent.dateValidationModule;
     }
@@ -11985,13 +12150,31 @@ var Dependency = /** @__PURE__ @class */ (function () {
      */
     Dependency.prototype.createConnectorLinesCollection = function (records) {
         var ganttRecords = records ? records : this.parent.currentViewData;
+        if (this.parent.pdfExportModule && this.parent.pdfExportModule.isPdfExport && this.parent.pdfExportModule.helper.exportProps && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings &&
+            this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth && this.parent.pdfExportModule.isPdfExport) {
+            ganttRecords = this.parent.pdfExportModule.helper.beforeSinglePageExport['cloneCurrentViewData'];
+        }
         var recordLength = ganttRecords.length;
         var count;
         var ganttRecord;
         var predecessorsCollection;
-        this.parent.connectorLineModule.expandedRecords = this.parent.virtualScrollModule && this.parent.enableVirtualization ?
-            this.parent.updatedRecords : this.parent.getExpandedRecords(this.parent.updatedRecords);
+        if (this.parent.pdfExportModule && this.parent.pdfExportModule.isPdfExport && this.parent.pdfExportModule.helper.exportProps && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings &&
+            this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth && this.parent.pdfExportModule.isPdfExport) {
+            this.parent.connectorLineModule.expandedRecords = this.parent.virtualScrollModule && this.parent.enableVirtualization ?
+                this.parent.pdfExportModule.helper.beforeSinglePageExport['cloneFlatData'] : this.parent.getExpandedRecords(this.parent.pdfExportModule.helper.beforeSinglePageExport['cloneFlatData']);
+        }
+        else {
+            this.parent.connectorLineModule.expandedRecords = this.parent.virtualScrollModule && this.parent.enableVirtualization ?
+                this.parent.updatedRecords : this.parent.getExpandedRecords(this.parent.updatedRecords);
+        }
         for (count = 0; count < recordLength; count++) {
+            if (this.parent.editModule && this.parent.editModule.deletedTaskDetails.length > 0) {
+                if (ganttRecords[count].parentItem) {
+                    var parentItem = this.parent.getRecordByID(ganttRecords[count].parentItem.taskId.toString());
+                    this.parent.setRecordValue('parentItem', this.parent.dataOperation.getCloneParent(parentItem), ganttRecords[count]);
+                }
+                ganttRecords[count].index = count;
+            }
             ganttRecord = ganttRecords[count];
             predecessorsCollection = ganttRecord.ganttProperties.predecessor;
             if (predecessorsCollection) {
@@ -12139,36 +12322,35 @@ var Dependency = /** @__PURE__ @class */ (function () {
                     this.validatePredecessor(record, undefined, 'successor');
                 }
             }
-            if (record && record.ganttProperties.taskId !== this.isValidatedParentTaskID && ganttProp) {
-                var validUpdate = false;
-                var predecessorNames = ganttProp.ganttProperties.predecessorsName ?
-                    ganttProp.ganttProperties.predecessorsName.split(',').length : ganttProp.ganttProperties.predecessorsName;
-                var predecessorLength = ganttProp.ganttProperties.predecessor ?
-                    ganttProp.ganttProperties.predecessor.length : ganttProp.ganttProperties.predecessor;
-                if ((predecessorLength && predecessorNames !== predecessorLength)) {
-                    validUpdate = true;
-                }
-                else if (record.hasChildRecords && record.ganttProperties.predecessor.length > 0 && ganttProp.hasChildRecords && !ganttProp.ganttProperties.predecessor) {
-                    validUpdate = true;
-                }
-                if ((taskBarModule.taskBarEditAction !== 'ParentDrag' && taskBarModule.taskBarEditAction !== 'ChildDrag')) {
-                    if (!ganttProp.hasChildRecords && record.hasChildRecords) {
+            if (record && !record.hasChildRecords && record.parentItem && this.validatedParentIds.indexOf(record.parentItem.taskId) == -1) {
+                this.validatedParentIds.push(record.parentItem.taskId);
+            }
+            
+            var validUpdate = true;
+            if (record && record.hasChildRecords && this.validatedParentIds.indexOf(record.ganttProperties.taskId.toString()) !== -1) {
+                validUpdate = false;
+            }
+            if (validUpdate) {
+                if (record && record.ganttProperties.taskId !== this.isValidatedParentTaskID && ganttProp) {
+                    if ((taskBarModule.taskBarEditAction !== 'ParentDrag' && taskBarModule.taskBarEditAction !== 'ChildDrag')) {
+                        if (!ganttProp.hasChildRecords && record.hasChildRecords) {
+                            this.parent.editModule['updateChildItems'](record);
+                            this.isValidatedParentTaskID = record.ganttProperties.taskId;
+                        }
+                    }
+                    else if ((!record.hasChildRecords && taskBarModule.taskBarEditAction == 'ChildDrag') ||
+                        (record.hasChildRecords && taskBarModule.taskBarEditAction == 'ParentDrag')) {
                         this.parent.editModule['updateChildItems'](record);
                         this.isValidatedParentTaskID = record.ganttProperties.taskId;
                     }
+                    if (!ganttProp.hasChildRecords) {
+                        this.parent.dataOperation.updateParentItems(record, true);
+                    }
                 }
-                else if ((record.hasChildRecords && taskBarModule.taskBarEditAction == 'ChildDrag') ||
-                    (validUpdate && taskBarModule.taskBarEditAction == 'ParentDrag')) {
+                else if (record && record.hasChildRecords && !ganttProp) {
                     this.parent.editModule['updateChildItems'](record);
-                    this.isValidatedParentTaskID = record.ganttProperties.taskId;
-                }
-                if (!ganttProp.hasChildRecords) {
-                    this.parent.dataOperation.updateParentItems(record, true);
                 }
             }
-            else if (record && record.hasChildRecords && !ganttProp) {
-                this.parent.editModule['updateChildItems'](record);
-            }
         }
     };
     /**
@@ -12251,7 +12433,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
     };
     ConnectorLine.prototype.getTaskbarMidpoint = function (isMilestone) {
         return Math.floor(isMilestone ?
-            (this.parent.chartRowsModule.milestoneMarginTop + (this.parent.chartRowsModule.milestoneHeight / 2)) + 1 :
+            (this.parent.chartRowsModule.milestoneMarginTop + (this.parent.chartRowsModule.milestoneHeight / 2)) :
             (this.parent.chartRowsModule.taskBarMarginTop + (this.parent.chartRowsModule.taskBarHeight / 2))) + 1;
     };
     /**
@@ -12265,14 +12447,45 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
      */
     ConnectorLine.prototype.createConnectorLineObject = function (parentGanttData, childGanttData, predecessor) {
         var connectorObj = {};
-        var updatedRecords = this.parent.pdfExportModule && this.parent.pdfExportModule.isPdfExport ?
-            this.parent.flatData : this.expandedRecords;
-        var parentIndex = updatedRecords.indexOf(parentGanttData);
-        var childIndex = updatedRecords.indexOf(childGanttData);
+        var updatedRecords;
+        if (this.parent.pdfExportModule && this.parent.pdfExportModule.isPdfExport && this.parent.pdfExportModule.helper.exportProps &&
+            this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth) {
+            updatedRecords = this.parent.pdfExportModule && this.parent.pdfExportModule.isPdfExport ?
+                this.parent.pdfExportModule.helper.beforeSinglePageExport['cloneFlatData'] : this.expandedRecords;
+        }
+        else {
+            updatedRecords = this.parent.pdfExportModule && this.parent.pdfExportModule.isPdfExport ?
+                this.parent.flatData : this.expandedRecords;
+        }
+        var parentIndex;
+        var childIndex;
+        if (this.parent.pdfExportModule && this.parent.pdfExportModule.isPdfExport && this.parent.pdfExportModule.helper.exportProps &&
+            this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth) {
+            var parentData = this.parent.flatData.filter(function (data) {
+                return data.ganttProperties.taskId.toString() == parentGanttData.ganttProperties.taskId.toString();
+            })[0];
+            var childData = this.parent.flatData.filter(function (data) {
+                return data.ganttProperties.taskId.toString() == childGanttData.ganttProperties.taskId.toString();
+            })[0];
+            parentIndex = parentData.index;
+            childIndex = childData.index;
+        }
+        else {
+            parentIndex = updatedRecords.indexOf(parentGanttData);
+            childIndex = updatedRecords.indexOf(childGanttData);
+        }
         var parentGanttRecord = parentGanttData.ganttProperties;
         var childGanttRecord = childGanttData.ganttProperties;
-        var currentData = this.parent.virtualScrollModule && this.parent.enableVirtualization ?
-            this.parent.currentViewData : this.parent.getExpandedRecords(this.parent.currentViewData);
+        var currentData;
+        if (this.parent.pdfExportModule && this.parent.pdfExportModule.isPdfExport && this.parent.pdfExportModule.helper.exportProps &&
+            this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth) {
+            currentData = this.parent.virtualScrollModule && this.parent.enableVirtualization ?
+                this.parent.pdfExportModule.helper.beforeSinglePageExport['cloneFlatData'] : this.parent.getExpandedRecords(this.parent.pdfExportModule.helper.beforeSinglePageExport['cloneFlatData']);
+        }
+        else {
+            currentData = this.parent.virtualScrollModule && this.parent.enableVirtualization ?
+                this.parent.currentViewData : this.parent.getExpandedRecords(this.parent.currentViewData);
+        }
         connectorObj.parentIndexInCurrentView = currentData.indexOf(parentGanttData);
         connectorObj.childIndexInCurrentView = currentData.indexOf(childGanttData);
         var isVirtualScroll = this.parent.virtualScrollModule && this.parent.enableVirtualization;
@@ -13057,8 +13270,17 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
         if (isNullOrUndefined(id)) {
             return null;
         }
-        return this.parent.viewType === 'ResourceView' ? this.parent.flatData[this.parent.getTaskIds().indexOf('T' + id.toString())] :
-            this.parent.flatData[this.parent.ids.indexOf(id.toString())];
+        if (this.parent.pdfExportModule && this.parent.pdfExportModule.isPdfExport && this.parent.pdfExportModule.helper.exportProps &&
+            this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth) {
+            var a = this.parent.pdfExportModule.helper.beforeSinglePageExport['cloneFlatData'].filter(function (data) {
+                return data.ganttProperties.taskId.toString() === id.toString();
+            })[0];
+            return a;
+        }
+        else {
+            return this.parent.viewType === 'ResourceView' ? this.parent.flatData[this.parent.getTaskIds().indexOf('T' + id.toString())] :
+                this.parent.flatData[this.parent.ids.indexOf(id.toString())];
+        }
     };
     /**
      * Method to remove connector line from DOM
@@ -13387,8 +13609,8 @@ var Tooltip$1 = /** @__PURE__ @class */ (function () {
                     if (taskbarTemplateNode) {
                         append(taskbarTemplateNode, tooltipTemplate);
                     }
-                    argsData.content = this.toolTipObj.content = taskbarTemplateNode ? tooltipTemplate :
-                        parent.tooltipModule.getTooltipContent((data.ganttProperties.isMilestone ? 'milestone' : 'taskbar'), data, parent, args);
+                    argsData.content = this.toolTipObj.content = taskbarTemplateNode ? tooltipTemplate : data ?
+                        parent.tooltipModule.getTooltipContent((data.ganttProperties.isMilestone ? 'milestone' : 'taskbar'), data, parent, args) : "";
                 }
                 else if (args.target.classList.contains('e-baseline-bar') ||
                     args.target.classList.contains('e-baseline-gantt-milestone')) {
@@ -13400,8 +13622,8 @@ var Tooltip$1 = /** @__PURE__ @class */ (function () {
                     if (baseLineTemplateNode) {
                         append(baseLineTemplateNode, baselineTemplate);
                     }
-                    argsData.content = this.toolTipObj.content = baseLineTemplateNode ? baselineTemplate :
-                        parent.tooltipModule.getTooltipContent((data.ganttProperties.isMilestone ? 'milestone' : 'baseline'), data, parent, args);
+                    argsData.content = this.toolTipObj.content = baseLineTemplateNode ? baselineTemplate : data ?
+                        parent.tooltipModule.getTooltipContent((data.ganttProperties.isMilestone ? 'milestone' : 'baseline'), data, parent, args) : "";
                 }
                 else if (args.target.classList.contains('e-event-markers')) {
                     argsData.content = this.toolTipObj.content = parent.tooltipModule.getTooltipContent('marker', data, parent, args);
@@ -13468,7 +13690,7 @@ var Tooltip$1 = /** @__PURE__ @class */ (function () {
     // eslint-disable-next-line
     Tooltip$$1.prototype.tooltipCloseHandler = function (args) {
         this.tooltipMouseEvent = null;
-        if (!this.parent.isAdaptive) {
+        if (!this.parent.isAdaptive && !isNullOrUndefined(this.currentTarget)) {
             EventHandler.remove(this.currentTarget, 'mousemove', this.mouseMoveHandler);
         }
         this.currentTarget = null;
@@ -13484,34 +13706,38 @@ var Tooltip$1 = /** @__PURE__ @class */ (function () {
      */
     Tooltip$$1.prototype.updateTooltipPosition = function (args) {
         args.element.style.visibility = 'visible';
-        // if (isNullOrUndefined(this.tooltipMouseEvent) || args.target.classList.contains('e-notes-info')) {
-        //     return;
-        // }
-        // const postion: { x: number, y: number } = this.getPointorPosition(this.tooltipMouseEvent);
-        // const containerPosition: { top: number, left: number, width?: number, height?: number } =
-        //  this.parent.getOffsetRect(this.parent.chartPane);
-        // const topEnd: number = containerPosition.top + this.parent.chartPane.offsetHeight;
-        // const leftEnd: number = containerPosition.left + this.parent.chartPane.offsetWidth;
-        // let tooltipPositionX: number = postion.x;
-        // let tooltipPositionY: number = postion.y;
-        // if (leftEnd < (tooltipPositionX + args.element.offsetWidth + 10)) {
-        //     while (leftEnd < (tooltipPositionX + args.element.offsetWidth + 10)) {
-        //         tooltipPositionX = leftEnd - args.element.offsetWidth - 10;
-        //         args.element.style.left = tooltipPositionX + 'px';
-        //     }
-        // } else {
-        //     tooltipPositionX = tooltipPositionX + 10;
-        //     args.element.style.left = tooltipPositionX + 'px';
-        // }
-        // if (window.innerHeight < args.element.offsetHeight + tooltipPositionY) {
-        //     tooltipPositionY = tooltipPositionY - args.element.offsetHeight - 10;
-        // }
-        // if ((topEnd < (tooltipPositionY + args.element.offsetHeight + 20))) {
-        //     tooltipPositionY = tooltipPositionY - args.element.offsetHeight - 10;
-        // } else {
-        //     tooltipPositionY = tooltipPositionY + 10;
-        // }
-        // args.element.style.top = tooltipPositionY + 'px';
+        var parentWithZoomStyle = this.parent.element.closest('[style*="zoom"]');
+        if (isNullOrUndefined(parentWithZoomStyle)) {
+            if (isNullOrUndefined(this.tooltipMouseEvent) || args.target.classList.contains('e-notes-info')) {
+                return;
+            }
+            var postion = this.getPointorPosition(this.tooltipMouseEvent);
+            var containerPosition = this.parent.getOffsetRect(this.parent.chartPane);
+            var topEnd = containerPosition.top + this.parent.chartPane.offsetHeight;
+            var leftEnd = containerPosition.left + this.parent.chartPane.offsetWidth;
+            var tooltipPositionX = postion.x;
+            var tooltipPositionY = postion.y;
+            if (leftEnd < (tooltipPositionX + args.element.offsetWidth + 10)) {
+                while (leftEnd < (tooltipPositionX + args.element.offsetWidth + 10)) {
+                    tooltipPositionX = leftEnd - args.element.offsetWidth - 10;
+                    args.element.style.left = tooltipPositionX + 'px';
+                }
+            }
+            else {
+                tooltipPositionX = tooltipPositionX + 10;
+                args.element.style.left = tooltipPositionX + 'px';
+            }
+            if (window.innerHeight < args.element.offsetHeight + tooltipPositionY) {
+                tooltipPositionY = tooltipPositionY - args.element.offsetHeight - 10;
+            }
+            if ((topEnd < (tooltipPositionY + args.element.offsetHeight + 20))) {
+                tooltipPositionY = tooltipPositionY - args.element.offsetHeight - 10;
+            }
+            else {
+                tooltipPositionY = tooltipPositionY + 10;
+            }
+            args.element.style.top = tooltipPositionY + 'px';
+        }
     };
     /**
      * Method to get mouse pointor position
@@ -14461,6 +14687,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
         createSpinner({ target: this.element }, this.createElement);
         this.trigger('load', {});
         this.element.classList.add(root);
+        this.rowHeight = (!isNullOrUndefined(document.body.className) && document.body.className.includes("e-bigger")) ? (this.rowHeight === 36) ? 46 : this.rowHeight : this.rowHeight;
         if (this.isAdaptive) {
             this.element.classList.add(adaptive);
         }
@@ -14896,7 +15123,9 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
             this.wireEvents();
             this.notify('initPredessorDialog', {});
         }
-        this.splitterModule.updateSplitterPosition();
+        if (!this.isFromOnPropertyChange) {
+            this.splitterModule.updateSplitterPosition();
+        }
         // if (this.gridLines === 'Vertical' || this.gridLines === 'Both') {
         //     this.renderChartVerticalLines();
         // }
@@ -14908,6 +15137,8 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
         removeClass(ganttChartElement.querySelectorAll('.e-critical-milestone'), criticalMilestone);
         removeClass(this.element.querySelectorAll('.e-connector-line'), criticalConnectorLineSVG);
         removeClass(this.element.querySelectorAll('.e-connector-line-arrow'), criticalConnectorArrowSVG);
+        var innerDivs = document.querySelector('.e-gantt-child-taskbar-inner-div');
+        innerDivs.style.outlineColor = "";
     };
     Gantt.prototype.wireEvents = function () {
         if (this.allowKeyboard) {
@@ -14999,7 +15230,39 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
         this.treeGridModule.renderTreeGrid();
     };
     Gantt.prototype.updateCurrentViewData = function () {
+        var _this = this;
         this.currentViewData = this.treeGrid.getCurrentViewRecords().slice();
+        if (!this.loadChildOnDemand && this.taskFields.hasChildMapping && this.currentViewData.length > 0) {
+            this.autoCalculateDateScheduling = false;
+            this.flatData = [];
+            this.dataOperation.taskIds = [];
+            this.ids = [];
+            this.dataOperation.recordIndex = 0;
+            this.dataOperation.dataArray = this.currentViewData;
+            this.dataOperation.cloneDataSource();
+            if (this.predecessorModule && this.taskFields.dependency) {
+                this.predecessorModule['parentIds'] = [];
+                this.predecessorModule['parentRecord'] = [];
+                this.predecessorModule.updatePredecessors();
+            }
+            var gridData = this.treeGrid.grid.contentModule['rows'];
+            var data = gridData.filter(function (x) {
+                if (x['data'][_this.taskFields.id] === _this.flatData[0].ganttProperties.taskId) {
+                    return x;
+                }
+            })[0];
+            var index = data['index'];
+            for (var i = 0; i < this.flatData.length; i++) {
+                this.flatData[i].index = index;
+                index++;
+            }
+            this.currentViewData = this.flatData;
+            this.treeGrid.grid.currentViewData = this.flatData;
+            if (!isNullOrUndefined(this.treeGrid['virtualScrollModule'])) {
+                this.treeGrid['virtualScrollModule'].visualData = this.flatData;
+                this.updatedRecords = this.flatData;
+            }
+        }
     };
     /**
      * @param {IGanttData} records -Defines the delete record collections.
@@ -15019,7 +15282,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
      * @private
      */
     Gantt.prototype.updateContentHeight = function (args) {
-        if (!this.allowTaskbarOverlap && this.viewType === 'ResourceView' && !this.isLoad) {
+        if ((!this.allowTaskbarOverlap && !this.ganttChartModule.isCollapseAll && !this.ganttChartModule.isExpandAll) && this.viewType === 'ResourceView' && !this.isLoad) {
             return;
         }
         else {
@@ -15385,6 +15648,9 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
         else {
             this.getCurrentRecords(args);
         }
+        if (!this.loadChildOnDemand && this.taskFields.hasChildMapping) {
+            this.updateContentHeight();
+        }
         if (this.enableCriticalPath && this.criticalPathModule) {
             this.criticalPathModule.showCriticalPath(this.enableCriticalPath);
         }
@@ -15400,6 +15666,9 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
         }
         this.initialChartRowElements = this.ganttChartModule.getChartRows();
         this.isLoad = false;
+        if (!this.loadChildOnDemand && this.taskFields.hasChildMapping) {
+            this.autoCalculateDateScheduling = true;
+        }
         this.trigger('dataBound', args);
     };
     /**
@@ -15620,6 +15889,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
                     break;
                 case 'projectStartDate':
                 case 'projectEndDate':
+                    this.timelineModule.isZoomToFit = false;
                     this.dataOperation.calculateProjectDates();
                     this.updateProjectDates(this.cloneProjectStartDate, this.cloneProjectEndDate, this.isTimelineRoundOff);
                     break;
@@ -15663,7 +15933,14 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
                     if (prop === 'locale') {
                         this.isLocaleChanged = true;
                     }
-                    isRefresh = true;
+                    if (prop === 'taskFields') {
+                        if (!isNullOrUndefined(newProp.taskFields.child)) {
+                            return;
+                        }
+                    }
+                    if (prop !== 'allowTaskbarDragAndDrop') {
+                        isRefresh = true;
+                    }
                     break;
                 case 'validateManualTasksOnLinking':
                     this.validateManualTasksOnLinking = newProp.validateManualTasksOnLinking;
@@ -16343,6 +16620,9 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
      * @returns {Promise<any>} .
      */
     Gantt.prototype.pdfExport = function (pdfExportProperties, isMultipleExport, pdfDoc, isBlob) {
+        if (pdfExportProperties && pdfExportProperties.fitToWidthSettings && pdfExportProperties.fitToWidthSettings.isFitToWidth) {
+            pdfExportProperties.pageOrientation == 'Landscape';
+        }
         return this.pdfExportModule ? this.pdfExportModule.export(pdfExportProperties, isMultipleExport, pdfDoc, isBlob)
             : null;
     };
@@ -16431,14 +16711,17 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
         this.isTimelineRoundOff = isTimelineRoundOff;
         this.timelineModule.refreshTimelineByTimeSpan();
         this.dataOperation.reUpdateGanttDataPosition();
-        this.timelineModule.updateChartByNewTimeline();
-        this.ganttChartModule.chartBodyContent.style.width = formatUnit(this.timelineModule.totalTimelineWidth);
-        this.ganttChartModule.updateLastRowBottomWidth();
-        if (this.taskFields.dependency) {
-            this.ganttChartModule.reRenderConnectorLines();
-        }
-        if (isFrom !== 'beforeAdd') {
-            this.notify('selectRowByIndex', {});
+        if (!this.pdfExportModule || (this.pdfExportModule && !this.pdfExportModule.isPdfExport) || (this.pdfExportModule && this.pdfExportModule.isPdfExport && this.pdfExportModule.helper.exportProps &&
+            this.pdfExportModule.helper.exportProps.fitToWidthSettings && !this.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth)) {
+            this.timelineModule.updateChartByNewTimeline();
+            this.ganttChartModule.chartBodyContent.style.width = formatUnit(this.timelineModule.totalTimelineWidth);
+            this.ganttChartModule.updateLastRowBottomWidth();
+            if (this.taskFields.dependency) {
+                this.ganttChartModule.reRenderConnectorLines();
+            }
+            if (isFrom !== 'beforeAdd') {
+                this.notify('selectRowByIndex', {});
+            }
         }
     };
     /**
@@ -16744,8 +17027,11 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
             }
             else {
                 this.editModule.addRecord(data, rowPosition, rowIndex);
+                if (rowPosition === 'Bottom') {
+                    this.selectedRowIndex = rowIndex;
+                }
                 if (rowPosition === 'Above' || rowPosition === 'Below' || rowPosition === 'Child') {
-                    this.currentSelection = data;
+                    this.currentSelection = !isNullOrUndefined(data) ? data : this.currentSelection;
                 }
             }
         }
@@ -17013,8 +17299,15 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
      * @returns {HTMLElement} .
      */
     Gantt.prototype.getRowByID = function (id) {
+        var _this = this;
         var record = this.getRecordByID(id.toString());
-        var index = this.updatedRecords.indexOf(record);
+        var index;
+        if (!this.loadChildOnDemand && this.taskFields.hasChildMapping) {
+            index = this.updatedRecords.map(function (item) { return item[_this.taskFields.id]; }).indexOf(record.ganttProperties.taskId);
+        }
+        else {
+            index = this.updatedRecords.indexOf(record);
+        }
         if (index !== -1) {
             return this.getRowByIndex(index);
         }
@@ -17475,6 +17768,9 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
     __decorate([
         Property(true)
     ], Gantt.prototype, "enableVirtualMaskRow", void 0);
+    __decorate([
+        Property(false)
+    ], Gantt.prototype, "loadChildOnDemand", void 0);
     __decorate([
         Property(true)
     ], Gantt.prototype, "UpdateOffsetOnTaskbarEdit", void 0);
@@ -17981,7 +18277,7 @@ var CellEdit = /** @__PURE__ @class */ (function () {
             args.cancel = true;
             return;
         }
-        if (data.hasChildRecords && ((field === taskSettings.endDate && ((!isNullOrUndefined(data['isManual']) &&
+        if (data.hasChildRecords && !this.parent.allowParentDependency && ((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')) {
             if ((field === taskSettings.dependency && !this.parent.allowParentDependency) || field !== taskSettings.dependency) {
@@ -18280,6 +18576,9 @@ var CellEdit = /** @__PURE__ @class */ (function () {
      * @returns {void} .
      */
     CellEdit.prototype.durationEdited = function (args) {
+        if (parseInt(args.data[this.parent.taskFields.duration]) < 0) {
+            args.data[this.parent.taskFields.duration] = 0;
+        }
         var ganttProb = args.data.ganttProperties;
         var durationString = args.data[this.parent.taskFields.duration];
         this.parent.dataOperation.updateDurationValue(durationString, ganttProb);
@@ -18552,14 +18851,18 @@ var EditTooltip = /** @__PURE__ @class */ (function () {
      * @returns {void} .
      */
     EditTooltip.prototype.updateTooltipPosition = function (args) {
-        // const containerPosition: { top: number, left: number } = this.parent.getOffsetRect(this.parent.chartPane);
-        // const leftEnd: number = containerPosition.left + this.parent.chartPane.offsetWidth;
-        // let tooltipPositionX: number = args.element.offsetLeft;
-        // if (leftEnd < (tooltipPositionX + args.element.offsetWidth)) {
-        //     tooltipPositionX += leftEnd - (tooltipPositionX + args.element.offsetWidth);
-        // }
-        // args.element.style.left = tooltipPositionX + 'px';
         args.element.style.visibility = 'visible';
+        var parentWithZoomStyle = this.parent.element.closest('[style*="zoom"]');
+        if (isNullOrUndefined(parentWithZoomStyle)) {
+            var containerPosition = this.parent.getOffsetRect(this.parent.chartPane);
+            var leftEnd = containerPosition.left + this.parent.chartPane.offsetWidth;
+            var tooltipPositionX = args.element.offsetLeft;
+            if (leftEnd < (tooltipPositionX + args.element.offsetWidth)) {
+                tooltipPositionX += leftEnd - (tooltipPositionX + args.element.offsetWidth);
+            }
+            args.element.style.left = tooltipPositionX + 'px';
+            args.element.style.visibility = 'visible';
+        }
     };
     /**
      * To show/hide taskbar edit tooltip.
@@ -18817,13 +19120,10 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
     TaskbarEdit.prototype.mouseDownHandler = function (e) {
         if (this.parent.editSettings.allowTaskbarEditing && !this.parent.readOnly) {
             this.canDrag = false;
-            if (this.parent.isAdaptive && this.taskBarEditElement) {
+            if (this.taskBarEditElement) {
                 var targetElement = this.getElementByPosition(e);
                 var element = parentsUntil$1(targetElement, taskBarMainContainer);
-                if (element && element.innerHTML === this.taskBarEditElement.innerHTML &&
-                    !(targetElement.classList.contains(connectorPointLeft) ||
-                        targetElement.classList.contains(connectorPointRight)) &&
-                    !this.tapPointOnFocus) {
+                if ((element && element.innerHTML === this.taskBarEditElement.innerHTML || this.taskBarEditElement.classList.contains("e-segmented-taskbar") || this.taskBarEditElement.classList.contains("collpse-parent-border"))) {
                     this.updateTaskBarEditElement(e);
                     this.canDrag = true;
                     e.preventDefault();
@@ -18846,7 +19146,7 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
             }
             return;
         }
-        if (this.tapPointOnFocus && element && element.innerHTML !== this.taskBarEditElement.innerHTML) {
+        if (this.tapPointOnFocus && !isNullOrUndefined(this.taskBarEditElement) && element && element.innerHTML !== this.taskBarEditElement.innerHTML) {
             this.connectorSecondRecord = this.parent.ganttChartModule.getRecordByTaskBar(element);
             this.connectorSecondAction = 'ConnectorPointLeftDrag';
             this.connectorSecondElement = element;
@@ -18857,8 +19157,16 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
             this.showHideActivePredecessors(false);
             this.initPublicProp();
         }
-        else if (targetElement.classList.contains(connectorPointLeftHover) ||
-            targetElement.classList.contains(connectorPointRightHover)) {
+        else if (targetElement.classList.contains(connectorPointLeftHover)) {
+            this.canDrag = false;
+            this.multipleSelectionEnabled();
+            this.showHideTaskBarEditingElements(targetElement, this.taskBarEditElement);
+            this.tapPointOnFocus = true;
+            this.taskBarEditAction = 'ConnectorPointLeftDrag';
+            this.connectorSecondRecord = this.taskBarEditRecord;
+            this.taskBarEditingAction(e, false);
+        }
+        else if (targetElement.classList.contains(connectorPointRightHover)) {
             this.canDrag = false;
             this.multipleSelectionEnabled();
             this.showHideTaskBarEditingElements(targetElement, this.taskBarEditElement);
@@ -18988,7 +19296,7 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
             }
         }
         if (this.parent.editSettings.allowTaskbarEditing && element) {
-            this.showHideTaskBarEditingElements(element, this.taskBarEditElement);
+            this.showHideTaskBarEditingElements(element, this.editElement);
             this.editElement = element;
             this.realTaskbarElement = this.editElement;
             var index = this.editElement.getAttribute('data-segment-index');
@@ -19069,7 +19377,7 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
         else {
             if (this.parent.isAdaptive) {
                 if (this.taskBarEditElement) {
-                    this.showHideTaskBarEditingElements(element, this.taskBarEditElement);
+                    this.showHideTaskBarEditingElements(element, this.editElement);
                 }
                 this.initPublicProp();
             }
@@ -19129,8 +19437,12 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
                 && isShowConnectorPoints) {
                 var connectorElement = !isNullOrUndefined(element.querySelector('.' + connectorPointLeft)) ?
                     element : element.parentElement;
-                addClass([connectorElement.querySelector('.' + connectorPointLeft)], [connectorPointLeftHover]);
-                addClass([connectorElement.querySelector('.' + connectorPointRight)], [connectorPointRightHover]);
+                if (!isNullOrUndefined(connectorElement.querySelector('.' + connectorPointLeft))) {
+                    addClass([connectorElement.querySelector('.' + connectorPointLeft)], [connectorPointLeftHover]);
+                }
+                if (!isNullOrUndefined(connectorElement.querySelector('.' + connectorPointRight))) {
+                    addClass([connectorElement.querySelector('.' + connectorPointRight)], [connectorPointRightHover]);
+                }
             }
         }
         else if (!fadeConnectorLine) {
@@ -19257,7 +19569,8 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
             var item = this.taskBarEditRecord.ganttProperties;
             this.previousItem = this.parent.timelineModule.extendFunction(item, this.previousItemProperty);
             if (this.taskBarEditAction !== 'ConnectorPointLeftDrag' &&
-                this.taskBarEditAction !== 'ConnectorPointRightDrag') {
+                this.taskBarEditAction !== 'ConnectorPointRightDrag' &&
+                !(this.parent.viewType == 'ResourceView' && this.taskBarEditAction == 'ParentDrag')) {
                 this.editTooltip.showHideTaskbarEditTooltip(true, this.segmentIndex);
             }
             this.taskBarEditElement.setAttribute('aria-grabbed', 'true');
@@ -19295,6 +19608,7 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
         this.dragMouseLeave = false;
         this.isMouseDragCheck();
         if (this.isMouseDragged && this.taskBarEditAction) {
+            event.preventDefault();
             if (!isNullOrUndefined(this.taskbarElement) && !isNullOrUndefined(this.editElement) && (this.taskBarEditAction !== "ConnectorPointRightDrag" && this.taskBarEditAction !== "ConnectorPointLeftDrag") && !(this.parent.viewType === 'ResourceView' && this.currentData.hasChildRecords)) {
                 var currentElement = this.editElement.parentElement;
                 currentElement.style.setProperty("position", "absolute");
@@ -19384,9 +19698,7 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
                 this.taskBarEditAction === 'ConnectorPointRightDrag') {
                 this.updateConnectorLineSecondProperties(e);
                 this.triggerDependencyEvent(e);
-                if (!this.parent.isAdaptive) {
-                    this.drawFalseLine();
-                }
+                this.drawFalseLine();
             }
             if (this.parent.viewType == 'ResourceView' && this.parent.allowTaskbarDragAndDrop) {
                 if (this.dragMoveY > this.mouseMoveY) {
@@ -19398,7 +19710,12 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
                     this.currentItemTop = this.currentItemTop + this.mouseMoveY;
                 }
                 var containerPosition = this.parent.getOffsetRect(this.parent.ganttChartModule.chartBodyContainer);
-                this.dragMoveY = e.pageY - containerPosition.top + this.parent.ganttChartModule.scrollObject.previousScroll.top;
+                if (this.parent.isAdaptive || e.touches) {
+                    this.dragMoveY = e.touches[0].pageY - containerPosition.top + this.parent.ganttChartModule.scrollObject.previousScroll.top;
+                }
+                else {
+                    this.dragMoveY = e.pageY - containerPosition.top + this.parent.ganttChartModule.scrollObject.previousScroll.top;
+                }
                 this.topValue = this.currentItemTop;
                 this.currentItemPrevTop = (this.currentItemPrevTop === 0 ||
                     this.topValue == this.currentItemTop) ? this.topValue :
@@ -19785,6 +20102,7 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
                         if (this.segmentIndex === 0) {
                             this.parent.setRecordValue('width', item.width - differenceWidth, item, true);
                             this.parent.setRecordValue('left', item.left + differenceWidth, item, true);
+                            segment.width = segment.width - differenceWidth;
                             for (var i = 1; i < item.segments.length; i++) {
                                 var segment_3 = segments[i];
                                 segment_3.left = segment_3.left - differenceWidth;
@@ -20265,6 +20583,7 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
         var traceParentTaskBar$$1 = this.taskBarEditElement.querySelector('.' + traceParentTaskBar);
         var traceParentProgressBar$$1 = this.taskBarEditElement.querySelector('.' + traceParentProgressBar);
         var traceConnectorPointRight = this.taskBarEditElement.querySelector('.' + rightConnectorPointOuterDiv);
+        var segmentConnectorPointRight = taskBarMainContainer$$1.querySelector('.' + rightConnectorPointOuterDiv);
         var manualParentTaskbar = this.taskBarEditElement;
         var manualTaskbar = this.taskBarEditElement.querySelector('.' + manualParentTaskBar);
         var manualParentRight = this.taskBarEditElement.querySelector('.' + manualParentRightResizer);
@@ -20291,6 +20610,9 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
                 }
                 taskBarMainContainer$$1.style.setProperty(position, (item.left) + 'px');
                 taskBarMainContainer$$1.style.width = (width) + 'px';
+                if (segmentedTaskBarContainer && segmentConnectorPointRight) {
+                    segmentConnectorPointRight.style.left = (this.parent.isAdaptive ? (width + 10) : (width + 2)) + 'px';
+                }
                 if (this.parent.viewType === 'ResourceView' && this.parent.allowTaskbarDragAndDrop && this.parent.rowDragAndDropModule &&
                     (this.taskBarEditAction === 'ChildDrag' || this.taskBarEditAction === 'MilestoneDrag')) {
                     taskBarMainContainer$$1.style.setProperty('top', (this.topValue) + 'px');
@@ -20407,9 +20729,9 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
                 }
                 if (segmentedTaskBarContainer) {
                     taskBarRightResizer$$1.style.setProperty(position, rightResizer + 'px');
-                    traceChildProgressBar$$1.style.width = (segment.progressWidth) + 'px';
+                    traceChildProgressBar$$1.style.width = (segment.width) + 'px';
                     if (!isNullOrUndefined(childProgressResizer$$1)) {
-                        childProgressResizer$$1.style.setProperty(position, segment.progressWidth - 10 + 'px');
+                        childProgressResizer$$1.style.setProperty(position, segment.width - 10 + 'px');
                     }
                 }
             }
@@ -20479,9 +20801,6 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
             this.taskBarEditAction === 'ConnectorPointRightDrag') && this.drawPredecessor && (!this.connectorSecondRecord.hasChildRecords ||
             this.connectorSecondRecord.hasChildRecords && this.parent.allowParentDependency)) {
             this.parent.connectorLineEditModule.updatePredecessor(this.connectorSecondRecord, this.finalPredecessor);
-            if (this.parent.UpdateOffsetOnTaskbarEdit) {
-                this.parent.connectorLineEditModule['calculateOffset'](this.connectorSecondRecord);
-            }
         }
         else {
             if (x1 !== x2 || (Math.abs(y1 - resMouseY) >= (this.parent.rowHeight - this.parent.taskbarHeight) / 2)) {
@@ -20771,6 +21090,7 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
     TaskbarEdit.prototype.updateConnectorLineSecondProperties = function (e) {
         var target = this.getElementByPosition(e);
         var element = parentsUntil$1(target, taskBarMainContainer);
+        var isBigger = document.body.className.includes("e-bigger");
         this.connectorSecondAction = null;
         var scrollTop = 0;
         if (parentsUntil$1(target, connectorPointLeft)) {
@@ -20793,20 +21113,20 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
             if ((this.parent.virtualScrollModule && this.parent.enableVirtualization &&
                 !this.elementOffsetLeft) || !this.parent.enableVirtualization) {
                 if (!this.parent.allowParentDependency) {
-                    this.elementOffsetLeft = this.realTaskbarElement.offsetLeft;
+                    this.elementOffsetLeft = this.realTaskbarElement.offsetLeft - ((isBigger) ? 10 : 0);
                     this.elementOffsetTop = this.realTaskbarElement.parentElement.offsetTop + this.realTaskbarElement.offsetHeight / 3 + scrollTop;
                 }
                 else {
                     if (this.taskBarEditElement.children[0].classList.contains('e-manualparent-main-container')) {
-                        this.elementOffsetLeft = this.realTaskbarElement.children[0]['offsetLeft'] + this.realTaskbarElement.offsetLeft;
+                        this.elementOffsetLeft = this.realTaskbarElement.children[0]['offsetLeft'] + this.realTaskbarElement.offsetLeft - ((isBigger) ? 10 : 0);
                         this.elementOffsetTop = ((this.realTaskbarElement.parentElement.offsetTop + this.realTaskbarElement.offsetHeight / 3 - 5) + this.taskBarEditElement.children[0]['offsetTop']) + scrollTop;
                     }
                     else {
-                        this.elementOffsetLeft = this.realTaskbarElement.offsetLeft;
+                        this.elementOffsetLeft = this.realTaskbarElement.offsetLeft - ((isBigger) ? 10 : 0);
                         this.elementOffsetTop = this.realTaskbarElement.parentElement.offsetTop + this.realTaskbarElement.offsetHeight / 3 + scrollTop;
                     }
                 }
-                this.elementOffsetWidth = this.realTaskbarElement.offsetWidth;
+                this.elementOffsetWidth = this.realTaskbarElement.offsetWidth + ((isBigger) ? 20 : 0);
                 this.elementOffsetHeight = this.realTaskbarElement.offsetHeight;
             }
             this.showHideTaskBarEditingElements(element, this.highlightedSecondElement, true);
@@ -20914,18 +21234,16 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
     // Get XY coordinates for touch and non-touch device
     TaskbarEdit.prototype.getCoordinate = function (event) {
         var coordinates = {};
-        if (this.parent.isAdaptive && event && event.type !== 'click') {
-            var e = event;
-            if (e.type === 'touchmove' || e.type === 'touchstart' || e.type === 'touchend') {
-                coordinates.pageX = e.changedTouches[0].pageX;
-                coordinates.pageY = e.changedTouches[0].pageY;
+        var e = event;
+        coordinates.pageX = e.pageX;
+        coordinates.pageY = e.pageY;
+        if (event && event.type !== 'click') {
+            var e_1 = event;
+            if (e_1.type === 'touchmove' || e_1.type === 'touchstart' || e_1.type === 'touchend') {
+                coordinates.pageX = e_1.changedTouches[0].pageX;
+                coordinates.pageY = e_1.changedTouches[0].pageY;
             }
         }
-        else if (event) {
-            var e = event;
-            coordinates.pageX = e.pageX;
-            coordinates.pageY = e.pageY;
-        }
         return coordinates;
     };
     // Get current target element by mouse position
@@ -21877,7 +22195,7 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
             if (!isNullOrUndefined(tasks.endDate) && tasks.endDate !== colName) {
                 this.updateScheduleFields(dialog, ganttProp, 'endDate');
             }
-            if (!isNullOrUndefined(tasks.duration) && tasks.duration !== colName) {
+            if (!isNullOrUndefined(tasks.duration) && tasks.duration !== colName || ganttProp.duration >= 0) {
                 this.updateScheduleFields(dialog, ganttProp, 'duration');
             }
             if (!isNullOrUndefined(tasks.work) && tasks.work !== colName) {
@@ -22035,17 +22353,33 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
         var ganttProp = currentData.ganttProperties;
         var taskSettings = ganttObj.taskFields;
         if (taskSettings.duration === columnName) {
-            if (!isNullOrUndefined(value) && value !== '') {
+            if (!isNullOrUndefined(value) && value !== '' && parseInt(value) >= 0) {
                 ganttObj.dataOperation.updateDurationValue(value, ganttProp);
                 this.parent.setRecordValue(taskSettings.duration, value, currentData);
                 this.parent.setRecordValue('taskData.' + taskSettings.duration, ganttProp.duration, currentData);
+                this.validateDuration(currentData);
             }
             else {
                 if (ganttObj.allowUnscheduledTasks) {
-                    this.parent.setRecordValue('duration', null, ganttProp, true);
+                    if ((ganttProp.startDate && ganttProp.endDate && ganttProp.startDate.getTime() > ganttProp.endDate.getTime()) || value.indexOf('-') !== -1) {
+                        this.parent.setRecordValue('duration', 0, ganttProp, true);
+                        if (ganttProp.endDate) {
+                            this.parent.setRecordValue('startDate', ganttProp.endDate, ganttProp, true);
+                        }
+                    }
+                    else {
+                        if (value === "") {
+                            this.parent.setRecordValue('duration', null, ganttProp, true);
+                            if (ganttProp.endDate) {
+                                this.parent.setRecordValue('endDate', null, ganttProp, true);
+                            }
+                        }
+                        else {
+                            this.parent.setRecordValue('duration', ganttProp.duration, ganttProp, true);
+                        }
+                    }
                 }
             }
-            this.validateDuration(currentData);
             this.parent.editModule.updateResourceRelatedFields(currentData, 'duration');
         }
         if (taskSettings.startDate === columnName) {
@@ -22053,13 +22387,15 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
                 var startDate = this.parent.dateValidationModule.getDateFromFormat(value);
                 startDate = this.parent.dateValidationModule.checkStartDate(startDate, ganttProp);
                 this.parent.setRecordValue('startDate', startDate, ganttProp, true);
+                this.validateStartDate(currentData);
             }
             else {
                 if (ganttObj.allowUnscheduledTasks && !(currentData.hasChildRecords)) {
                     this.parent.setRecordValue('startDate', null, ganttProp, true);
+                    this.parent.setRecordValue('duration', null, ganttProp, true);
+                    this.parent.setRecordValue('isMilestone', false, ganttProp, true);
                 }
             }
-            this.validateStartDate(currentData);
         }
         if (taskSettings.endDate === columnName) {
             if (value !== '') {
@@ -22074,13 +22410,15 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
                 if (isNullOrUndefined(ganttProp.startDate) || endDate.getTime() > (ganttProp.startDate).getTime()) {
                     this.parent.setRecordValue('endDate', endDate, ganttProp, true);
                 }
+                this.validateEndDate(currentData);
             }
             else {
                 if (ganttObj.allowUnscheduledTasks) {
                     this.parent.setRecordValue('endDate', null, ganttProp, true);
+                    this.parent.setRecordValue('duration', null, ganttProp, true);
+                    this.parent.setRecordValue('isMilestone', false, ganttProp, true);
                 }
             }
-            this.validateEndDate(currentData);
         }
         if (taskSettings.work === columnName) {
             if (!isNullOrUndefined(value) && value !== '') {
@@ -22487,7 +22825,7 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
                     var eDate = getValue('endDate', selectedItem);
                     var duration = getValue('duration', selectedItem);
                     var startDate_1 = !isNullOrUndefined(gridData) && gridData.length > 0 ?
-                        !isNullOrUndefined(taskFields.endDate) ? new Date(getValue('endDate', gridData[0]).getTime()) :
+                        (!isNullOrUndefined(taskFields.endDate) && !isNullOrUndefined(gridData[0].endDate)) ? new Date(getValue('endDate', gridData[0]).getTime()) :
                             new Date(getValue('startDate', gridData[0]).getTime()) :
                         !isNullOrUndefined(this.beforeOpenArgs.rowData.ganttProperties.startDate) &&
                             new Date(this.beforeOpenArgs.rowData.ganttProperties.startDate.getTime());
@@ -24706,6 +25044,11 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
         var ganttPropByMapping = getSwapKey(ganttObj.columnMapping);
         var scheduleFieldNames = [];
         var isScheduleValueUpdated = false;
+        if (!isNullOrUndefined(ganttData[tasks.milestone])) {
+            if (ganttData[tasks.milestone] === true) {
+                ganttData[tasks.milestone] = false;
+            }
+        }
         for (var _i = 0, _b = Object.keys(data); _i < _b.length; _i++) {
             var key = _b[_i];
             if ([tasks.startDate, tasks.endDate, tasks.duration].indexOf(key) !== -1) {
@@ -24767,6 +25110,22 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                 else if (key === tasks.cssClass) {
                     ganttPropKey = 'cssClass';
                 }
+                else if (key === tasks.milestone) {
+                    ganttPropKey = 'isMilestone';
+                    if (!isNullOrUndefined(tasks.duration)) {
+                        var ganttProp = ganttData.ganttProperties;
+                        var durationValue = data[tasks.duration];
+                        if (value) {
+                            durationValue = 0;
+                        }
+                        else {
+                            durationValue = durationValue <= 0 ? 1 : durationValue;
+                        }
+                        ganttObj.setRecordValue(tasks.duration, durationValue, ganttData, true);
+                        ganttObj.setRecordValue('duration', durationValue, ganttProp, true);
+                        ganttObj.setRecordValue('taskData.' + tasks.duration, durationValue, ganttData);
+                    }
+                }
                 else if ((key === tasks.segments) && (!isNullOrUndefined(ganttData.ganttProperties.segments))) {
                     ganttPropKey = 'segments';
                     /* eslint-disable-next-line */
@@ -25166,10 +25525,11 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                 this.parent.predecessorModule.isValidatedParentTaskID = '';
             }
             if (this.parent.allowParentDependency && ganttRecord.hasChildRecords && this.parent.previousRecords[ganttRecord.uniqueID].ganttProperties.startDate &&
-                (args.action === "DrawConnectorLine") || (args.action === "DialogEditing")) {
+                (args.action === "DrawConnectorLine")) {
                 this.updateChildItems(ganttRecord);
             }
             this.updateParentItemOnEditing();
+            this.parent.dataOperation.updateParentItems(ganttRecord, true);
         }
         /** Update parent up-to zeroth level */
         if (ganttRecord.parentItem) {
@@ -25182,6 +25542,10 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                 this.updateParentItemOnEditing();
             }
         }
+        if (this.parent.UpdateOffsetOnTaskbarEdit && this.parent.connectorLineEditModule && args.data) {
+            this.parent.connectorLineEditModule['calculateOffset'](args.data);
+        }
+        this.parent.predecessorModule['validatedParentIds'] = [];
         this.initiateSaveAction(args);
     };
     Edit$$1.prototype.updateParentItemOnEditing = function () {
@@ -25201,7 +25565,7 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
      */
     Edit$$1.prototype.updateParentChildRecord = function (data) {
         var ganttRecord = data;
-        if (ganttRecord.hasChildRecords && this.taskbarMoved && this.parent.taskMode === 'Auto' && (!isNullOrUndefined(this.parent.editModule.cellEditModule) && !this.parent.editModule.cellEditModule.isResourceCellEdited)) {
+        if (ganttRecord.hasChildRecords && this.taskbarMoved && (ganttRecord[this.parent.taskFields.manual] === false || this.parent.taskMode === 'Auto') && (!isNullOrUndefined(this.parent.editModule.cellEditModule) && !this.parent.editModule.cellEditModule.isResourceCellEdited)) {
             this.updateChildItems(ganttRecord);
         }
         if (!isNullOrUndefined(this.parent.editModule.cellEditModule)) {
@@ -25677,6 +26041,11 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                 this.updateScheduleDatesOnEditing(args);
             }
         }
+        if (this.parent.enableCriticalPath) {
+            var criticalModule = this.parent.criticalPathModule;
+            criticalModule.showCriticalPath(true);
+            criticalModule.criticalConnectorLine(criticalModule.criticalPathCollection, criticalModule.detailPredecessorCollection, true, criticalModule.predecessorCollectionTaskIds);
+        }
         if (!this.parent.editSettings.allowTaskbarEditing || (this.parent.editSettings.allowTaskbarEditing &&
             !this.taskbarEditModule.dependencyCancel)) {
             eventArgs.requestType = 'save';
@@ -25690,11 +26059,6 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                 eventArgs.taskBarEditAction = args.taskBarEditAction;
             }
             this.endEditAction(args);
-            if (this.parent.enableCriticalPath) {
-                var criticalModule = this.parent.criticalPathModule;
-                criticalModule.showCriticalPath(true);
-                criticalModule.criticalConnectorLine(criticalModule.criticalPathCollection, criticalModule.detailPredecessorCollection, true, criticalModule.predecessorCollectionTaskIds);
-            }
             this.parent.trigger('actionComplete', eventArgs);
             if (!isNullOrUndefined(this.parent.loadingIndicator) && this.parent.loadingIndicator.indicatorType === "Shimmer") {
                 this.parent.hideMaskRow();
@@ -25880,7 +26244,9 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
             if (!this.parent.taskFields.parentID) {
                 var deleteRecordIDs = [];
                 deleteRecordIDs.push(deletedRow.ganttProperties.rowUniqueID.toString());
-                this.parent.editModule.removeFromDataSource(deleteRecordIDs);
+                if (this.parent.viewType === 'ProjectView') {
+                    this.parent.editModule.removeFromDataSource(deleteRecordIDs);
+                }
             }
             var flatRecordIndex = this.parent.flatData.indexOf(deletedRow);
             if (gObj.taskFields.parentID) {
@@ -27169,6 +27535,57 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
             }
         }
     };
+    /**
+     * Method to update the values to client side from server side.
+     *
+     * @param {Object} e - Defines the new modified data from the server.
+     * @param {ITaskAddedEventArgs} args - Defines the client side data.
+     * @returns {void} .
+     */
+    Edit$$1.prototype.updateClientDataFromServer = function (e, args) {
+        var serverReturnedValue = e.addedRecords[0];
+        var _aLength = Object.keys(serverReturnedValue).length;
+        for (var j = 0, _a = Object.keys(serverReturnedValue); j < _aLength; j++) {
+            var key = _a[parseInt(j.toString(), 10)];
+            args.data["" + key] = serverReturnedValue["" + key];
+        }
+        if (this.parent.taskFields.id !== null) {
+            args.data.ganttProperties['taskId'] = serverReturnedValue[this.parent.taskFields.id];
+        }
+        if (this.parent.taskFields.name !== null) {
+            args.data.ganttProperties['taskName'] = serverReturnedValue[this.parent.taskFields.name];
+        }
+        if (this.parent.taskFields.startDate !== null) {
+            args.data.ganttProperties['startDate'] = serverReturnedValue[this.parent.taskFields.startDate];
+        }
+        if (this.parent.taskFields.endDate !== null) {
+            args.data.ganttProperties['endDate'] = serverReturnedValue[this.parent.taskFields.endDate];
+        }
+        if (this.parent.taskFields.duration !== null) {
+            args.data.ganttProperties['duration'] = parseInt(serverReturnedValue[this.parent.taskFields.duration]);
+        }
+        if (this.parent.taskFields.durationUnit !== null) {
+            args.data.ganttProperties['durationUnit'] = serverReturnedValue[this.parent.taskFields.durationUnit];
+        }
+        if (this.parent.taskFields.progress !== null) {
+            args.data.ganttProperties['progress'] = serverReturnedValue[this.parent.taskFields.progress];
+        }
+        if (this.parent.taskFields.dependency !== null) {
+            args.data.ganttProperties['dependency'] = serverReturnedValue[this.parent.taskFields.dependency];
+        }
+        if (this.parent.taskFields.parentID !== null) {
+            args.data.ganttProperties['parentID'] = serverReturnedValue[this.parent.taskFields.parentID];
+        }
+        if (this.parent.taskFields.baselineEndDate !== null) {
+            args.data.ganttProperties['baselineEndDate'] = serverReturnedValue[this.parent.taskFields.baselineEndDate];
+        }
+        if (this.parent.taskFields.baselineStartDate !== null) {
+            args.data.ganttProperties['baselineStartDate'] = serverReturnedValue[this.parent.taskFields.baselineStartDate];
+        }
+        if (this.parent.taskFields.resourceInfo !== null) {
+            args.data.ganttProperties['resources'] = serverReturnedValue[this.parent.taskFields.resourceInfo];
+        }
+    };
     /**
      * Method to add new record.
      *
@@ -27230,7 +27647,8 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                         /* tslint:disable-next-line */
                         var query = _this.parent.query instanceof Query ? _this.parent.query : new Query();
                         var adaptor = data_2.adaptor;
-                        if (!(adaptor instanceof WebApiAdaptor && adaptor instanceof ODataAdaptor && adaptor instanceof ODataV4Adaptor) || data_2.dataSource.batchUrl) {
+                        var moduleName = adaptor.getModuleName();
+                        if (!(moduleName == "WebApiAdaptor" || moduleName == "ODataAdaptor" || moduleName == "ODataV4Adaptor") || data_2.dataSource.batchUrl) {
                             /* tslint:disable-next-line */
                             var crud = data_2.saveChanges(updatedData_2, _this.parent.taskFields.id, null, query);
                             crud.then(function (e) {
@@ -27240,6 +27658,7 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                                     _this.parent.setRecordValue('taskData', e.addedRecords[0], args.data);
                                     _this.parent.setRecordValue(_this.parent.taskFields.id, e.addedRecords[0][_this.parent.taskFields.id], args.data);
                                     _this.parent.setRecordValue('rowUniqueID', e.addedRecords[0][_this.parent.taskFields.id].toString(), args.data.ganttProperties, true);
+                                    _this.updateClientDataFromServer(e, args);
                                     var idsIndex = _this.parent.ids.indexOf(prevID_1);
                                     if (idsIndex !== -1) {
                                         _this.parent.ids[idsIndex] = e.addedRecords[0][_this.parent.taskFields.id].toString();
@@ -28542,6 +28961,9 @@ var Filter$1 = /** @__PURE__ @class */ (function () {
                     break;
                 }
                 if (!isNullOrUndefined(this.parent.element.parentNode)) {
+                    if (parentNode.parentNode instanceof HTMLDocument) {
+                        break;
+                    }
                     parentNode = parentNode.parentNode;
                     marginLeft = parentNode.style.marginLeft;
                 }
@@ -28968,7 +29390,24 @@ var Selection$1 = /** @__PURE__ @class */ (function () {
      * @returns {Object[]} .
      */
     Selection$$1.prototype.getSelectedRecords = function () {
-        return this.parent.treeGrid.getSelectedRecords();
+        if (!this.parent.loadChildOnDemand && this.parent.taskFields.hasChildMapping) {
+            var selectedRows = [];
+            var selectedIndexes_1 = this.parent.selectionModule.getSelectedRowIndexes();
+            var _loop_1 = function (i) {
+                var rec = this_1.parent.currentViewData.filter(function (data) {
+                    return data.index == selectedIndexes_1[i];
+                })[0];
+                selectedRows.push(rec);
+            };
+            var this_1 = this;
+            for (var i = 0; i < selectedIndexes_1.length; i++) {
+                _loop_1(i);
+            }
+            return selectedRows;
+        }
+        else {
+            return this.parent.treeGrid.getSelectedRecords();
+        }
     };
     /**
      * Get the selected records for cell selection.
@@ -29068,19 +29507,19 @@ var Selection$1 = /** @__PURE__ @class */ (function () {
             records = [records];
         }
         var ganttRow = [].slice.call(this.parent.ganttChartModule.chartBodyContent.querySelector('tbody').children);
-        var _loop_1 = function (i) {
+        var _loop_2 = function (i) {
             var selectedRow = ganttRow.filter(function (e) {
                 // eslint-disable-next-line
                 return parseInt(e.getAttribute('aria-rowindex'), 0) === records[i];
             })[0];
             if (!isNullOrUndefined(selectedRow)) {
                 // eslint-disable-next-line
-                this_1.getSelectedRowIndexes().indexOf(records[i]) > -1 ? this_1.addClass(selectedRow) : this_1.removeClass(selectedRow);
+                this_2.getSelectedRowIndexes().indexOf(records[i]) > -1 ? this_2.addClass(selectedRow) : this_2.removeClass(selectedRow);
             }
         };
-        var this_1 = this;
+        var this_2 = this;
         for (var i = 0; i < records.length; i++) {
-            _loop_1(i);
+            _loop_2(i);
         }
     };
     Selection$$1.prototype.addClass = function (selectedRow) {
@@ -29633,6 +30072,14 @@ var Toolbar$3 = /** @__PURE__ @class */ (function () {
         var edit = gObj.editSettings;
         var gID = this.id;
         var ind = gObj.selectedRowIndex;
+        if (!this.parent.loadChildOnDemand && this.parent.taskFields.hasChildMapping) {
+            for (var i = 0; i < gObj.updatedRecords.length; i++) {
+                if (gObj.updatedRecords[i].index === ind) {
+                    ind = i;
+                    break;
+                }
+            }
+        }
         var previousGanttRecord;
         var isSelected = gObj.selectionModule ? gObj.selectionModule.selectedRowIndexes.length === 1 ||
             gObj.selectionModule.getSelectedRowCellIndexes().length === 1 ? true : false : false;
@@ -30167,6 +30614,7 @@ var DayMarkers = /** @__PURE__ @class */ (function () {
 /** @hidden */
 var CriticalPath = /** @__PURE__ @class */ (function () {
     function CriticalPath(parent) {
+        this.validatedids = [];
         this.resourceCollectionIds = [];
         this.criticalTasks = [];
         this.parent = parent;
@@ -30193,6 +30641,7 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
             var collectionTaskId = [];
             var fromDataObject = [];
             var criticalPathIds = [];
+            this.criticalTasks = [];
             /* eslint-disable-next-line */
             if (parentRecords[0].ganttProperties.autoEndDate > parentRecords[0].ganttProperties.endDate && !parentRecords[0].ganttProperties.isAutoSchedule) {
                 checkEndDate = parentRecords[0].ganttProperties.autoEndDate;
@@ -30389,6 +30838,7 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
                 this.slackCalculation(fromDataObject, collection, collectionTaskId, checkEndDate, totalRecords, modelIds);
             }
             criticalPathIds = this.finalCriticalPath(collection, taskBeyondEnddate, totalRecords, modelIds, checkEndDate);
+            this.validatedids = [];
             this.criticalPathCollection = criticalPathIds;
             this.detailPredecessorCollection = collection;
             this.predecessorCollectionTaskIds = collectionTaskId;
@@ -30768,73 +31218,69 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
             return this.parent.dataOperation.getDuration(startDate, endDate, durationUnit, record.ganttProperties.isAutoSchedule, true);
         }
     };
-    /* eslint-disable-next-line */
-    CriticalPath.prototype.finalCriticalPath = function (collection, taskBeyondEnddate, flatRecords, modelRecordIds, checkEndDate) {
-        var criticalPathIds = [];
-        var index;
-        var predecessorFrom;
-        var slackindexes = [];
-        var indexes = [];
-        for (var z = flatRecords.length - 1; z >= 0; z--) {
-            if (flatRecords[parseInt(z.toString(), 10)].slack === '0 day') {
-                var index1 = flatRecords[parseInt(z.toString(), 10)].index;
-                slackindexes.push(index1);
-            }
-        }
-        var num = 0;
-        indexes.push(slackindexes[parseInt(num.toString(), 10)]);
-        for (var j = 0; j < indexes.length; j++) {
-            var i = flatRecords[indexes[parseInt(j.toString(), 10)]].ganttProperties.predecessor;
-            if (!isNullOrUndefined(i)) {
-                for (var f = i.length - 1; f >= 0; f--) {
-                    if (this.parent.viewType === 'ProjectView') {
-                        var q = modelRecordIds.indexOf(i[parseInt(f.toString(), 10)]['from']);
-                        for (var k = 0; k < indexes.length; k++) {
-                            var item = indexes[parseInt(j.toString(), 10)];
-                            if (item !== q) {
-                                indexes.push(q);
-                            }
-                            break;
-                        }
+    CriticalPath.prototype.updateCriticalTasks = function (record, criticalPathIds) {
+        for (var i = 0; i < record.ganttProperties.predecessor.length; i++) {
+            var fromRecord = void 0;
+            if (this.parent.viewType === 'ProjectView') {
+                fromRecord = this.parent.getRecordByID(record.ganttProperties.predecessor[i].from);
+            }
+            else {
+                var resourceIndex = this.resourceCollectionIds.indexOf(record.ganttProperties.predecessor[i].from.toString());
+                fromRecord = this.parent.flatData[resourceIndex];
+            }
+            var durationDiff = void 0;
+            if (record.ganttProperties.endDate.getTime() >= this.maxEndDate.getTime()) {
+                record.ganttProperties.slack = record.slack = 0 + ' ' + record.ganttProperties.durationUnit;
+                if (record.ganttProperties.progress < 100) {
+                    record.isCritical = true;
+                    record.ganttProperties.isCritical = true;
+                    if (criticalPathIds.indexOf(parseInt(record.ganttProperties.taskId)) == -1) {
+                        criticalPathIds.push(parseInt(record.ganttProperties.taskId));
                     }
-                    else {
-                        var q = this.resourceCollectionIds.indexOf(i[parseInt(f.toString(), 10)]['from']);
-                        for (var k = 0; k < indexes.length; k++) {
-                            var item = indexes[parseInt(j.toString(), 10)];
-                            if (item !== q) {
-                                indexes.push(q);
-                            }
-                            break;
-                        }
+                }
+            }
+            if (fromRecord) {
+                if (record.ganttProperties.predecessor[i].type == 'FS') {
+                    durationDiff = this.parent.dataOperation.getDuration(fromRecord.ganttProperties.endDate, record.ganttProperties.startDate, fromRecord.ganttProperties.durationUnit, fromRecord.ganttProperties.isAutoSchedule, true);
+                }
+                else if (record.ganttProperties.predecessor[i].type == 'SS') {
+                    durationDiff = this.parent.dataOperation.getDuration(fromRecord.ganttProperties.startDate, record.ganttProperties.startDate, fromRecord.ganttProperties.durationUnit, fromRecord.ganttProperties.isAutoSchedule, true);
+                }
+                else if (record.ganttProperties.predecessor[i].type == 'FF') {
+                    durationDiff = this.parent.dataOperation.getDuration(fromRecord.ganttProperties.endDate, record.ganttProperties.endDate, fromRecord.ganttProperties.durationUnit, fromRecord.ganttProperties.isAutoSchedule, true);
+                }
+                else if (record.ganttProperties.predecessor[i].type == 'SF') {
+                    durationDiff = this.parent.dataOperation.getDuration(record.ganttProperties.endDate, fromRecord.ganttProperties.startDate, fromRecord.ganttProperties.durationUnit, fromRecord.ganttProperties.isAutoSchedule, true);
+                }
+                if (durationDiff == 0 && this.validatedids.indexOf(parseInt(fromRecord.ganttProperties.taskId)) == -1 && fromRecord.ganttProperties.taskId != record.ganttProperties.taskId) {
+                    fromRecord.ganttProperties.slack = record.ganttProperties.slack;
+                    fromRecord.slack = record.slack;
+                    fromRecord.isCritical = record.ganttProperties.isCritical;
+                    fromRecord.ganttProperties.isCritical = record.ganttProperties.isCritical;
+                    if (criticalPathIds.indexOf(parseInt(fromRecord.ganttProperties.taskId)) == -1 && fromRecord.ganttProperties.isCritical && fromRecord.ganttProperties.progress < 100) {
+                        this.validatedids.push(parseInt(fromRecord.ganttProperties.taskId));
+                        criticalPathIds.push(parseInt(fromRecord.ganttProperties.taskId));
+                    }
+                    if (fromRecord.ganttProperties.predecessorsName) {
+                        this.updateCriticalTasks(fromRecord, criticalPathIds);
                     }
                 }
             }
         }
-        for (var x = 0; x < indexes.length; x++) {
+    };
+    /* eslint-disable-next-line */
+    CriticalPath.prototype.finalCriticalPath = function (collection, taskBeyondEnddate, flatRecords, modelRecordIds, checkEndDate) {
+        var criticalPathIds = [];
+        var index;
+        var predecessorFrom;
+        for (var x = collection.length - 1; x >= 0; x--) {
             if (this.parent.viewType === 'ProjectView') {
-                index = modelRecordIds.indexOf(flatRecords[indexes[parseInt(x.toString(), 10)]]['ganttProperties']['taskId'].toString());
+                index = modelRecordIds.indexOf(collection[x]['taskid'].toString());
             }
             else {
-                index = this.resourceCollectionIds.indexOf(flatRecords[indexes[parseInt(x.toString(), 10)]]['TaskID'].toString());
+                index = this.resourceCollectionIds.indexOf(collection[x]['taskid'].toString());
             }
             var predecessorLength = flatRecords[index].ganttProperties.predecessor;
-            if (isNullOrUndefined(predecessorLength)) {
-                if (taskBeyondEnddate.length > 0) {
-                    for (var i = 0; i < taskBeyondEnddate.length; i++) {
-                        if (this.parent.viewType === 'ProjectView') {
-                            index = modelRecordIds.indexOf(taskBeyondEnddate[i].toString());
-                        }
-                        else {
-                            index = this.resourceCollectionIds.indexOf(taskBeyondEnddate[i].toString());
-                        }
-                        if (index !== -1 && flatRecords[index].ganttProperties.progress < 100) {
-                            this.criticalTasks.push(flatRecords[index]);
-                            criticalPathIds = criticalPathIds.concat(taskBeyondEnddate[i]);
-                        }
-                    }
-                }
-                break;
-            }
             var noSlackValue = 0 + ' ' + flatRecords[index].ganttProperties.durationUnit;
             for (var i = predecessorLength.length - 1; i >= 0; i--) {
                 var toID = void 0;
@@ -30847,6 +31293,7 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
                 var dateDifference = void 0;
                 var currentData = flatRecords[index].ganttProperties;
                 if (predecessorLength[i].type === 'FS') {
+                    /* eslint-disable-next-line */
                     if (predecessorLength[i].to != currentData.taskId.toString() || this.parent.viewType === 'ResourceView') {
                         /* eslint-disable-next-line */
                         dateDifference = this.parent.dataOperation.getDuration(currentData.endDate, flatRecords[toID].ganttProperties.startDate, currentData.durationUnit, currentData.isAutoSchedule, currentData.isMilestone);
@@ -30898,8 +31345,28 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
                     flatRecords[index].isCritical = true;
                     flatRecords[index].ganttProperties.isCritical = true;
                     this.criticalTasks.push(flatRecords[index]);
-                    var num_1 = flatRecords[parseInt(index.toString(), 10)]['ganttProperties']['taskId'];
-                    criticalPathIds.push(num_1);
+                    if (criticalPathIds.indexOf(collection[x]['taskid']) === -1) {
+                        criticalPathIds.push(collection[x]['taskid']);
+                    }
+                }
+            }
+            if (flatRecords[index].ganttProperties.predecessor.length > 0) {
+                this.updateCriticalTasks(flatRecords[index], criticalPathIds);
+            }
+        }
+        if (taskBeyondEnddate.length > 0) {
+            for (var i = 0; i < taskBeyondEnddate.length; i++) {
+                if (this.parent.viewType === 'ProjectView') {
+                    index = modelRecordIds.indexOf(taskBeyondEnddate[i].toString());
+                }
+                else {
+                    index = this.resourceCollectionIds.indexOf(taskBeyondEnddate[i].toString());
+                }
+                if (index !== -1 && flatRecords[index].ganttProperties.progress < 100) {
+                    this.criticalTasks.push(flatRecords[index]);
+                    if (criticalPathIds.indexOf(taskBeyondEnddate[i]) === -1) {
+                        criticalPathIds = criticalPathIds.concat(taskBeyondEnddate[i]);
+                    }
                 }
             }
         }
@@ -30944,7 +31411,7 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
                 }
             }
             /* eslint-disable-next-line */
-            if (this_2.parent.allowUnscheduledTasks && !criticalData[columnFields.startDate] && !criticalData[columnFields.endDate] && criticalData[columnFields.duration]) {
+            if (this_2.parent.allowUnscheduledTasks && criticalData && !criticalData[columnFields.startDate] && !criticalData[columnFields.endDate] && criticalData[columnFields.duration]) {
                 taskClass = criticalUnscheduledTask;
             }
             else {
@@ -30957,6 +31424,8 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
                 }
                 if (element.getElementsByClassName('e-gantt-child-taskbar-inner-div').length > 0) {
                     addClass(element.querySelectorAll('.e-gantt-child-taskbar-inner-div'), criticalChildTaskBarInnerDiv);
+                    var innerDivs = document.querySelector('.e-gantt-child-taskbar-inner-div');
+                    innerDivs.style.outlineColor = "";
                 }
                 if (element.getElementsByClassName('e-gantt-child-progressbar-inner-div').length > 0) {
                     addClass(element.querySelectorAll('.e-gantt-child-progressbar-inner-div'), taskClass);
@@ -31182,7 +31651,7 @@ var ContextMenu$2 = /** @__PURE__ @class */ (function () {
                     taskfields = this.parent.taskFields;
                     if (!isNullOrUndefined(taskfields.duration)) {
                         var ganttProp = this.rowData.ganttProperties;
-                        data[taskfields.duration] = '1 ' + ganttProp.durationUnit;
+                        data[taskfields.duration] = data[taskfields.duration] <= 0 ? 1 : data[taskfields.duration];
                     }
                     else {
                         data[taskfields.startDate] = new Date(this.rowData.taskData[taskfields.startDate]);
@@ -31195,6 +31664,9 @@ var ContextMenu$2 = /** @__PURE__ @class */ (function () {
                             data[taskfields.milestone] = false;
                         }
                     }
+                    if (data[taskfields.startDate]) {
+                        this.parent.setRecordValue(taskfields.startDate, this.rowData.ganttProperties.startDate, data, true);
+                    }
                     this.parent.updateRecordByID(data);
                 }
                 break;
@@ -32002,8 +32474,16 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
         var dragElement = this.parent.element.querySelector('.e-ganttdrag');
         var ganttTop = this.parent.element.getClientRects()[0].top;
         var ganttLeft = this.parent.element.getClientRects()[0].left;
-        var left = getValue('event', args.originalEvent).clientX - ganttLeft;
-        var top = getValue('event', args.originalEvent).clientY - ganttTop;
+        var left;
+        var top;
+        if (this.parent.isAdaptive) {
+            left = args.originalEvent.event.touches[0].clientX - ganttLeft;
+            top = args.originalEvent.event.touches[0].clientY - ganttTop;
+        }
+        else {
+            left = getValue('event', args.originalEvent).clientX - ganttLeft;
+            top = getValue('event', args.originalEvent).clientY - ganttTop;
+        }
         dragElement.style.left = left + 20 + 'px';
         dragElement.style.top = top + 20 + 'px';
         this.parent.trigger('rowDrag', args);
@@ -32884,6 +33364,8 @@ var PdfGanttTheme = /** @__PURE__ @class */ (function () {
                 ganttStyle.taskbar.progressColor = new PdfColor(33, 82, 125);
                 ganttStyle.taskbar.criticalTaskColor = new PdfColor(255, 139, 139);
                 ganttStyle.taskbar.criticalProgressColor = new PdfColor(255, 85, 85);
+                ganttStyle.taskbar.baselineColor = new PdfColor(240, 173, 78);
+                ganttStyle.taskbar.baselineBorderColor = new PdfColor(240, 173, 78);
                 ganttStyle.criticalConnectorLineColor = new PdfColor(255, 85, 85);
                 ganttStyle.taskbar.criticalTaskBorderColor = new PdfColor(255, 85, 85);
                 ganttStyle.taskbar.parentTaskColor = new PdfColor(119, 119, 119);
@@ -32904,6 +33386,8 @@ var PdfGanttTheme = /** @__PURE__ @class */ (function () {
                 ganttStyle.taskbar.progressColor = new PdfColor(0, 86, 179);
                 ganttStyle.taskbar.criticalTaskColor = new PdfColor(255, 139, 139);
                 ganttStyle.taskbar.criticalProgressColor = new PdfColor(255, 85, 85);
+                ganttStyle.taskbar.baselineColor = new PdfColor(255, 193, 7);
+                ganttStyle.taskbar.baselineBorderColor = new PdfColor(255, 193, 7);
                 ganttStyle.criticalConnectorLineColor = new PdfColor(255, 85, 85);
                 ganttStyle.taskbar.criticalTaskBorderColor = new PdfColor(255, 85, 85);
                 ganttStyle.taskbar.parentTaskColor = new PdfColor(108, 117, 125);
@@ -32926,6 +33410,8 @@ var PdfGanttTheme = /** @__PURE__ @class */ (function () {
                 ganttStyle.taskbar.progressColor = new PdfColor(0, 91, 163);
                 ganttStyle.taskbar.criticalTaskColor = new PdfColor(255, 139, 139);
                 ganttStyle.taskbar.criticalProgressColor = new PdfColor(255, 85, 85);
+                ganttStyle.taskbar.baselineColor = new PdfColor(216, 59, 1);
+                ganttStyle.taskbar.baselineBorderColor = new PdfColor(216, 59, 1);
                 ganttStyle.criticalConnectorLineColor = new PdfColor(255, 85, 85);
                 ganttStyle.taskbar.criticalTaskBorderColor = new PdfColor(255, 85, 85);
                 ganttStyle.taskbar.parentTaskColor = new PdfColor(118, 118, 118);
@@ -32946,6 +33432,8 @@ var PdfGanttTheme = /** @__PURE__ @class */ (function () {
                 ganttStyle.taskbar.progressColor = new PdfColor(63, 81, 181);
                 ganttStyle.taskbar.criticalTaskColor = new PdfColor(255, 139, 139);
                 ganttStyle.taskbar.criticalProgressColor = new PdfColor(255, 85, 85);
+                ganttStyle.taskbar.baselineColor = new PdfColor(193, 87, 0);
+                ganttStyle.taskbar.baselineBorderColor = new PdfColor(193, 87, 0);
                 ganttStyle.criticalConnectorLineColor = new PdfColor(255, 85, 85);
                 ganttStyle.taskbar.criticalTaskBorderColor = new PdfColor(255, 85, 85);
                 ganttStyle.taskbar.parentTaskColor = new PdfColor(132, 132, 132);
@@ -33515,7 +34003,7 @@ var PdfTreeGridLayouter = /** @__PURE__ @class */ (function (_super) {
         var startColumn = 0;
         var endColumn = 0;
         var cellWidths = 0;
-        var availableWidth = this.currentGraphics.clientSize.width - this.currentBounds.x;
+        var availableWidth = pointToPixel(this.currentGraphics.clientSize.width) - this.currentBounds.x;
         for (var i = 0; i < this.treegrid.columns.count; i++) {
             cellWidths += this.treegrid.columns.getColumn(i).width;
             if (cellWidths >= availableWidth) {
@@ -33741,6 +34229,10 @@ var PdfTreeGridLayouter = /** @__PURE__ @class */ (function (_super) {
                     }
                 }
                 var size = new SizeF(column.width, height);
+                if (cell.columnSpan > 1) {
+                    size = new SizeF(cell.width, height);
+                    i += cell.columnSpan;
+                }
                 if (!this.checkIfDefaultFormat(column.format) && this.checkIfDefaultFormat(cell.style.format)) {
                     cell.style.format = column.format;
                 }
@@ -34126,12 +34618,15 @@ var PdfTreeGrid = /** @__PURE__ @class */ (function (_super) {
                         colSpan = cell.columnSpan;
                         currentCellIndex = j;
                         cell.isCellMergeStart = true;
+                        var totalColumnWidth = this.columns.columns[currentCellIndex].width;
                         //Set Column merges.
                         while (colSpan > 1) {
                             currentCellIndex++;
                             row.cells.getCell(currentCellIndex).isCellMergeContinue = true;
                             colSpan--;
+                            totalColumnWidth += this.columns.columns[currentCellIndex].width;
                         }
+                        cell.width = totalColumnWidth;
                     }
                     else if (cell.columnSpan === 1 && cell.rowSpan > 1) {
                         rowSpan = cell.rowSpan;
@@ -34413,11 +34908,11 @@ var PdfTreeGridCell = /** @__PURE__ @class */ (function () {
             if (this.finishedDrawingCell) {
                 temp = (this.remainingString === '') ? this.remainingString : this.value;
                 /* eslint-disable-next-line */
-                graphics.drawString(temp, font, textPen, textBrush, (innerLayoutArea.x + leftAdjustment), innerLayoutArea.y, (innerLayoutArea.width - leftAdjustment - padding), (innerLayoutArea.height - padding), this.style.format);
+                graphics.drawString(temp, font, textPen, textBrush, (innerLayoutArea.x + leftAdjustment), this.isHeaderCell ? innerLayoutArea.y - 16 : innerLayoutArea.y, (innerLayoutArea.width - leftAdjustment - padding), (innerLayoutArea.height - padding), this.style.format);
             }
             else {
                 /* eslint-disable-next-line */
-                graphics.drawString(this.remainingString, font, textPen, textBrush, (innerLayoutArea.x + leftAdjustment), innerLayoutArea.y, this.style.format);
+                graphics.drawString(this.remainingString, font, textPen, textBrush, (innerLayoutArea.x + leftAdjustment), this.isHeaderCell ? innerLayoutArea.y - 16 : innerLayoutArea.y, this.style.format);
             }
             result = graphics.stringLayoutResult;
         }
@@ -35144,8 +35639,101 @@ var PdfTreeGridColumnCollection = /** @__PURE__ @class */ (function () {
  */
 var ExportHelper = /** @__PURE__ @class */ (function () {
     function ExportHelper(parent) {
+        this.totalColumnWidth = 0;
+        this.beforeSinglePageExport = {};
+        this.baselineHeight = 8;
         this.parent = parent;
     }
+    ExportHelper.prototype.processToFit = function () {
+        this.beforeSinglePageExport['zoomingProjectStartDate'] = this.parent.zoomingProjectStartDate;
+        this.beforeSinglePageExport['zoomingProjectEndDate'] = this.parent.zoomingProjectEndDate;
+        this.beforeSinglePageExport['cloneProjectStartDate'] = this.parent.cloneProjectStartDate;
+        this.beforeSinglePageExport['cloneProjectEndDate'] = this.parent.cloneProjectEndDate;
+        this.beforeSinglePageExport['customTimelineSettings'] = extend({}, this.parent.timelineModule.customTimelineSettings, null, true);
+        this.beforeSinglePageExport['isTimelineRoundOff'] = this.parent.isTimelineRoundOff;
+        this.beforeSinglePageExport['topTier'] = this.parent.timelineModule.topTier;
+        this.beforeSinglePageExport['topTierCellWidth'] = this.parent.timelineModule.topTierCellWidth;
+        this.beforeSinglePageExport['topTierCollection'] = this.parent.timelineModule.topTierCollection;
+        this.beforeSinglePageExport['bottomTier'] = this.parent.timelineModule.bottomTier;
+        this.beforeSinglePageExport['bottomTierCellWidth'] = this.parent.timelineModule.bottomTierCellWidth;
+        this.beforeSinglePageExport['bottomTierCollection'] = this.parent.timelineModule.bottomTierCollection;
+        this.beforeSinglePageExport['totalTimelineWidth'] = this.parent.timelineModule.totalTimelineWidth;
+        this.beforeSinglePageExport['timelineStartDate'] = this.parent.timelineModule.timelineStartDate;
+        this.beforeSinglePageExport['timelineEndDate'] = this.parent.timelineModule.timelineEndDate;
+        this.beforeSinglePageExport['timelineRoundOffEndDate'] = this.parent.timelineModule.timelineRoundOffEndDate;
+        this.beforeSinglePageExport['perDayWidth'] = this.parent.perDayWidth;
+        this.beforeSinglePageExport['updatedConnectorLineCollection'] = extend([], this.parent.updatedConnectorLineCollection, null, true);
+        this.parent.timelineModule.isZoomToFit = true;
+        this.parent.timelineModule.isZooming = false;
+        if (!this.parent.zoomingProjectStartDate) {
+            this.parent.zoomingProjectStartDate = this.parent.cloneProjectStartDate;
+            this.parent.zoomingProjectEndDate = this.parent.cloneProjectEndDate;
+        }
+        if (this.parent.zoomingProjectStartDate > this.parent.cloneProjectStartDate) {
+            this.parent.cloneProjectStartDate = new Date(this.parent.allowUnscheduledTasks ? this.parent.zoomingProjectStartDate : this.parent.cloneProjectStartDate);
+        }
+        this.parent.dataOperation.calculateProjectDates();
+        var timeDifference = (this.parent.cloneProjectEndDate.getTime() - this.parent.cloneProjectStartDate.getTime());
+        var totalDays = (timeDifference / (1000 * 3600 * 24));
+        var chartsideWidth;
+        var gridWidth;
+        if (this.exportProps.fitToWidthSettings.gridWidth) {
+            gridWidth = parseInt(this.exportProps.fitToWidthSettings.gridWidth.split('%')[0]);
+        }
+        if (this.exportProps.fitToWidthSettings.chartWidth) {
+            chartsideWidth = parseInt(this.exportProps.fitToWidthSettings.chartWidth.split('%')[0]);
+        }
+        else {
+            if (this.exportProps.fitToWidthSettings.gridWidth) {
+                chartsideWidth = 100 - gridWidth;
+            }
+            else {
+                chartsideWidth = 70;
+            }
+        }
+        var pdfwidth = (this.parent.pdfExportModule['pdfPageDimensions'].width * chartsideWidth) / 100;
+        var chartWidth = pdfwidth;
+        var perDayWidth = chartWidth / totalDays;
+        var zoomingLevel;
+        var firstValue;
+        var secondValue;
+        var zoomingCollections = this.parent.zoomingLevels.slice();
+        var sortedCollectons = zoomingCollections.sort(function (a, b) {
+            return (!a.perDayWidth && !b.perDayWidth ? 0 : (a.perDayWidth < b.perDayWidth) ? 1 : -1);
+        });
+        if (perDayWidth === 0) { // return when the Gantt chart is not in viewable state.
+            return;
+        }
+        for (var i = 0; i < sortedCollectons.length; i++) {
+            firstValue = sortedCollectons[i];
+            if (i === sortedCollectons.length - 1) {
+                zoomingLevel = sortedCollectons[i];
+                break;
+            }
+            else {
+                secondValue = sortedCollectons[i + 1];
+            }
+            if (perDayWidth >= firstValue.perDayWidth) {
+                zoomingLevel = sortedCollectons[i];
+                break;
+            }
+            if (perDayWidth < firstValue.perDayWidth && perDayWidth > secondValue.perDayWidth) {
+                zoomingLevel = sortedCollectons[i + 1];
+                break;
+            }
+        }
+        var newTimeline = extend({}, {}, zoomingLevel, true);
+        this.parent.timelineModule['roundOffDateToZoom'](this.parent.cloneProjectStartDate, true, perDayWidth, newTimeline.bottomTier.unit, zoomingLevel);
+        this.parent.timelineModule['roundOffDateToZoom'](this.parent.cloneProjectEndDate, false, perDayWidth, newTimeline.bottomTier.unit, zoomingLevel);
+        var numberOfCells = this.parent.timelineModule['calculateNumberOfTimelineCells'](newTimeline);
+        var scrollHeight = this.parent.pdfExportModule['pdfPageDimensions'].height; //17 is horizontal scrollbar width
+        var contentHeight = this.parent.pdfExportModule['pdfPageDimensions'].height;
+        var emptySpace = contentHeight <= scrollHeight ? 0 : 17;
+        newTimeline.timelineUnitSize = Math.abs((chartWidth - emptySpace)) / numberOfCells;
+        this.parent.timelineModule['changeTimelineSettings'](newTimeline);
+        this.parent.timelineModule.isZoomToFit = false;
+        this.parent.timelineModule.isZooming = false;
+    };
     /**
      * @param {IGanttData[]} data .
      * @param {PdfGantt} gantt .
@@ -35167,11 +35755,16 @@ var ExportHelper = /** @__PURE__ @class */ (function () {
         this.gantt.style.cellPadding.right = 0;
         this.ganttStyle = this.gantt.ganttStyle;
         this.gantt.borderColor = this.ganttStyle.chartGridLineColor;
+        this.parent.pdfExportModule.isPdfExport = true;
+        if (this.exportProps.fitToWidthSettings && this.exportProps.fitToWidthSettings.isFitToWidth) {
+            this.processToFit();
+        }
         this.processHeaderContent();
         this.processGanttContent();
         this.processTimeline();
         this.processTaskbar();
         this.processPredecessor();
+        this.parent.pdfExportModule.isPdfExport = false;
     };
     ExportHelper.prototype.processHeaderContent = function () {
         var _this = this;
@@ -35227,7 +35820,9 @@ var ExportHelper = /** @__PURE__ @class */ (function () {
             this.renderEmptyGantt();
         }
         else {
-            this.flatData.forEach(function (data) {
+            var flatData = void 0;
+            flatData = this.flatData;
+            flatData.forEach(function (data) {
                 _this.row = _this.gantt.rows.addRow();
                 if (data.hasChildRecords) {
                     _this.gantt.rows.getRow(_this.rowIndex).isParentRow = true;
@@ -35236,6 +35831,9 @@ var ExportHelper = /** @__PURE__ @class */ (function () {
                 else {
                     _this.processRecordRow(data);
                 }
+                if (_this.exportProps.fitToWidthSettings && _this.exportProps.fitToWidthSettings.isFitToWidth) {
+                    _this.row.height = 33.33;
+                }
                 _this.rowIndex++;
             });
         }
@@ -35287,7 +35885,7 @@ var ExportHelper = /** @__PURE__ @class */ (function () {
                 else {
                     predecessor.connectorLineColor = _this.ganttStyle.connectorLineColor;
                 }
-                predecessor.connectorLineColor = _this.ganttStyle.connectorLineColor;
+                _this.ganttStyle.connectorLineColor = predecessor.connectorLineColor;
                 _this.gantt.predecessorCollection.push(predecessor);
             });
             this.parent.pdfExportModule.isPdfExport = false;
@@ -35352,7 +35950,9 @@ var ExportHelper = /** @__PURE__ @class */ (function () {
      */
     ExportHelper.prototype.processTaskbar = function () {
         var _this = this;
-        this.flatData.forEach(function (data) {
+        var flatData;
+        flatData = this.flatData;
+        flatData.forEach(function (data) {
             var taskbar = _this.gantt.taskbar.add();
             var ganttProp = data.ganttProperties;
             taskbar.left = ganttProp.left;
@@ -35383,7 +35983,22 @@ var ExportHelper = /** @__PURE__ @class */ (function () {
             taskbar.startDate = ganttProp.startDate;
             taskbar.endDate = ganttProp.endDate;
             taskbar.height = _this.parent.chartRowsModule.taskBarHeight;
+            if (_this.parent.renderBaseline) {
+                var height = void 0;
+                if ((taskbar.height + _this.baselineHeight) <= _this.parent.rowHeight) {
+                    height = taskbar.height;
+                }
+                else {
+                    height = taskbar.height - (_this.baselineHeight + 1);
+                }
+                taskbar.height = height;
+            }
+            taskbar.baselineTop = _this.parent.chartRowsModule.baselineTop;
             taskbar.isMilestone = ganttProp.isMilestone;
+            taskbar.baselineStartDate = ganttProp.baselineStartDate;
+            taskbar.baselineEndDate = ganttProp.baselineEndDate;
+            taskbar.baselineLeft = ganttProp.baselineLeft;
+            taskbar.baselineWidth = ganttProp.baselineWidth;
             taskbar.milestoneColor = new PdfColor(_this.ganttStyle.taskbar.milestoneColor);
             taskbar.isParentTask = data.hasChildRecords;
             if (ganttProp.isMilestone) {
@@ -35414,6 +36029,7 @@ var ExportHelper = /** @__PURE__ @class */ (function () {
                     taskbar.taskColor = new PdfColor(_this.ganttStyle.taskbar.criticalTaskColor);
                     taskbar.progressColor = new PdfColor(_this.ganttStyle.taskbar.criticalProgressColor);
                     taskbar.taskBorderColor = new PdfColor(_this.ganttStyle.taskbar.criticalTaskBorderColor);
+                    taskbar.milestoneColor = new PdfColor(_this.ganttStyle.taskbar.criticalTaskColor);
                 }
                 else {
                     taskbar.taskColor = new PdfColor(_this.ganttStyle.taskbar.taskColor);
@@ -35421,6 +36037,8 @@ var ExportHelper = /** @__PURE__ @class */ (function () {
                     taskbar.taskBorderColor = new PdfColor(_this.ganttStyle.taskbar.taskBorderColor);
                 }
             }
+            taskbar.baselineColor = new PdfColor(_this.ganttStyle.taskbar.baselineColor);
+            taskbar.baselineBorderColor = new PdfColor(_this.ganttStyle.taskbar.baselineBorderColor);
             taskbar.gridLineColor = new PdfColor(_this.ganttStyle.chartGridLineColor);
             _this.gantt.taskbarCollection.push(taskbar);
             var taskStyle = {};
@@ -35429,6 +36047,8 @@ var ExportHelper = /** @__PURE__ @class */ (function () {
             taskStyle.taskBorderColor = taskbar.taskBorderColor;
             taskStyle.progressColor = taskbar.progressColor;
             taskStyle.milestoneColor = taskbar.milestoneColor;
+            taskStyle.baselineColor = taskbar.baselineColor;
+            taskStyle.baselineBorderColor = taskbar.baselineBorderColor;
             var args = {
                 taskbar: taskStyle,
                 data: data
@@ -35440,6 +36060,8 @@ var ExportHelper = /** @__PURE__ @class */ (function () {
                 taskbar.taskBorderColor = args.taskbar.taskBorderColor;
                 taskbar.progressColor = args.taskbar.progressColor;
                 taskbar.milestoneColor = args.taskbar.milestoneColor;
+                taskbar.baselineColor = args.taskbar.baselineColor;
+                taskbar.baselineBorderColor = args.taskbar.baselineBorderColor;
             }
         });
     };
@@ -35541,7 +36163,8 @@ var ExportHelper = /** @__PURE__ @class */ (function () {
         row.height = pixelToPoint(this.parent.rowHeight);
         this.copyStyles(this.ganttStyle.columnHeader, row.cells.getCell(0), row.isParentRow);
         var count = this.columns.length;
-        this.mergeCells(0, 0, count);
+        row.cells.getCell(0).value = this.parent.localeObj.getConstant('emptyRecord');
+        this.mergeCells(1, 0, count);
     };
     ExportHelper.prototype.mergeCells = function (rowIndex, colIndex, lastColIndex) {
         this.gantt.rows.getRow(rowIndex).cells.getCell(colIndex).columnSpan = lastColIndex;
@@ -35586,6 +36209,26 @@ var ExportHelper = /** @__PURE__ @class */ (function () {
         var widths = [];
         var treeColumnIndex = 0;
         var tWidth = (this.pdfDoc.pageSettings.width - 82);
+        if (this.exportProps && this.exportProps.fitToWidthSettings && this.exportProps.fitToWidthSettings.isFitToWidth) {
+            var gridWidth = void 0;
+            if (this.exportProps.fitToWidthSettings.gridWidth) {
+                gridWidth = parseInt(this.exportProps.fitToWidthSettings.gridWidth.split('%')[0]);
+            }
+            else {
+                if (this.exportProps.fitToWidthSettings.chartWidth) {
+                    var chartWidth = parseInt(this.exportProps.fitToWidthSettings.chartWidth.split('%')[0]);
+                    gridWidth = 100 - chartWidth;
+                }
+                else {
+                    gridWidth = 30;
+                }
+            }
+            var pdfwidth = (this.parent.pdfExportModule['pdfPageDimensions'].width * gridWidth) / 100;
+            var perColumnWidth = pdfwidth / this.gantt.columns.columns.length;
+            for (var i = 0; i < this.gantt.columns.columns.length; i++) {
+                this.gantt.columns.getColumn(i).width = perColumnWidth;
+            }
+        }
         if (this.totalColumnWidth > (this.pdfDoc.pageSettings.width - 82)) {
             this.gantt.style.allowHorizontalOverflow = true;
         }
@@ -35713,6 +36356,8 @@ var __assign$3 = (undefined && undefined.__assign) || function () {
  */
 var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
     function PdfGanttTaskbarCollection(parent) {
+        /** Defines the task baselineHeight . */
+        this.baselineHeight = 8;
         /**
          * @private
          */
@@ -35759,6 +36404,7 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
         //code for while current pdf page is exceed
         if (yPoint > pageSize.height) {
             page = this.GetNextPage(page);
+            page['contentWidth'] = pointToPixel(detail.endPoint - detail.startPoint);
             taskGraphics = page.graphics;
             startPoint.y = 0;
             if (this.parent.pdfExportModule.gantt.enableHeader) {
@@ -35766,6 +36412,11 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                 startPoint.y = pixelToPoint(this.parent.timelineModule.isSingleTier ? 45 : 60);
             }
             isNextPage = true;
+            var graphics = page.graphics;
+            var pen = new PdfPen(new PdfColor(206, 206, 206));
+            if (page['contentWidth'] && (this.parent.gridLines == "Both" || this.parent.gridLines == "Horizontal")) {
+                graphics.drawRectangle(pen, startPoint.x, startPoint.y, page['contentWidth'] + 0.5, rowHeight);
+            }
         }
         this.drawLeftLabel(page, startPoint, detail, cumulativeWidth);
         //Draw Taskbar
@@ -35789,9 +36440,13 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
         if (!taskbar.isMilestone) {
             var taskbarPen = new PdfPen(taskbar.taskBorderColor);
             var taskBrush = new PdfSolidBrush(taskbar.taskColor);
+            var baselinePen = new PdfPen(taskbar.baselineBorderColor);
+            var baselineBrush = new PdfSolidBrush(taskbar.baselineColor);
             var progressPen = new PdfPen(taskbar.progressColor);
             var progressBrush = new PdfSolidBrush(taskbar.progressColor);
-            var adjustHeight = pixelToPoint((this.parent.rowHeight - this.height) / 2.0);
+            var adjustHeightforTaskbar = pixelToPoint((this.parent.rowHeight - this.height) / 2.0);
+            var adjustHeightforBaseline = pixelToPoint((this.parent.rowHeight - this.height) / 4.5);
+            var adjustHeight = this.parent.renderBaseline ? adjustHeightforBaseline : adjustHeightforTaskbar;
             pageIndex = page.section.indexOf(page);
             var startDate = isNullOrUndefined(this.unscheduleStarteDate) ? this.startDate : this.unscheduleStarteDate;
             var endDate = isNullOrUndefined(this.unscheduleEndDate) ? this.endDate : this.unscheduleEndDate;
@@ -35805,6 +36460,9 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                     this.drawUnscheduledTask(taskGraphics, startPoint, cumulativeWidth, adjustHeight);
                 }
                 else {
+                    if (this.parent.renderBaseline && taskbar.baselineStartDate && taskbar.baselineEndDate) {
+                        taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight + pixelToPoint(taskbar.height + 3), pixelToPoint(this.baselineWidth), pixelToPoint(this.baselineHeight));
+                    }
                     taskGraphics.drawRectangle(taskbarPen, taskBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth) + 0.5, startPoint.y + adjustHeight, pixelToPoint(taskbar.width), pixelToPoint(taskbar.height));
                     if (this.isScheduledTask) {
                         taskGraphics.drawRectangle(progressPen, progressBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth) + 0.5, startPoint.y + adjustHeight, pixelToPoint(taskbar.progressWidth), pixelToPoint(taskbar.height));
@@ -35836,6 +36494,9 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                     this.drawUnscheduledTask(taskGraphics, startPoint, cumulativeWidth, adjustHeight);
                 }
                 else {
+                    if (this.parent.renderBaseline && taskbar.baselineStartDate && taskbar.baselineEndDate) {
+                        taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight + pixelToPoint(taskbar.height + 3), pixelToPoint(this.baselineWidth), pixelToPoint(this.baselineHeight));
+                    }
                     taskGraphics.drawRectangle(taskbarPen, taskBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth) + 0.5, startPoint.y + adjustHeight, pixelToPoint(renderWidth), pixelToPoint(taskbar.height));
                     taskbar.width = taskbar.width - renderWidth;
                     if (this.isScheduledTask) {
@@ -35867,6 +36528,9 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                     this.taskStartPoint = __assign$3({}, startPoint);
                     this.isStartPoint = true;
                 }
+                if (this.parent.renderBaseline && taskbar.baselineStartDate && taskbar.baselineEndDate) {
+                    taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight + pixelToPoint(taskbar.height + 3), pixelToPoint(this.baselineWidth), pixelToPoint(this.baselineHeight));
+                }
                 taskGraphics.drawRectangle(taskbarPen, taskBrush, startPoint.x + pixelToPoint(taskbar.left + 0.5), startPoint.y + adjustHeight, pixelToPoint(taskbar.width), pixelToPoint(taskbar.height));
                 if (this.isScheduledTask) {
                     taskGraphics.drawRectangle(progressPen, progressBrush, startPoint.x + pixelToPoint(taskbar.left + 0.5), startPoint.y + adjustHeight, pixelToPoint(taskbar.progressWidth), pixelToPoint(taskbar.height));
@@ -35888,6 +36552,9 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                     this.taskStartPoint = __assign$3({}, startPoint);
                     this.isStartPoint = true;
                 }
+                if (this.parent.renderBaseline && taskbar.baselineStartDate && taskbar.baselineEndDate) {
+                    taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight + pixelToPoint(taskbar.height + 3), pixelToPoint(this.baselineWidth), pixelToPoint(this.baselineHeight));
+                }
                 taskGraphics.drawRectangle(taskbarPen, taskBrush, startPoint.x + pixelToPoint(taskbar.left) + 0.5, startPoint.y + adjustHeight, pixelToPoint(detail.totalWidth), pixelToPoint(taskbar.height));
                 if (this.isScheduledTask) {
                     var progressBoundsWidth = 0;
@@ -35913,6 +36580,9 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
         }
         else {
             this.drawMilestone(page, startPoint, detail, cumulativeWidth);
+            if (this.parent.renderBaseline && taskbar.baselineStartDate && taskbar.baselineEndDate) {
+                this.drawMilestone(page, startPoint, detail, cumulativeWidth);
+            }
         }
         this.drawRightLabel(page, startPoint, detail, cumulativeWidth);
         return isNextPage;
@@ -36071,13 +36741,20 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
             var pageIndex = page.section.indexOf(page);
             this.taskStartPoint = __assign$3({}, startPoint);
             var milestonePen = new PdfPen(this.milestoneColor);
-            var adjustHeight = pixelToPoint(((this.parent.rowHeight - this.height) / 2.0));
+            var adjustHeightforBaselineMilesone = pixelToPoint(((this.parent.rowHeight - this.height) / 3.0));
+            var adjustHeightforMilesone = pixelToPoint(((this.parent.rowHeight - this.height) / 2.0));
+            var adjustHeight = this.parent.renderBaseline ? adjustHeightforBaselineMilesone : adjustHeightforMilesone;
             var milestoneBrush = new PdfSolidBrush(this.milestoneColor);
+            var baselinePen = new PdfPen(this.baselineBorderColor);
+            var baselineBrush = new PdfSolidBrush(this.baselineColor);
             taskGraphics.save(); //saving graphics state
-            var height = Math.floor(this.parent.chartRowsModule.taskBarHeight * 0.6);
+            var height = Math.floor(this.parent.chartRowsModule.taskBarHeight * 0.8);
             /* eslint-disable-next-line */
             taskGraphics.translateTransform(startPoint.x + pixelToPoint(this.left - cumulativeWidth), startPoint.y + adjustHeight - (this.parent.chartRowsModule.taskBarHeight * 0.7) / 2);
             taskGraphics.rotateTransform(45); //apply rotation
+            if (this.parent.renderBaseline && this.baselineStartDate && this.baselineEndDate) {
+                taskGraphics.drawRectangle(baselinePen, baselineBrush, 2, 2, pixelToPoint(height), pixelToPoint(height));
+            }
             taskGraphics.drawRectangle(milestonePen, milestoneBrush, 0, 0, pixelToPoint(height), pixelToPoint(height));
             taskGraphics.restore(); //restoring graphics state
             this.endPage = this.startPage = pageIndex;
@@ -36108,7 +36785,7 @@ var PdfTimeline = /** @__PURE__ @class */ (function () {
      * @returns {void}
      */
     PdfTimeline.prototype.drawTimeline = function (page, startPoint, detail) {
-        var remainWidth = Math.floor(detail.totalWidth);
+        var remainWidth = pointToPixel(Math.floor(detail.totalWidth));
         var renderWidth = 0;
         this.topTierPoint.x = startPoint.x;
         this.topTierPoint.y = startPoint.y;
@@ -36136,7 +36813,7 @@ var PdfTimeline = /** @__PURE__ @class */ (function () {
                 //Primary header Event Arguments
                 /* eslint-disable-next-line */
                 this.triggerQueryTimelinecell(page, this.topTierPoint.x, this.topTierPoint.y, this.topTierHeight, renderWidth, pHeader.value, true);
-                this.topTierPoint.x += pixelToPoint(renderWidth);
+                this.topTierPoint.x += renderWidth;
                 remainWidth -= renderWidth;
                 if (isCompleted) {
                     this.topTierIndex++;
@@ -36162,7 +36839,7 @@ var PdfTimeline = /** @__PURE__ @class */ (function () {
                 //Secondary header Event Arguments
                 /* eslint-disable-next-line */
                 this.triggerQueryTimelinecell(page, this.bottomTierPoint.x, this.bottomTierPoint.y, this.bottomTierHeight, width, secondHeader.value, false);
-                this.bottomTierPoint.x = this.bottomTierPoint.x + pixelToPoint(width);
+                this.bottomTierPoint.x = this.bottomTierPoint.x + width;
                 remainWidth -= width;
                 secondHeader.completedWidth = width;
                 if (isCompleted) {
@@ -36193,7 +36870,7 @@ var PdfTimeline = /** @__PURE__ @class */ (function () {
                     //Primary header Event Arguments
                     /* eslint-disable-next-line */
                     this.triggerQueryTimelinecell(page, this.topTierPoint.x, this.topTierPoint.y, this.topTierHeight, pHeader.completedWidth, pHeader.value, true);
-                    this.topTierPoint.x += pixelToPoint(pHeader.completedWidth);
+                    this.topTierPoint.x += pHeader.completedWidth;
                 }
             }
         }
@@ -36206,7 +36883,7 @@ var PdfTimeline = /** @__PURE__ @class */ (function () {
                     //Secondary header Event Arguments
                     /* eslint-disable-next-line */
                     this.triggerQueryTimelinecell(page, this.bottomTierPoint.x, this.bottomTierPoint.y, this.bottomTierHeight, secondHeader.width, secondHeader.value, false);
-                    this.bottomTierPoint.x = this.bottomTierPoint.x + pixelToPoint(secondHeader.width);
+                    this.bottomTierPoint.x = this.bottomTierPoint.x + secondHeader.width;
                 }
             }
         }
@@ -36253,7 +36930,10 @@ var PdfTimeline = /** @__PURE__ @class */ (function () {
         var e = eventArgs.timelineCell;
         var rectPen = new PdfPen(eventArgs.timelineCell.borderColor);
         var rectBrush = new PdfSolidBrush(eventArgs.timelineCell.backgroundColor);
-        graphics.drawRectangle(rectPen, rectBrush, x, y, pixelToPoint(width), pixelToPoint(height));
+        graphics.drawRectangle(rectPen, rectBrush, x, y, width, pixelToPoint(height));
+        if (!isTopTier && (this.parent.gridLines == "Both" || this.parent.gridLines == "Vertical")) {
+            graphics.drawRectangle(rectPen, rectBrush, x, y + pixelToPoint(height), width, page.getClientSize().height);
+        }
         var font = new PdfStandardFont(ganttStyle.fontFamily, e.fontSize, e.fontStyle);
         if (ganttStyle.font) {
             font = ganttStyle.font;
@@ -36262,7 +36942,13 @@ var PdfTimeline = /** @__PURE__ @class */ (function () {
         var pLeft = ganttStyle.timeline.padding ? eventArgs.timelineCell.padding.left : 0;
         var pTop = ganttStyle.timeline.padding ? eventArgs.timelineCell.padding.top : 0;
         /* eslint-disable-next-line */
-        graphics.drawString(eventArgs.value, font, null, textBrush, x + pLeft, y + pTop, pixelToPoint(width), pixelToPoint(height), e.format);
+        if (isTopTier) {
+            x = x + pLeft + 4;
+        }
+        else {
+            x = x + pLeft;
+        }
+        graphics.drawString(eventArgs.value, font, null, textBrush, x, y + pTop, pixelToPoint(width), pixelToPoint(height), e.format);
     };
     return PdfTimeline;
 }());
@@ -36429,7 +37115,9 @@ var PdfGanttPredecessor = /** @__PURE__ @class */ (function () {
                 }
                 break;
         }
-        var midPoint = Math.round((this.parent.rowHeight - 1) / 2.0);
+        var midPointforTaskbar = Math.round((this.parent.rowHeight - 1) / 2.0);
+        var midPointforBaseline = Math.round((this.parent.rowHeight - 10) / 2.0);
+        var midPoint = this.parent.renderBaseline ? midPointforBaseline : midPointforTaskbar;
         midPoint = pixelToPoint(midPoint);
         /* eslint-disable-next-line */
         var point1, point2, point3, point4, point5, point6;
@@ -36924,6 +37612,7 @@ var PdfGantt = /** @__PURE__ @class */ (function (_super) {
         var pageData;
         this.headerDetails.forEach(function (detail, index) {
             var page = _this.result.page.section.getPages()[_this.startPageIndex];
+            page['contentWidth'] = pointToPixel(_this.headerDetails[index].endPoint - _this.headerDetails[index].startPoint);
             _this.chartHeader.drawTimeline(page, _this.startPoint, detail);
             taskbarPoint.y = taskbarPoint.y + pixelToPoint(_this.parent.timelineModule.isSingleTier ? 45 : 60); // headerHeight
             pageStartX = taskbarPoint.x;
@@ -36934,6 +37623,11 @@ var PdfGantt = /** @__PURE__ @class */ (function (_super) {
                 var task = _this.taskbarCollection[i];
                 var rowHeight = _this.rows.getRow(i + 1).height;
                 var pdfPage = _this.result.page.section.getPages()[_this.startPageIndex];
+                var graphics = pdfPage.graphics;
+                var pen = new PdfPen(new PdfColor(206, 206, 206));
+                if (page['contentWidth'] && (_this.parent.gridLines == "Both" || _this.parent.gridLines == "Horizontal")) {
+                    graphics.drawRectangle(pen, pageStartX, taskbarPoint.y, page['contentWidth'] + 0.5, rowHeight);
+                }
                 /* eslint-disable-next-line */
                 var isNextPage = task.drawTaskbar(pdfPage, taskbarPoint, detail, cumulativeWidth, rowHeight, _this.taskbarCollection[i]);
                 if (isNextPage) {
@@ -37068,11 +37762,23 @@ var PdfExport = /** @__PURE__ @class */ (function () {
         if (isNullOrUndefined(pdfExportProperties)) {
             pdfExportProperties = {};
         }
-        if (pdfExportProperties.exportType === 'CurrentViewData') {
-            data = this.parent.currentViewData;
+        if (pdfExportProperties.fitToWidthSettings && pdfExportProperties.fitToWidthSettings.isFitToWidth) {
+            if (pdfExportProperties.exportType === 'CurrentViewData') {
+                this.helper.beforeSinglePageExport['cloneFlatData'] = extend([], this.parent.currentViewData, null, true);
+            }
+            else {
+                this.helper.beforeSinglePageExport['cloneFlatData'] = extend([], this.parent.flatData, null, true);
+            }
+            this.helper.beforeSinglePageExport['cloneCurrentViewData'] = extend([], this.parent.currentViewData, null, true);
+            data = this.helper.beforeSinglePageExport['cloneFlatData'];
         }
         else {
-            data = this.parent.flatData;
+            if (pdfExportProperties.exportType === 'CurrentViewData') {
+                data = this.parent.currentViewData;
+            }
+            else {
+                data = this.parent.flatData;
+            }
         }
         this.initGantt();
         if (!isNullOrUndefined(pdfDoc)) {
@@ -37097,6 +37803,7 @@ var PdfExport = /** @__PURE__ @class */ (function () {
         var section = this.pdfDocument.sections.add();
         this.processSectionExportProperties(section, pdfExportProperties);
         var pdfPage = section.pages.add();
+        this.pdfPageDimensions = pdfPage.getClientSize();
         /* eslint-disable-next-line */
         return new Promise(function (resolve, reject) {
             _this.helper.processGridExport(data, _this.gantt, pdfExportProperties);
@@ -37107,6 +37814,26 @@ var PdfExport = /** @__PURE__ @class */ (function () {
             format.break = PdfLayoutBreakType.FitElement;
             var layouter = _this.gantt.drawGrid(pdfPage, 0, 0, format);
             _this.gantt.drawChart(layouter);
+            if (_this.helper.exportProps && _this.helper.exportProps.fitToWidthSettings && _this.helper.exportProps.fitToWidthSettings.isFitToWidth) {
+                _this.parent.zoomingProjectStartDate = _this.helper.beforeSinglePageExport['zoomingProjectStartDate'];
+                _this.parent.zoomingProjectEndDate = _this.helper.beforeSinglePageExport['zoomingProjectEndDate'];
+                _this.parent.cloneProjectStartDate = _this.helper.beforeSinglePageExport['cloneProjectStartDate'];
+                _this.parent.cloneProjectEndDate = _this.helper.beforeSinglePageExport['cloneProjectEndDate'];
+                _this.parent.timelineModule.customTimelineSettings = _this.helper.beforeSinglePageExport['customTimelineSettings'];
+                _this.parent.isTimelineRoundOff = _this.helper.beforeSinglePageExport['isTimelineRoundOff'];
+                _this.parent.timelineModule.topTier = _this.helper.beforeSinglePageExport['topTier'];
+                _this.parent.timelineModule.topTierCellWidth = _this.helper.beforeSinglePageExport['topTierCellWidth'];
+                _this.parent.timelineModule.topTierCollection = _this.helper.beforeSinglePageExport['topTierCollection'];
+                _this.parent.timelineModule.bottomTier = _this.helper.beforeSinglePageExport['bottomTier'];
+                _this.parent.timelineModule.bottomTierCellWidth = _this.helper.beforeSinglePageExport['bottomTierCellWidth'];
+                _this.parent.timelineModule.bottomTierCollection = _this.helper.beforeSinglePageExport['bottomTierCollection'];
+                _this.parent.timelineModule.totalTimelineWidth = _this.helper.beforeSinglePageExport['totalTimelineWidth'];
+                _this.parent.timelineModule.timelineStartDate = _this.helper.beforeSinglePageExport['timelineStartDate'];
+                _this.parent.timelineModule.timelineEndDate = _this.helper.beforeSinglePageExport['timelineEndDate'];
+                _this.parent.timelineModule.timelineRoundOffEndDate = _this.helper.beforeSinglePageExport['timelineRoundOffEndDate'];
+                _this.parent.perDayWidth = _this.helper.beforeSinglePageExport['perDayWidth'];
+                _this.parent.updatedConnectorLineCollection = _this.helper.beforeSinglePageExport['updatedConnectorLineCollection'];
+            }
             if (!isMultipleExport) {
                 if (!_this.isBlob) {
                     // save the PDF