@syncfusion/ej2-gantt 20.4.54 → 21.1.35

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

@@ -1,6 +1,6 @@
-import { Browser, ChildProperty, Collection, Complex, Component, Event, EventHandler, Internationalization, KeyboardEvents, L10n, NotifyPropertyChanges, Property, addClass, append, classList, closest, compile, createElement, deleteObject, extend, formatUnit, getValue, isNullOrUndefined, isObject, isObjectArray, isUndefined, merge, remove, removeClass, setValue } from '@syncfusion/ej2-base';
+import { Browser, ChildProperty, Collection, Complex, Component, Event, EventHandler, Internationalization, KeyboardEvents, L10n, NotifyPropertyChanges, Property, SanitizeHtmlHelper, addClass, append, classList, closest, compile, createElement, deleteObject, extend, formatUnit, getValue, isNullOrUndefined, isObject, isObjectArray, isUndefined, merge, remove, removeClass, setValue } from '@syncfusion/ej2-base';
 import { Dialog, Tooltip, createSpinner, hideSpinner, showSpinner } from '@syncfusion/ej2-popups';
-import { Edit, ForeignKey, Grid, Page, Predicate, Toolbar, ValueFormatter, click, filterAfterOpen, getActualProperties, getCustomDateFormat, getForeignData, getObject, getUid, parentsUntil, setCssInGridPopUp } from '@syncfusion/ej2-grids';
+import { Edit, ForeignKey, Grid, Page, Predicate, Toolbar, ValueFormatter, click, filterAfterOpen, getActualProperties, getCustomDateFormat, getFilterMenuPostion, getForeignData, getObject, getUid, parentsUntil, setCssInGridPopUp } from '@syncfusion/ej2-grids';
 import { CacheAdaptor, DataManager, DataUtil, Deferred, ODataAdaptor, ODataV4Adaptor, Query, RemoteSaveAdaptor, UrlAdaptor, WebApiAdaptor, WebMethodAdaptor } from '@syncfusion/ej2-data';
 import { ColumnMenu, ContextMenu, Edit as Edit$1, ExcelExport, Filter, Reorder, Resize, RowDD, Selection, Sort, TreeGrid, VirtualScroll } from '@syncfusion/ej2-treegrid';
 import { Splitter } from '@syncfusion/ej2-layouts';
@@ -150,7 +150,7 @@ function updateDates(record, parent) {
 function formatString(str, args) {
     var regx;
     for (var i = 0; i < args.length; i++) {
-        // eslint-disable-next-line detect-non-literal-regexp
+        // eslint-disable-next-line security/detect-non-literal-regexp
         regx = new RegExp('\\{' + (i) + '\\}', 'gm');
         str = str.replace(regx, args[i].toString());
     }
@@ -260,32 +260,37 @@ var DateProcessor = /** @__PURE__ @class */ (function () {
             }
         }
         var tStartDate;
-        do {
-            tStartDate = new Date(cloneStartDate.getTime());
-            var holidayLength = this.parent.totalHolidayDates.length;
-            // check holidays and weekends
-            if (this.isValidateNonWorkDays(ganttProp)) {
-                var startTime = (!validateAsMilestone || isLoad) ? this.parent.defaultStartTime : this.parent.defaultEndTime;
-                if (!this.parent.includeWeekend) {
-                    var tempDate = new Date(cloneStartDate.getTime());
-                    cloneStartDate = this.getNextWorkingDay(cloneStartDate);
-                    if (tempDate.getTime() !== cloneStartDate.getTime()) {
-                        this.setTime(startTime, cloneStartDate);
+        if (this.parent.autoCalculateDateScheduling) {
+            do {
+                tStartDate = new Date(cloneStartDate.getTime());
+                var holidayLength = this.parent.totalHolidayDates.length;
+                // check holidays and weekends
+                if (this.isValidateNonWorkDays(ganttProp)) {
+                    var startTime = (!validateAsMilestone || isLoad) ? this.parent.defaultStartTime : this.parent.defaultEndTime;
+                    if (!this.parent.includeWeekend) {
+                        var tempDate = new Date(cloneStartDate.getTime());
+                        cloneStartDate = this.getNextWorkingDay(cloneStartDate);
+                        if (tempDate.getTime() !== cloneStartDate.getTime()) {
+                            this.setTime(startTime, cloneStartDate);
+                        }
                     }
-                }
-                for (var count = 0; count < holidayLength; count++) {
-                    var holidayFrom = this.getDateFromFormat(new Date(this.parent.totalHolidayDates[count]));
-                    var holidayTo = new Date(holidayFrom.getTime());
-                    holidayFrom.setHours(0, 0, 0, 0);
-                    holidayTo.setHours(23, 59, 59, 59);
-                    if (cloneStartDate.getTime() >= holidayFrom.getTime() && cloneStartDate.getTime() < holidayTo.getTime()) {
-                        cloneStartDate.setDate(cloneStartDate.getDate() + 1);
-                        this.setTime(startTime, cloneStartDate);
+                    for (var count = 0; count < holidayLength; count++) {
+                        var holidayFrom = this.getDateFromFormat(new Date(this.parent.totalHolidayDates[count]));
+                        var holidayTo = new Date(holidayFrom.getTime());
+                        holidayFrom.setHours(0, 0, 0, 0);
+                        holidayTo.setHours(23, 59, 59, 59);
+                        if (cloneStartDate.getTime() >= holidayFrom.getTime() && cloneStartDate.getTime() < holidayTo.getTime()) {
+                            cloneStartDate.setDate(cloneStartDate.getDate() + 1);
+                            this.setTime(startTime, cloneStartDate);
+                        }
                     }
                 }
-            }
-        } while (tStartDate.getTime() !== cloneStartDate.getTime());
-        return new Date(cloneStartDate.getTime());
+            } while (tStartDate.getTime() !== cloneStartDate.getTime());
+            return new Date(cloneStartDate.getTime());
+        }
+        else {
+            return new Date(cloneStartDate.getTime());
+        }
     };
     /**
      * To update given date value to valid end date
@@ -320,36 +325,44 @@ var DateProcessor = /** @__PURE__ @class */ (function () {
             }
         }
         var tempCheckDate;
-        do {
-            tempCheckDate = new Date(cloneEndDate.getTime());
-            var holidayLength = this.parent.totalHolidayDates.length;
-            if (this.isValidateNonWorkDays(ganttProp)) {
-                if (!this.parent.includeWeekend) {
-                    var tempDate = new Date(cloneEndDate.getTime());
-                    cloneEndDate = this.getPreviousWorkingDay(cloneEndDate);
-                    if (tempDate.getTime() !== cloneEndDate.getTime()) {
-                        this.setTime(this.parent.defaultEndTime, cloneEndDate);
-                    }
-                }
-                for (var count = 0; count < holidayLength; count++) {
-                    var holidayFrom = this.getDateFromFormat(new Date(this.parent.totalHolidayDates[count]));
-                    var holidayTo = new Date(holidayFrom.getTime());
-                    var tempHoliday = new Date(cloneEndDate.getTime());
-                    tempHoliday.setMinutes(cloneEndDate.getMilliseconds() - 2);
-                    holidayFrom.setHours(0, 0, 0, 0);
-                    holidayTo.setHours(23, 59, 59, 59);
-                    if (cloneEndDate.getTime() >= holidayFrom.getTime() && cloneEndDate.getTime() < holidayTo.getTime() ||
-                        tempHoliday.getTime() >= holidayFrom.getTime() && tempHoliday.getTime() < holidayTo.getTime()) {
-                        cloneEndDate.setDate(cloneEndDate.getDate() - 1);
-                        if (!(cloneEndDate.getTime() === holidayFrom.getTime() && this.parent.defaultEndTime === 86400 &&
-                            this.getSecondsInDecimal(cloneEndDate) === 0)) {
+        if (this.parent.autoCalculateDateScheduling) {
+            do {
+                tempCheckDate = new Date(cloneEndDate.getTime());
+                var holidayLength = this.parent.totalHolidayDates.length;
+                if (this.isValidateNonWorkDays(ganttProp)) {
+                    if (!this.parent.includeWeekend) {
+                        var tempDate = new Date(cloneEndDate.getTime());
+                        cloneEndDate = this.getPreviousWorkingDay(cloneEndDate);
+                        if (tempDate.getTime() !== cloneEndDate.getTime()) {
                             this.setTime(this.parent.defaultEndTime, cloneEndDate);
                         }
                     }
+                    for (var count = 0; count < holidayLength; count++) {
+                        var holidayFrom = this.getDateFromFormat(new Date(this.parent.totalHolidayDates[count]));
+                        var holidayTo = new Date(holidayFrom.getTime());
+                        var tempHoliday = new Date(cloneEndDate.getTime());
+                        tempHoliday.setMinutes(cloneEndDate.getMilliseconds() - 2);
+                        holidayFrom.setHours(0, 0, 0, 0);
+                        holidayTo.setHours(23, 59, 59, 59);
+                        if (cloneEndDate.getTime() >= holidayFrom.getTime() && cloneEndDate.getTime() < holidayTo.getTime() ||
+                            tempHoliday.getTime() >= holidayFrom.getTime() && tempHoliday.getTime() < holidayTo.getTime()) {
+                            cloneEndDate.setDate(cloneEndDate.getDate() - 1);
+                            if (!(cloneEndDate.getTime() === holidayFrom.getTime() && this.parent.defaultEndTime === 86400 &&
+                                this.getSecondsInDecimal(cloneEndDate) === 0)) {
+                                this.setTime(this.parent.defaultEndTime, cloneEndDate);
+                            }
+                        }
+                    }
                 }
+            } while (tempCheckDate.getTime() !== cloneEndDate.getTime());
+            return new Date(cloneEndDate.getTime());
+        }
+        else {
+            if (!isNullOrUndefined(cloneEndDate)) {
+                this.setTime(this.parent.defaultEndTime, cloneEndDate);
             }
-        } while (tempCheckDate.getTime() !== cloneEndDate.getTime());
-        return new Date(cloneEndDate.getTime());
+            return new Date(cloneEndDate.getTime());
+        }
     };
     /**
      * To validate the baseline start date
@@ -464,6 +477,13 @@ var DateProcessor = /** @__PURE__ @class */ (function () {
             }
             this.parent.setRecordValue('endDate', tempEndDate, ganttProp, true);
         }
+        else {
+            tempEndDate = ganttData[this.parent.taskFields.endDate];
+            if (!isNullOrUndefined(tempEndDate)) {
+                this.setTime(this.parent.defaultEndTime, tempEndDate);
+            }
+            this.parent.setRecordValue('endDate', tempEndDate, ganttProp, true);
+        }
         if (this.parent.taskFields.endDate) {
             this.parent.dataOperation.updateMappingData(ganttData, 'endDate');
         }
@@ -530,9 +550,9 @@ var DateProcessor = /** @__PURE__ @class */ (function () {
      */
     DateProcessor.prototype.getNonworkingTime = function (sDate, eDate, isAutoSchedule, isCheckTimeZone) {
         isCheckTimeZone = isNullOrUndefined(isCheckTimeZone) ? true : isCheckTimeZone;
-        var weekendCount = !this.parent.includeWeekend && isAutoSchedule ? this.getWeekendCount(sDate, eDate) : 0;
+        var weekendCount = (!this.parent.includeWeekend && this.parent.autoCalculateDateScheduling) && isAutoSchedule ? this.getWeekendCount(sDate, eDate) : 0;
         var totalHours = this.getNumberOfSeconds(sDate, eDate, isCheckTimeZone);
-        var holidaysCount = isAutoSchedule ? this.getHolidaysCount(sDate, eDate) : 0;
+        var holidaysCount = isAutoSchedule && this.parent.autoCalculateDateScheduling ? this.getHolidaysCount(sDate, eDate) : 0;
         var totWorkDays = (totalHours - (weekendCount * 86400) - (holidaysCount * 86400)) / 86400; // working days between two dates
         var nonWorkHours = this.getNonWorkingSecondsOnDate(sDate, eDate, isAutoSchedule);
         var totalNonWorkTime = (totWorkDays * (86400 - this.parent.secondsPerDay)) +
@@ -724,6 +744,9 @@ var DateProcessor = /** @__PURE__ @class */ (function () {
                                     if (!isNullOrUndefined(data.ganttProperties.startDate))
                                         sDate = data.ganttProperties.startDate;
                                 }
+                                else {
+                                    sDate = _this.getProjectStartDate(ganttProp);
+                                }
                             });
                         }
                         else {
@@ -1002,6 +1025,9 @@ var DateProcessor = /** @__PURE__ @class */ (function () {
     /*Check given date is on holidays*/
     DateProcessor.prototype.isOnHolidayOrWeekEnd = function (date, checkWeekEnd) {
         checkWeekEnd = !isNullOrUndefined(checkWeekEnd) ? checkWeekEnd : this.parent.includeWeekend;
+        if (!this.parent.autoCalculateDateScheduling) {
+            checkWeekEnd = true;
+        }
         if (!checkWeekEnd && this.parent.nonWorkingDayIndex.indexOf(date.getDay()) !== -1) {
             return true;
         }
@@ -1031,8 +1057,8 @@ var DateProcessor = /** @__PURE__ @class */ (function () {
         var startRangeIndex = -1;
         var endRangeIndex = -1;
         var totNonWrkSecs = 0;
-        var startOnHoliday = isAutoSchedule ? this.isOnHolidayOrWeekEnd(startDate, null) : false;
-        var endOnHoliday = isAutoSchedule ? this.isOnHolidayOrWeekEnd(endDate, null) : false;
+        var startOnHoliday = isAutoSchedule && this.parent.autoCalculateDateScheduling ? this.isOnHolidayOrWeekEnd(startDate, null) : false;
+        var endOnHoliday = isAutoSchedule && this.parent.autoCalculateDateScheduling ? this.isOnHolidayOrWeekEnd(endDate, null) : false;
         for (var i = 0; i < this.parent.nonWorkingTimeRanges.length; i++) {
             var val = this.parent.nonWorkingTimeRanges[i];
             if (sHour >= val.from && sHour <= val.to) {
@@ -1715,7 +1741,7 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
     TaskProcessor.prototype.constructResourceViewDataSource = function (resources, data, unassignedTasks) {
         var _loop_1 = function (i) {
             var tempData = data[i];
-            child = this_1.parent.taskFields.child != null ? this_1.parent.taskFields.child : 'Children';
+            var child = this_1.parent.taskFields.child != null ? this_1.parent.taskFields.child : 'Children';
             var resourceData = tempData && tempData[this_1.parent.taskFields.resourceInfo];
             var resourceIdMapping = this_1.parent.resourceFields.id;
             if ((!tempData[child] || tempData[child].length === 0) && resourceData && resourceData.length) {
@@ -1742,7 +1768,7 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
                 this_1.constructResourceViewDataSource(resources, tempData[this_1.parent.taskFields.child], unassignedTasks);
             }
         };
-        var this_1 = this, child;
+        var this_1 = this;
         for (var i = 0; i < data.length; i++) {
             _loop_1(i);
         }
@@ -1801,7 +1827,7 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
                 }
             }
             var ganttData = this_3.createRecord(tempData, level, parentItem, true);
-            if (!this_3.parent.enableValidation) {
+            if (!this_3.parent.enableValidation || !this_3.parent.autoCalculateDateScheduling) {
                 this_3.updateTaskLeftWidth(ganttData);
             }
             ganttData.index = this_3.recordIndex++;
@@ -1835,6 +1861,9 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
                     this_3.parent.setRecordValue('autoDuration', this_3.calculateAutoDuration(parentProp), parentProp, true);
                     this_3.updateAutoWidthLeft(parentData);
                 }
+                if (!this_3.parent.allowParentDependency) {
+                    this_3.resetDependency(parentData);
+                }
                 this_3.updateWidthLeft(parentData);
                 this_3.updateTaskData(parentData);
             }
@@ -1951,6 +1980,9 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
         if (!isNullOrUndefined(data[taskSettings.child]) && data[taskSettings.child].length > 0) {
             this.parent.setRecordValue('hasChildRecords', true, ganttData);
             this.parent.setRecordValue('isMilestone', false, ganttProperties, true);
+            if (!this.parent.allowParentDependency) {
+                this.resetDependency(ganttData);
+            }
         }
         else {
             this.parent.setRecordValue('hasChildRecords', false, ganttData);
@@ -2351,6 +2383,16 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
                 }
             }
         }
+        if (!this.parent.autoCalculateDateScheduling) {
+            if (!isNullOrUndefined(ganttData.ganttProperties.startDate)) {
+                ganttData[this.parent.taskFields.startDate] = ganttData.ganttProperties.startDate;
+                ganttData.taskData[this.parent.taskFields.startDate] = ganttData.ganttProperties.startDate;
+            }
+            if (!isNullOrUndefined(ganttData.ganttProperties.endDate)) {
+                ganttData[this.parent.taskFields.endDate] = ganttData.ganttProperties.endDate;
+                ganttData.taskData[this.parent.taskFields.endDate] = ganttData.ganttProperties.endDate;
+            }
+        }
         if (!isNullOrUndefined(segments)) {
             this.parent.setRecordValue('segments', this.setSegmentsInfo(ganttData, true), ganttProperties, true);
         }
@@ -3344,7 +3386,7 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
                 var rangeObj_1 = {};
                 if (this._isInStartDateRange(cStartDate, tStartDate, tEndDate) || this._isInEndDateRange(cEndDate, tStartDate, tEndDate)) {
                     if ((tStartDate.getTime() > cStartDate.getTime() && tStartDate.getTime() < cEndDate.getTime()
-                        && tEndDate.getTime() > cStartDate.getTime() && tEndDate.getTime() > cEndDate.getTime())
+                        && tEndDate.getTime() > cStartDate.getTime() && tEndDate.getTime() >= cEndDate.getTime())
                         || (cStartDate.getTime() === tStartDate.getTime() && cEndDate.getTime() <= tEndDate.getTime())) {
                         rangeObj_1.from = tStartDate;
                         rangeObj_1.to = cEndDate;
@@ -3625,7 +3667,7 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
      */
     TaskProcessor.prototype.updateTaskLeftWidth = function (data) {
         var task = data.ganttProperties;
-        if (!data.hasChildRecords) {
+        if (!data.hasChildRecords || !this.parent.autoCalculateDateScheduling) {
             this.updateWidthLeft(data);
         }
         this.parent.setRecordValue('baselineLeft', this.calculateBaselineLeft(task), task, true);
@@ -3637,7 +3679,12 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
             childData = parentItem.childRecords;
         }
         if (parentItem && childData.indexOf(data) === childData.length - 1 && !data.hasChildRecords && this.parent.enableValidation) {
-            this.updateParentItems(parentItem);
+            if (this.parent.autoCalculateDateScheduling || this.parent.viewType === "ResourceView") {
+                this.updateParentItems(parentItem);
+            }
+            if (!this.parent.autoCalculateDateScheduling) {
+                this.updateWidthLeft(parentItem);
+            }
         }
         else if (parentItem && !this.parent.enableValidation) {
             this.updateWidthLeft(parentItem);
@@ -3780,105 +3827,119 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
         var parentData = isParent ? cloneParent : this.parent.getParentTask(cloneParent);
         var deleteUpdate = false;
         var ganttProp = parentData.ganttProperties;
-        if (parentData.childRecords.length > 0) {
-            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 totalDuration = 0;
-            var progressValues = {};
-            var minStartDate = null;
-            var maxEndDate = null;
-            var milestoneCount = 0;
-            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') {
-                        deleteUpdate = true;
+        if (this.parent.autoCalculateDateScheduling || this.parent.viewType === "ResourceView") {
+            if (parentData.childRecords.length > 0) {
+                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 totalDuration = 0;
+                var progressValues = {};
+                var minStartDate = null;
+                var maxEndDate = null;
+                var milestoneCount = 0;
+                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') {
+                            deleteUpdate = true;
+                        }
+                        continue;
                     }
-                    continue;
-                }
-                var startDate = this.getValidStartDate(childData.ganttProperties);
-                if (parentData.hasChildRecords && !ganttProp.isAutoSchedule && !isNullOrUndefined(childData.ganttProperties.autoStartDate)) {
-                    startDate = childData.ganttProperties.autoStartDate;
-                }
-                var endDate = this.getValidEndDate(childData.ganttProperties);
-                if (parentData.hasChildRecords && !ganttProp.isAutoSchedule && !isNullOrUndefined(childData.ganttProperties.autoEndDate)) {
-                    endDate = childData.ganttProperties.autoEndDate;
-                }
-                if (isNullOrUndefined(minStartDate)) {
-                    minStartDate = this.getDateFromFormat(startDate);
-                }
-                if (isNullOrUndefined(maxEndDate)) {
-                    maxEndDate = this.getDateFromFormat(endDate);
-                }
-                if (!isNullOrUndefined(endDate) && this.compareDates(endDate, maxEndDate) === 1) {
-                    maxEndDate = this.getDateFromFormat(endDate);
-                }
-                if (!isNullOrUndefined(startDate) && this.compareDates(startDate, minStartDate) === -1) {
-                    minStartDate = this.getDateFromFormat(startDate);
-                }
-                if (!childData.ganttProperties.isMilestone && isScheduledTask(childData.ganttProperties)) {
-                    progressValues = this.getParentProgress(childData);
-                    totalProgress += getValue('totalProgress', progressValues);
-                    if (childData[this.parent.taskFields.duration] < 1) {
-                        totalDuration += getValue('totalDuration', progressValues);
-                        totalDuration = Number(totalDuration.toFixed(4));
+                    var startDate = this.getValidStartDate(childData.ganttProperties);
+                    if (parentData.hasChildRecords && !ganttProp.isAutoSchedule && !isNullOrUndefined(childData.ganttProperties.autoStartDate)) {
+                        startDate = childData.ganttProperties.autoStartDate;
+                    }
+                    var endDate = this.getValidEndDate(childData.ganttProperties);
+                    if (parentData.hasChildRecords && !ganttProp.isAutoSchedule && !isNullOrUndefined(childData.ganttProperties.autoEndDate)) {
+                        endDate = childData.ganttProperties.autoEndDate;
+                    }
+                    if (isNullOrUndefined(minStartDate)) {
+                        minStartDate = this.getDateFromFormat(startDate);
+                    }
+                    if (isNullOrUndefined(maxEndDate)) {
+                        maxEndDate = this.getDateFromFormat(endDate);
+                    }
+                    if (!isNullOrUndefined(endDate) && this.compareDates(endDate, maxEndDate) === 1) {
+                        maxEndDate = this.getDateFromFormat(endDate);
+                    }
+                    if (!isNullOrUndefined(startDate) && this.compareDates(startDate, minStartDate) === -1) {
+                        minStartDate = this.getDateFromFormat(startDate);
+                    }
+                    if (!childData.ganttProperties.isMilestone && isScheduledTask(childData.ganttProperties)) {
+                        progressValues = this.getParentProgress(childData);
+                        totalProgress += getValue('totalProgress', progressValues);
+                        if (childData[this.parent.taskFields.duration] < 1) {
+                            totalDuration += getValue('totalDuration', progressValues);
+                            totalDuration = Number(totalDuration.toFixed(4));
+                        }
+                        else {
+                            totalDuration += getValue('totalDuration', progressValues);
+                        }
                     }
                     else {
-                        totalDuration += getValue('totalDuration', progressValues);
+                        milestoneCount++;
                     }
+                    childCompletedWorks += childData.ganttProperties.work;
                 }
-                else {
-                    milestoneCount++;
-                }
-                childCompletedWorks += childData.ganttProperties.work;
-            }
-            if (!deleteUpdate) {
-                if (this.compareDates(previousStartDate, minStartDate) !== 0) {
-                    this.parent.setRecordValue(ganttProp.isAutoSchedule ? 'startDate' : 'autoStartDate', minStartDate, parentData.ganttProperties, true);
-                }
-                if (this.compareDates(previousEndDate, maxEndDate) !== 0) {
-                    this.parent.setRecordValue(ganttProp.isAutoSchedule ? 'endDate' : 'autoEndDate', maxEndDate, parentData.ganttProperties, true);
-                }
-                var taskCount = void 0;
-                if (this.parent.isOnDelete && childData.isDelete) {
-                    taskCount = childLength - milestoneCount - 1;
-                }
-                else {
-                    taskCount = childLength - milestoneCount;
-                }
-                var parentProgress = (taskCount > 0 && totalDuration > 0) ? (totalProgress / totalDuration) : 0;
-                var parentProp = parentData.ganttProperties;
-                var milestone = (taskCount === 0) && minStartDate && maxEndDate &&
-                    minStartDate.getTime() === maxEndDate.getTime() ? true : false;
-                this.parent.setRecordValue('isMilestone', milestone, parentProp, true);
-                if (parentProp.isAutoSchedule) {
-                    this.calculateDuration(parentData);
-                }
-                this.updateWorkWithDuration(parentData);
-                var parentWork = parentProp.work;
-                parentWork = this.parent.isOnEdit ? parentWork : (parentWork + childCompletedWorks);
-                this.parent.setRecordValue('work', parentWork, parentProp, true);
-                this.parent.setRecordValue('taskType', 'FixedDuration', parentProp, true);
-                if (!isNullOrUndefined(this.parent.taskFields.type)) {
-                    this.updateMappingData(parentData, 'type');
-                }
-                this.parent.setRecordValue('progress', Math.floor(parentProgress), parentProp, true);
-                this.parent.setRecordValue('totalProgress', totalProgress, parentProp, true);
-                this.parent.setRecordValue('totalDuration', totalDuration, parentProp, true);
-                if (!parentProp.isAutoSchedule) {
-                    this.parent.setRecordValue('autoDuration', this.calculateAutoDuration(parentProp), parentProp, true);
-                    this.updateAutoWidthLeft(parentData);
+                if (!deleteUpdate) {
+                    var taskCount = void 0;
+                    if (this.parent.isOnDelete && childData.isDelete) {
+                        taskCount = childLength - milestoneCount - 1;
+                    }
+                    else {
+                        taskCount = childLength - milestoneCount;
+                    }
+                    var parentProgress = (taskCount > 0 && totalDuration > 0) ? (totalProgress / totalDuration) : 0;
+                    var parentProp = parentData.ganttProperties;
+                    var milestone = (taskCount === 0) && minStartDate && maxEndDate &&
+                        minStartDate.getTime() === maxEndDate.getTime() ? true : false;
+                    if (this.compareDates(previousStartDate, minStartDate) !== 0) {
+                        this.parent.setRecordValue(ganttProp.isAutoSchedule ? 'startDate' : 'autoStartDate', minStartDate, parentData.ganttProperties, true);
+                        if ((((!isNullOrUndefined(ganttProp.autoDuration)) ? ganttProp.autoDuration === 0 : ganttProp.duration === 0)) && parentData['isManual'] && milestone) {
+                            this.parent.setRecordValue('startDate', minStartDate, parentData.ganttProperties, true);
+                        }
+                    }
+                    if (this.compareDates(previousEndDate, maxEndDate) !== 0) {
+                        this.parent.setRecordValue(ganttProp.isAutoSchedule ? 'endDate' : 'autoEndDate', maxEndDate, parentData.ganttProperties, true);
+                        if ((((!isNullOrUndefined(ganttProp.autoDuration)) ? ganttProp.autoDuration === 0 : ganttProp.duration === 0)) && parentData['isManual'] && milestone) {
+                            this.parent.setRecordValue('endDate', maxEndDate, parentData.ganttProperties, true);
+                        }
+                    }
+                    this.parent.setRecordValue('isMilestone', milestone, parentProp, true);
+                    if (parentProp.isAutoSchedule) {
+                        this.calculateDuration(parentData);
+                    }
+                    this.updateWorkWithDuration(parentData);
+                    var parentWork = parentProp.work;
+                    parentWork = this.parent.isOnEdit ? parentWork : (parentWork + childCompletedWorks);
+                    this.parent.setRecordValue('work', parentWork, parentProp, true);
+                    this.parent.setRecordValue('taskType', 'FixedDuration', parentProp, true);
+                    if (!isNullOrUndefined(this.parent.taskFields.type)) {
+                        this.updateMappingData(parentData, 'type');
+                    }
+                    this.parent.setRecordValue('progress', Math.floor(parentProgress), parentProp, true);
+                    this.parent.setRecordValue('totalProgress', totalProgress, parentProp, true);
+                    this.parent.setRecordValue('totalDuration', totalDuration, parentProp, true);
+                    if (!parentProp.isAutoSchedule) {
+                        this.parent.setRecordValue('autoDuration', this.calculateAutoDuration(parentProp), parentProp, true);
+                        this.updateAutoWidthLeft(parentData);
+                    }
+                    if (!this.parent.allowParentDependency) {
+                        this.resetDependency(parentData);
+                    }
+                    this.updateWidthLeft(parentData);
+                    this.updateTaskData(parentData);
                 }
-                this.updateWidthLeft(parentData);
-                this.updateTaskData(parentData);
             }
         }
+        else {
+            parentData.ganttProperties.endDate = parentData.taskData[this.parent.taskFields.endDate];
+        }
         if (deleteUpdate && parentData.childRecords.length === 1 && parentData.ganttProperties.duration === 0) {
             this.parent.setRecordValue('isMilestone', true, parentData.ganttProperties, true);
             this.updateWidthLeft(parentData);
@@ -3886,7 +3947,9 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
         }
         var parentItem = this.parent.getParentTask(parentData.parentItem);
         if (parentItem) {
-            this.updateParentItems(parentItem);
+            if (this.parent.autoCalculateDateScheduling || this.parent.viewType === "ResourceView") {
+                this.updateParentItems(parentItem);
+            }
         }
         deleteUpdate = false;
     };
@@ -4141,9 +4204,19 @@ var ChartScroll = /** @__PURE__ @class */ (function () {
         var parent = this.parent;
         setTimeout(function () {
             parent.hideMaskRow();
+            if (parent.viewType === 'ResourceView' && !parent.allowTaskbarOverlap && parent.showOverAllocation) {
+                for (var i = 0; i < parent.currentViewData.length; i++) {
+                    var tr = parent.chartRowsModule.ganttChartTableBody.childNodes[i];
+                    if (tr['style'].display !== 'none' && parent.currentViewData[i].hasChildRecords && !parent.currentViewData[i].expanded) {
+                        parent.treeGrid.getRowByIndex(i)['style'].height = tr['style'].height;
+                    }
+                }
+                parent.contentHeight = parent.enableRtl ? parent['element'].getElementsByClassName('e-content')[2].children[0]['offsetHeight'] :
+                    parent['element'].getElementsByClassName('e-content')[0].children[0]['offsetHeight'];
+                document.getElementsByClassName('e-chart-rows-container')[0]['style'].height = parent.contentHeight + 'px';
+            }
         }, 0);
     };
-    
     ChartScroll.prototype.updateShimmer = function () {
         var parent = this.parent;
         setTimeout(function () {
@@ -4183,11 +4256,11 @@ var ChartScroll = /** @__PURE__ @class */ (function () {
             scrollArgs.scrollDirection = 'Horizontal';
             scrollArgs.action = 'HorizontalScroll';
         }
-        if ((scrollArgs.scrollDirection != 'Horizontal' && !isNullOrUndefined(scrollArgs.scrollDirection)) && this.parent.enableVirtualization === true && (this.parent.isToolBarClick
+        if ((scrollArgs.scrollDirection !== 'Horizontal' && !isNullOrUndefined(scrollArgs.scrollDirection)) && this.parent.enableVirtualization === true && (this.parent.isToolBarClick
             || isNullOrUndefined(this.parent.isToolBarClick))) {
             this.parent.isVirtualScroll = true;
             if (this.parent.showIndicator || isNullOrUndefined(this.parent.showIndicator)) {
-                if (!this.parent.enableVirtualMaskRow && this.parent.enableVirtualization && this.parent.loadingIndicator.indicatorType === "Spinner") {
+                if (!this.parent.enableVirtualMaskRow && this.parent.enableVirtualization && this.parent.loadingIndicator.indicatorType === 'Spinner') {
                     this.updateSpinner();
                 }
             }
@@ -4231,11 +4304,12 @@ var ChartScroll = /** @__PURE__ @class */ (function () {
      * To set scroll left for chart scroll container
      *
      * @param {number} scrollLeft  - To set scroll left for scroll container
+     * @param {number} leftSign - specifies left sign
      * @returns {void} .
      */
     ChartScroll.prototype.setScrollLeft = function (scrollLeft, leftSign) {
         if (leftSign) {
-            scrollLeft = leftSign == -1 && this.parent.enableRtl ? -scrollLeft : scrollLeft;
+            scrollLeft = leftSign === -1 && this.parent.enableRtl ? -scrollLeft : scrollLeft;
         }
         this.element.scrollLeft = scrollLeft;
         this.parent.ganttChartModule.chartTimelineContainer.scrollLeft = this.element.scrollLeft;
@@ -4393,9 +4467,11 @@ var GanttChart = /** @__PURE__ @class */ (function () {
                 }
                 else {
                     if (this.parent.viewType === 'ProjectView') {
-                        this.parent.chartRowsModule.ganttChartTableBody.children[i].children[0].children[1].children[1].setAttribute('tabindex', '-1');
+                        if (!isNullOrUndefined(this.parent.chartRowsModule.ganttChartTableBody.children[parseInt(i.toString(), 10)].children[0].children[1].children[1])) {
+                            this.parent.chartRowsModule.ganttChartTableBody.children[i].children[0].children[1].children[1].setAttribute('tabindex', '-1');
+                        }
                     }
-                    else if (this.parent.chartRowsModule.ganttChartTableBody.children[i].children[0].children[1].children[0]) {
+                    else if (this.parent.chartRowsModule.ganttChartTableBody.children[parseInt(i.toString(), 10)].children[0].children[1].children[0]) {
                         this.parent.chartRowsModule.ganttChartTableBody.children[i].children[0].children[1].children[0].setAttribute('tabindex', '-1');
                     }
                 }
@@ -4448,7 +4524,14 @@ var GanttChart = /** @__PURE__ @class */ (function () {
             Math.floor((this.parent.rowHeight - this.parent.chartRowsModule.taskBarHeight));
     };
     GanttChart.prototype.renderRange = function (rangeCollection, currentRecord) {
-        var topValue = this.getTopValue(currentRecord);
+        var topValue = 0;
+        var rowIndex = this.parent.currentViewData.indexOf(currentRecord);
+        if (!this.parent.allowTaskbarOverlap && this.parent.enableMultiTaskbar) {
+            topValue = !currentRecord.expanded ? this.parent.getRowByIndex(rowIndex).offsetTop : this.parent.getRowByIndex(rowIndex).offsetTop + this.parent.rowHeight;
+        }
+        else {
+            topValue = this.getTopValue(currentRecord);
+        }
         var sameIDElement = this.rangeViewContainer.querySelector('.' + 'rangeContainer' + currentRecord.ganttProperties.rowUniqueID);
         if (sameIDElement) {
             sameIDElement.remove();
@@ -4461,7 +4544,14 @@ var GanttChart = /** @__PURE__ @class */ (function () {
             return;
         }
         for (var i = 0; i < rangeCollection.length; i++) {
-            var height = this.getRangeHeight(currentRecord);
+            var height = void 0;
+            if (!this.parent.allowTaskbarOverlap && !currentRecord.expanded && this.parent.enableMultiTaskbar) {
+                height = parseInt(this.parent.chartRowsModule.ganttChartTableBody.childNodes[rowIndex].style.height) -
+                    (this.parent.rowHeight - this.parent.chartRowsModule.taskBarHeight);
+            }
+            else {
+                height = this.getRangeHeight(currentRecord);
+            }
             var leftDiv = createElement('div', {
                 className: rangeChildContainer + ' ' + 'e-leftarc', styles: (this.parent.enableRtl ? 'right:' : 'left:') +
                     ((this.parent.enableRtl ? rangeCollection[i].left + rangeCollection[i].width - 5 : rangeCollection[i].left) + "px;\n                top: " + Math.floor((this.parent.rowHeight - this.parent.chartRowsModule.taskBarHeight) / 2) + "px;\n                height: " + (height + 1) + "px; border-right: 0px")
@@ -5778,7 +5868,7 @@ var Timeline = /** @__PURE__ @class */ (function () {
             else {
                 var value = property === 'topTier' ? 'bottomTier' : 'topTier';
                 var assignValue = 'bottomTier';
-                if (newTimeline[assignValue].unit != "None") {
+                if (newTimeline["" + assignValue].unit != "None") {
                     _this.customTimelineSettings[value] = __assign({}, newTimeline[assignValue]);
                 }
             }
@@ -6081,7 +6171,7 @@ var Timeline = /** @__PURE__ @class */ (function () {
             else {
                 secondValue = sortedUnitLevels[i + 1];
             }
-            if (count >= firstValue[tier].count) {
+            if (count >= firstValue["" + tier].count) {
                 currentZoomCollection = sortedUnitLevels[i];
                 checkSameCountLevels = sortedUnitLevels.filter(function (tempLevel) {
                     if (tier === "bottomTier") {
@@ -6099,7 +6189,7 @@ var Timeline = /** @__PURE__ @class */ (function () {
                 }
                 break;
             }
-            else if (count < firstValue[tier].count && count > secondValue[tier].count) {
+            else if (count < firstValue["" + tier].count && count > secondValue["" + tier].count) {
                 currentZoomCollection = sortedUnitLevels[i + 1];
                 checkSameCountLevels = sortedUnitLevels.filter(function (tempLevel) {
                     if (tier === "bottomTier") {
@@ -7182,6 +7272,15 @@ var GanttTreeGrid = /** @__PURE__ @class */ (function () {
         this.columnMenuOpen = function (args) {
             _this.parent.notify('columnMenuOpen', args);
             _this.parent.trigger('columnMenuOpen', args);
+            document.querySelector(".e-colmenu").addEventListener('mousemove', function (event) {
+                var filPopOptions = document.querySelector(".e-filter-popup");
+                var filOptions = document.querySelector(".e-filter-item");
+                if (!isNullOrUndefined(filPopOptions)) {
+                    if (!filOptions.classList.contains('e-focused')) {
+                        remove(_this.parent.filterModule.filterMenuElement);
+                    }
+                }
+            });
         };
         this.columnMenuClick = function (args) {
             _this.parent.trigger('columnMenuClick', args);
@@ -7213,6 +7312,7 @@ var GanttTreeGrid = /** @__PURE__ @class */ (function () {
         this.parent.treeGrid = new TreeGrid();
         this.parent.treeGrid.allowSelection = false;
         this.parent.treeGrid.allowKeyboard = this.parent.allowKeyboard;
+        this.parent.treeGrid['${enableHtmlSanitizer}'] = this.parent.enableHtmlSanitizer;
         this.parent.treeGrid.enableImmutableMode = this.parent.enableImmutableMode;
         this.treeGridColumns = [];
         if (!this.parent.isLocaleChanged && this.parent.isLoad) {
@@ -7403,6 +7503,12 @@ var GanttTreeGrid = /** @__PURE__ @class */ (function () {
         if (!this.parent.ganttChartModule.isExpandCollapseFromChart && !this.parent.isExpandCollapseLevelMethod) {
             var collapsedArgs = this.createExpandCollapseArgs(args);
             this.parent.ganttChartModule.collapsedGanttRow(collapsedArgs);
+            if (this.parent.viewType === 'ResourceView' && !this.parent.allowTaskbarOverlap && 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'];
+                document.getElementsByClassName('e-chart-rows-container')[0]['style'].height = this.parent.contentHeight + 'px';
+            }
         }
         if (!isNullOrUndefined(this.parent.loadingIndicator) && this.parent.loadingIndicator.indicatorType === "Shimmer") {
             this.parent.hideMaskRow();
@@ -7416,6 +7522,12 @@ var GanttTreeGrid = /** @__PURE__ @class */ (function () {
             if (!args['data'].length) {
                 var expandedArgs = this.createExpandCollapseArgs(args);
                 this.parent.ganttChartModule.expandedGanttRow(expandedArgs);
+                if (this.parent.viewType === 'ResourceView' && !this.parent.allowTaskbarOverlap && 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'];
+                    document.getElementsByClassName('e-chart-rows-container')[0]['style'].height = this.parent.contentHeight + 'px';
+                }
             }
         }
         if (!isNullOrUndefined(this.parent.loadingIndicator) && this.parent.loadingIndicator.indicatorType === "Shimmer") {
@@ -7508,6 +7620,14 @@ var GanttTreeGrid = /** @__PURE__ @class */ (function () {
             this.parent.addDeleteRecord = false;
         }
         this.parent.trigger('actionComplete', updatedArgs);
+        if (this.parent.viewType === 'ResourceView' && !this.parent.allowTaskbarOverlap && this.parent.showOverAllocation) {
+            for (var i = 0; i < this.parent.currentViewData.length; i++) {
+                if (this.parent.currentViewData[i].hasChildRecords && !this.parent.currentViewData[i].expanded) {
+                    this.parent.chartRowsModule.updateDragDropRecords(this.parent.currentViewData[i]);
+                }
+            }
+            this.parent.ganttChartModule.renderRangeContainer(this.parent.currentViewData);
+        }
         if (!isNullOrUndefined(this.parent.loadingIndicator) && this.parent.loadingIndicator.indicatorType === "Shimmer") {
             this.parent.hideMaskRow();
         }
@@ -8990,8 +9110,12 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                 }
             }
             else {
-                labelString = this.getTaskLabel(this.parent.labelSettings.taskLabel);
+                var field = this.parent.labelSettings.taskLabel;
+                labelString = this.getTaskLabel(field);
                 labelString = labelString === 'isCustomTemplate' ? this.parent.labelSettings.taskLabel : labelString;
+                if (this.parent.enableHtmlSanitizer && typeof (labelString) === 'string') {
+                    labelString = SanitizeHtmlHelper.sanitize(labelString);
+                }
             }
             if (labelString.indexOf('null') === -1) {
                 if (this.getTaskLabel(this.parent.labelSettings.taskLabel) === 'isCustomTemplate' &&
@@ -9003,7 +9127,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                         (this.taskBarHeight - 1) + 'px; text-align:' + (this.parent.enableRtl ? 'right;' : 'left;') +
                         'display:' + 'inline-block;' +
                         'width:' + (data.ganttProperties.width - 10) + 'px; height:' +
-                        this.taskBarHeight + 'px;">' + labelString + '</span>';
+                        this.taskBarHeight + 'px;"></span>';
                 }
                 else {
                     taskLabel$$1 = '<span class="' + taskLabel + '" style="line-height:' +
@@ -9011,7 +9135,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                         (this.parent.enableRtl ? 'right;' : 'left;')) : '') +
                         +(this.parent.viewType === 'ResourceView' ? 'display:inline-flex;' : '') +
                         +(this.parent.viewType === 'ResourceView' ? (data.ganttProperties.width - 10) : '') + 'px; height:' +
-                        this.taskBarHeight + 'px;">' + labelString + '</span>';
+                        this.taskBarHeight + 'px;"></span>';
                 }
             }
             var template = !isNullOrUndefined(data.ganttProperties.segments) && data.ganttProperties.segments.length > 0 ?
@@ -9037,6 +9161,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                     data.ganttProperties.segments.length === 0))) {
                 if (template !== '' && !isNullOrUndefined(progressDiv) && progressDiv.length > 0) {
                     var templateElement = this.createDivElement(template)[0];
+                    templateElement.innerText = labelString;
                     var childLabel = this.parent.labelSettings.taskLabel;
                     if (childLabel && childLabel['elementRef'])
                         templateElement.appendChild(tempDiv);
@@ -9519,6 +9644,11 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
             if (labelString) {
                 labelString = labelString === 'isCustomTemplate' ? field : labelString;
                 leftLabelTemplateNode = this.getLableText(labelString, leftLabelInnerDiv);
+                if (this.parent.enableHtmlSanitizer && typeof (labelString) === 'string') {
+                    labelString = SanitizeHtmlHelper.sanitize(labelString);
+                    labelString = labelString === 'isCustomTemplate' ? field : labelString;
+                    leftLabelTemplateNode = this.getLableText(labelString, leftLabelInnerDiv);
+                }
             }
         }
         if (leftLabelTemplateNode && leftLabelTemplateNode.length > 0) {
@@ -9569,6 +9699,11 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
             if (labelString) {
                 labelString = labelString === 'isCustomTemplate' ? field : labelString;
                 rightLabelTemplateNode = this.getLableText(labelString, rightLabelInnerDiv);
+                if (this.parent.enableHtmlSanitizer && typeof (labelString) === 'string') {
+                    labelString = SanitizeHtmlHelper.sanitize(labelString);
+                    labelString = labelString === 'isCustomTemplate' ? field : labelString;
+                    rightLabelTemplateNode = this.getLableText(labelString, rightLabelInnerDiv);
+                }
             }
         }
         if (rightLabelTemplateNode && rightLabelTemplateNode.length > 0) {
@@ -9620,7 +9755,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
             '<div class="' + manualParentMilestoneBottom + '" style="top:' +
             (this.milesStoneRadius) + 'px;border-right-width:' + this.milesStoneRadius + 'px; border-left-width:' +
             this.milesStoneRadius + 'px; border-top-width:' + this.milesStoneRadius + 'px;"></div></div>';
-        return this.createDivElement(data.ganttProperties.width === 0 ? milestoneTemplate : template);
+        return this.createDivElement(data.ganttProperties.width === 0 ? milestoneTemplate : !data.ganttProperties.isMilestone ? template : null);
     };
     /**
      * To get parent taskbar node.
@@ -9664,6 +9799,9 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
             else {
                 labelString = this.getTaskLabel(this.parent.labelSettings.taskLabel);
                 labelString = labelString === 'isCustomTemplate' ? this.parent.labelSettings.taskLabel : labelString;
+                if (this.parent.enableHtmlSanitizer && typeof (labelString) === 'string') {
+                    labelString = SanitizeHtmlHelper.sanitize(labelString);
+                }
             }
             if (labelString.indexOf('null') === -1) {
                 if (this.getTaskLabel(this.parent.labelSettings.taskLabel) === 'isCustomTemplate' &&
@@ -9676,7 +9814,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                         'px; text-align:' + (this.parent.enableRtl ? 'right;' : 'left;') +
                         'display:' + 'inline-block;' +
                         'width:' + (data.ganttProperties.width - 10) + 'px; height:' +
-                        this.taskBarHeight + 'px;">' + labelString + '</span>';
+                        this.taskBarHeight + 'px;"></span>';
                 }
                 else {
                     labelDiv = '<span class="' +
@@ -9686,9 +9824,10 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                         (this.parent.viewType === 'ResourceView' ? 'width:' + (data.ganttProperties.width - 10) : '') + 'px; height:' +
                         (this.taskBarHeight - 1) + 'px;' + (this.parent.viewType === 'ResourceView' ? 'display: inline-flex;' : '') +
                         (this.parent.viewType === 'ResourceView' ? 'width:' + (data.ganttProperties.width - 10) : '') + 'px; height:' +
-                        this.taskBarHeight + 'px;">' + labelString + '</span>';
+                        this.taskBarHeight + 'px;"></span>';
                 }
                 var labelElement = this.createDivElement(labelDiv)[0];
+                labelElement.innerText = labelString;
                 var parentLabel = this.parent.labelSettings.taskLabel;
                 if (parentLabel && parentLabel['elementRef'])
                     labelElement.appendChild(div);
@@ -9855,7 +9994,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         var mileStoneLeft = -(this.connectorPointWidth + 2);
         var pointerTop = Math.floor(this.milesStoneRadius - (this.connectorPointWidth / 2));
         var marginTop;
-        if ((!this.templateData.ganttProperties.isAutoSchedule && this.templateData.hasChildRecords)) {
+        if ((!this.templateData.ganttProperties.isAutoSchedule && this.templateData.hasChildRecords) && this.parent.allowParentDependency) {
             marginTop = '';
         }
         else {
@@ -9874,7 +10013,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         var pointerRight = this.parent.isAdaptive ? 10 : -2;
         var pointerTop = Math.floor(this.milesStoneRadius - (this.connectorPointWidth / 2));
         var marginTop;
-        if ((!this.templateData.ganttProperties.isAutoSchedule && this.templateData.hasChildRecords)) {
+        if ((!this.templateData.ganttProperties.isAutoSchedule && this.templateData.hasChildRecords) && this.parent.allowParentDependency) {
             marginTop = '';
         }
         else {
@@ -10163,6 +10302,9 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         this.parent.renderTemplates();
         this.triggerQueryTaskbarInfo();
         this.parent.modifiedRecords = [];
+        if (this.parent.viewType == 'ResourceView' && this.parent.showOverAllocation) {
+            this.updateOverlapped();
+        }
         if (collapsedResourceRecord.length) {
             for (var j = 0; j < collapsedResourceRecord.length; j++) {
                 if (collapsedResourceRecord[j].hasChildRecords) {
@@ -10189,22 +10331,37 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         var taskbarContainerNode = this.taskbarContainer();
         taskbarContainerNode[0].setAttribute('aria-label', this.generateAriaLabel(this.templateData));
         taskbarContainerNode[0].setAttribute('rowUniqueId', this.templateData.ganttProperties.rowUniqueID);
-        var connectorLineLeftNode = this.getLeftPointNode();
-        if ((this.templateData.ganttProperties.isAutoSchedule && this.parent.viewType === 'ProjectView') || !this.templateData.hasChildRecords) {
-            taskbarContainerNode[0].appendChild([].slice.call(connectorLineLeftNode)[0]);
+        var connectorLineLeftNode;
+        if (!this.templateData.hasChildRecords && !this.parent.allowParentDependency) {
+            var connectorLineLeftNode_1 = this.getLeftPointNode();
+            taskbarContainerNode[0].appendChild([].slice.call(connectorLineLeftNode_1)[0]);
+        }
+        else if (this.parent.allowParentDependency) {
+            connectorLineLeftNode = this.getLeftPointNode();
+            if ((this.templateData.ganttProperties.isAutoSchedule && this.parent.viewType === 'ProjectView') || !this.templateData.hasChildRecords) {
+                taskbarContainerNode[0].appendChild([].slice.call(connectorLineLeftNode)[0]);
+            }
         }
         if (this.templateData.hasChildRecords) {
             var parentTaskbarTemplateNode = this.getParentTaskbarNode(i, taskbarContainerNode);
+            var milestoneTemplateNode = this.getMilestoneNode(i, taskbarContainerNode);
             if (!this.templateData.ganttProperties.isAutoSchedule) {
                 var manualTaskbar = this.getManualTaskbar();
-                manualTaskbar[0].appendChild([].slice.call(connectorLineLeftNode)[0]);
-                var connectorLineRightNode = this.getRightPointNode();
-                manualTaskbar[0].appendChild([].slice.call(connectorLineRightNode)[0]);
-                taskbarContainerNode[0].appendChild([].slice.call(manualTaskbar)[0]);
+                if (!isNullOrUndefined(manualTaskbar[0])) {
+                    if (this.parent.allowParentDependency) {
+                        manualTaskbar[0].appendChild([].slice.call(connectorLineLeftNode)[0]);
+                        var connectorLineRightNode_1 = this.getRightPointNode();
+                        manualTaskbar[0].appendChild([].slice.call(connectorLineRightNode_1)[0]);
+                    }
+                    taskbarContainerNode[0].appendChild([].slice.call(manualTaskbar)[0]);
+                }
             }
             if (parentTaskbarTemplateNode && parentTaskbarTemplateNode.length > 0) {
                 taskbarContainerNode[0].appendChild([].slice.call(parentTaskbarTemplateNode)[0]);
             }
+            else if (milestoneTemplateNode && milestoneTemplateNode.length > 0) {
+                taskbarContainerNode[0].appendChild([].slice.call(milestoneTemplateNode)[0]);
+            }
             if (this.parent.renderBaseline && this.templateData.ganttProperties.baselineStartDate &&
                 this.templateData.ganttProperties.baselineEndDate) {
                 taskBaselineTemplateNode = ((this.templateData.ganttProperties.baselineStartDate.getTime() === this.templateData.ganttProperties.baselineEndDate.getTime()) || ((!isNullOrUndefined(this.templateData.ganttProperties.baselineStartDate) && !isNullOrUndefined(this.templateData.ganttProperties.startDate) && (this.templateData.ganttProperties.baselineStartDate.getTime() === this.templateData.ganttProperties.startDate.getTime()))
@@ -10274,8 +10431,13 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                     ? this.getMilestoneBaselineNode() : this.getTaskBaselineNode();
             }
         }
-        if ((this.templateData.ganttProperties.isAutoSchedule && this.parent.viewType === 'ProjectView') || !this.templateData.hasChildRecords) {
-            var connectorLineRightNode = this.getRightPointNode();
+        var connectorLineRightNode;
+        if (this.parent.allowParentDependency && ((this.templateData.ganttProperties.isAutoSchedule && this.parent.viewType === 'ProjectView') || !this.templateData.hasChildRecords)) {
+            connectorLineRightNode = this.getRightPointNode();
+            taskbarContainerNode[0].appendChild([].slice.call(connectorLineRightNode)[0]);
+        }
+        else if (!this.parent.allowParentDependency) {
+            connectorLineRightNode = this.getRightPointNode();
             taskbarContainerNode[0].appendChild([].slice.call(connectorLineRightNode)[0]);
         }
         var rightLabelNode = this.getRightLabelNode(i);
@@ -10296,6 +10458,10 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                 else {
                     var text = createElement('Text');
                     text.innerHTML = indicators[indicatorIndex].name;
+                    if (this.parent.enableHtmlSanitizer && typeof (indicators[indicatorIndex].name) === 'string') {
+                        indicators[indicatorIndex].name = SanitizeHtmlHelper.sanitize(indicators[indicatorIndex].name);
+                        text.innerText = indicators[indicatorIndex].name;
+                    }
                     taskIndicatorTextNode = text.childNodes;
                 }
                 taskIndicatorNode[0].appendChild([].slice.call(taskIndicatorTextNode)[0]);
@@ -10389,7 +10555,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                 getComputedStyle(trElement.querySelector(classCollections[1])).borderBottomColor :
                 (trElement.querySelector('.' + baselineBar) ? getComputedStyle(trElement.querySelector('.' + baselineBar)).backgroundColor : null);
         }
-        else {
+        else if (taskbarElement) {
             var childTask = taskbarElement.querySelector(classCollections[0]);
             var progressTask = taskbarElement.querySelector(classCollections[1]);
             args.taskbarBgColor = isNullOrUndefined(childTask) ? null : taskbarElement.classList.contains(traceChildTaskBar) ?
@@ -10468,7 +10634,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                 trElement.querySelector('.' + baselineBar).style.backgroundColor = args.baselineColor;
             }
         }
-        else {
+        else if (taskbarElement) {
             if (taskbarElement.querySelector(classCollections[0]) &&
                 getComputedStyle(taskbarElement.querySelector(classCollections[0])).backgroundColor !== args.taskbarBgColor) {
                 taskbarElement.querySelector(classCollections[0]).style.backgroundColor = args.taskbarBgColor;
@@ -10570,6 +10736,78 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         }
         return null;
     };
+    // to update the eOverlapped property
+    ChartRows.prototype.updateOverlapped = function () {
+        for (var k = 0; k < this.parent.treeGrid.parentData.length; k++) {
+            var childRecords = this.parent.treeGrid.parentData[k].childRecords;
+            for (var i = 0; i < childRecords.length; i++) {
+                if (childRecords[i + 1]) {
+                    childRecords[i].ganttProperties.eOverlapped = undefined;
+                }
+                for (var j = i + 1; j < childRecords.length; j++) {
+                    childRecords[j].ganttProperties.eOverlapped = undefined;
+                    if (childRecords[i].ganttProperties.startDate.getTime() < childRecords[j].ganttProperties.endDate.getTime() &&
+                        childRecords[i].ganttProperties.endDate.getTime() > childRecords[j].ganttProperties.startDate.getTime()) {
+                        childRecords[j].ganttProperties.eOverlapped = true;
+                        childRecords[i].ganttProperties.eOverlapped = true;
+                    }
+                    else {
+                        if (isNullOrUndefined(childRecords[j].ganttProperties.eOverlapped)) {
+                            childRecords[j].ganttProperties.eOverlapped = false;
+                        }
+                        if (isNullOrUndefined(childRecords[i].ganttProperties.eOverlapped)) {
+                            childRecords[i].ganttProperties.eOverlapped = false;
+                        }
+                    }
+                }
+            }
+        }
+    };
+    // To update the row height when allow overallocation set to false
+    ChartRows.prototype.updateDragDropRecords = function (data, tr) {
+        var childRecords = data.childRecords;
+        var rowIndex = this.parent.currentViewData.indexOf(data);
+        var treeGridContentHeight = this.parent.enableRtl ? this.parent['element'].getElementsByClassName('e-content')[2].children[0]['offsetHeight'] :
+            this.parent['element'].getElementsByClassName('e-content')[0].children[0]['offsetHeight'];
+        if (!tr) {
+            tr = this.ganttChartTableBody.childNodes[rowIndex];
+        }
+        tr['style'].height = this.parent.treeGrid.getRowByIndex(rowIndex)['style'].height = this.parent.rowHeight + 'px';
+        this.parent.contentHeight = treeGridContentHeight;
+        var rowIDs = [];
+        var rowCounts = 0;
+        if (data) {
+            for (var i = 0; i < childRecords.length; i++) {
+                for (var j = i + 1; j < childRecords.length; j++) {
+                    var taskbarContainer = tr.getElementsByClassName('e-taskbar-main-container');
+                    for (var k = 0; k < taskbarContainer.length; k++) {
+                        if (childRecords[i].ganttProperties.startDate.getTime() < childRecords[j].ganttProperties.endDate.getTime() &&
+                            childRecords[i].ganttProperties.endDate.getTime() > childRecords[j].ganttProperties.startDate.getTime()) {
+                            if (taskbarContainer[k].getAttribute('rowuniqueid') === childRecords[j]['rowUniqueID'] &&
+                                rowIDs.indexOf(childRecords[j]['rowUniqueID']) == -1) {
+                                rowIDs.push(childRecords[j]['rowUniqueID']);
+                                rowCounts++;
+                                tr.children[0]['style'].verticalAlign = 'baseline';
+                                tr.getElementsByClassName('e-taskbar-main-container')[k]['style'].marginTop = (rowCounts * this.parent.rowHeight) + this.taskBarMarginTop + 'px';
+                                tr['style'].height = this.parent.treeGrid.getRowByIndex(rowIndex)['style'].height = parseInt(tr['style'].height) + this.parent.rowHeight + 'px';
+                            }
+                        }
+                        else {
+                            if (taskbarContainer[k].getAttribute('rowuniqueid') === childRecords[j]['rowUniqueID'] &&
+                                rowIDs.indexOf(childRecords[j]['rowUniqueID']) == -1 && this.parent.rowDragAndDropModule &&
+                                this.parent.rowDragAndDropModule['draggedRecord'] && taskbarContainer[k].getAttribute('rowuniqueid') ===
+                                this.parent.rowDragAndDropModule['draggedRecord']['rowUniqueID'] && this.parent.rowDragAndDropModule['draggedRecord']['rowUniqueID'] === childRecords[j]['rowUniqueID']) {
+                                tr.getElementsByClassName('e-taskbar-main-container')[k]['style'].marginTop =
+                                    this.parent.editModule.taskbarEditModule.draggedRecordMarginTop;
+                            }
+                        }
+                    }
+                }
+            }
+            this.parent.contentHeight = treeGridContentHeight;
+            document.getElementsByClassName('e-chart-rows-container')[0]['style'].height = this.parent.contentHeight + 'px';
+        }
+    };
     /**
      * To refresh edited TR
      *
@@ -10583,14 +10821,22 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         var selectedItem = this.parent.currentViewData[index];
         if (index !== -1 && selectedItem) {
             var data = selectedItem;
+            if (!this.parent.allowTaskbarOverlap && this.parent.viewType === 'ResourceView' && data.expanded) {
+                tr['style'].height = this.parent.treeGrid.getRowByIndex(index)['style'].height = this.parent.rowHeight + 'px';
+            }
             if (this.parent.viewType === 'ResourceView' && data.hasChildRecords && !data.expanded && this.parent.enableMultiTaskbar) {
                 tr.replaceChild(this.getResourceParent(data).childNodes[0], tr.childNodes[0]);
             }
             else {
-                tr.replaceChild(this.getGanttChartRow(index, data).childNodes[0], tr.childNodes[0]);
+                if (this.parent.viewType === 'ResourceView' && this.parent.allowTaskbarDragAndDrop && !data.expanded) {
+                    tr.replaceWith(this.getGanttChartRow(index, data));
+                }
+                else {
+                    tr.replaceChild(this.getGanttChartRow(index, data).childNodes[0], tr.childNodes[0]);
+                }
             }
             this.parent.renderTemplates();
-            if (this.parent.viewType === 'ResourceView' && data.hasChildRecords && this.parent.showOverAllocation) {
+            if (this.parent.viewType === 'ResourceView' && data.hasChildRecords && this.parent.showOverAllocation && this.parent.allowTaskbarOverlap) {
                 if (isValidateRange) {
                     this.parent.ganttChartModule.renderRangeContainer(this.parent.currentViewData);
                 }
@@ -10612,6 +10858,12 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
             }
             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) {
+                this.updateDragDropRecords(selectedItem, tr);
+            }
+            if (this.parent.viewType === 'ResourceView' && data.hasChildRecords && this.parent.showOverAllocation && !this.parent.allowTaskbarOverlap) {
+                this.parent.ganttChartModule.renderRangeContainer(this.parent.currentViewData);
+            }
             var nextEditableElement = this.parent.ganttChartModule.tempNextElement;
             if (this.parent.ganttChartModule.isEditableElement && nextEditableElement) {
                 this.parent.treeGrid.grid.focusModule.focus();
@@ -10625,7 +10877,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
     ChartRows.prototype.getResourceParent = function (record) {
         var chartRows = this.parent.ganttChartModule.getChartRows();
         //Below code is for rendering taskbartemplate in resource view with multi taskbar
-        if (this.parent.initialChartRowElements) {
+        if (this.parent.initialChartRowElements && (!this.parent.allowTaskbarDragAndDrop && this.parent.allowTaskbarOverlap)) {
             for (var j = 0; j < this.parent.initialChartRowElements.length; j++) {
                 if (!isNullOrUndefined(chartRows[j])) {
                     if (!isNullOrUndefined(chartRows[j].childNodes[0].childNodes[1].childNodes[2]) &&
@@ -10653,7 +10905,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                 var id = chartRows[i].querySelector('.' + taskBarMainContainer).getAttribute('rowUniqueId');
                 var ganttData = this.parent.getRecordByID(id);
                 var zIndex = "";
-                if (ganttData && ganttData.ganttProperties.eOverlapIndex) {
+                if (ganttData && !isNullOrUndefined(ganttData.ganttProperties.eOverlapIndex)) {
                     zIndex = (ganttData.ganttProperties.eOverlapIndex).toString();
                 }
                 var cloneChildElement = cloneElement.cloneNode(true);
@@ -10801,7 +11053,9 @@ var Dependency = /** @__PURE__ @class */ (function () {
         for (var count = length; count >= 0; count--) {
             var ganttData = predecessorTasks[count];
             var ganttProp = ganttData.ganttProperties;
-            this.ensurePredecessorCollectionHelper(ganttData, ganttProp);
+            if ((!ganttData.hasChildRecords && !this.parent.allowParentDependency) || this.parent.allowParentDependency) {
+                this.ensurePredecessorCollectionHelper(ganttData, ganttProp);
+            }
         }
     };
     /**
@@ -10964,18 +11218,26 @@ var Dependency = /** @__PURE__ @class */ (function () {
                 offsetUnit: offsetUnits.durationUnit,
                 offset: offsetUnits.duration
             };
-            var fromData = _this.parent.connectorLineModule.getRecordByID(obj.to);
-            var toData = _this.parent.connectorLineModule.getRecordByID(obj.from);
-            var isValid;
-            if (_this.parent.connectorLineEditModule && toData && fromData) {
-                isValid = _this.parent.connectorLineEditModule.validateParentPredecessor(toData, fromData);
-                if (isValid)
+            var isOwnParent = _this.checkIsParent(match[0]);
+            if (!_this.parent.allowParentDependency) {
+                if (!isOwnParent) {
                     collection.push(obj);
+                }
             }
             else {
-                collection.push(obj);
+                var fromData = _this.parent.connectorLineModule.getRecordByID(obj.to);
+                var toData = _this.parent.connectorLineModule.getRecordByID(obj.from);
+                var isValid = void 0;
+                if (_this.parent.connectorLineEditModule && toData && fromData) {
+                    isValid = _this.parent.connectorLineEditModule.validateParentPredecessor(toData, fromData);
+                    if (isValid)
+                        collection.push(obj);
+                }
+                else {
+                    collection.push(obj);
+                }
+                match.splice(0);
             }
-            match.splice(0);
         });
         return collection;
     };
@@ -11098,7 +11360,9 @@ var Dependency = /** @__PURE__ @class */ (function () {
         var length = predecessorsCollection.length;
         for (var count = 0; count < length; count++) {
             ganttRecord = predecessorsCollection[count];
-            this.updatePredecessorHelper(ganttRecord, predecessorsCollection);
+            if ((!ganttRecord.hasChildRecords && !this.parent.allowParentDependency) || this.parent.allowParentDependency) {
+                this.updatePredecessorHelper(ganttRecord, predecessorsCollection);
+            }
         }
     };
     /**
@@ -11147,12 +11411,16 @@ var Dependency = /** @__PURE__ @class */ (function () {
      * @private
      */
     Dependency.prototype.updatedRecordsDateByPredecessor = function () {
+        if (!this.parent.autoCalculateDateScheduling) {
+            return;
+        }
         var flatData = this.parent.flatData;
         var totLength = this.parent.flatData.length;
         for (var count = 0; count < totLength; count++) {
             if (flatData[count].ganttProperties.predecessorsName) {
                 this.validatePredecessorDates(flatData[count]);
-                if (flatData[count].hasChildRecords && this.parent.editModule && !this.parent.allowUnscheduledTasks) {
+                if (flatData[count].hasChildRecords && this.parent.editModule && !this.parent.allowUnscheduledTasks
+                    && this.parent.allowParentDependency) {
                     this.parent.editModule['updateChildItems'](flatData[count]);
                 }
             }
@@ -11197,7 +11465,7 @@ var Dependency = /** @__PURE__ @class */ (function () {
                 var predecessor = predecessors[count];
                 parentGanttRecord = this.parent.connectorLineModule.getRecordByID(predecessor.from);
                 record = this.parent.connectorLineModule.getRecordByID(predecessor.to);
-                if (this.parent.isLoad && this.parentPredecessors.indexOf(ganttRecord) == -1
+                if (this.parent.allowParentDependency && this.parent.isLoad && this.parentPredecessors.indexOf(ganttRecord) == -1
                     && (ganttRecord.hasChildRecords || record.hasChildRecords)) {
                     this.parentPredecessors.push(ganttRecord);
                 }
@@ -11881,9 +12149,16 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
      * @private
      */
     ConnectorLine.prototype.getHeightValue = function (data) {
-        return (data.parentIndex * data.rowHeight) > (data.childIndex * data.rowHeight) ?
-            ((data.parentIndex * data.rowHeight) - (data.childIndex * data.rowHeight)) :
-            ((data.childIndex * data.rowHeight) - (data.parentIndex * data.rowHeight));
+        if (this.parent.viewType === 'ResourceView' && this.parent.showOverAllocation && !this.parent.allowTaskbarOverlap) {
+            return (data.parentIndex * this.parent.rowHeight) > (data.childIndex * this.parent.rowHeight) ?
+                ((data.parentIndex * this.parent.rowHeight) - (data.childIndex * this.parent.rowHeight)) :
+                ((data.childIndex * this.parent.rowHeight) - (data.parentIndex * this.parent.rowHeight));
+        }
+        else {
+            return (data.parentIndex * data.rowHeight) > (data.childIndex * data.rowHeight) ?
+                ((data.parentIndex * data.rowHeight) - (data.childIndex * data.rowHeight)) :
+                ((data.childIndex * data.rowHeight) - (data.parentIndex * data.rowHeight));
+        }
     };
     /**
      * To get sstype2 inner element width.
@@ -11960,7 +12235,30 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
         var heightValue = isVirtual ? connectorLine$$1.height : (height + isMilestoneValue);
         var borderTopWidth = 0;
         var addTop = 0;
-        if (this.parent.currentViewData[data.parentIndex] && this.parent.currentViewData[data.childIndex]) {
+        var parentOverlapTopValue = 0;
+        var childOverlapTopValue = 0;
+        var count = 0;
+        if (this.parent.viewType === 'ResourceView' && this.parent.showOverAllocation && !this.parent.allowTaskbarOverlap) {
+            for (var i = 0; i < this.parent.currentViewData.length; i++) {
+                if (this.parent.getRowByIndex(i).style.display != 'none') {
+                    if (count < data.parentIndex) {
+                        count++;
+                        parentOverlapTopValue = parentOverlapTopValue + this.parent.getRowByIndex(i).offsetHeight;
+                    }
+                }
+            }
+            count = 0;
+            for (var j = 0; j < this.parent.currentViewData.length; j++) {
+                if (this.parent.getRowByIndex(j).style.display != 'none') {
+                    if (count < data.childIndex) {
+                        count++;
+                        childOverlapTopValue = childOverlapTopValue + this.parent.getRowByIndex(j).offsetHeight;
+                    }
+                }
+            }
+            heightValue = Math.abs(parentOverlapTopValue - childOverlapTopValue);
+        }
+        if (this.parent.currentViewData[data.parentIndex] && this.parent.currentViewData[data.childIndex] && this.parent.allowParentDependency) {
             var fromRecordIsParent = this.parent.currentViewData[data.parentIndex].hasChildRecords;
             var toRecordIsParent = this.parent.currentViewData[data.childIndex].hasChildRecords;
             var fromRecordIsManual = this.parent.currentViewData[data.parentIndex].ganttProperties.isAutoSchedule;
@@ -12053,7 +12351,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                 this.getBorderStyles('top', this.lineStroke) + 'position:relative;"></div>';
             if (this.getParentPosition(data) === 'FSType1') {
                 div = div + direction + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FSType1">';
                 div = div + eLine;
                 div = div + direction + (isMilestoneParent ? -1 : 0) + 'px;width:' + (isMilestoneParent ?
@@ -12073,7 +12371,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                     'px;border-top-width:' + (5 + this.lineStroke) + 'px;width:0;height:0;position:relative;"></div></div>';
             }
             if (this.getParentPosition(data) === 'FSType2') {
-                div = div + direction + data.parentLeft + 'px;top:' + (isVirtual ? connectorLine$$1.top : ((data.parentIndex * data.rowHeight) + addTop +
+                div = div + direction + data.parentLeft + 'px;top:' + (isVirtual ? connectorLine$$1.top : ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop +
                     this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FSType2">';
                 div = div + eLine;
@@ -12105,7 +12403,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FSType3') {
                 div = div + direction + (data.childLeft - 20) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + addTop + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FSType3">';
                 div = div + rightArrow;
                 div = div + direction + '10px;' + this.getBorderStyles((this.parent.enableRtl ? 'right' : 'left'), 10) +
@@ -12135,7 +12433,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FSType4') {
                 div = div + direction + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FSType4">';
                 div = div + rightArrow;
                 div = div + direction + (data.childLeft - (data.parentLeft + data.parentWidth + 10)) + 'px;' +
@@ -12161,7 +12459,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SSType4') {
                 div = div + direction + (data.parentLeft - 10) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SSType4">';
                 div = div + rightArrow;
                 div = div + direction + (data.childLeft - data.parentLeft) + 'px;' + duplicateStingTwo;
@@ -12174,7 +12472,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SSType3') {
                 div = div + direction + (data.childLeft - 20) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SSType3">';
                 div = div + rightArrow;
                 div = div + direction + '10px;' + duplicateStingTwo;
@@ -12187,7 +12485,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SSType2') {
                 div = div + direction + setInnerElementLeftSSType2 + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + addTop + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SSType2">';
                 div = div + eLine;
                 div = div + 'width:' + (setInnerChildWidthSSType2 + 1) + 'px;' +
@@ -12207,7 +12505,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SSType1') {
                 div = div + direction + (data.childLeft - 20) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + addTop +
+                    ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop +
                         this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SSType1">';
                 div = div + eLine;
@@ -12225,7 +12523,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType1') {
                 div = div + direction + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + addTop + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FFType1">';
                 div = div + eLine;
                 div = div + direction + (isMilestoneParent ? (((data.parentLeft + data.parentWidth) -
@@ -12249,7 +12547,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType2') {
                 div = div + direction + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + addTop + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FFType2">';
                 div = div + eLine;
                 div = div + (isMilestoneParent ? direction + '-1px;' : '') + 'width:' +
@@ -12275,7 +12573,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType3') {
                 div = div + direction + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FFType3">';
                 div = div + duplicateStingOne;
                 div = div + eLine;
@@ -12298,7 +12596,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType4') {
                 div = div + direction + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FFType4">';
                 div = div + leftArrow;
                 div = div + (direction + ((data.childLeft + data.childWidth) -
@@ -12327,7 +12625,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType4') {
                 div = div + direction + (data.parentLeft - 10) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;width:1px;' +
+                    ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;width:1px;' +
                     'height:' + heightValue + 'px;position:absolute" data-connectortype="SFType4">';
                 div = div + duplicateStingFour + 'top:' + (-5 - this.lineStroke + (this.lineStroke - 1)) + 'px;' +
                     'border-bottom-width:' + (5 + this.lineStroke) +
@@ -12355,7 +12653,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType3') {
                 div = div + direction + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((!this.parent.allowTaskbarOverlap ? childOverlapTopValue : (data.childIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SFType3">';
                 div = div + duplicateStingOne;
                 div = div + eLine;
@@ -12373,7 +12671,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType1') {
                 div = div + direction + (data.parentLeft - 10) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SFType1">';
                 div = div + eLine;
                 div = div + 'width:11px;' + this.getBorderStyles('top', this.lineStroke) + 'position:relative;"></div>';
@@ -12398,7 +12696,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType2') {
                 div = div + direction + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + addTop + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((!this.parent.allowTaskbarOverlap ? parentOverlapTopValue : (data.parentIndex * data.rowHeight)) + addTop + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SFType2">';
                 div = div + eLine;
                 div = div + direction + (((data.parentLeft) - (data.childLeft + data.childWidth)) - 10) +
@@ -12794,7 +13092,7 @@ var Tooltip$1 = /** @__PURE__ @class */ (function () {
         this.toolTipObj.position = 'BottomCenter';
         this.toolTipObj.openDelay = 700;
         this.toolTipObj.enableRtl = this.parent.enableRtl;
-        this.toolTipObj.enableHtmlSanitizer = false;
+        this.toolTipObj.enableHtmlSanitizer = this.parent.enableHtmlSanitizer;
         this.toolTipObj.cssClass = ganttTooltip;
         this.toolTipObj.animation = { open: { effect: 'None', delay: 0 }, close: { effect: 'None', delay: 0 } };
         this.toolTipObj.afterOpen = this.updateTooltipPosition.bind(this);
@@ -13007,8 +13305,12 @@ var Tooltip$1 = /** @__PURE__ @class */ (function () {
         var taskName;
         if (ganttData) {
             data = ganttData.ganttProperties;
-            taskName = !isNullOrUndefined(data.taskName) ? '<tr class = "e-gantt-tooltip-rowcell"><td colspan="3">' +
-                (this.parent.disableHtmlEncode ? data.taskName.replace(/</g, "&lt;").replace(/>/g, "&gt;") : data.taskName) + '</td></tr>' : '';
+            var taskNameValue = data.taskName;
+            if (this.parent.enableHtmlSanitizer && typeof (taskNameValue) === 'string') {
+                taskNameValue = SanitizeHtmlHelper.sanitize(taskNameValue);
+            }
+            taskName = !isNullOrUndefined(taskNameValue) ? '<tr class = "e-gantt-tooltip-rowcell"><td colspan="3">' +
+                (this.parent.disableHtmlEncode ? taskNameValue.replace(/</g, "&lt;").replace(/>/g, "&gt;") : taskNameValue) + '</td></tr>' : '';
         }
         switch (elementType) {
             case 'milestone':
@@ -13020,9 +13322,13 @@ var Tooltip$1 = /** @__PURE__ @class */ (function () {
                     else if (!isNullOrUndefined(data.startDate)) {
                         milestoneStartDate = data.startDate;
                     }
+                    var sDateValue = this.parent.getFormatedDate(milestoneStartDate, this.parent.getDateFormat());
+                    if (this.parent.enableHtmlSanitizer && typeof (sDateValue) === 'string') {
+                        sDateValue = SanitizeHtmlHelper.sanitize(sDateValue);
+                    }
                     var sDate = !isNullOrUndefined(milestoneStartDate) ? '<tr><td class = "e-gantt-tooltip-label"> Date</td><td>:</td>' +
                         '<td class = "e-gantt-tooltip-value">' +
-                        this.parent.getFormatedDate(milestoneStartDate, this.parent.getDateFormat()) + '</td></tr>' : '';
+                        sDateValue + '</td></tr>' : '';
                     content$$1 = '<table class = "e-gantt-tooltiptable"><tbody>' +
                         taskName + sDate + '</tbody></table>';
                     break;
@@ -13030,20 +13336,28 @@ var Tooltip$1 = /** @__PURE__ @class */ (function () {
             case 'taskbar':
                 {
                     var scheduledTask = !ganttData.hasChildRecords || data.isAutoSchedule ? true : false;
+                    var startDateValue = this.parent.getFormatedDate(scheduledTask ? data.startDate : data.autoStartDate, this.parent.getDateFormat());
+                    var endDateValue = this.parent.getFormatedDate(scheduledTask ? data.endDate : data.autoEndDate, this.parent.getDateFormat());
+                    var durationValue = this.parent.getDurationString((scheduledTask ? data.duration : data.autoDuration), data.durationUnit);
+                    var progressValue = data.progress;
+                    if (this.parent.enableHtmlSanitizer) {
+                        startDateValue = typeof (startDateValue) === 'string' ? SanitizeHtmlHelper.sanitize(startDateValue) : startDateValue;
+                        endDateValue = typeof (endDateValue) === 'string' ? SanitizeHtmlHelper.sanitize(endDateValue) : endDateValue;
+                        durationValue = typeof (durationValue) === 'string' ? SanitizeHtmlHelper.sanitize(durationValue) : durationValue;
+                        progressValue = typeof (progressValue) === 'string' ? SanitizeHtmlHelper.sanitize(progressValue) : progressValue;
+                    }
                     var startDate = data.startDate ? '<tr><td class = "e-gantt-tooltip-label">' +
                         this.parent.localeObj.getConstant(scheduledTask ? 'startDate' : 'subTasksStartDate') +
-                        '</td><td>:</td>' + '<td class = "e-gantt-tooltip-value"> ' +
-                        this.parent.getFormatedDate(scheduledTask ? data.startDate : data.autoStartDate, this.parent.getDateFormat()) +
-                        '</td></tr>' : '';
+                        '</td><td>:</td>' + '<td class = "e-gantt-tooltip-value"> ' + startDateValue + '</td></tr>' : '';
                     var endDate = data.endDate ? '<tr><td class = "e-gantt-tooltip-label">' +
                         this.parent.localeObj.getConstant(scheduledTask ? 'endDate' : 'subTasksEndDate') +
-                        '</td><td>:</td><td class = "e-gantt-tooltip-value">' + this.parent.getFormatedDate(scheduledTask ? data.endDate : data.autoEndDate, this.parent.getDateFormat()) + '</td></tr>' : '';
+                        '</td><td>:</td>' + '<td class = "e-gantt-tooltip-value">' + endDateValue + '</td></tr>' : '';
                     var duration = !isNullOrUndefined(data.duration) ? '<tr><td class = "e-gantt-tooltip-label">' +
                         this.parent.localeObj.getConstant('duration') + '</td><td>:</td>' +
-                        '<td class = "e-gantt-tooltip-value"> ' + this.parent.getDurationString((scheduledTask ? data.duration : data.autoDuration), data.durationUnit) +
+                        '<td class = "e-gantt-tooltip-value"> ' + durationValue +
                         '</td></tr>' : '';
                     var progress = !isNullOrUndefined(data.progress) ? '<tr><td class = "e-gantt-tooltip-label">' +
-                        this.parent.localeObj.getConstant('progress') + '</td><td>:</td><td>' + data.progress +
+                        this.parent.localeObj.getConstant('progress') + '</td><td>:</td><td>' + progressValue +
                         '</td></tr>' : '';
                     content$$1 = '<table class = "e-gantt-tooltiptable"><tbody>' +
                         taskName + startDate + endDate + duration + progress + '</tbody></table>';
@@ -13051,82 +13365,131 @@ var Tooltip$1 = /** @__PURE__ @class */ (function () {
                 }
             case 'baseline':
                 {
+                    var baselineStartDateValue = this.parent.getFormatedDate(data.baselineStartDate, this.parent.getDateFormat());
+                    var baselineEndDateValue = this.parent.getFormatedDate(data.baselineEndDate, this.parent.getDateFormat());
+                    if (this.parent.enableHtmlSanitizer) {
+                        baselineStartDateValue = typeof (baselineStartDateValue) === 'string' ? SanitizeHtmlHelper.sanitize(baselineStartDateValue) : baselineStartDateValue;
+                        baselineEndDateValue = typeof (baselineEndDateValue) === 'string' ? SanitizeHtmlHelper.sanitize(baselineEndDateValue) : baselineEndDateValue;
+                    }
                     content$$1 = '<table class = "e-gantt-tooltiptable"><tbody>' +
                         taskName + '<tr><td class = "e-gantt-tooltip-label">' +
                         this.parent.localeObj.getConstant('baselineStartDate') + '</td><td>:</td>' + '<td class = "e-gantt-tooltip-value">' +
-                        this.parent.getFormatedDate(data.baselineStartDate, this.parent.getDateFormat()) + '</td></tr><tr>' +
+                        baselineStartDateValue + '</td></tr><tr>' +
                         '<td class = "e-gantt-tooltip-label">' + this.parent.localeObj.getConstant('baselineEndDate') +
                         '</td><td>:</td><td class = "e-gantt-tooltip-value">' +
-                        this.parent.getFormatedDate(data.baselineEndDate, this.parent.getDateFormat()) + '</td></tr></tbody></table>';
+                        baselineEndDateValue + '</td></tr></tbody></table>';
                     break;
                 }
             case 'marker':
                 {
                     var markerTooltipElement = parent.tooltipModule.getMarkerTooltipData(args);
+                    var markerTooltipElementValue = this.parent.getFormatedDate(this.parent.dateValidationModule.getDateFromFormat(markerTooltipElement.day), this.parent.getDateFormat());
                     var markerLabel = markerTooltipElement.label ? markerTooltipElement.label : '';
+                    if (this.parent.enableHtmlSanitizer) {
+                        markerLabel = typeof (markerLabel) === 'string' ? SanitizeHtmlHelper.sanitize(markerLabel) : markerLabel;
+                        markerTooltipElementValue = typeof (markerTooltipElementValue) === 'string' ? SanitizeHtmlHelper.sanitize(markerTooltipElementValue) : markerTooltipElementValue;
+                    }
                     content$$1 = '<table class = "e-gantt-tooltiptable"><tbody><tr><td>' +
-                        this.parent.getFormatedDate(this.parent.dateValidationModule.getDateFromFormat(markerTooltipElement.day), this.parent.getDateFormat()) +
-                        '</td></tr><tr><td>' +
-                        markerLabel + '</td></tr></tbody></table>';
+                        markerTooltipElementValue + '</td></tr><tr><td>' + (this.parent.disableHtmlEncode ? markerLabel.replace(/</g, "&lt;").replace(/>/g, "&gt;") : markerLabel) + '</td></tr></tbody></table>';
                     break;
                 }
             case 'connectorLine':
                 {
+                    var fromNameValue = parent.tooltipModule.predecessorTooltipData.fromName;
+                    var fromIdValue = parent.tooltipModule.predecessorTooltipData.fromId;
+                    var toNameValue = parent.tooltipModule.predecessorTooltipData.toName;
+                    var toIdValue = parent.tooltipModule.predecessorTooltipData.toId;
+                    var linkTextValue = parent.tooltipModule.predecessorTooltipData.linkText;
+                    var offsetStringValue = parent.tooltipModule.predecessorTooltipData.offsetString;
+                    if (this.parent.enableHtmlSanitizer) {
+                        fromNameValue = typeof (fromNameValue) === 'string' ? SanitizeHtmlHelper.sanitize(fromNameValue) : fromNameValue;
+                        fromIdValue = typeof (fromIdValue) === 'string' ? SanitizeHtmlHelper.sanitize(fromIdValue) : fromIdValue;
+                        toNameValue = typeof (toNameValue) === 'string' ? SanitizeHtmlHelper.sanitize(toNameValue) : toNameValue;
+                        toIdValue = typeof (toIdValue) === 'string' ? SanitizeHtmlHelper.sanitize(toIdValue) : toIdValue;
+                        linkTextValue = typeof (linkTextValue) === 'string' ? SanitizeHtmlHelper.sanitize(linkTextValue) : linkTextValue;
+                        offsetStringValue = typeof (offsetStringValue) === 'string' ? SanitizeHtmlHelper.sanitize(offsetStringValue) : offsetStringValue;
+                    }
                     content$$1 = '<table class = "e-gantt-tooltiptable"><tbody><tr><td class = "e-gantt-tooltip-label">' +
                         this.parent.localeObj.getConstant('from') + '</td><td>:</td>' +
-                        '<td class = "e-gantt-tooltip-value">' + parent.tooltipModule.predecessorTooltipData.fromName + ' (' +
-                        parent.tooltipModule.predecessorTooltipData.fromId + ')' + '</td></tr><tr><td class = "e-gantt-tooltip-label">' +
+                        '<td class = "e-gantt-tooltip-value">' + (this.parent.disableHtmlEncode ? fromNameValue.replace(/</g, "&lt;").replace(/>/g, "&gt;") : fromNameValue) + ' (' +
+                        (this.parent.disableHtmlEncode ? (typeof (fromIdValue) === 'string' ? fromIdValue.replace(/</g, "&lt;").replace(/>/g, "&gt;") : fromIdValue) : fromIdValue) + ')' + '</td></tr><tr><td class = "e-gantt-tooltip-label">' +
                         this.parent.localeObj.getConstant('to') + '</td><td>:</td>' + '<td class = "e-gantt-tooltip-value">' +
-                        parent.tooltipModule.predecessorTooltipData.toName +
-                        ' (' + parent.tooltipModule.predecessorTooltipData.toId + ')' +
-                        '</td></tr><tr><td class = "e-gantt-tooltip-label">' + this.parent.localeObj.getConstant('taskLink') +
-                        '</td><td>:</td><td class = "e-gantt-tooltip-value"> ' + parent.tooltipModule.predecessorTooltipData.linkText +
+                        (this.parent.disableHtmlEncode ? toNameValue.replace(/</g, "&lt;").replace(/>/g, "&gt;") : toNameValue) + ' (' + toIdValue + ')' + '</td></tr><tr><td class = "e-gantt-tooltip-label">' + this.parent.localeObj.getConstant('taskLink') +
+                        '</td><td>:</td><td class = "e-gantt-tooltip-value"> ' + linkTextValue +
                         '</td></tr><tr><td class = "e-gantt-tooltip-label">' + this.parent.localeObj.getConstant('lag') +
                         '</td><td>:</td><td class = "e-gantt-tooltip-value">' +
-                        parent.tooltipModule.predecessorTooltipData.offsetString + '</td></tr></tbody></table>';
+                        offsetStringValue + '</td></tr></tbody></table>';
                     break;
                 }
             case 'indicator':
                 if (args.target.title.length) {
-                    content$$1 = '<table class = "e-gantt-tooltiptable"><tbody><tr>' + args.target.title + '</tr></tbody></table>';
+                    var titleValue = args.target.title;
+                    if (this.parent.enableHtmlSanitizer && typeof (titleValue) === 'string') {
+                        titleValue = SanitizeHtmlHelper.sanitize(titleValue);
+                    }
+                    content$$1 = '<table class = "e-gantt-tooltiptable"><tbody><tr>' + titleValue + '</tr></tbody></table>';
                 }
                 break;
             case 'timeline':
-                content$$1 = '<table class = "e-gantt-tooltiptable"><tbody><tr>' + args.target.title + '</tr></tbody></table>';
+                var timlineTitleValue = args.target.title;
+                if (this.parent.enableHtmlSanitizer && typeof (timlineTitleValue) === 'string') {
+                    timlineTitleValue = SanitizeHtmlHelper.sanitize(timlineTitleValue);
+                }
+                content$$1 = '<table class = "e-gantt-tooltiptable"><tbody><tr>' + timlineTitleValue + '</tr></tbody></table>';
                 break;
             case 'manualtaskbar':
                 {
+                    var autoStartDateValue = this.parent.getFormatedDate(data.autoStartDate, this.parent.getDateFormat());
+                    var autoEndDateValue = this.parent.getFormatedDate(data.autoEndDate, this.parent.getDateFormat());
+                    var durationUnitValue = this.parent.getDurationString(data.duration, data.durationUnit);
+                    var manualStartDateValue = this.parent.getFormatedDate(data.startDate, this.parent.getDateFormat());
+                    var manualEndDateValue = this.parent.getFormatedDate(data.endDate, this.parent.getDateFormat());
+                    if (this.parent.enableHtmlSanitizer) {
+                        autoStartDateValue = typeof (autoStartDateValue) === 'string' ? SanitizeHtmlHelper.sanitize(autoStartDateValue) : autoStartDateValue;
+                        autoEndDateValue = typeof (autoEndDateValue) === 'string' ? SanitizeHtmlHelper.sanitize(autoEndDateValue) : autoEndDateValue;
+                        durationUnitValue = typeof (durationUnitValue) === 'string' ? SanitizeHtmlHelper.sanitize(durationUnitValue) : durationUnitValue;
+                        manualStartDateValue = typeof (manualStartDateValue) === 'string' ? SanitizeHtmlHelper.sanitize(manualStartDateValue) : manualStartDateValue;
+                        manualEndDateValue = typeof (manualEndDateValue) === 'string' ? SanitizeHtmlHelper.sanitize(manualEndDateValue) : manualEndDateValue;
+                    }
                     var autoStartDate = data.autoStartDate ? '<tr><td class = "e-gantt-tooltip-label">' +
                         this.parent.localeObj.getConstant('subTasksStartDate') + '</td><td>:</td>' + '<td class = "e-gantt-tooltip-value"> ' +
-                        this.parent.getFormatedDate(data.autoStartDate, this.parent.getDateFormat()) + '</td></tr>' : '';
+                        autoStartDateValue + '</td></tr>' : '';
                     var autoEndDate = data.autoEndDate ? '<tr><td class = "e-gantt-tooltip-label">' +
                         this.parent.localeObj.getConstant('subTasksEndDate') + '</td><td>:</td>' + '<td class = "e-gantt-tooltip-value">' +
-                        this.parent.getFormatedDate(data.autoEndDate, this.parent.getDateFormat()) + '</td></tr>' : '';
+                        autoEndDateValue + '</td></tr>' : '';
                     var durationValue = !isNullOrUndefined(data.duration) ? '<tr><td class = "e-gantt-tooltip-label">' +
                         this.parent.localeObj.getConstant('duration') + '</td><td>:</td>' +
-                        '<td class = "e-gantt-tooltip-value"> ' + this.parent.getDurationString(data.duration, data.durationUnit) +
+                        '<td class = "e-gantt-tooltip-value"> ' + durationUnitValue +
                         '</td></tr>' : '';
                     var manualStartDate = data.startDate ? '<tr><td class = "e-gantt-tooltip-label">' +
                         this.parent.localeObj.getConstant('startDate') + '</td><td>:</td>' + '<td class = "e-gantt-tooltip-value"> ' +
-                        this.parent.getFormatedDate(data.startDate, this.parent.getDateFormat()) + '</td></tr>' : '';
+                        manualStartDateValue + '</td></tr>' : '';
                     var manualEndDate = data.endDate ? '<tr><td class = "e-gantt-tooltip-label">' +
                         this.parent.localeObj.getConstant('endDate') + '</td><td>:</td>' + '<td class = "e-gantt-tooltip-value">' +
-                        this.parent.getFormatedDate(data.endDate, this.parent.getDateFormat()) + '</td></tr>' : '';
+                        manualEndDateValue + '</td></tr>' : '';
                     content$$1 = '<table class = "e-gantt-tooltiptable"><tbody>' +
                         taskName + manualStartDate + autoStartDate + manualEndDate + autoEndDate + durationValue + '</tbody></table>';
                     break;
                 }
             case 'manualmilestone':
                 {
+                    var autoStartValue = this.parent.getFormatedDate(data.autoStartDate, this.parent.getDateFormat());
+                    var autoEndValue = this.parent.getFormatedDate(data.autoEndDate, this.parent.getDateFormat());
+                    var dateValue = this.parent.getFormatedDate(data.startDate, this.parent.getDateFormat());
+                    if (this.parent.enableHtmlSanitizer) {
+                        autoStartValue = typeof (autoStartValue) === 'string' ? SanitizeHtmlHelper.sanitize(autoStartValue) : autoStartValue;
+                        autoEndValue = typeof (autoEndValue) === 'string' ? SanitizeHtmlHelper.sanitize(autoEndValue) : autoEndValue;
+                        dateValue = typeof (dateValue) === 'string' ? SanitizeHtmlHelper.sanitize(dateValue) : dateValue;
+                    }
                     var autoStart = data.autoStartDate ? '<tr><td class = "e-gantt-tooltip-label">' +
                         this.parent.localeObj.getConstant('subTasksStartDate') + '</td><td>:</td>' + '<td class = "e-gantt-tooltip-value"> ' +
-                        this.parent.getFormatedDate(data.autoStartDate, this.parent.getDateFormat()) + '</td></tr>' : '';
+                        autoStartValue + '</td></tr>' : '';
                     var autoEnd = data.autoEndDate ? '<tr><td class = "e-gantt-tooltip-label">' +
                         this.parent.localeObj.getConstant('subTasksEndDate') + '</td><td>:</td>' + '<td class = "e-gantt-tooltip-value">' +
-                        this.parent.getFormatedDate(data.autoEndDate, this.parent.getDateFormat()) + '</td></tr>' : '';
+                        autoEndValue + '</td></tr>' : '';
                     var date = '<tr><td class = "e-gantt-tooltip-label"> Date</td><td>:</td>' +
                         '<td class = "e-gantt-tooltip-value">' +
-                        this.parent.getFormatedDate(data.startDate, this.parent.getDateFormat()) + '</tr>';
+                        dateValue + '</tr>';
                     content$$1 = '<table class = "e-gantt-tooltiptable"><tbody>' +
                         taskName + date + autoStart + autoEnd + '</tbody></table>';
                     break;
@@ -13155,6 +13518,9 @@ var Tooltip$1 = /** @__PURE__ @class */ (function () {
      */
     Tooltip$$1.prototype.getPredecessorTooltipData = function (args) {
         var predeceesorParent = args.target.parentElement.id;
+        if (this.parent.enableHtmlSanitizer && typeof (predeceesorParent) === 'string') {
+            predeceesorParent = SanitizeHtmlHelper.sanitize(predeceesorParent);
+        }
         var taskIds = predeceesorParent.match(/ConnectorLineparent(.*)child(.*)/);
         taskIds.shift();
         var fromTask;
@@ -13434,7 +13800,6 @@ var FocusModule = /** @__PURE__ @class */ (function () {
                     var top_1 = containerPosition.top + (containerPosition.height / 2);
                     var left = containerPosition.left + (containerPosition.width / 2);
                     this.setActiveElement(e.target);
-                    // eslint-disable-next-line security/detect-non-literal-fs-filename
                     contextMenu.open(top_1, left);
                     e.preventDefault();
                     break;
@@ -13813,6 +14178,12 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
             this.treeGrid.isReact = true;
             this.treeGrid.grid.isReact = true;
         }
+        if (this.isVue) {
+            this.treeGrid.isVue = true;
+            this.treeGrid.grid.isVue = true;
+            this.treeGrid.vueInstance = this.vueInstance;
+            this.treeGrid.grid.vueInstance = this.vueInstance;
+        }
         createSpinner({ target: this.element }, this.createElement);
         this.trigger('load', {});
         this.element.classList.add(root);
@@ -13838,13 +14209,13 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
     };
     Gantt.prototype.hideMaskRow = function () {
         var isTablePresent = this.element.querySelectorAll('.e-masked-table').length;
-        if (!isNullOrUndefined(this.contentMaskTable) && isTablePresent != 0) {
+        if (!isNullOrUndefined(this.contentMaskTable) && (isTablePresent != 0 || this.contentMaskTable)) {
             var maskTable = this.contentMaskTable;
             remove(maskTable);
             this.contentMaskTable = null;
         }
         isTablePresent = this.element.querySelectorAll('.e-masked-table').length;
-        if (!isNullOrUndefined(this.headerMaskTable) && isTablePresent != 0) {
+        if (!isNullOrUndefined(this.headerMaskTable) && (isTablePresent != 0 || this.headerMaskTable)) {
             var maskTable = this.headerMaskTable;
             remove(maskTable);
             this.headerMaskTable = null;
@@ -13857,8 +14228,8 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
         }
         if (this.element.querySelectorAll('.' + timelineHeaderTableContainer).length != 0) {
             for (var i = 0; i < this.singleTier; i++) {
-                if (!isNullOrUndefined(this.element.querySelectorAll('.' + timelineHeaderTableContainer)[i])) {
-                    this.element.querySelectorAll('.' + timelineHeaderTableContainer)[i]['style'].visibility = "visible";
+                if (!isNullOrUndefined(this.element.querySelectorAll('.' + timelineHeaderTableContainer)[parseInt(i.toString(), 10)])) {
+                    this.element.querySelectorAll('.' + timelineHeaderTableContainer)[parseInt(i.toString(), 10)]['style'].visibility = "visible";
                 }
             }
         }
@@ -13880,7 +14251,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
                 if (this.element.querySelectorAll('.' + timelineHeaderTableContainer).length != 0) {
                     this.singleTier = this.timelineModule.isSingleTier ? 1 : 2;
                     for (var i = 0; i < this.singleTier; i++) {
-                        this.element.querySelectorAll('.' + timelineHeaderTableContainer)[i]['style'].visibility = "hidden";
+                        this.element.querySelectorAll('.' + timelineHeaderTableContainer)[parseInt(i.toString(), 10)]['style'].visibility = "hidden";
                     }
                 }
                 if (this.singleTier === 0) {
@@ -13999,7 +14370,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
         }
         this.topBottomHeader = 0;
         for (var i = 0; i < row.length; i++) {
-            tbody.appendChild(this.applyTimelineMaskRow(row[i]));
+            tbody.appendChild(this.applyTimelineMaskRow(row[parseInt(i.toString(), 10)]));
             this.topBottomHeader = this.topBottomHeader + 1;
         }
         table.appendChild(tbody);
@@ -14013,11 +14384,11 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
         maskRow.appendChild(this.createElement('td', { className: 'e-timeline-masked-top-header-cell' }));
         maskRow.appendChild(this.createElement('td', { className: 'e-timeline-masked-top-header-cell' }));
         for (var i = 0; i < maskRow.childNodes.length - 1; i++) {
-            maskRow.childNodes[i]['style']['width'] = 166 + 'px';
+            maskRow.childNodes[parseInt(i.toString(), 10)]['style']['width'] = 166 + 'px';
         }
         var maskCells = [].slice.call(maskRow.childNodes);
         for (var i = 0; i < maskCells.length; i++) {
-            var maskCell = maskCells[i];
+            var maskCell = maskCells[parseInt(i.toString(), 10)];
             switch (this.topBottomHeader) {
                 case 0:
                     if (this.enableRtl) {
@@ -14034,7 +14405,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
                     maskCell.appendChild(this.createElement('td', { className: 'e-timeline-masked-top-header-cell' }));
                     var innerMaskCells = [].slice.call(maskCell.childNodes);
                     for (var i_1 = 0; i_1 < innerMaskCells.length; i_1++) {
-                        var htmlInner = innerMaskCells[i_1];
+                        var htmlInner = innerMaskCells[parseInt(i_1.toString(), 10)];
                         if (i_1 === 0) {
                             if (this.enableRtl) {
                                 htmlInner.innerHTML = '<span class="e-mask e-skeleton e-skeleton-text e-shimmer-wave e-innerHTML"></span>';
@@ -14086,7 +14457,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
             else if (this.columnLoop === 4) {
                 this.columnLoop = 1;
             }
-            tbody.appendChild(this.applyMaskRow(row[j]));
+            tbody.appendChild(this.applyMaskRow(row[parseInt(j.toString(), 10)]));
         }
         table.appendChild(tbody);
         table.style.width = 100 + '%';
@@ -14107,7 +14478,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
         }
         var maskCells = [].slice.call(maskRow.childNodes);
         for (var i = 0; i < maskCells.length; i++) {
-            var maskCell = maskCells[i];
+            var maskCell = maskCells[parseInt(i.toString(), 10)];
             switch (this.columnLoop) {
                 case 1:
                     if (i === 0) {
@@ -14205,7 +14576,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
             this.predecessorModule['parentIds'] = [];
             this.predecessorModule['parentRecord'] = [];
             this.predecessorModule.updatePredecessors();
-            if (this.isInPredecessorValidation && this.enableValidation) {
+            if (this.isInPredecessorValidation && this.enableValidation && this.autoCalculateDateScheduling) {
                 this.predecessorModule.updatedRecordsDateByPredecessor();
             }
         }
@@ -14218,7 +14589,9 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
             if (this.enableValidation) {
                 this.dataOperation.updateGanttData();
             }
-            this.predecessorModule.updateParentPredecessor();
+            if (this.allowParentDependency) {
+                this.predecessorModule.updateParentPredecessor();
+            }
             if (this.dataSource instanceof Object && isCountRequired(this)) {
                 var count = getValue('count', this.dataSource);
                 this.treeGrid.dataSource = { result: this.flatData, count: count };
@@ -14231,7 +14604,9 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
             if (this.enableValidation) {
                 this.dataOperation.updateGanttData();
             }
-            this.predecessorModule.updateParentPredecessor();
+            if (this.allowParentDependency) {
+                this.predecessorModule.updateParentPredecessor();
+            }
             this.treeGridPane.classList.remove('e-temp-content');
             remove(this.treeGridPane.querySelector('.e-gantt-temp-header'));
             this.notify('dataReady', {});
@@ -14348,22 +14723,27 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
      * @private
      */
     Gantt.prototype.updateContentHeight = function (args) {
-        if (this.virtualScrollModule && this.enableVirtualization && !isNullOrUndefined(args)) {
-            var length_1 = getValue('result.length', args);
-            this.contentHeight = length_1 * this.rowHeight;
+        if (!this.allowTaskbarOverlap && this.viewType === 'ResourceView' && !this.isLoad) {
+            return;
         }
         else {
-            var expandedRecords = this.virtualScrollModule && this.enableVirtualization ?
-                this.currentViewData : this.getExpandedRecords(this.currentViewData);
-            var height = void 0;
-            var chartRow$$1 = !isNullOrUndefined(this.ganttChartModule.getChartRows()) ? this.ganttChartModule.getChartRows()[0] : null;
-            if (!isNullOrUndefined(chartRow$$1) && chartRow$$1.getBoundingClientRect().height > 0) {
-                height = chartRow$$1.getBoundingClientRect().height;
+            if (this.virtualScrollModule && this.enableVirtualization && !isNullOrUndefined(args)) {
+                var length_1 = getValue('result.length', args);
+                this.contentHeight = length_1 * this.rowHeight;
             }
             else {
-                height = this.rowHeight;
+                var expandedRecords = this.virtualScrollModule && this.enableVirtualization ?
+                    this.currentViewData : this.getExpandedRecords(this.currentViewData);
+                var height = void 0;
+                var chartRow$$1 = !isNullOrUndefined(this.ganttChartModule.getChartRows()) ? this.ganttChartModule.getChartRows()[0] : null;
+                if (!isNullOrUndefined(chartRow$$1) && chartRow$$1.getBoundingClientRect().height > 0) {
+                    height = chartRow$$1.getBoundingClientRect().height;
+                }
+                else {
+                    height = this.rowHeight;
+                }
+                this.contentHeight = expandedRecords.length * height;
             }
-            this.contentHeight = expandedRecords.length * height;
         }
     };
     /**
@@ -14879,7 +15259,6 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
                     this.chartRowsModule.refreshGanttRows();
                     break;
                 case 'includeWeekend':
-                case 'dayWorkingTime':
                 case 'allowUnscheduledTasks':
                 case 'holidays':
                     this.isLoad = true;
@@ -14972,6 +15351,10 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
                 case 'readOnly':
                 case 'viewType':
                 case 'taskFields':
+                case 'dayWorkingTime':
+                case 'allowTaskbarDragAndDrop':
+                case 'allowTaskbarOverlap':
+                case 'allowParentDependency':
                     if (prop === 'locale') {
                         this.isLocaleChanged = true;
                     }
@@ -14986,6 +15369,9 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
             }
         }
         if (isRefresh) {
+            if (this.isLoad && this.contentMaskTable) {
+                this.contentMaskTable = null;
+            }
             this.refresh();
         }
     };
@@ -15113,7 +15499,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
                 args: [this]
             });
         }
-        if (this.allowRowDragAndDrop) {
+        if (this.allowRowDragAndDrop || this.allowTaskbarDragAndDrop) {
             modules.push({
                 member: 'rowDragAndDrop',
                 args: [this]
@@ -15648,10 +16034,11 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
      * @param  {PdfExportProperties} pdfExportProperties - Defines the export properties of the Gantt.
      * @param  {isMultipleExport} isMultipleExport - Define to enable multiple export.
      * @param  {pdfDoc} pdfDoc - Defined the Pdf Document if multiple export is enabled.
+     * @param  {boolean} isBlob - If the 'isBlob' parameter is set to true, the method returns PDF data as a blob instead of exporting it as a down-loadable PDF file. The default value is false.
      * @returns {Promise<any>} .
      */
-    Gantt.prototype.pdfExport = function (pdfExportProperties, isMultipleExport, pdfDoc) {
-        return this.pdfExportModule ? this.pdfExportModule.export(pdfExportProperties, isMultipleExport, pdfDoc)
+    Gantt.prototype.pdfExport = function (pdfExportProperties, isMultipleExport, pdfDoc, isBlob) {
+        return this.pdfExportModule ? this.pdfExportModule.export(pdfExportProperties, isMultipleExport, pdfDoc, isBlob)
             : null;
     };
     /**
@@ -15683,7 +16070,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
      * @private
      */
     Gantt.prototype.renderWorkingDayCell = function (args) {
-        var includeWeekend = this.taskMode !== 'Auto' ? true : this.includeWeekend ? true : false;
+        var includeWeekend = this.taskMode !== 'Auto' ? true : (this.includeWeekend || !this.autoCalculateDateScheduling) ? true : false;
         var nonWorkingDays = !includeWeekend ? this.nonWorkingDayIndex : [];
         var holidays = this.totalHolidayDates;
         if (nonWorkingDays.length > 0 && nonWorkingDays.indexOf(args.date.getDay()) !== -1) {
@@ -15693,7 +16080,12 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
             var tempDate = new Date(args.date.getTime());
             tempDate.setHours(0, 0, 0);
             if (holidays.indexOf(tempDate.getTime()) !== -1) {
-                args.isDisabled = true;
+                if (!this.autoCalculateDateScheduling) {
+                    args.isDisabled = false;
+                }
+                else {
+                    args.isDisabled = true;
+                }
             }
         }
     };
@@ -15810,8 +16202,8 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
             var id = ganttData.rowUniqueID;
             var task = this.getRecordByID(id);
             var isValid = false;
-            if (isNullOrUndefined(value) || (!isNullOrUndefined(value) && !isNullOrUndefined(ganttData[field]) && (value instanceof Date ? value.getTime() !==
-                ganttData[field].getTime() : ganttData[field] !== value))) {
+            if (isNullOrUndefined(value) || (!isNullOrUndefined(value) && !isNullOrUndefined(ganttData["" + field]) && (value instanceof Date ? value.getTime() !==
+                ganttData["" + field].getTime() : ganttData["" + field] !== value))) {
                 isValid = true;
             }
             if (task && ((this.editedRecords.indexOf(task) === -1 && isValid) || this.editedRecords.length === 0)) {
@@ -16758,6 +17150,12 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
     __decorate([
         Property(false)
     ], Gantt.prototype, "enableImmutableMode", void 0);
+    __decorate([
+        Property(true)
+    ], Gantt.prototype, "allowParentDependency", void 0);
+    __decorate([
+        Property(false)
+    ], Gantt.prototype, "enableHtmlSanitizer", void 0);
     __decorate([
         Property(true)
     ], Gantt.prototype, "disableHtmlEncode", void 0);
@@ -16767,6 +17165,12 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
     __decorate([
         Property(true)
     ], Gantt.prototype, "enableVirtualMaskRow", void 0);
+    __decorate([
+        Property(true)
+    ], Gantt.prototype, "UpdateOffsetOnTaskbarEdit", void 0);
+    __decorate([
+        Property(true)
+    ], Gantt.prototype, "autoCalculateDateScheduling", void 0);
     __decorate([
         Property(true)
     ], Gantt.prototype, "autoFocusTasks", void 0);
@@ -16815,6 +17219,12 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
     __decorate([
         Property(false)
     ], Gantt.prototype, "renderBaseline", void 0);
+    __decorate([
+        Property(false)
+    ], Gantt.prototype, "allowTaskbarDragAndDrop", void 0);
+    __decorate([
+        Property(true)
+    ], Gantt.prototype, "allowTaskbarOverlap", void 0);
     __decorate([
         Property('Horizontal')
     ], Gantt.prototype, "gridLines", void 0);
@@ -17260,8 +17670,10 @@ var CellEdit = /** @__PURE__ @class */ (function () {
         }
         if (data.hasChildRecords && ((field === taskSettings.endDate && ((!isNullOrUndefined(data['isManual']) &&
             data['isManual'] === false) || this.parent.taskMode === 'Auto')) || field === taskSettings.duration
-            || field === taskSettings.progress || field === taskSettings.work || field === 'taskType')) {
-            args.cancel = true;
+            || field === taskSettings.dependency || field === taskSettings.progress || field === taskSettings.work || field === 'taskType')) {
+            if ((field === taskSettings.dependency && !this.parent.allowParentDependency) || field !== taskSettings.dependency) {
+                args.cancel = true;
+            }
         }
         else {
             var callBackPromise_1 = new Deferred();
@@ -17311,7 +17723,7 @@ var CellEdit = /** @__PURE__ @class */ (function () {
     };
     CellEdit.prototype.isValueChange = function (args, field) {
         var data = getValue('data', args);
-        var editedValue = data[field];
+        var editedValue = data["" + field];
         var previousValue = getValue('previousData', args);
         if ((isNullOrUndefined(editedValue) && !isNullOrUndefined(previousValue)) || (!isNullOrUndefined(editedValue) && isNullOrUndefined(previousValue))) {
             return true;
@@ -17479,7 +17891,7 @@ var CellEdit = /** @__PURE__ @class */ (function () {
         var ganttSegments = [];
         var segments = ganttProp.segments;
         for (var i = 0; i < segments.length; i++) {
-            var segment = segments[i];
+            var segment = segments[parseInt(i.toString(), 10)];
             var endDate = segment.endDate;
             endDate = (!isNullOrUndefined(ganttProp.endDate)) && endDate.getTime() <
                 ganttProp.endDate.getTime() && i !== segments.length - 1 ? endDate : ganttProp.endDate;
@@ -17678,7 +18090,7 @@ var CellEdit = /** @__PURE__ @class */ (function () {
                     }
                 }
                 if (!isNullOrUndefined(index) && index !== -1) {
-                    editedResources.push(previousResource[index]);
+                    editedResources.push(previousResource[parseInt(index.toString(), 10)]);
                 }
                 else {
                     var resource = resourceData.filter(function (resourceInfo) {
@@ -17740,7 +18152,7 @@ var CellEdit = /** @__PURE__ @class */ (function () {
     CellEdit.prototype.typeEdited = function (args, editedObj) {
         var key = 'taskType';
         var ganttProb = args.data.ganttProperties;
-        var taskType = editedObj[key];
+        var taskType = editedObj["" + key];
         this.parent.setRecordValue('taskType', taskType, ganttProb, true);
         //this.parent.dataOperation.updateMappingData(args.data, 'taskType');
         this.updateEditedRecord(args);
@@ -17850,15 +18262,12 @@ var EditTooltip = /** @__PURE__ @class */ (function () {
             this.parent.tooltipModule.toolTipObj.close();
             this.updateTooltip(segmentIndex);
             if (this.taskbarEdit.connectorSecondAction === 'ConnectorPointLeftDrag') {
-                // eslint-disable-next-line security/detect-non-literal-fs-filename
                 this.toolTipObj.open(this.taskbarEdit.connectorSecondElement.querySelector('.' + connectorPointLeft));
             }
             else if (this.taskbarEdit.connectorSecondAction === 'ConnectorPointRightDrag') {
-                // eslint-disable-next-line security/detect-non-literal-fs-filename
                 this.toolTipObj.open(this.taskbarEdit.connectorSecondElement.querySelector('.' + connectorPointRight));
             }
             else {
-                // eslint-disable-next-line security/detect-non-literal-fs-filename
                 this.toolTipObj.open(this.taskbarEdit.taskBarEditElement);
             }
         }
@@ -18049,6 +18458,10 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
         _this.elementOffsetWidth = 0;
         _this.elementOffsetHeight = 0;
         _this.segmentIndex = -1;
+        _this.currentItemTop = 0;
+        _this.currentItemPrevTop = 0;
+        _this.topValue = 0;
+        _this.draggedRecordMarginTop = 0;
         _this.parent = ganttObj;
         _this.initPublicProp();
         _this.wireEvents();
@@ -18291,7 +18704,9 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
                         if (!isNullOrUndefined(parentRecord) && !parentRecord.expanded) {
                             this.prevZIndex = (this.taskBarEditElement).style.zIndex;
                             (this.taskBarEditElement).style.zIndex = '1000';
-                            addClass([this.taskBarEditElement.querySelector('.e-gantt-child-taskbar')], 'e-collapsed-taskbar-drag');
+                            if (this.taskBarEditElement.querySelector('.e-gantt-child-taskbar')) {
+                                addClass([this.taskBarEditElement.querySelector('.e-gantt-child-taskbar')], 'e-collapsed-taskbar-drag');
+                            }
                         }
                     }
                 }
@@ -18455,9 +18870,20 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
                     this.parent.ganttChartModule.scrollObject.previousScroll.left;
             }
             this.tooltipPositionX = this.mouseDownX;
-            this.mouseDownY = e.pageY - containerPosition.top +
+            this.mouseDownY = this.dragMoveY = e.pageY - containerPosition.top +
                 this.parent.ganttChartModule.scrollObject.previousScroll.top;
         }
+        if (this.parent.viewType == "ResourceView" && this.parent.allowTaskbarDragAndDrop) {
+            var toolbarHeight = 0;
+            if (!isNullOrUndefined(this.parent.toolbarModule) && !isNullOrUndefined(this.parent.toolbarModule.element)) {
+                toolbarHeight = this.parent.toolbarModule.element.offsetHeight;
+            }
+            this.topValue = this.parent.getOffsetRect(event.target).top - this.parent.getOffsetRect(this.parent.element).top -
+                parseInt((closest(event.target, '.e-taskbar-main-container'))['style'].marginTop) -
+                this.parent.element.getElementsByClassName('e-timeline-header-container')[0]['offsetHeight'] -
+                toolbarHeight + document.getElementsByClassName('e-chart-scroll-container e-content')[0].scrollTop;
+            this.currentItemPrevTop = this.currentItemTop = this.topValue;
+        }
         if (this.taskBarEditAction === 'ConnectorPointLeftDrag' || this.taskBarEditAction === 'ConnectorPointRightDrag') {
             this.fromPredecessorText = this.taskBarEditAction === 'ConnectorPointLeftDrag' ? 'start' : 'finish';
             this.parent.connectorLineModule.tooltipTable.innerHTML = this.parent.connectorLineModule.getConnectorLineTooltipInnerTd(this.taskBarEditRecord.ganttProperties.taskName, this.fromPredecessorText, '', '');
@@ -18589,6 +19015,22 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
                     this.drawFalseLine();
                 }
             }
+            if (this.parent.viewType == 'ResourceView' && this.parent.allowTaskbarDragAndDrop) {
+                if (this.dragMoveY > this.mouseMoveY) {
+                    this.mouseMoveY = this.dragMoveY - this.mouseMoveY;
+                    this.currentItemTop = this.currentItemTop - this.mouseMoveY;
+                }
+                else {
+                    this.mouseMoveY -= this.dragMoveY;
+                    this.currentItemTop = this.currentItemTop + this.mouseMoveY;
+                }
+                var containerPosition = this.parent.getOffsetRect(this.parent.ganttChartModule.chartBodyContainer);
+                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 :
+                    this.currentItemPrevTop;
+            }
             this.setItemPosition();
             this.updateEditedItem();
             this.editTooltip.updateTooltip(this.segmentIndex);
@@ -18668,12 +19110,12 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
                 this.timerCount = this.parent.ganttChartModule.scrollObject.previousScroll.left;
                 this.startScrollTimer('left');
             }
-            else if (isConnectorLineEdit && ((mouseY + 80) >
+            else if (((mouseY + 80) >
                 containerPosition.top + this.parent.ganttChartModule.chartBodyContainer.offsetHeight)) {
                 this.timerCount = this.parent.ganttChartModule.scrollObject.previousScroll.top;
                 this.startScrollTimer('bottom');
             }
-            else if (isConnectorLineEdit && ((mouseY - 20) < containerPosition.top)) {
+            else if (((mouseY - 20) < containerPosition.top)) {
                 this.timerCount = this.parent.ganttChartModule.scrollObject.previousScroll.top;
                 this.startScrollTimer('top');
             }
@@ -19459,6 +19901,11 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
                 taskBarMainContainer$$1.style.width = (width) + 'px';
                 leftLabelContainer$$1.style.width = (item.left) + 'px';
                 taskBarMainContainer$$1.style.setProperty(position, (item.left) + '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');
+                    taskBarMainContainer$$1.style.zIndex = '4';
+                }
                 if (this.taskBarEditAction === 'LeftResizing' && this.segmentIndex === 0) {
                     var parent_1 = this.taskBarEditElement.parentElement;
                     var segmentedTasks = parent_1.getElementsByClassName('e-segmented-taskbar');
@@ -19571,7 +20018,8 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
         this.previousMouseMove = null;
         this.editTooltip.showHideTaskbarEditTooltip(false, this.segmentIndex);
         if (this.taskBarEditAction && this.isMouseDragged) {
-            if (!this.dragMouseLeave && this.taskBarEditedAction) {
+            if ((!this.dragMouseLeave && this.taskBarEditedAction) || (this.parent.viewType === 'ResourceView' &&
+                this.parent.allowTaskbarDragAndDrop)) {
                 this.taskBarEditedAction(e);
                 this.isMouseDragged = false;
             }
@@ -19680,6 +20128,65 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
         var args = extend({}, arg);
         var ganttRecord = args.data;
         var taskData = ganttRecord.ganttProperties;
+        var draggedRecIndex = this.parent.currentViewData.indexOf(ganttRecord);
+        if ((args.taskBarEditAction === 'MilestoneDrag' || args.taskBarEditAction === 'ChildDrag') && this.parent.viewType === "ResourceView"
+            && this.parent.allowTaskbarDragAndDrop && this.dragMoveY > 0) {
+            if (this.parent.rowDragAndDropModule) {
+                var flatRecordCol = this.parent.currentViewData;
+                if (flatRecordCol[this.taskBarEditRecord.parentItem.index] && ((this.parent.editedRecords.indexOf(flatRecordCol[this.taskBarEditRecord.parentItem.index]) === -1))) {
+                    this.parent.editedRecords.push(flatRecordCol[this.taskBarEditRecord.parentItem.index]);
+                }
+                var ganttrec = void 0;
+                var resHeight = 0;
+                var rowCount = 0;
+                var childIndex_1;
+                var droppedRecord = void 0;
+                var treeGridrows = this.parent.treeGrid.getRows().length;
+                for (var i = 0; i < treeGridrows; i++) {
+                    if (resHeight < this.dragMoveY && this.parent.getRowByIndex(i).style.display !== 'none') {
+                        rowCount = i;
+                        resHeight = resHeight + parseInt(this.parent.getRowByIndex(i).style.height);
+                        if (!flatRecordCol[i].parentItem) {
+                            ganttrec = flatRecordCol[i];
+                        }
+                        else {
+                            ganttrec = this.parent.getRecordByID(flatRecordCol[i].parentItem.taskId);
+                        }
+                    }
+                }
+                var draggedRecordtaskbar = this.parent.getRowByIndex(draggedRecIndex).getElementsByClassName('e-taskbar-main-container');
+                var taskbarContainer = this.parent.getRowByIndex(rowCount).getElementsByClassName('e-taskbar-main-container');
+                for (var j = 0; j < taskbarContainer.length; j++) {
+                    if (taskbarContainer[j]['offsetTop'] < this.dragMoveY && draggedRecordtaskbar[0].getAttribute('rowuniqueid') !==
+                        taskbarContainer[j].getAttribute('rowuniqueid')) {
+                        this.draggedRecordMarginTop = taskbarContainer[j]['style'].marginTop;
+                        childIndex_1 = taskbarContainer[j].getAttribute('rowuniqueid');
+                    }
+                }
+                if (childIndex_1) {
+                    droppedRecord = this.parent.currentViewData.filter(function (data) {
+                        if (data['rowUniqueID'] === childIndex_1) {
+                            return data;
+                        }
+                        else {
+                            return null;
+                        }
+                    });
+                }
+                if (droppedRecord) {
+                    var droppedRecordIndex = this.parent.currentViewData.indexOf(droppedRecord[0]);
+                    var position = (droppedRecord[0].hasChildRecords || (!droppedRecord[0].parentItem &&
+                        droppedRecord[0].childRecords.length == 0)) ? 'child' : 'below';
+                    if (this.parent.rowDragAndDropModule) {
+                        this.parent.rowDragAndDropModule.reorderRows([draggedRecIndex], droppedRecordIndex, position);
+                    }
+                    this.dragMoveY = 0;
+                }
+            }
+            if (this.parent.viewType === 'ResourceView' && this.parent.showOverAllocation) {
+                this.parent.ganttChartModule.renderOverAllocationContainer();
+            }
+        }
         if (args.taskBarEditAction === 'ProgressResizing') {
             if (args.previousData.progress !== taskData.progress) {
                 this.parent.setRecordValue('progress', this.getProgressPercent(taskData.width, taskData.progressWidth), taskData, true);
@@ -19871,14 +20378,20 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
             }
             if ((this.parent.virtualScrollModule && this.parent.enableVirtualization &&
                 !this.elementOffsetLeft) || !this.parent.enableVirtualization) {
-                if (this.taskBarEditElement.children[0].classList.contains('e-manualparent-main-container')) {
-                    this.elementOffsetLeft = this.taskBarEditElement.children[0]['offsetLeft'] + this.taskBarEditElement.offsetLeft;
-                    this.elementOffsetTop = ((this.taskBarEditElement.offsetTop - 5) + this.taskBarEditElement.children[0]['offsetTop']) + scrollTop;
-                }
-                else {
+                if (!this.parent.allowParentDependency) {
                     this.elementOffsetLeft = this.taskBarEditElement.offsetLeft;
                     this.elementOffsetTop = this.taskBarEditElement.offsetTop + scrollTop;
                 }
+                else {
+                    if (this.taskBarEditElement.children[0].classList.contains('e-manualparent-main-container')) {
+                        this.elementOffsetLeft = this.taskBarEditElement.children[0]['offsetLeft'] + this.taskBarEditElement.offsetLeft;
+                        this.elementOffsetTop = ((this.taskBarEditElement.offsetTop - 5) + this.taskBarEditElement.children[0]['offsetTop']) + scrollTop;
+                    }
+                    else {
+                        this.elementOffsetLeft = this.taskBarEditElement.offsetLeft;
+                        this.elementOffsetTop = this.taskBarEditElement.offsetTop + scrollTop;
+                    }
+                }
                 this.elementOffsetWidth = this.taskBarEditElement.offsetWidth;
                 this.elementOffsetHeight = this.taskBarEditElement.offsetHeight;
             }
@@ -20897,7 +21410,7 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
             targetId = inputElement.querySelector('input').getAttribute('id');
             inputElement = inputElement.querySelector('#' + targetId);
         }
-        else if (!isNullOrUndefined(args.event) && !isNullOrUndefined(args.event.path[1])) {
+        else if (!isNullOrUndefined(args.event) && !isNullOrUndefined(args.event.path) && !isNullOrUndefined(args.event.path)[1]) {
             inputElement = args.event.path[1];
             targetId = inputElement.querySelector('input').getAttribute('id');
             inputElement = inputElement.querySelector('#' + targetId);
@@ -20936,6 +21449,9 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
             if (!isNullOrUndefined(tasks.startDate) && tasks.startDate !== colName) {
                 this.updateScheduleFields(dialog, ganttProp, 'startDate');
             }
+            if (tasks.endDate === colName && !isNullOrUndefined(ganttProp.startDate) && !isNullOrUndefined(args.value) && ganttProp.startDate.getTime() > args.value) {
+                this.updateScheduleFields(dialog, ganttProp, 'endDate');
+            }
             if (!isNullOrUndefined(tasks.endDate) && tasks.endDate !== colName) {
                 this.updateScheduleFields(dialog, ganttProp, 'endDate');
             }
@@ -21126,6 +21642,9 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
         if (taskSettings.endDate === columnName) {
             if (value !== '') {
                 var endDate = this.parent.dateValidationModule.getDateFromFormat(value);
+                if (isNullOrUndefined(ganttProp.startDate) && isNullOrUndefined(endDate) && ganttProp.startDate.getTime() > endDate.getTime()) {
+                    endDate = ganttProp.endDate;
+                }
                 if (endDate.getHours() === 0 && ganttObj.defaultEndTime !== 86400) {
                     this.parent.dateValidationModule.setTime(ganttObj.defaultEndTime, endDate);
                 }
@@ -21508,6 +22027,9 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
                 item.content = this.renderGeneralTab(item.content);
             }
             else if (item.content === 'Dependency') {
+                if (this.editedRecord.hasChildRecords && !this.parent.allowParentDependency) {
+                    item.disabled = true;
+                }
                 item.content = this.renderPredecessorTab(item.content);
             }
             else if (item.content === 'Resources') {
@@ -21969,27 +22491,34 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
         this.preTableCollection = [];
         for (var i = 0; i < flatData.length; i++) {
             var data = flatData[i];
-            var currentFlatData = data;
-            if (data.parentUniqueID === this.beforeOpenArgs.rowData['uniqueID']) {
-                this.isValidData = false;
-            }
-            else {
-                do {
-                    if (currentFlatData.parentItem) {
-                        currentFlatData = this.parent.flatData[this.parent.ids.indexOf(currentFlatData.parentItem.taskId)];
-                        if (currentFlatData.uniqueID === this.beforeOpenArgs.rowData['uniqueID']) {
-                            this.isValidData = false;
-                            break;
+            if (this.parent.allowParentDependency) {
+                var currentFlatData = data;
+                if (data.parentUniqueID === this.beforeOpenArgs.rowData['uniqueID']) {
+                    this.isValidData = false;
+                }
+                else {
+                    do {
+                        if (currentFlatData.parentItem) {
+                            currentFlatData = this.parent.flatData[this.parent.ids.indexOf(currentFlatData.parentItem.taskId)];
+                            if (currentFlatData.uniqueID === this.beforeOpenArgs.rowData['uniqueID']) {
+                                this.isValidData = false;
+                                break;
+                            }
                         }
-                    }
-                } while (currentFlatData.parentItem);
-            }
-            if (data.hasChildRecords && this.isValidData) {
-                this.isValidData = this.isParentValid(data.childRecords);
+                    } while (currentFlatData.parentItem);
+                }
+                if (data.hasChildRecords && this.isValidData) {
+                    this.isValidData = this.isParentValid(data.childRecords);
+                }
+                if (!this.isValidData) {
+                    this.isValidData = true;
+                    continue;
+                }
             }
-            if (!this.isValidData) {
-                this.isValidData = true;
-                continue;
+            else {
+                if (data.hasChildRecords) {
+                    continue;
+                }
             }
             var taskId = this.parent.viewType === 'ResourceView' ? data.ganttProperties.taskId.toString()
                 : data.ganttProperties.rowUniqueID.toString();
@@ -22226,6 +22755,10 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
                 }
                 else {
                     tasksData[fieldName] = controlObj.value;
+                    if (this.parent.enableHtmlSanitizer && typeof (controlObj.value) === 'string') {
+                        controlObj.value = SanitizeHtmlHelper.sanitize(controlObj.value);
+                        tasksData[fieldName] = controlObj.value;
+                    }
                 }
             }
         }
@@ -22509,9 +23042,10 @@ var ConnectorLineEdit = /** @__PURE__ @class */ (function () {
                     var from = 'from';
                     var to = 'to';
                     this.parent.connectorLineModule.removeConnectorLineById('parent' + predecessor[from] + 'child' + predecessor[to]);
-                    parentGanttRecord = this.parent.connectorLineModule.getRecordByID(predecessor[from]);
-                    childGanttRecord = this.parent.connectorLineModule.getRecordByID(predecessor[to]);
-                    if (parentGanttRecord || childGanttRecord) {
+                    parentGanttRecord = this.parent.connectorLineModule.getRecordByID(predecessor["" + from]);
+                    childGanttRecord = this.parent.connectorLineModule.getRecordByID(predecessor["" + to]);
+                    if ((!this.parent.allowParentDependency && (parentGanttRecord && parentGanttRecord.expanded === true) ||
+                        (childGanttRecord && childGanttRecord.expanded === true)) || (this.parent.allowParentDependency && (parentGanttRecord || childGanttRecord))) {
                         connectorObj =
                             this.parent.predecessorModule.updateConnectorLineObject(parentGanttRecord, childGanttRecord, predecessor);
                         if (!isNullOrUndefined(connectorObj)) {
@@ -22562,8 +23096,8 @@ var ConnectorLineEdit = /** @__PURE__ @class */ (function () {
             if (!isNullOrUndefined(values[0])) {
                 var ids = this.parent.viewType === 'ResourceView' ? this.parent.getTaskIds() : this.parent.ids;
                 if (ids.indexOf(values[0]) === -1) {
-                    if (values[0].indexOf(" ") != -1) {
-                        match = values[0].split(" ");
+                    if (values[0].indexOf(' ') !== -1) {
+                        match = values[0].split(' ');
                         if (match.length === 1) {
                             match = values[0].match(/(\d+|[A-z]+)/g);
                         }
@@ -22642,7 +23176,7 @@ var ConnectorLineEdit = /** @__PURE__ @class */ (function () {
         var parentRec = rec;
         if (rec.parentItem) {
             parentRec = this.parent.flatData.filter(function (item) {
-                return item.uniqueID == rec.parentUniqueID;
+                return item.uniqueID === rec.parentUniqueID;
             })[0];
             if (parentRec.parentItem) {
                 parentRec = this.getRootParent(parentRec);
@@ -22723,11 +23257,20 @@ var ConnectorLineEdit = /** @__PURE__ @class */ (function () {
         if (!isNullOrUndefined(predecessorString) && predecessorString.length > 0) {
             predecessorIdArray = this.idFromPredecessor(predecessorString);
             var _loop_2 = function (count) {
-                if (parseInt(predecessorIdArray[predecessorIdArray.length - 1]) !== ganttRecord[this_2.parent.taskFields.id]) {
-                    var num = this_2.parent.ids.indexOf(predecessorIdArray[predecessorIdArray.length - 1]);
-                    var fromRecord = this_2.parent.currentViewData[num];
-                    if (fromRecord && ganttRecord) {
-                        flag = this_2.validateParentPredecessor(fromRecord, ganttRecord);
+                //Check edited item has parent item in predecessor collection
+                if (!this_2.parent.allowParentDependency) {
+                    var checkParent = this_2.checkParentRelation(ganttRecord, predecessorIdArray);
+                    if (!checkParent) {
+                        return { value: false };
+                    }
+                }
+                else {
+                    if (parseInt(predecessorIdArray[predecessorIdArray.length - 1]) !== ganttRecord[this_2.parent.taskFields.id]) {
+                        var num = this_2.parent.ids.indexOf(predecessorIdArray[predecessorIdArray.length - 1]);
+                        var fromRecord = this_2.parent.currentViewData[num];
+                        if (fromRecord && ganttRecord) {
+                            flag = this_2.validateParentPredecessor(fromRecord, ganttRecord);
+                        }
                     }
                 }
                 // Check if predecessor exist more then one
@@ -22977,7 +23520,9 @@ var ConnectorLineEdit = /** @__PURE__ @class */ (function () {
             this.parent.editModule.updateEditedTask(args.editEventArgs);
         }
         else if (args.validateMode.preserveLinkWithEditing) {
-            this.calculateOffset(ganttRecord);
+            if (this.parent.UpdateOffsetOnTaskbarEdit) {
+                this.calculateOffset(ganttRecord);
+            }
             this.parent.editModule.updateEditedTask(args.editEventArgs);
         }
     };
@@ -23008,7 +23553,7 @@ var ConnectorLineEdit = /** @__PURE__ @class */ (function () {
         var prevPredecessor = extend([], record.ganttProperties.predecessor, [], true);
         var validPredecessor = this.parent.predecessorModule.getValidPredecessor(record);
         for (var i = 0; i < validPredecessor.length; i++) {
-            var predecessor = validPredecessor[i];
+            var predecessor = validPredecessor[parseInt(i.toString(), 10)];
             var parentTask = this.parent.connectorLineModule.getRecordByID(predecessor.from);
             var offset = void 0;
             if (isScheduledTask(parentTask.ganttProperties) && isScheduledTask(record.ganttProperties)) {
@@ -23088,7 +23633,7 @@ var ConnectorLineEdit = /** @__PURE__ @class */ (function () {
             var parentPredecessor = extend([], [], parentGanttRecord.ganttProperties.predecessor, true);
             var index = getIndex(predecessor[i], 'from', prevPredecessor, 'to');
             prevPredecessor.splice(index, 1);
-            var parentIndex = getIndex(predecessor[i], 'from', parentPredecessor, 'to');
+            var parentIndex = getIndex(predecessor[parseInt(i.toString(), 10)], 'from', parentPredecessor, 'to');
             parentPredecessor.splice(parentIndex, 1);
             this.parent.setRecordValue('predecessor', parentPredecessor, parentGanttRecord.ganttProperties, true);
         }
@@ -23199,41 +23744,41 @@ var ConnectorLineEdit = /** @__PURE__ @class */ (function () {
             var violationType = null;
             if (predecessor[i].type === 'FS') {
                 if (ganttTaskData.startDate < startDate) {
-                    this.validationPredecessor.push(predecessor[i]);
+                    this.validationPredecessor.push(predecessor[parseInt(i.toString(), 10)]);
                     violationType = 'taskBeforePredecessor_FS';
                 }
                 else if (ganttTaskData.startDate > startDate) {
-                    this.validationPredecessor.push(predecessor[i]);
+                    this.validationPredecessor.push(predecessor[parseInt(i.toString(), 10)]);
                     violationType = 'taskAfterPredecessor_FS';
                 }
             }
             else if (predecessor[i].type === 'SS') {
                 if (ganttTaskData.startDate < startDate) {
-                    this.validationPredecessor.push(predecessor[i]);
+                    this.validationPredecessor.push(predecessor[parseInt(i.toString(), 10)]);
                     violationType = 'taskBeforePredecessor_SS';
                 }
                 else if (ganttTaskData.startDate > startDate) {
-                    this.validationPredecessor.push(predecessor[i]);
+                    this.validationPredecessor.push(predecessor[parseInt(i.toString(), 10)]);
                     violationType = 'taskAfterPredecessor_SS';
                 }
             }
             else if (predecessor[i].type === 'FF') {
                 if (endDate <= parentGanttRecord.ganttProperties.endDate) {
-                    this.validationPredecessor.push(predecessor[i]);
+                    this.validationPredecessor.push(predecessor[parseInt(i.toString(), 10)]);
                     violationType = 'taskBeforePredecessor_FF';
                 }
                 else if (endDate > parentGanttRecord.ganttProperties.endDate) {
-                    this.validationPredecessor.push(predecessor[i]);
+                    this.validationPredecessor.push(predecessor[parseInt(i.toString(), 10)]);
                     violationType = 'taskAfterPredecessor_FF';
                 }
             }
             else if (predecessor[i].type === 'SF') {
                 if (endDate < parentGanttRecord.ganttProperties.startDate) {
-                    this.validationPredecessor.push(predecessor[i]);
+                    this.validationPredecessor.push(predecessor[parseInt(i.toString(), 10)]);
                     violationType = 'taskBeforePredecessor_SF';
                 }
                 else if (endDate >= parentGanttRecord.ganttProperties.startDate) {
-                    this.validationPredecessor.push(predecessor[i]);
+                    this.validationPredecessor.push(predecessor[parseInt(i.toString(), 10)]);
                     violationType = 'taskAfterPredecessor_SF';
                 }
             }
@@ -23264,13 +23809,13 @@ var ConnectorLineEdit = /** @__PURE__ @class */ (function () {
             var prevPredecessor = prevData.ganttProperties.predecessor;
             if (!isNullOrUndefined(prevPredecessor)) {
                 for (var p = 0; p < prevPredecessor.length; p++) {
-                    var parentGanttRecord = this.parent.connectorLineModule.getRecordByID(prevPredecessor[p].from);
+                    var parentGanttRecord = this.parent.connectorLineModule.getRecordByID(prevPredecessor[parseInt(p.toString(), 10)].from);
                     if (parentGanttRecord === data) {
-                        data.ganttProperties.predecessor.push(prevPredecessor[p]);
+                        data.ganttProperties.predecessor.push(prevPredecessor[parseInt(p.toString(), 10)]);
                     }
                     else {
                         var parentPredecessor = extend([], [], parentGanttRecord.ganttProperties.predecessor, true);
-                        var parentIndex = getIndex(prevPredecessor[p], 'from', parentPredecessor, 'to');
+                        var parentIndex = getIndex(prevPredecessor[parseInt(p.toString(), 10)], 'from', parentPredecessor, 'to');
                         if (parentIndex !== -1) {
                             parentPredecessor.splice(parentIndex, 1);
                             this.parent.setRecordValue('predecessor', parentPredecessor, parentGanttRecord.ganttProperties, true);
@@ -23280,9 +23825,9 @@ var ConnectorLineEdit = /** @__PURE__ @class */ (function () {
             }
             if (!isNullOrUndefined(newPredecessor)) {
                 for (var n = 0; n < newPredecessor.length; n++) {
-                    var parentGanttRecord = this.parent.connectorLineModule.getRecordByID(newPredecessor[n].from);
+                    var parentGanttRecord = this.parent.connectorLineModule.getRecordByID(newPredecessor[parseInt(n.toString(), 10)].from);
                     var parentPredecessor = extend([], [], parentGanttRecord.ganttProperties.predecessor, true);
-                    parentPredecessor.push(newPredecessor[n]);
+                    parentPredecessor.push(newPredecessor[parseInt(n.toString(), 10)]);
                     this.parent.setRecordValue('predecessor', parentPredecessor, parentGanttRecord.ganttProperties, true);
                 }
             }
@@ -23745,7 +24290,7 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
         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) {
-                if (isNullOrUndefined(data[key]) && !ganttObj.allowUnscheduledTasks) {
+                if (isNullOrUndefined(data["" + key]) && !ganttObj.allowUnscheduledTasks) {
                     continue;
                 }
                 if (isFromDialog) {
@@ -23800,7 +24345,7 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                 else if (key === tasks.name) {
                     ganttPropKey = 'taskName';
                 }
-                else if (key === tasks.segments) {
+                else if ((key === tasks.segments) && (!isNullOrUndefined(ganttData.ganttProperties.segments))) {
                     ganttPropKey = 'segments';
                     /* eslint-disable-next-line */
                     if (data && !isNullOrUndefined(data[this.parent.taskFields.segments]) && data[this.parent.taskFields.segments].length > 0) {
@@ -24168,8 +24713,10 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
      */
     Edit$$1.prototype.updateEditedTask = function (args) {
         var ganttRecord = args.data;
-        this.updateParentChildRecord(ganttRecord);
-        if (this.parent.isConnectorLineUpdate) {
+        if (this.parent.autoCalculateDateScheduling) {
+            this.updateParentChildRecord(ganttRecord);
+        }
+        if (this.parent.isConnectorLineUpdate && this.parent.autoCalculateDateScheduling) {
             /* validating predecessor for updated child items */
             for (var i = 0; i < this.validatedChildItems.length; i++) {
                 var child = this.validatedChildItems[i];
@@ -24188,7 +24735,7 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                 this.parent.predecessorModule.validatePredecessor(ganttRecord, [], '');
                 this.parent.predecessorModule.isValidatedParentTaskID = '';
             }
-            if (ganttRecord.hasChildRecords && this.parent.previousRecords[ganttRecord.uniqueID].ganttProperties.startDate &&
+            if (this.parent.allowParentDependency && ganttRecord.hasChildRecords && this.parent.previousRecords[ganttRecord.uniqueID].ganttProperties.startDate &&
                 (args.action === "DrawConnectorLine")) {
                 this.updateChildItems(ganttRecord);
             }
@@ -24196,7 +24743,9 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
         }
         /** Update parent up-to zeroth level */
         if (ganttRecord.parentItem) {
-            this.parent.dataOperation.updateParentItems(ganttRecord, true);
+            if (this.parent.autoCalculateDateScheduling) {
+                this.parent.dataOperation.updateParentItems(ganttRecord, true);
+            }
             var parentData = this.parent.getRecordByID(ganttRecord.parentItem.taskId);
             if (!parentData.ganttProperties.predecessorsName) {
                 this.parent.predecessorModule.validatePredecessor(parentData, [], '');
@@ -24442,7 +24991,7 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
             durationDiff = this.parent.dateValidationModule.getDuration(validStartDate, validEndDate, 'minute', true, false);
         }
         for (var i = 0; i < childRecords.length; i++) {
-            if ((!(this.parent.isUnscheduledTask(childRecords[i].ganttProperties))) && (childRecords[i].ganttProperties.isAutoSchedule)) {
+            if (childRecords[i].ganttProperties.isAutoSchedule) {
                 if (durationDiff > 0) {
                     var startDate = isScheduledTask(childRecords[i].ganttProperties) ?
                         childRecords[i].ganttProperties.startDate : childRecords[i].ganttProperties.startDate ?
@@ -24560,52 +25109,52 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
         }
         for (var i = 0; i < eLength; i++) {
             if (e.changedRecords) {
-                rec = e.changedRecords[i];
+                rec = e.changedRecords[parseInt(i.toString(), 10)];
             }
             else {
-                rec = e[i];
+                rec = e[parseInt(i.toString(), 10)];
             }
             var _aLength = Object.keys(rec).length;
             for (var j = 0, _a = Object.keys(rec); j < _aLength; j++) {
-                var key = _a[j];
-                this.parent.editedRecords[i][key] = rec[key];
-                this.parent.editedRecords[i].taskData[key] = rec[key];
+                var key = _a[parseInt(j.toString(), 10)];
+                this.parent.editedRecords[parseInt(i.toString(), 10)]["" + key] = rec["" + key];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].taskData["" + key] = rec["" + key];
             }
             if (this.parent.taskFields.id !== null) {
-                this.parent.editedRecords[i].ganttProperties["taskId"] = rec[this.parent.taskFields.id];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['taskId'] = rec[this.parent.taskFields.id];
             }
             if (this.parent.taskFields.name !== null) {
-                this.parent.editedRecords[i].ganttProperties["taskName"] = rec[this.parent.taskFields.name];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['taskName'] = rec[this.parent.taskFields.name];
             }
             if (this.parent.taskFields.startDate !== null) {
-                this.parent.editedRecords[i].ganttProperties["startDate"] = rec[this.parent.taskFields.startDate];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['startDate'] = rec[this.parent.taskFields.startDate];
             }
             if (this.parent.taskFields.endDate !== null) {
-                this.parent.editedRecords[i].ganttProperties["endDate"] = rec[this.parent.taskFields.endDate];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['endDate'] = rec[this.parent.taskFields.endDate];
             }
             if (this.parent.taskFields.duration !== null) {
-                this.parent.editedRecords[i].ganttProperties["duration"] = parseInt(rec[this.parent.taskFields.duration]);
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['duration'] = parseInt(rec[this.parent.taskFields.duration]);
             }
             if (this.parent.taskFields.durationUnit !== null) {
-                this.parent.editedRecords[i].ganttProperties["durationUnit"] = rec[this.parent.taskFields.durationUnit];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['durationUnit'] = rec[this.parent.taskFields.durationUnit];
             }
             if (this.parent.taskFields.progress !== null) {
-                this.parent.editedRecords[i].ganttProperties["progress"] = rec[this.parent.taskFields.progress];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['progress'] = rec[this.parent.taskFields.progress];
             }
             if (this.parent.taskFields.dependency !== null) {
-                this.parent.editedRecords[i].ganttProperties["dependency"] = rec[this.parent.taskFields.dependency];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['dependency'] = rec[this.parent.taskFields.dependency];
             }
             if (this.parent.taskFields.parentID !== null) {
-                this.parent.editedRecords[i].ganttProperties["parentID"] = rec[this.parent.taskFields.parentID];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['parentID'] = rec[this.parent.taskFields.parentID];
             }
             if (this.parent.taskFields.baselineEndDate !== null) {
-                this.parent.editedRecords[i].ganttProperties["baselineEndDate"] = rec[this.parent.taskFields.baselineEndDate];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['baselineEndDate'] = rec[this.parent.taskFields.baselineEndDate];
             }
             if (this.parent.taskFields.baselineStartDate !== null) {
-                this.parent.editedRecords[i].ganttProperties["baselineStartDate"] = rec[this.parent.taskFields.baselineStartDate];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['baselineStartDate'] = rec[this.parent.taskFields.baselineStartDate];
             }
             if (this.parent.taskFields.resourceInfo !== null) {
-                this.parent.editedRecords[i].ganttProperties["resources"] = rec[this.parent.taskFields.resourceInfo];
+                this.parent.editedRecords[parseInt(i.toString(), 10)].ganttProperties['resources'] = rec[this.parent.taskFields.resourceInfo];
             }
         }
         this.saveSuccess(args);
@@ -24674,6 +25223,14 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
         }
         if (!this.isTreeGridRefresh) {
             this.parent.chartRowsModule.refreshRecords(this.parent.editedRecords);
+            if (this.parent.viewType === 'ResourceView' && !this.parent.allowTaskbarOverlap && this.parent.showOverAllocation) {
+                this.parent.contentHeight = this.parent['element'].getElementsByClassName('e-content')[0].children[0]['offsetHeight'];
+                this.parent.ganttChartModule.chartBodyContent.style.height = this.parent.contentHeight + 'px';
+                this.parent.ganttChartModule.renderRangeContainer(this.parent.currentViewData);
+                if (this.parent.taskFields.dependency) {
+                    this.parent.ganttChartModule.reRenderConnectorLines();
+                }
+            }
             if (this.parent.isConnectorLineUpdate && !isNullOrUndefined(this.parent.connectorLineEditModule)) {
                 this.parent.updatedConnectorLineCollection = [];
                 this.parent.connectorLineIds = [];
@@ -25589,15 +26146,24 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                 if (parentTask && parentTask.ganttProperties.taskName !==
                     this_2.parent.localeObj.getConstant('unassignedTask') && isDuplicate.length === 0) {
                     this_2.checkWithUnassignedTask(updateUnAssignedResources_1[i]);
-                    if (parentTask) {
-                        this_2.parent.dataOperation.updateParentItems(updateUnAssignedResources_1[i].parentItem);
-                    }
                 }
                 else if (!parentTask && (!isDuplicate || isDuplicate.length === 0)) {
                     this_2.checkWithUnassignedTask(updateUnAssignedResources_1[i]);
-                    if (updateUnAssignedResources_1[i].parentItem && unassignedTask) {
-                        this_2.parent.dataOperation.updateParentItems(updateUnAssignedResources_1[i].parentItem);
+                }
+                unassignedTask = this_2.parent.flatData.filter(function (data) {
+                    return data.ganttProperties.taskName === _this.parent.localeObj.getConstant('unassignedTask');
+                })[0];
+                var parentItem = this_2.parent.currentViewData.filter(function (data) {
+                    if (data.ganttProperties.taskId == updateUnAssignedResources_1[i].ganttProperties.taskId && (!data.hasChildRecords && data.parentItem)
+                        && unassignedTask.uniqueID === data.parentItem.uniqueID) {
+                        return data;
                     }
+                    else {
+                        return null;
+                    }
+                });
+                if (parentItem[0]) {
+                    this_2.parent.dataOperation.updateParentItems(parentItem[0]);
                 }
             };
             var this_2 = this;
@@ -26207,7 +26773,7 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                 if (!isNullOrUndefined(ganttData)) {
                     _this.validateUpdateValues(args.newTaskData, ganttData, true);
                 }
-                if (!isNullOrUndefined(args.data[tempTaskID])) {
+                if (!isNullOrUndefined(args.data["" + tempTaskID])) {
                     if (args.data[tempTaskID] != args.data['ganttProperties']['taskId']) {
                         args.data['ganttProperties']['taskId'] = args.data[tempTaskID];
                         args.newTaskData[tempTaskID] = args.data[tempTaskID];
@@ -27493,9 +28059,95 @@ var Filter$1 = /** @__PURE__ @class */ (function () {
             }
         }
     };
+    Filter$$1.prototype.setPosition = function (li, ul) {
+        var gridPos = this.parent.element.getBoundingClientRect();
+        var gridPosTop = gridPos.top;
+        var gridPosLeft = gridPos.left;
+        var parentNode;
+        var parentNodeTop;
+        var parentNodeLeft;
+        var paddingTop;
+        var paddingLeft;
+        var marginTop;
+        var marginLeft;
+        if (!isNullOrUndefined(this.parent.element.parentNode) && this.parent.element.parentNode['tagName'] != 'BODY') {
+            parentNode = this.parent.element.parentNode;
+            parentNodeTop = parentNode.getBoundingClientRect().top;
+            marginTop = parentNode.style.marginTop;
+            while (true) {
+                if (Math.abs(gridPosTop) > Math.abs(parentNodeTop)) {
+                    paddingTop = gridPosTop - parentNodeTop;
+                    break;
+                }
+                if (!isNullOrUndefined(this.parent.element.parentNode)) {
+                    parentNode = parentNode.parentNode;
+                    marginTop = parentNode.parentNode.style.marginTop;
+                }
+                parentNodeTop = parentNode.getBoundingClientRect().top;
+            }
+            parentNodeLeft = parentNode.getBoundingClientRect().left;
+            marginLeft = parentNode.style.marginLeft;
+            while (true) {
+                if (Math.abs(gridPosLeft) > Math.abs(parentNodeLeft)) {
+                    paddingLeft = gridPosLeft - parentNodeLeft;
+                    break;
+                }
+                if (!isNullOrUndefined(this.parent.element.parentNode)) {
+                    parentNode = parentNode.parentNode;
+                    marginLeft = parentNode.style.marginLeft;
+                }
+                parentNodeLeft = parentNode.getBoundingClientRect().left;
+            }
+        }
+        var liPos = li.getBoundingClientRect();
+        var left = liPos.right + window.scrollX;
+        var top = liPos.top + window.scrollY;
+        if (gridPos.right < (left + ul.offsetWidth)) {
+            if ((liPos.left - ul.offsetWidth) > gridPos.left) {
+                left = (liPos.left - ul.offsetWidth);
+            }
+            else {
+                left -= (left + ul.offsetWidth) - gridPos.right;
+            }
+        }
+        else {
+            if (!isNullOrUndefined(paddingTop) && !isNullOrUndefined(paddingLeft)) {
+                left = Math.abs(liPos.right - gridPos.left);
+                top = Math.abs(liPos.top - gridPos.top);
+            }
+        }
+        if (!isNullOrUndefined(paddingTop) && !isNullOrUndefined(paddingLeft)) {
+            ul.style.top = typeof (parseInt(marginTop)) === "string" ? (top + paddingTop + parseInt(marginTop)) + 'px' : (top + paddingTop) + 'px';
+            ul.style.left = typeof (parseInt(marginLeft)) === "string" ? (left + paddingLeft + parseInt(marginLeft) + 8) + 'px' : (left + paddingLeft) + 'px';
+        }
+        else {
+            ul.style.top = top + 'px';
+            ul.style.left = left + 'px';
+        }
+    };
     Filter$$1.prototype.updateFilterMenuPosition = function (element, args) {
         addClass([element], 'e-gantt');
-        document.querySelector('#' + this.parent.treeGrid.grid.element.id).appendChild(element);
+        document.querySelector('#' + this.parent.controlId).appendChild(element);
+        var targetElement;
+        if (this.parent.showColumnMenu) {
+            targetElement = document.querySelector('#treeGrid' + this.parent.controlId + '_gridcontrol_colmenu_Filter');
+            element.style.zIndex = targetElement.parentElement.style.zIndex;
+            if (this.parent.treeGrid.filterSettings.type === 'Menu') {
+                this.setPosition(targetElement, getValue('filterModel.dlgObj.element', args));
+            }
+            else {
+                this.setPosition(targetElement, getValue('filterModel.dialogObj.element', args));
+            }
+        }
+        else {
+            targetElement = this.parent.treeGrid.grid.getColumnHeaderByField(args.columnName).querySelector('.e-filtermenudiv');
+            if (this.parent.treeGrid.filterSettings.type === 'Menu') {
+                getFilterMenuPostion(targetElement, getValue('filterModel.dlgObj', args));
+            }
+            else {
+                getFilterMenuPostion(targetElement, getValue('filterModel.dialogObj', args));
+            }
+        }
         if (this.parent.treeGrid.filterSettings.type === 'Menu') {
             element.querySelector('.e-valid-input').focus();
         }
@@ -27913,7 +28565,10 @@ var Selection$1 = /** @__PURE__ @class */ (function () {
             var rIndex = parseInt(selectedRow.getAttribute('aria-rowindex'), 10);
             var isToggle = this.parent.selectionSettings.enableToggle;
             if (this.parent.selectionSettings.type === 'Single' || (!this.isMultiCtrlRequest && !this.isMultiShiftRequest)) {
-                this.selectRow(rIndex, isToggle);
+                if (!this.parent.allowTaskbarDragAndDrop || (this.parent.allowTaskbarDragAndDrop && (this.parent.rowDragAndDropModule &&
+                    !this.parent.rowDragAndDropModule['draggedRecord']))) {
+                    this.selectRow(rIndex, isToggle);
+                }
             }
             else {
                 if (this.isMultiShiftRequest) {
@@ -27957,7 +28612,7 @@ var Selection$1 = /** @__PURE__ @class */ (function () {
     };
     Selection$$1.prototype.addRemoveClass = function (records) {
         if (typeof (records) == "number") {
-            records = Array.from(String(records), function (num) { return Number(num); });
+            records = [records];
         }
         var ganttRow = [].slice.call(this.parent.ganttChartModule.chartBodyContent.querySelector('tbody').children);
         var _loop_1 = function (i) {
@@ -28743,6 +29398,9 @@ var NonWorkingDay = /** @__PURE__ @class */ (function () {
             });
             var property = this.parent.disableHtmlEncode ? 'textContent' : 'innerHTML';
             spanElement[property] = this.parent.holidays[i].label ? this.parent.holidays[i].label : '';
+            if (this.parent.enableHtmlSanitizer && typeof (spanElement[property]) === 'string') {
+                spanElement[property] = SanitizeHtmlHelper.sanitize(spanElement[property]);
+            }
             holidayDiv.appendChild(spanElement);
             if (this.parent.holidays[i].cssClass) {
                 holidayDiv.classList.add(this.parent.holidays[i].cssClass);
@@ -28929,6 +29587,9 @@ var EventMarker$1 = /** @__PURE__ @class */ (function () {
                 });
                 var property = this.parent.disableHtmlEncode ? 'textContent' : 'innerHTML';
                 spanElement[property] = this.parent.eventMarkers[i].label;
+                if (this.parent.enableHtmlSanitizer && typeof (spanElement[property]) === 'string') {
+                    spanElement[property] = SanitizeHtmlHelper.sanitize(spanElement[property]);
+                }
                 if (this.parent.enableRtl) {
                     spanElement.style.right = '5px';
                 }
@@ -30176,7 +30837,7 @@ var ContextMenu$2 = /** @__PURE__ @class */ (function () {
                 this.parent.selectionModule.selectRow(rowIndex);
             }
             if (!args.parentItem) {
-                this.rowData = this.parent.updatedRecords[rowIndex];
+                this.rowData = this.parent.updatedRecords[parseInt(rowIndex.toString(), 10)];
             }
             for (var _i = 0, _a = args.items; _i < _a.length; _i++) {
                 var item = _a[_i];
@@ -30308,7 +30969,7 @@ var ContextMenu$2 = /** @__PURE__ @class */ (function () {
                                 this.parent.selectionModule.getSelectedRowCellIndexes().length === 1 ? true : false : false;
                             var prevRecord = this.parent.updatedRecords[this.parent.selectionModule.getSelectedRowIndexes()[0] - 1];
                             if (!this.parent.editSettings.allowEditing || index === 0 || index === -1 || !isSelected ||
-                                this.parent.viewType === 'ResourceView' || this.parent.updatedRecords[index].level - prevRecord.level === 1) {
+                                this.parent.viewType === 'ResourceView' || this.parent.updatedRecords[parseInt(index.toString(), 10)].level - prevRecord.level === 1) {
                                 this.updateItemVisibility(item.text);
                             }
                         }
@@ -30324,7 +30985,7 @@ var ContextMenu$2 = /** @__PURE__ @class */ (function () {
                             var isSelect = this.parent.selectionModule ? this.parent.selectionModule.selectedRowIndexes.length === 1 ||
                                 this.parent.selectionModule.getSelectedRowCellIndexes().length === 1 ? true : false : false;
                             if (!this.parent.editSettings.allowEditing || ind === -1 || ind === 0 || !isSelect ||
-                                this.parent.viewType === 'ResourceView' || this.parent.updatedRecords[ind].level === 0) {
+                                this.parent.viewType === 'ResourceView' || this.parent.updatedRecords[parseInt(ind.toString(), 10)].level === 0) {
                                 this.updateItemVisibility(item.text);
                             }
                         }
@@ -30334,7 +30995,7 @@ var ContextMenu$2 = /** @__PURE__ @class */ (function () {
                     {
                         var taskSettings = this.parent.taskFields;
                         if (this.parent.readOnly || !taskbarElement || isNullOrUndefined(taskSettings.segments) ||
-                            this.parent.currentViewData[rowIndex].hasChildRecords) {
+                            this.parent.currentViewData[parseInt(rowIndex.toString(), 10)].hasChildRecords) {
                             this.updateItemVisibility(item.text);
                         }
                         break;
@@ -30539,7 +31200,7 @@ var ContextMenu$2 = /** @__PURE__ @class */ (function () {
     };
     ContextMenu$$1.prototype.contextMenuOnClose = function (args) {
         var parent = 'parentObj';
-        if (args.items.length > 0 && args.items[0][parent] instanceof ContextMenu$1) {
+        if (args.items.length > 0 && args.items[0]["" + parent] instanceof ContextMenu$1) {
             this.revertItemStatus();
         }
     };
@@ -31032,7 +31693,7 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
                         parentUniqueID = this.droppedRecord.uniqueID;
                     }
                     else {
-                        parentUniqueID = this.droppedRecord.parentItem.uniqueID;
+                        parentUniqueID = this.droppedRecord.parentItem ? this.droppedRecord.parentItem.uniqueID : this.droppedRecord.uniqueID;
                     }
                     var droppedParentItem = this.parent.getTaskByUniqueID(parentUniqueID);
                     var editedObj = {};
@@ -31059,7 +31720,7 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
                         this.updateSharedResourceTask();
                     }
                 }
-                if (this.parent.taskFields.dependency) {
+                if (this.parent.taskFields.dependency && this.parent.allowParentDependency) {
                     var isValidPredecessor = true;
                     var draggedParent = void 0;
                     var toParent_1;
@@ -35824,8 +36485,9 @@ var PdfExport = /** @__PURE__ @class */ (function () {
      * @param {object} pdfDoc .
      * @returns {Promise<Object>} .
      */
-    PdfExport.prototype.export = function (pdfExportProperties, isMultipleExport, pdfDoc) {
+    PdfExport.prototype.export = function (pdfExportProperties, isMultipleExport, pdfDoc, isBlob) {
         var _this = this;
+        this.isBlob = isBlob;
         var args = {
             requestType: 'beforePdfExport',
             ganttObject: this.parent,
@@ -35869,7 +36531,7 @@ var PdfExport = /** @__PURE__ @class */ (function () {
             this.pdfDocument = new PdfDocument();
         }
         this.processExport(data, pdfExportProperties, isMultipleExport).then(function () {
-            _this.parent.trigger('pdfExportComplete', {});
+            _this.parent.trigger('pdfExportComplete', _this.isBlob ? { promise: _this.blobPromise } : {});
             if (!isNullOrUndefined(_this.parent.loadingIndicator) && _this.parent.loadingIndicator.indicatorType === "Shimmer") {
                 _this.parent.hideMaskRow();
             }
@@ -35895,12 +36557,17 @@ var PdfExport = /** @__PURE__ @class */ (function () {
             var layouter = _this.gantt.drawGrid(pdfPage, 0, 0, format);
             _this.gantt.drawChart(layouter);
             if (!isMultipleExport) {
-                // save the PDF
-                if (!isNullOrUndefined(pdfExportProperties) && pdfExportProperties.fileName) {
-                    _this.pdfDocument.save(pdfExportProperties.fileName);
+                if (!_this.isBlob) {
+                    // save the PDF
+                    if (!isNullOrUndefined(pdfExportProperties) && pdfExportProperties.fileName) {
+                        _this.pdfDocument.save(pdfExportProperties.fileName);
+                    }
+                    else {
+                        _this.pdfDocument.save('Export.pdf');
+                    }
                 }
                 else {
-                    _this.pdfDocument.save('Export.pdf');
+                    _this.blobPromise = _this.pdfDocument.save();
                 }
                 _this.pdfDocument.destroy();
             }