@syncfusion/ej2-gantt 20.2.49 → 20.3.47

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

@@ -1,12 +1,12 @@
 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 { Dialog, Tooltip, createSpinner, hideSpinner, showSpinner } from '@syncfusion/ej2-popups';
-import { Edit, ForeignKey, Grid, Page, Predicate, Toolbar, ValueFormatter, click, filterAfterOpen, getActualProperties, getCustomDateFormat, getFilterMenuPostion, getForeignData, getObject, getUid, parentsUntil, setCssInGridPopUp } from '@syncfusion/ej2-grids';
+import { Edit, ForeignKey, Grid, Page, Predicate, Toolbar, ValueFormatter, click, filterAfterOpen, getActualProperties, getCustomDateFormat, 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';
 import { ContextMenu as ContextMenu$1, Tab, Toolbar as Toolbar$1 } from '@syncfusion/ej2-navigations';
 import { Count, HtmlEditor, Link, QuickToolbar, RichTextEditor, Toolbar as Toolbar$2 } from '@syncfusion/ej2-richtexteditor';
-import { MaskedTextBox, NumericTextBox, TextBox } from '@syncfusion/ej2-inputs';
+import { FormValidator, MaskedTextBox, NumericTextBox, TextBox } from '@syncfusion/ej2-inputs';
 import { CheckBox } from '@syncfusion/ej2-buttons';
 import { DatePicker, DateTimePicker } from '@syncfusion/ej2-calendars';
 import { CheckBoxSelection, ComboBox, DropDownList, MultiSelect } from '@syncfusion/ej2-dropdowns';
@@ -1740,7 +1740,9 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
     };
     TaskProcessor.prototype.calculateSharedTaskUniqueIds = function () {
         var _loop_2 = function (i) {
-            var value = this_2.parent.getTaskIds()[i].match(/(\d+|[A-z]+)/g);
+            var value = [];
+            value[0] = this_2.parent.getTaskIds()[i][0];
+            value[1] = this_2.parent.getTaskIds()[i].slice(1);
             if (value[0] !== 'R') {
                 var sharedRecords_1 = [];
                 var ids_1 = [];
@@ -1807,7 +1809,6 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
                     this_3.parent.setRecordValue('autoDuration', this_3.calculateAutoDuration(parentProp), parentProp, true);
                     this_3.updateAutoWidthLeft(parentData);
                 }
-                this_3.resetDependency(parentData);
                 this_3.updateWidthLeft(parentData);
                 this_3.updateTaskData(parentData);
             }
@@ -1832,7 +1833,8 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
         var length = columns.length;
         if (length) {
             for (var i = 0; i < length; i++) {
-                if (ganttRecord[columns[i].field] === undefined) {
+                var fieldName = ganttRecord[columns[i].field];
+                if (fieldName === undefined) {
                     this.parent.setRecordValue(columns[i].field, data[columns[i].field], ganttRecord);
                 }
             }
@@ -1881,6 +1883,7 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
             this.parent.setRecordValue('parentId', data[taskSettings.parentID], ganttProperties, true);
         }
         this.addCustomFieldValue(data, ganttData);
+        ganttData.checkboxState = 'uncheck';
         this.parent.setRecordValue('isAutoSchedule', autoSchedule, ganttProperties, true);
         this.parent.setRecordValue('resourceInfo', this.setResourceInfo(data), ganttProperties, true);
         this.parent.setRecordValue('isMilestone', false, ganttProperties, true);
@@ -1923,7 +1926,6 @@ 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);
-            this.resetDependency(ganttData);
         }
         else {
             this.parent.setRecordValue('hasChildRecords', false, ganttData);
@@ -1966,6 +1968,9 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
         }
         else {
             var uniqueId = ganttData.uniqueID.replace(this.parent.element.id + '_data_', '');
+            if (this.parent.viewType === 'ResourceView' && typeof (ganttData.ganttProperties.taskId) === "string") {
+                uniqueId = ganttProperties.taskId.toString();
+            }
             this.parent.setRecordValue('rowUniqueID', uniqueId, ganttData);
             this.parent.setRecordValue('rowUniqueID', uniqueId, ganttProperties, true);
             this.parent.setRecordValue('sharedTaskUniqueIds', [], ganttProperties, true);
@@ -3085,10 +3090,12 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
     TaskProcessor.prototype.updateResourceName = function (data) {
         var resourceInfo = data.ganttProperties.resourceInfo;
         var resourceName = [];
+        var taskMapping = this.parent.taskFields;
         if (resourceInfo) {
+            var resourceLength = resourceInfo.length;
             var taskResources = extend([], [], data.taskData[this.parent.taskFields.resourceInfo], true);
             this.parent.setRecordValue('taskData.' + this.parent.taskFields.resourceInfo, [], data);
-            for (var i = 0; i < resourceInfo.length; i++) {
+            for (var i = 0; i < resourceLength; i++) {
                 var resource = resourceInfo[i];
                 var resName = resource[this.parent.resourceFields.name];
                 var resourceUnit = resource[this.parent.resourceFields.unit];
@@ -3097,7 +3104,7 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
                 }
                 resourceName.push(resName);
                 if (data.taskData) {
-                    var mapping = this.parent.taskFields.resourceInfo;
+                    var mapping = taskMapping.resourceInfo;
                     // eslint-disable-next-line
                     if (typeof (taskResources[i] === 'object')) {
                         data.taskData[mapping].push(taskResources[i]);
@@ -3776,7 +3783,6 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
                     this.parent.setRecordValue('autoDuration', this.calculateAutoDuration(parentProp), parentProp, true);
                     this.updateAutoWidthLeft(parentData);
                 }
-                this.resetDependency(parentData);
                 this.updateWidthLeft(parentData);
                 this.updateTaskData(parentData);
             }
@@ -4331,7 +4337,7 @@ var GanttChart = /** @__PURE__ @class */ (function () {
     GanttChart.prototype.renderTimelineContainer = function () {
         this.chartTimelineContainer =
             createElement('div', { className: timelineHeaderContainer });
-        this.chartTimelineContainer.setAttribute("role", "TimelineHeader");
+        this.chartTimelineContainer.setAttribute("role", "presentation");
         this.chartElement.appendChild(this.chartTimelineContainer);
     };
     /**
@@ -4457,12 +4463,10 @@ var GanttChart = /** @__PURE__ @class */ (function () {
         }
     };
     GanttChart.prototype.ganttChartMouseClick = function (e) {
-        if (this.parent.editSettings.allowTaskbarEditing) {
-            if (this.parent.autoFocusTasks) {
-                this.scrollToTarget(e); /** Scroll to task */
-            }
-            this.parent.notify('chartMouseClick', e);
+        if (this.parent.autoFocusTasks) {
+            this.scrollToTarget(e); /** Scroll to task */
         }
+        this.parent.notify('chartMouseClick', e);
     };
     GanttChart.prototype.ganttChartMouseUp = function (e) {
         if (this.parent.editSettings.allowTaskbarEditing) {
@@ -4796,6 +4800,10 @@ var GanttChart = /** @__PURE__ @class */ (function () {
         this.parent.updatedConnectorLineCollection = [];
         this.parent.predecessorModule.createConnectorLinesCollection();
         this.parent.connectorLineModule.renderConnectorLines(this.parent.updatedConnectorLineCollection);
+        if (this.parent.enableCriticalPath && this.parent.criticalPathModule) {
+            var criticalModule = this.parent.criticalPathModule;
+            criticalModule.criticalConnectorLine(criticalModule.criticalPathCollection, criticalModule.detailPredecessorCollection, true, criticalModule.predecessorCollectionTaskIds);
+        }
     };
     /**
      * To collapse gantt rows
@@ -7510,11 +7518,30 @@ var GanttTreeGrid = /** @__PURE__ @class */ (function () {
      */
     GanttTreeGrid.prototype.composeIDColumn = function (column) {
         var isProjectView = this.parent.viewType === 'ProjectView';
+        var lengthDataSource = this.parent.dataSource['length'];
+        var taskIDName;
         column.isPrimaryKey = isProjectView ? true : false;
         column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('id');
         column.width = column.width ? column.width : 100;
-        column.allowEditing = column.allowEditing ? column.allowEditing : false;
-        column.editType = column.editType ? column.editType : 'numericedit';
+        for (var i = 0; i < lengthDataSource; i++) {
+            if (!isNullOrUndefined(this.parent.dataSource[i][this.parent.taskFields.id])) {
+                taskIDName = this.parent.dataSource[i][this.parent.taskFields.id];
+                break;
+            }
+        }
+        if (typeof (taskIDName) === "string") {
+            if (this.parent.viewType === 'ResourceView') {
+                column.allowEditing = column.allowEditing ? column.allowEditing : false;
+            }
+            else {
+                column.allowEditing = column.allowEditing ? column.allowEditing : true;
+            }
+            column.editType = column.editType ? column.editType : 'stringedit';
+        }
+        else {
+            column.allowEditing = column.allowEditing ? column.allowEditing : false;
+            column.editType = column.editType ? column.editType : 'numericedit';
+        }
         column.valueAccessor = isProjectView ? null : this.idValueAccessor.bind(this);
     };
     GanttTreeGrid.prototype.composeUniqueIDColumn = function (column) {
@@ -8508,7 +8535,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
      * @private
      */
     ChartRows.prototype.getIndicatorNode = function (indicator) {
-        var templateString = '<label class="' + label + ' ' + taskIndicatorDiv + '" role="LabelIndicator" style="line-height:'
+        var templateString = '<label class="' + label + ' ' + taskIndicatorDiv + '"style="line-height:'
             + (this.parent.rowHeight) + 'px;' +
             'left:' + this.getIndicatorleft(indicator.date) + 'px;"><i class="' + indicator.iconClass + '"></i> </label>';
         return this.createDivElement(templateString);
@@ -9024,7 +9051,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
      */
     ChartRows.prototype.getTaskBaselineNode = function () {
         var data = this.templateData;
-        var template = '<div class="' + baselineBar + ' ' + '" role="BaselineBar" style="margin-top:' + this.baselineTop +
+        var template = '<div class="' + baselineBar + ' ' + '" role="term" style="margin-top:' + this.baselineTop +
             'px;left:' + data.ganttProperties.baselineLeft + 'px;' +
             'width:' + data.ganttProperties.baselineWidth + 'px;height:' +
             this.baselineHeight + 'px;' + (this.baselineColor ? 'background-color: ' + this.baselineColor + ';' : '') + '"></div>';
@@ -9277,10 +9304,10 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         var className = (this.parent.gridLines === 'Horizontal' || this.parent.gridLines === 'Both') ?
             'e-chart-row-border' : '';
         table.innerHTML = '<tr class="' + this.getRowClassName(this.templateData) + ' ' + chartRow + '"' +
-            'role="ChartRow" style="display:' + this.getExpandDisplayProp(this.templateData) + ';height:' +
+            'style="display:' + this.getExpandDisplayProp(this.templateData) + ';height:' +
             this.parent.rowHeight + 'px;">' +
             '<td class="' + chartRowCell + ' ' + className
-            + '" role="ChartCell" style="width:' + this.parent.timelineModule.totalTimelineWidth + 'px;"></td></tr>';
+            + '"style="width:' + this.parent.timelineModule.totalTimelineWidth + 'px;"></td></tr>';
         return table.childNodes;
     };
     /**
@@ -9345,7 +9372,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
     };
     ChartRows.prototype.leftLabelContainer = function () {
         var template = '<div class="' + ((this.leftTaskLabelTemplateFunction) ? leftLabelTempContainer :
-            leftLabelContainer) + ' ' + '" tabindex="-1" role="LeftLabel" style="height:' +
+            leftLabelContainer) + ' ' + '" tabindex="-1" role="term" style="height:' +
             (this.parent.rowHeight - 2) + 'px;width:' + this.taskNameWidth(this.templateData) + '"></div>';
         return this.createDivElement(template);
     };
@@ -9357,7 +9384,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         var template = '<div class="' + taskBarMainContainer + ' ' +
             this.parent.getUnscheduledTaskClass(data.ganttProperties) + ' ' +
             ((data.ganttProperties.cssClass) ? data.ganttProperties.cssClass : '') + '" ' +
-            ' tabindex="-1" role="TaskBar" style="' + ((data.ganttProperties.isMilestone && !manualParent) ?
+            ' tabindex="-1" role="term" style="' + ((data.ganttProperties.isMilestone && !manualParent) ?
             ('width:' + this.milestoneHeight + 'px;height:' +
                 this.milestoneHeight + 'px;margin-top:' + this.milestoneMarginTop + 'px;left:' + (data.ganttProperties.left -
                 (this.milestoneHeight / 2)) + 'px;') : ('width:' + data.ganttProperties.width +
@@ -9368,26 +9395,26 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
     };
     ChartRows.prototype.rightLabelContainer = function () {
         var template = '<div class="' + ((this.rightTaskLabelTemplateFunction) ? rightLabelTempContainer :
-            rightLabelContainer) + '" ' + ' tabindex="-1" role="RightLabel" style="left:' + this.getRightLabelLeft(this.templateData) + 'px; height:'
+            rightLabelContainer) + '" ' + ' tabindex="-1" role="term" style="left:' + this.getRightLabelLeft(this.templateData) + 'px; height:'
             + (this.parent.rowHeight - 2) + 'px;"></div>';
         return this.createDivElement(template);
     };
     ChartRows.prototype.childTaskbarLeftResizer = function () {
         var lResizerLeft = -(this.parent.isAdaptive ? 12 : 2);
         var template = '<div class="' + taskBarLeftResizer + ' ' + icon + '"' +
-            ' role="LeftResizer" style="left:' + lResizerLeft + 'px;height:' + (this.taskBarHeight) + 'px;"></div>';
+            'style="left:' + lResizerLeft + 'px;height:' + (this.taskBarHeight) + 'px;"></div>';
         return this.createDivElement(template);
     };
     ChartRows.prototype.childTaskbarRightResizer = function () {
         var rResizerLeft = this.parent.isAdaptive ? -2 : -10;
         var template = '<div class="' + taskBarRightResizer + ' ' + icon + '"' +
-            ' role="RightResizer" style="left:' + (this.templateData.ganttProperties.width + rResizerLeft) + 'px;' +
+            'style="left:' + (this.templateData.ganttProperties.width + rResizerLeft) + 'px;' +
             'height:' + (this.taskBarHeight) + 'px;"></div>';
         return this.createDivElement(template);
     };
     ChartRows.prototype.childTaskbarProgressResizer = function () {
         var template = '<div class="' + childProgressResizer + '"' +
-            ' role="ProgressResizer" style="left:' + (this.templateData.ganttProperties.progressWidth - 6) + 'px;margin-top:' +
+            'style="left:' + (this.templateData.ganttProperties.progressWidth - 6) + 'px;margin-top:' +
             (this.taskBarHeight - 4) + 'px;"><div class="' + progressBarHandler + '"' +
             '><div class="' + progressHandlerElement + '"></div>' +
             '<div class="' + progressBarHandlerAfter + '"></div></div>';
@@ -9398,9 +9425,16 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         var pointerLeft = -((this.parent.isAdaptive ? 14 : 2) + this.connectorPointWidth);
         var mileStoneLeft = -(this.connectorPointWidth + 2);
         var pointerTop = Math.floor(this.milesStoneRadius - (this.connectorPointWidth / 2));
+        var marginTop;
+        if ((!this.templateData.ganttProperties.isAutoSchedule && this.templateData.hasChildRecords)) {
+            marginTop = '';
+        }
+        else {
+            marginTop = 'margin-top:' + this.connectorPointMargin + 'px';
+        }
         var template = '<div class="' + leftConnectorPointOuterDiv + '" style="' +
             ((data.ganttProperties.isMilestone) ? ('margin-top:' + pointerTop + 'px;left:' + mileStoneLeft +
-                'px;') : ('margin-top:' + this.connectorPointMargin + 'px;left:' + pointerLeft + 'px;')) + '">' +
+                'px;') : (marginTop + ';left:' + pointerLeft + 'px;')) + '">' +
             '<div class="' + connectorPointLeft + ' ' + this.parent.getUnscheduledTaskClass(data.ganttProperties) +
             '" style="width: ' + this.connectorPointWidth + 'px;' +
             'height: ' + this.connectorPointWidth + 'px;">' + this.touchLeftConnectorpoint + '</div></div>';
@@ -9410,10 +9444,16 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         var data = this.templateData;
         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)) {
+            marginTop = '';
+        }
+        else {
+            marginTop = 'margin-top:' + this.connectorPointMargin + 'px';
+        }
         var template = '<div class="' + rightConnectorPointOuterDiv + '" style="' +
             ((data.ganttProperties.isMilestone) ? ('left:' + (this.milestoneHeight - 2) + 'px;margin-top:' +
-                pointerTop + 'px;') : ('left:' + (data.ganttProperties.width + pointerRight) + 'px;margin-top:' +
-                this.connectorPointMargin + 'px;')) + '">' +
+                pointerTop + 'px;') : ('left:' + (data.ganttProperties.width + pointerRight) + 'px;' + marginTop + ';')) + '">' +
             '<div class="' + connectorPointRight + ' ' + this.parent.getUnscheduledTaskClass(data.ganttProperties) +
             '" style="width:' + this.connectorPointWidth + 'px;height:' + this.connectorPointWidth + 'px;">' +
             this.touchRightConnectorpoint + '</div></div>';
@@ -9713,14 +9753,17 @@ 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);
-        if (!this.templateData.hasChildRecords) {
-            var connectorLineLeftNode = this.getLeftPointNode();
+        var 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);
             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 (parentTaskbarTemplateNode && parentTaskbarTemplateNode.length > 0) {
@@ -9795,7 +9838,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                     ? this.getMilestoneBaselineNode() : this.getTaskBaselineNode();
             }
         }
-        if (!this.templateData.hasChildRecords) {
+        if ((this.templateData.ganttProperties.isAutoSchedule && this.parent.viewType == 'ProjectView') || !this.templateData.hasChildRecords) {
             var connectorLineRightNode = this.getRightPointNode();
             taskbarContainerNode[0].appendChild([].slice.call(connectorLineRightNode)[0]);
         }
@@ -10198,6 +10241,21 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
         }
         return defaultValue;
     };
+    ChartRows.prototype.generateBaselineAriaLabel = function (data) {
+        data = this.templateData;
+        var defaultValue = '';
+        var nameConstant = this.parent.localeObj.getConstant('name');
+        var startDateConstant = this.parent.localeObj.getConstant('startDate');
+        var endDateConstant = this.parent.localeObj.getConstant('endDate');
+        var taskNameVal = data.ganttProperties.taskName;
+        var startDateVal = data.ganttProperties.baselineStartDate;
+        var endDateVal = data.ganttProperties.baselineEndDate;
+        defaultValue += 'Baseline' + ' ';
+        defaultValue += nameConstant + ' ' + taskNameVal + ' ';
+        defaultValue += startDateConstant + ' ' + this.parent.getFormatedDate(startDateVal) + ' ';
+        defaultValue += endDateConstant + ' ' + this.parent.getFormatedDate(endDateVal) + ' ';
+        return defaultValue;
+    };
     ChartRows.prototype.generateSpiltTaskAriaLabel = function (data, ganttProp) {
         var defaultValue = '';
         var startDateConstant = this.parent.localeObj.getConstant('startDate');
@@ -10237,6 +10295,7 @@ var Dependency = /** @__PURE__ @class */ (function () {
     function Dependency(gantt) {
         this.parentRecord = [];
         this.parentIds = [];
+        this.parentPredecessors = [];
         this.parent = gantt;
         this.dateValidateModule = this.parent.dateValidationModule;
     }
@@ -10252,9 +10311,7 @@ var Dependency = /** @__PURE__ @class */ (function () {
         for (var count = length; count >= 0; count--) {
             var ganttData = predecessorTasks[count];
             var ganttProp = ganttData.ganttProperties;
-            if (!ganttData.hasChildRecords) {
-                this.ensurePredecessorCollectionHelper(ganttData, ganttProp);
-            }
+            this.ensurePredecessorCollectionHelper(ganttData, ganttProp);
         }
     };
     /**
@@ -10364,8 +10421,29 @@ var Dependency = /** @__PURE__ @class */ (function () {
                 values = el.split('-');
                 offsetValue = '-';
             }
-            match = values[0].match(/(\d+|[A-z]+)/g);
+            match = [];
             var ids = _this.parent.viewType === 'ResourceView' ? _this.parent.getTaskIds() : _this.parent.ids;
+            var isExist1 = _this.parent.viewType === 'ResourceView' ? ids.indexOf('T' + values[0]) : ids.indexOf(values[0]);
+            if (isExist1 !== -1) {
+                match[0] = values[0];
+            }
+            else {
+                if (ids.indexOf(values[0]) === -1) {
+                    match = values[0].split(" ");
+                    if (match.length === 1) {
+                        if (match[0].indexOf(" ") != -1) {
+                            match = values[0].match(/(\d+|[A-z]+)/g);
+                        }
+                        else {
+                            match[0] = values[0].slice(0, -2);
+                            match[1] = values[0].slice(-2);
+                        }
+                    }
+                }
+                else {
+                    match[0] = values[0];
+                }
+            }
             var isExist = _this.parent.viewType === 'ResourceView' ? ids.indexOf('T' + match[0]) : ids.indexOf(match[0]);
             /*Validate for appropriate predecessor*/
             if (match[0] && isExist !== -1) {
@@ -10396,10 +10474,18 @@ var Dependency = /** @__PURE__ @class */ (function () {
                 offsetUnit: offsetUnits.durationUnit,
                 offset: offsetUnits.duration
             };
-            var isOwnParent = _this.checkIsParent(match[0]);
-            if (!isOwnParent) {
+            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)
+                    collection.push(obj);
+            }
+            else {
                 collection.push(obj);
             }
+            match.splice(0);
         });
         return collection;
     };
@@ -10414,6 +10500,9 @@ var Dependency = /** @__PURE__ @class */ (function () {
         var predecessors = data.ganttProperties.predecessor;
         var durationUnitTexts = this.parent.durationUnitTexts;
         var resultString = '';
+        var temp1;
+        var match;
+        match = [];
         if (predecessors) {
             var length_1 = predecessors.length;
             for (var i = 0; i < length_1; i++) {
@@ -10423,6 +10512,15 @@ var Dependency = /** @__PURE__ @class */ (function () {
                     : data.ganttProperties.rowUniqueID;
                 if (currentValue.from !== id.toString()) {
                     temp = currentValue.from + currentValue.type;
+                    if (typeof (data.ganttProperties.taskId) === "string") {
+                        match[0] = temp.slice(0, -2);
+                        match[1] = temp.slice(-2);
+                        temp1 = match[0] + " " + match[1];
+                    }
+                    else {
+                        temp1 = temp;
+                    }
+                    temp = temp1;
                     if (currentValue.offset !== 0) {
                         temp += currentValue.offset > 0 ? ('+' + currentValue.offset + ' ') : (currentValue.offset + ' ');
                         var multiple = currentValue.offset !== 1;
@@ -10510,9 +10608,7 @@ var Dependency = /** @__PURE__ @class */ (function () {
         var length = predecessorsCollection.length;
         for (var count = 0; count < length; count++) {
             ganttRecord = predecessorsCollection[count];
-            if (!ganttRecord.hasChildRecords) {
-                this.updatePredecessorHelper(ganttRecord, predecessorsCollection);
-            }
+            this.updatePredecessorHelper(ganttRecord, predecessorsCollection);
         }
     };
     /**
@@ -10562,9 +10658,22 @@ var Dependency = /** @__PURE__ @class */ (function () {
      */
     Dependency.prototype.updatedRecordsDateByPredecessor = function () {
         var flatData = this.parent.flatData;
-        for (var count = 0; count < flatData.length; count++) {
+        var totLength = this.parent.flatData.length;
+        for (var count = 0; count < totLength; count++) {
             if (flatData[count].ganttProperties.predecessor) {
                 this.validatePredecessorDates(flatData[count]);
+                if (flatData[count].hasChildRecords && this.parent.editModule) {
+                    this.parent.editModule['updateChildItems'](flatData[count]);
+                }
+            }
+        }
+    };
+    Dependency.prototype.updateParentPredecessor = function () {
+        if (this.parent.enablePredecessorValidation) {
+            var parentPredecessorLength = this.parentPredecessors.length;
+            for (var i = parentPredecessorLength - 1; i >= 0; i--) {
+                var item = this.parentPredecessors[i];
+                this.validatePredecessorDates(item);
             }
         }
     };
@@ -10595,6 +10704,10 @@ 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
+                    && (ganttRecord.hasChildRecords || record.hasChildRecords)) {
+                    this.parentPredecessors.push(ganttRecord);
+                }
                 if (record.ganttProperties.isAutoSchedule || this.parent.validateManualTasksOnLinking) {
                     this.validateChildGanttRecord(parentGanttRecord, record);
                 }
@@ -10635,8 +10748,8 @@ var Dependency = /** @__PURE__ @class */ (function () {
                 this.dateValidateModule.calculateEndDate(childGanttRecord);
             }
             this.parent.dataOperation.updateWidthLeft(childGanttRecord);
-            if (childGanttRecord.parentItem && this.parent.getParentTask(childGanttRecord.parentItem).ganttProperties.isAutoSchedule
-                && this.parent.isInPredecessorValidation && !this.parent.isLoad) {
+            if (!this.parent.isLoad && childGanttRecord.parentItem && this.parent.isInPredecessorValidation &&
+                this.parent.getParentTask(childGanttRecord.parentItem).ganttProperties.isAutoSchedule) {
                 if (this.parentIds.indexOf(childGanttRecord.parentItem.uniqueID) === -1) {
                     this.parentIds.push(childGanttRecord.parentItem.uniqueID);
                     this.parentRecord.push(childGanttRecord.parentItem);
@@ -10993,8 +11106,19 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
      */
     ConnectorLine.prototype.createConnectorLineObject = function (parentGanttData, childGanttData, predecessor) {
         var connectorObj = {};
-        var updatedRecords = this.parent.pdfExportModule && this.parent.pdfExportModule.isPdfExport ?
-            this.parent.flatData : this.expandedRecords;
+        var updatedRecords;
+        if (this.parent.pdfExportModule && this.parent.pdfExportModule.isPdfExport) {
+            if (this.parent.pdfExportModule['helper']['exportProps'].exportType &&
+                this.parent.pdfExportModule['helper']['exportProps'].exportType === 'CurrentViewData') {
+                updatedRecords = this.expandedRecords;
+            }
+            else {
+                updatedRecords = this.parent.flatData;
+            }
+        }
+        else {
+            updatedRecords = this.expandedRecords;
+        }
         var parentIndex = updatedRecords.indexOf(parentGanttData);
         var childIndex = updatedRecords.indexOf(childGanttData);
         var parentGanttRecord = parentGanttData.ganttProperties;
@@ -11317,6 +11441,63 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             isMilestoneValue = (data.milestoneParent && data.milestoneChild) ? 0 : data.milestoneParent ? -5 : data.milestoneChild ? 5 : 0;
         }
         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 fromRecordIsParent = this.parent.currentViewData[data.parentIndex].hasChildRecords;
+            var toRecordIsParent = this.parent.currentViewData[data.childIndex].hasChildRecords;
+            var fromRecordIsManual = this.parent.currentViewData[data.parentIndex].ganttProperties.isAutoSchedule;
+            var toRecordIsManual = this.parent.currentViewData[data.childIndex].ganttProperties.isAutoSchedule;
+            var isValid = true;
+            if (((fromRecordIsParent && fromRecordIsManual) && !toRecordIsParent) || ((toRecordIsParent && toRecordIsManual) &&
+                !fromRecordIsParent) || (fromRecordIsParent && fromRecordIsManual && toRecordIsManual && toRecordIsParent)
+                || (!fromRecordIsParent && !toRecordIsParent)) {
+                isValid = false;
+            }
+            if (isValid) {
+                if (((fromRecordIsParent && !fromRecordIsManual) && (toRecordIsParent && !toRecordIsManual))) {
+                    addTop = -11;
+                }
+                else if (!((fromRecordIsParent && !fromRecordIsManual) && (toRecordIsParent && !toRecordIsManual))) {
+                    if (data.childIndex > data.parentIndex) {
+                        if (!fromRecordIsParent && toRecordIsParent) {
+                            borderTopWidth = -11;
+                        }
+                        else {
+                            borderTopWidth = 11;
+                            addTop = -11;
+                        }
+                    }
+                    else {
+                        if ((fromRecordIsParent && !toRecordIsParent)) {
+                            borderTopWidth = -11;
+                        }
+                        else {
+                            borderTopWidth = 11;
+                            addTop = -11;
+                        }
+                    }
+                }
+                if (this.parent.currentViewData[data.parentIndex].ganttProperties.isMilestone) {
+                    if (data.parentIndex > data.childIndex) {
+                        addTop = -5;
+                        borderTopWidth = 10;
+                    }
+                    else if (data.type === 'SS' || data.type === 'FF') {
+                        addTop = -5;
+                    }
+                }
+                else if (this.parent.currentViewData[data.childIndex].ganttProperties.isMilestone) {
+                    if (data.parentIndex > data.childIndex) {
+                        addTop = 5;
+                        borderTopWidth = -10;
+                    }
+                    else if (data.type === 'SS' || data.type === 'FF') {
+                        addTop = 5;
+                    }
+                }
+            }
+        }
         if (this.getParentPosition(data)) {
             connectorContainer = '<div id="ConnectorLine' + data.connectorLineId + '" style="background-color:black">';
             var div = '<div class="' + connectorLineContainer +
@@ -11336,7 +11517,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                 'border-top-width:' + (5 + this.lineStroke) + 'px;width:0;height:0;position:relative;"></div>';
             var duplicateStingThree = this.getBorderStyles('top', this.lineStroke) + 'position:relative;"></div>' + eLine +
                 'top:' + (-(13 + ((this.lineStroke - 1) * 2))) + 'px;width:0px;' + this.getBorderStyles('left', this.lineStroke) +
-                this.getBorderStyles('top', (heightValue - (this.lineStroke - 1))) + 'position:relative;"></div>';
+                this.getBorderStyles('top', (heightValue + borderTopWidth - (this.lineStroke - 1))) + 'position:relative;"></div>';
             var duplicateStingFour = leftArrow + 'left:' +
                 (((data.childLeft + data.childWidth) - (data.parentLeft)) + 10) + 'px;' +
                 this.getBorderStyles('right', 10);
@@ -11344,7 +11525,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                 this.getBorderStyles('top', this.lineStroke) + 'position:relative;"></div>';
             if (this.getParentPosition(data) === 'FSType1') {
                 div = div + 'left:' + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((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 + 'left:' + (isMilestoneParent ? -1 : 0) + 'px;width:' + (isMilestoneParent ?
@@ -11354,7 +11535,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                 div = div + eLine;
                 div = div + 'left:' + ((data.childLeft - (data.parentLeft + data.parentWidth + 10)) - 10) + 'px;' +
                     'width:0px;' + this.getBorderStyles('right', this.lineStroke) +
-                    this.getBorderStyles('top', (heightValue - this.lineStroke)) + 'position:relative;"></div>';
+                    this.getBorderStyles('top', (heightValue + borderTopWidth - this.lineStroke)) + 'position:relative;"></div>';
                 div = div + eLine;
                 div = div + 'left:' + ((data.childLeft - (data.parentLeft + data.parentWidth + 10)) - 10) + 'px;width:10px;' +
                     this.getBorderStyles('top', this.lineStroke) + 'position:relative;"></div>';
@@ -11364,7 +11545,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 + 'left:' + data.parentLeft + 'px;top:' + (isVirtual ? connectorLine$$1.top : ((data.parentIndex * data.rowHeight) +
+                div = div + 'left:' + data.parentLeft + 'px;top:' + (isVirtual ? connectorLine$$1.top : ((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;
@@ -11374,7 +11555,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                 div = div + eLine;
                 div = div + 'left:' + (data.parentWidth + 10 - this.lineStroke) + 'px;' +
                     this.getBorderStyles('left', this.lineStroke) + 'width:0px;' +
-                    this.getBorderStyles('top', (heightValue - this.getconnectorLineGap(data) - this.lineStroke)) + 'position:relative;"></div>';
+                    this.getBorderStyles('top', (heightValue + borderTopWidth - this.getconnectorLineGap(data) - this.lineStroke)) + 'position:relative;"></div>';
                 div = div + eLine;
                 div = div + 'left:' + (data.parentWidth - (((data.parentLeft + data.parentWidth) - data.childLeft) + 20)) + 'px;' +
                     'width:' + (((data.parentLeft + data.parentWidth) - data.childLeft) + 30) + 'px;' +
@@ -11396,7 +11577,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FSType3') {
                 div = div + 'left:' + (data.childLeft - 20) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((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 + 'left:10px;' + this.getBorderStyles('left', 10) +
@@ -11406,7 +11587,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                 div = div + 'width:10px;' + this.getBorderStyles('top', this.lineStroke) +
                     'position:relative;top:' + (-(6 + (5 + this.lineStroke) + Math.round(this.lineStroke / 2))) + 'px;"></div>';
                 div = div + eLine;
-                div = div + 'width:' + this.lineStroke + 'px;' + this.getBorderStyles('top', (heightValue - this.getconnectorLineGap(data) - this.lineStroke + 1)) +
+                div = div + 'width:' + this.lineStroke + 'px;' + this.getBorderStyles('top', (heightValue + borderTopWidth - this.getconnectorLineGap(data) - this.lineStroke + 1)) +
                     'position:relative;top:' + (-(13 + ((this.lineStroke - 1) * 2))) + 'px;"></div>';
                 div = div + eLine;
                 div = div + 'width:' + (((data.parentLeft + data.parentWidth) - data.childLeft) + 30) + 'px;' +
@@ -11426,7 +11607,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FSType4') {
                 div = div + 'left:' + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((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 + 'left:' + (data.childLeft - (data.parentLeft + data.parentWidth + 10)) + 'px;' +
@@ -11442,7 +11623,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                 div = div + 'top:' + (-(13 + ((this.lineStroke - 1) * 2))) + 'px;left:' +
                     (data.childLeft - (data.parentLeft + data.parentWidth) - 20) + 'px;width:0px;' +
                     this.getBorderStyles('left', this.lineStroke) +
-                    this.getBorderStyles('top', (heightValue - this.lineStroke + 1)) + 'position:relative;"></div>';
+                    this.getBorderStyles('top', (heightValue + borderTopWidth - this.lineStroke + 1)) + 'position:relative;"></div>';
                 div = div + eLine;
                 div = div + (isMilestoneParent ? 'left:-1px;' : '') + 'top:' +
                     (-(13 + ((this.lineStroke - 1) * 2))) + 'px;width:' +
@@ -11452,7 +11633,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SSType4') {
                 div = div + 'left:' + (data.parentLeft - 10) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((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 + 'left:' + (data.childLeft - data.parentLeft) + 'px;' + duplicateStingTwo;
@@ -11465,7 +11646,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SSType3') {
                 div = div + 'left:' + (data.childLeft - 20) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((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 + 'left:10px;' + duplicateStingTwo;
@@ -11478,14 +11659,14 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SSType2') {
                 div = div + 'left:' + setInnerElementLeftSSType2 + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((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;' +
                     this.getBorderStyles('top', this.lineStroke) + 'position:relative;"></div>';
                 div = div + eLine;
                 div = div + 'width:0px;' + this.getBorderStyles('left', this.lineStroke) +
-                    this.getBorderStyles('top', (heightValue - this.lineStroke)) + 'position:relative;"></div>';
+                    this.getBorderStyles('top', (heightValue + borderTopWidth - this.lineStroke)) + 'position:relative;"></div>';
                 div = div + eLine;
                 div = div + 'width:' + setInnerElementWidthSSType2 + 'px;' +
                     this.getBorderStyles('top', this.lineStroke) + 'position:relative;"></div>';
@@ -11498,7 +11679,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SSType1') {
                 div = div + 'left:' + (data.childLeft - 20) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) +
+                    ((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;
@@ -11506,7 +11687,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                     this.getBorderStyles('top', this.lineStroke) + 'position:relative;"></div>';
                 div = div + eLine;
                 div = div + 'width:0px;' + this.getBorderStyles('left', this.lineStroke) +
-                    this.getBorderStyles('top', (heightValue - this.lineStroke)) + 'position:relative;"></div>';
+                    this.getBorderStyles('top', (heightValue + borderTopWidth - this.lineStroke)) + 'position:relative;"></div>';
                 div = div + eLine;
                 div = div + 'width:10px;' + this.getBorderStyles('top', this.lineStroke) + 'position:relative;"></div>';
                 div = div + rightArrow;
@@ -11516,7 +11697,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType1') {
                 div = div + 'left:' + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((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 + 'left:' + (isMilestoneParent ? (((data.parentLeft + data.parentWidth) -
@@ -11527,7 +11708,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                 div = div + eLine;
                 div = div + 'left:' + (((data.parentLeft + data.parentWidth) -
                     (data.childLeft + data.childWidth)) + 20) + 'px;width:0px;' + this.getBorderStyles('left', this.lineStroke) +
-                    this.getBorderStyles('top', (heightValue - this.lineStroke)) + 'position:relative;"></div>';
+                    this.getBorderStyles('top', (heightValue + borderTopWidth - this.lineStroke)) + 'position:relative;"></div>';
                 div = div + eLine;
                 div = div + 'left:' + (isMilestone ? 4 : 10) + 'px;width:' + (isMilestone ?
                     (((data.parentLeft + data.parentWidth) - (data.childLeft + data.childWidth)) + (16 + this.lineStroke)) :
@@ -11540,7 +11721,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType2') {
                 div = div + 'left:' + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((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 ? 'left:-1px;' : '') + 'width:' +
@@ -11551,7 +11732,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                 div = div + eLine;
                 div = div + 'left:' + (((data.childLeft + data.childWidth) - (data.parentLeft + data.parentWidth)) + 20) +
                     'px;width:0px;' + this.getBorderStyles('left', this.lineStroke) +
-                    this.getBorderStyles('top', (heightValue - this.lineStroke)) +
+                    this.getBorderStyles('top', (heightValue + borderTopWidth - this.lineStroke)) +
                     'position:relative;"></div>';
                 div = div + eLine;
                 div = div + 'left:' + (isMilestone ? (((data.childLeft + data.childWidth) - (data.parentLeft + data.parentWidth)) + 4) :
@@ -11566,7 +11747,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType3') {
                 div = div + 'left:' + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((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;
@@ -11579,7 +11760,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                 div = div + 'left:' + (((data.parentLeft + data.parentWidth) - (data.childLeft + data.childWidth)) + 20) +
                     'px;top:' + (-(13 + ((this.lineStroke - 1) * 2))) + 'px;' +
                     'width:0px;' + this.getBorderStyles('left', this.lineStroke) +
-                    this.getBorderStyles('top', (heightValue - this.lineStroke + 1)) + 'position:relative;"></div>';
+                    this.getBorderStyles('top', (heightValue + borderTopWidth - this.lineStroke + 1)) + 'position:relative;"></div>';
                 div = div + eLine;
                 div = div + (isMilestoneParent ? ('left:' + (((data.parentLeft + data.parentWidth) -
                     (data.childLeft + data.childWidth)) - 1) + 'px;width:21') : ('left:' + ((data.parentLeft + data.parentWidth) -
@@ -11589,7 +11770,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType4') {
                 div = div + 'left:' + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((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 + ('left:' + ((data.childLeft + data.childWidth) -
@@ -11608,7 +11789,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                 div = div + 'left:' + (((data.childLeft + data.childWidth) -
                     (data.parentLeft + data.parentWidth)) + 20) + 'px;top:' + (-(13 + ((this.lineStroke - 1) * 2))) +
                     'px;width:0px;' + this.getBorderStyles('left', this.lineStroke) +
-                    this.getBorderStyles('top', (heightValue - this.lineStroke + 1)) + 'position:relative;"></div>';
+                    this.getBorderStyles('top', (heightValue + borderTopWidth - this.lineStroke + 1)) + 'position:relative;"></div>';
                 div = div + eLine;
                 div = div + (isMilestoneParent ? ('left:-1px;width:' + (((data.childLeft + data.childWidth) -
                     (data.parentLeft + data.parentWidth)) + (21 + this.lineStroke))) : ('width:' + (((data.childLeft + data.childWidth) -
@@ -11618,7 +11799,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType4') {
                 div = div + 'left:' + (data.parentLeft - 10) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;width:1px;' +
+                    ((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) +
@@ -11631,7 +11812,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                 div = div + eLine;
                 div = div + 'left:' + (((data.childLeft + data.childWidth) - (data.parentLeft)) + 30) + 'px;top:' +
                     (-(13 + ((this.lineStroke - 1) * 2))) + 'px;width:0px;' + this.getBorderStyles('left', this.lineStroke) +
-                    this.getBorderStyles('top', (heightValue - this.getconnectorLineGap(data) - (this.lineStroke - 1))) + 'position:relative;"></div>';
+                    this.getBorderStyles('top', (heightValue + borderTopWidth - this.getconnectorLineGap(data) - (this.lineStroke - 1))) + 'position:relative;"></div>';
                 div = div + eLine;
                 div = div + 'top:' + (-(13 + ((this.lineStroke - 1) * 2))) + 'px;width:' +
                     (((data.childLeft + data.childWidth) - (data.parentLeft)) + (30 + this.lineStroke)) + 'px;' +
@@ -11646,7 +11827,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType3') {
                 div = div + 'left:' + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((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;
@@ -11656,7 +11837,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                 div = div + eLine;
                 div = div + 'left:20px;top:' + (-(13 + ((this.lineStroke - 1) * 2))) + 'px;width:0px;' +
                     this.getBorderStyles('left', this.lineStroke) +
-                    this.getBorderStyles('top', (heightValue - (this.lineStroke - 1))) + 'position:relative;"></div>';
+                    this.getBorderStyles('top', (heightValue + borderTopWidth - (this.lineStroke - 1))) + 'position:relative;"></div>';
                 div = div + eLine;
                 div = div + 'left:20px;top:' + (-(13 + ((this.lineStroke - 1) * 2))) + 'px;width:' +
                     ((data.parentLeft - (data.childLeft + data.childWidth + 20)) + this.lineStroke) + 'px;' +
@@ -11664,13 +11845,13 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType1') {
                 div = div + 'left:' + (data.parentLeft - 10) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((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>';
                 div = div + eLine;
                 div = div + 'width:0px;' + this.getBorderStyles('left', this.lineStroke) +
-                    this.getBorderStyles('top', (heightValue - this.getconnectorLineGap(data) - this.lineStroke)) + 'position:relative;"></div>';
+                    this.getBorderStyles('top', (heightValue + borderTopWidth - this.getconnectorLineGap(data) - this.lineStroke)) + 'position:relative;"></div>';
                 div = div + eLine;
                 div = div + 'width:' + (((data.childLeft + data.childWidth) - (data.parentLeft)) + (30 + this.lineStroke)) + 'px;' +
                     this.getBorderStyles('top', this.lineStroke) + 'position:relative;"></div>';
@@ -11689,7 +11870,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType2') {
                 div = div + 'left:' + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine$$1.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
+                    ((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 + 'left:' + (((data.parentLeft) - (data.childLeft + data.childWidth)) - 10) +
@@ -11697,7 +11878,7 @@ var ConnectorLine = /** @__PURE__ @class */ (function () {
                 div = div + eLine;
                 div = div + 'left:' + (((data.parentLeft) - (data.childLeft + data.childWidth)) - 10) +
                     'px;width:0px;' + this.getBorderStyles('left', this.lineStroke) +
-                    this.getBorderStyles('top', (heightValue - this.lineStroke)) + 'position:relative;"></div>';
+                    this.getBorderStyles('top', (heightValue + borderTopWidth - this.lineStroke)) + 'position:relative;"></div>';
                 div = div + eLine;
                 div = div + (isMilestone ? ('left:4px;width:' + (((data.parentLeft) - (data.childLeft + data.childWidth))
                     - (14 - this.lineStroke))) : ('left:10px;width:' + (((data.parentLeft) -
@@ -11947,11 +12128,11 @@ var Splitter$1 = /** @__PURE__ @class */ (function () {
     };
     /**
      * @param {SplitterSettingsModel} splitter .
-     * @param {boolean} isDynamic .
+     
      * @returns {string} .
      * @private
      */
-    Splitter$$1.prototype.calculateSplitterPosition = function (splitter$$1, isDynamic) {
+    Splitter$$1.prototype.calculateSplitterPosition = function (splitter$$1) {
         if (!isNullOrUndefined(this.splitterObject) && this.parent.enablePersistence) {
             return this.splitterObject.paneSettings[0].size;
         }
@@ -11967,8 +12148,7 @@ var Splitter$1 = /** @__PURE__ @class */ (function () {
             }
             else if (!isNullOrUndefined(splitter$$1.columnIndex) && splitter$$1.columnIndex >= 0) {
                 if ((splitter$$1.columnIndex * 150) < this.parent.ganttWidth || !this.parent.element.classList.contains('e-device')) {
-                    return isDynamic ? this.getSpliterPositionInPercentage(this.getTotalColumnWidthByIndex(splitter$$1.columnIndex).toString() + 'px') :
-                        this.getSpliterPositionInPercentage((splitter$$1.columnIndex * 150) + 'px');
+                    return this.getSpliterPositionInPercentage(this.getTotalColumnWidthByIndex(splitter$$1.columnIndex).toString() + 'px');
                 }
                 else {
                     return this.getSpliterPositionInPercentage((splitter$$1.columnIndex * 130) + 'px');
@@ -12004,10 +12184,10 @@ var Splitter$1 = /** @__PURE__ @class */ (function () {
      */
     Splitter$$1.prototype.getTotalColumnWidthByIndex = function (index) {
         var width = 0;
-        var tr = this.parent.treeGrid.element.querySelectorAll('.e-headercell');
+        var tr = this.parent.ganttColumns;
         index = tr.length > index ? index : tr.length;
         for (var column = 0; column < index; column++) {
-            width = width + tr[column].offsetWidth;
+            width = width + parseInt(tr[column].width);
         }
         return width;
     };
@@ -12018,7 +12198,7 @@ var Splitter$1 = /** @__PURE__ @class */ (function () {
     Splitter$$1.prototype.updateSplitterPosition = function () {
         this.splitterObject.separatorSize = this.parent.splitterSettings.separatorSize >= 4 ?
             this.parent.splitterSettings.separatorSize : 4;
-        var splitterPosition = this.calculateSplitterPosition(this.parent.splitterSettings, true);
+        var splitterPosition = this.calculateSplitterPosition(this.parent.splitterSettings);
         this.splitterObject.paneSettings[0].min = this.getSpliterPositionInPercentage(this.parent.splitterSettings.minimum);
         this.splitterObject.dataBind();
         this.splitterObject.paneSettings[0].size = splitterPosition;
@@ -12435,7 +12615,8 @@ var Tooltip$1 = /** @__PURE__ @class */ (function () {
      */
     Tooltip$$1.prototype.getPredecessorTooltipData = function (args) {
         var predeceesorParent = args.target.parentElement.id;
-        var taskIds = predeceesorParent.match(/\d+/g);
+        var taskIds = predeceesorParent.match(/ConnectorLineparent(.*)child(.*)/);
+        taskIds.shift();
         var fromTask;
         var toTask;
         if (this.parent.viewType === 'ResourceView') {
@@ -12731,7 +12912,7 @@ var FocusModule = /** @__PURE__ @class */ (function () {
             if (ganttObj.selectionSettings.mode !== 'Cell' && ganttObj.selectedRowIndex !== -1) {
                 var selectedItem = ganttObj.currentViewData[ganttObj.selectedRowIndex];
                 var focusedRowIndex = this.parent.ganttChartModule.focusedRowIndex;
-                var selectingRowIndex = focusedRowIndex > -1 ? focusedRowIndex : expandedRecords.indexOf(selectedItem);
+                var selectingRowIndex = expandedRecords.indexOf(selectedItem);
                 var currentSelectingRecord = e.action === 'downArrow' ? expandedRecords[selectingRowIndex + 1] :
                     expandedRecords[selectingRowIndex - 1];
                 ganttObj.selectionModule.selectRow(ganttObj.currentViewData.indexOf(currentSelectingRecord), false, true);
@@ -13144,6 +13325,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
             if (this.enableValidation) {
                 this.dataOperation.updateGanttData();
             }
+            this.predecessorModule.updateParentPredecessor();
             if (this.dataSource instanceof Object && isCountRequired(this)) {
                 var count = getValue('count', this.dataSource);
                 this.treeGrid.dataSource = { result: this.flatData, count: count };
@@ -13156,6 +13338,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
             if (this.enableValidation) {
                 this.dataOperation.updateGanttData();
             }
+            this.predecessorModule.updateParentPredecessor();
             this.treeGridPane.classList.remove('e-temp-content');
             remove(this.treeGridPane.querySelector('.e-gantt-temp-header'));
             this.notify('dataReady', {});
@@ -13467,7 +13650,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
             {
                 topTier: { unit: 'Hour', format: 'ddd MMM, h a', count: 1 },
                 bottomTier: { unit: 'Minutes', format: 'mm', count: 30 }, timelineUnitSize: 66, level: 22,
-                timelineViewMode: 'Hour', weekStartDay: _WeekStartDay, updateTimescaleView: true, weekendBackground: null, showTooltip: true
+                timelineViewMode: 'Hour', weekStartDay: 0, updateTimescaleView: true, weekendBackground: null, showTooltip: true
             },
             {
                 topTier: { unit: 'Hour', format: 'ddd MMM, h a', count: 1 },
@@ -14808,7 +14991,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
     Gantt.prototype.setSplitterPosition = function (value, type) {
         var tempSplitterSettings = {};
         tempSplitterSettings[type] = value;
-        var splitterPosition = this.splitterModule.calculateSplitterPosition(tempSplitterSettings, true);
+        var splitterPosition = this.splitterModule.calculateSplitterPosition(tempSplitterSettings);
         var pane1 = this.splitterModule.splitterObject.element.querySelectorAll('.e-pane')[0];
         var pane2 = this.splitterModule.splitterObject.element.querySelectorAll('.e-pane')[1];
         this.splitterModule.splitterPreviousPositionGrid = pane1.scrollWidth + 1 + 'px';
@@ -14890,7 +15073,10 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
             if (this.viewType === 'ResourceView') {
                 this.editModule.addRowPosition = rowPosition;
                 this.editModule.addRowIndex = rowIndex;
-                var resources = data[this.taskFields.resourceInfo];
+                var resources = void 0;
+                if (!isNullOrUndefined(data)) {
+                    resources = data[this.taskFields.resourceInfo];
+                }
                 var id = void 0;
                 var parentTask = void 0;
                 if (!isNullOrUndefined(resources) && resources.length) {
@@ -15388,6 +15574,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
      */
     Gantt.prototype.showColumn = function (keys, showBy) {
         this.treeGrid.showColumns(keys, showBy);
+        this.updateTreeColumns();
     };
     /**
      * Hides a column by column name.
@@ -15399,6 +15586,7 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
      */
     Gantt.prototype.hideColumn = function (keys, hideBy) {
         this.treeGrid.hideColumns(keys, hideBy);
+        this.updateTreeColumns();
     };
     /**
      * To set scroll top for chart scroll container.
@@ -16135,8 +16323,7 @@ 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.dependency || field === taskSettings.progress
-            || field === taskSettings.work || field === 'taskType')) {
+            || field === taskSettings.progress || field === taskSettings.work || field === 'taskType')) {
             args.cancel = true;
         }
         else {
@@ -16966,6 +17153,9 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
         }
     };
     TaskbarEdit.prototype.mouseClickHandler = function (e) {
+        if (!this.parent.editSettings.allowTaskbarEditing) {
+            return;
+        }
         var targetElement = this.getElementByPosition(e);
         var element = parentsUntil$1(targetElement, taskBarMainContainer);
         if (this.parent.selectionModule && this.parent.selectionModule.enableSelectMultiTouch) {
@@ -17498,10 +17688,13 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
         var _this = this;
         this.stopScrollTimer();
         this.scrollTimer = window.setInterval(function () {
-            if (direction === 'right' || direction === 'bottom') {
+            if (direction === 'right') {
                 _this.timerCount = (_this.timerCount + 1) >= _this.parent.timelineModule.totalTimelineWidth ?
                     _this.parent.timelineModule.totalTimelineWidth : (_this.timerCount + 1);
             }
+            else if (direction === 'bottom') {
+                _this.timerCount = _this.timerCount + 1;
+            }
             else {
                 _this.timerCount = (_this.timerCount - 1) < 0 ? 0 : (_this.timerCount - 1);
             }
@@ -18609,8 +18802,14 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
             }
             if ((this.parent.virtualScrollModule && this.parent.enableVirtualization &&
                 !this.elementOffsetLeft) || !this.parent.enableVirtualization) {
-                this.elementOffsetLeft = this.taskBarEditElement.offsetLeft;
-                this.elementOffsetTop = this.taskBarEditElement.offsetTop + scrollTop;
+                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;
             }
@@ -18779,6 +18978,7 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
         this.addedRecord = null;
         this.dialogEditValidationFlag = false;
         this.ganttResources = [];
+        this.isValidData = true;
         /**
          * @private
          */
@@ -19020,7 +19220,7 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
                 tempData[field] = 0;
                 tempData.ganttProperties.work = tempData[field];
             }
-            else if (columns[i].field === 'taskType') {
+            else if (columns[i].field === taskSettings.type) {
                 tempData[field] = this.parent.taskType;
                 tempData.ganttProperties.taskType = tempData[field];
             }
@@ -19063,6 +19263,24 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
      */
     DialogEdit.prototype.openEditDialog = function (taskId) {
         var ganttObj = this.parent;
+        if (!isNullOrUndefined(taskId)) {
+            if (!isNullOrUndefined(taskId['ganttProperties'])) {
+                if (typeof taskId['ganttProperties']['taskId'] === 'string') {
+                    this.numericOrString = "stringedit";
+                }
+                else {
+                    this.numericOrString = "numericedit";
+                }
+            }
+            if (isNullOrUndefined(taskId['ganttProperties']) && !isNullOrUndefined(taskId)) {
+                if (isNaN(Number(taskId)) || this.parent.columnByField[this.parent.taskFields.id].editType === "stringedit") {
+                    this.numericOrString = "stringedit";
+                }
+                else {
+                    this.numericOrString = "numericedit";
+                }
+            }
+        }
         if (typeof taskId === 'object' && !isNullOrUndefined(taskId)) {
             this.rowIndex = this.parent.currentViewData.indexOf(taskId);
             if (this.rowIndex > -1) {
@@ -19097,11 +19315,11 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
         this.beforeOpenArgs.rowIndex = this.rowIndex;
         var dialogMaxWidth = this.parent.isAdaptive ? '' : '600px';
         var dialog = this.parent.createElement('div', { id: ganttObj.element.id + '_dialog', styles: 'max-width:' + dialogMaxWidth });
+        dialog.classList.add('e-gantt-dialog');
         ganttObj.element.appendChild(dialog);
         dialogModel.animationSettings = { effect: 'None' };
         dialogModel.header = this.localeObj.getConstant(this.isEdit ? 'editDialogTitle' : 'addDialogTitle');
         dialogModel.isModal = true;
-        dialogModel.cssClass = 'e-gantt-dialog';
         dialogModel.allowDragging = this.parent.isAdaptive ? false : true;
         dialogModel.showCloseIcon = true;
         var position = this.parent.isAdaptive ? { X: 'top', Y: 'left' } : { X: 'center', Y: 'center' };
@@ -19456,6 +19674,13 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
             placeholder: column.headerText,
             floatLabelType: 'Auto'
         };
+        if (!isNullOrUndefined(this.parent.taskFields.id) && !isNullOrUndefined(this.parent.columnMapping.id)
+            && !isNullOrUndefined(this.numericOrString)) {
+            if (taskSettings.id === column.field) {
+                column.editType = this.numericOrString;
+            }
+        }
+        
         switch (column.editType) {
             case 'booleanedit':
                 {
@@ -19470,7 +19695,7 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
             case 'stringedit':
                 {
                     var textBox = common;
-                    if (column.field === ganttObj.columnMapping.duration || column.field === ganttObj.columnMapping.startDate ||
+                    if (column.field === ganttObj.columnMapping.duration || column.field === ganttObj.columnMapping.id || column.field === ganttObj.columnMapping.startDate ||
                         column.field === ganttObj.columnMapping.endDate) {
                         textBox.change = function (args) {
                             _this.validateScheduleFields(args, column, ganttObj);
@@ -19527,7 +19752,7 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
                     break;
                 }
             case 'dropdownedit':
-                if (column.field === 'taskType' || column.field === ganttObj.columnMapping.manual) {
+                if (column.field === ganttObj.columnMapping.type || column.field === ganttObj.columnMapping.manual) {
                     var dataKey = 'dataSource';
                     var fieldsKey = 'fields';
                     var types = [
@@ -19555,12 +19780,19 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
         return fieldsModel;
     };
     DialogEdit.prototype.validateScheduleFields = function (args, column, ganttObj) {
-        var dialog = ganttObj.editModule.dialogModule.dialog;
+        var _a;
+        var dialog;
+        if (!isNullOrUndefined(ganttObj.editModule.dialogModule.dialog)) {
+            dialog = ganttObj.editModule.dialogModule.dialog;
+        }
         var targetId = null;
         var inputElement;
         var currentData = ganttObj.editModule.dialogModule.editedRecord;
         var cellValue = null;
         var colName = null;
+        var formObject;
+        var ids = this.parent.viewType === 'ResourceView' ? this.parent.getTaskIds() : this.parent.ids;
+        var strViewType = this.parent.viewType;
         if (!isNullOrUndefined(args.element)) {
             inputElement = args.element;
             targetId = inputElement.getAttribute('id');
@@ -19582,6 +19814,20 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
         else {
             cellValue = inputElement.value;
             colName = targetId.replace(ganttObj.element.id, '');
+            if (this.parent.columnByField[this.parent.taskFields.id].editType === "stringedit") {
+                var customFn = function (args) {
+                    if (strViewType === 'ResourceView') {
+                        return ids.indexOf('T' + args['value']) === -1 && ids.indexOf('R' + args['value']) === -1;
+                    }
+                    else {
+                        return ids.indexOf(args['value']) === -1;
+                    }
+                };
+                var options = {
+                    rules: (_a = {}, _a[this.parent.taskFields.id] = { required: true, minLength: [customFn, 'ID is already present, please enter new value'] }, _a)
+                };
+                formObject = new FormValidator('#' + this.parent.element.id + 'GeneralTabContainer', options);
+            }
         }
         if (colName.search('Segments') === 0) {
             colName = colName.replace('SegmentsTabContainer', '');
@@ -19805,7 +20051,7 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
                 this.validateDuration(currentData);
             }
         }
-        if (columnName === 'taskType') {
+        if (columnName === taskSettings.type) {
             this.parent.setRecordValue('taskType', value, ganttProp, true);
         }
         if (taskSettings.manual === columnName) {
@@ -20165,9 +20411,6 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
                 item.content = this.renderGeneralTab(item.content);
             }
             else if (item.content === 'Dependency') {
-                if (this.editedRecord.hasChildRecords) {
-                    item.disabled = true;
-                }
                 item.content = this.renderPredecessorTab(item.content);
             }
             else if (item.content === 'Resources') {
@@ -20273,6 +20516,7 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
     };
     DialogEdit.prototype.isCheckIsDisabled = function (column) {
         var disabled = false;
+        var stringOrNumber;
         if (column.allowEditing === false || column.isPrimaryKey || this.parent.readOnly) {
             if (this.parent.customColumns.indexOf(column.field) !== -1) {
                 disabled = true;
@@ -20282,8 +20526,19 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
                     column.field === this.parent.taskFields.duration || column.field === this.parent.taskFields.progress ||
                     column.field === this.parent.taskFields.startDate || column.field === this.parent.taskFields.endDate ||
                     column.field === this.parent.taskFields.baselineStartDate || column.field === this.parent.taskFields.baselineEndDate ||
-                    column.field === this.parent.taskFields.work || column.field === 'taskType') {
-                    disabled = true;
+                    column.field === this.parent.taskFields.work || column.field === this.parent.taskFields.type) {
+                    for (var i = 0; i < this.parent.currentViewData['length']; i++) {
+                        if (!isNullOrUndefined(this.parent.currentViewData[i].ganttProperties.taskId)) {
+                            stringOrNumber = this.parent.currentViewData[i].ganttProperties.taskId;
+                            break;
+                        }
+                    }
+                    if (typeof (stringOrNumber) === "string") {
+                        disabled = false;
+                    }
+                    else {
+                        disabled = true;
+                    }
                 }
             }
         }
@@ -20295,13 +20550,30 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
                 if ((column.field === this.parent.taskFields.endDate && ((!isNullOrUndefined(this.editedRecord['isManual']) &&
                     this.editedRecord['isManual'] == false) || this.parent.taskMode == 'Auto')) || column.field === this.parent.taskFields.duration ||
                     column.field === this.parent.taskFields.progress || column.field === this.parent.taskFields.work ||
-                    column.field === 'taskType') {
+                    column.field === this.parent.taskFields.type) {
                     disabled = true;
                 }
             }
         }
         return disabled;
     };
+    DialogEdit.prototype.isParentValid = function (data) {
+        if (data.length > 0) {
+            for (var i = 0; i < data.length; i++) {
+                if (data[i].uniqueID == this.beforeOpenArgs.rowData['uniqueID']) {
+                    this.isValidData = false;
+                    break;
+                }
+                if (data[i].hasChildRecords) {
+                    this.isParentValid(data[i].childRecords);
+                }
+                if (!this.isValidData) {
+                    break;
+                }
+            }
+        }
+        return this.isValidData;
+    };
     DialogEdit.prototype.renderPredecessorTab = function (itemName) {
         var _this = this;
         var ganttObj = this.parent;
@@ -20417,7 +20689,20 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
         var rowResource = ganttData.ganttProperties.resourceInfo;
         var inputModel = this.beforeOpenArgs[itemName];
         var resourceTreeGridId = ganttObj.element.id + '' + itemName + 'TabContainer';
-        var resourceData = extend([], [], ganttObj.resources, true);
+        var resourceData = [];
+        if (this.parent.viewType === 'ResourceView') {
+            for (var i = 0; i < ganttObj.currentViewData.length; i++) {
+                for (var j = 0; j < ganttObj.resources.length; j++) {
+                    if (ganttObj.currentViewData[i][ganttObj.taskFields.id] === ganttObj.resources[j][resourceSettings.id] &&
+                        (ganttObj.currentViewData[i].hasChildRecords || isNullOrUndefined(ganttObj.currentViewData[i].parentItem))) {
+                        resourceData.push(ganttObj.resources[j]);
+                    }
+                }
+            }
+        }
+        else {
+            resourceData = extend([], [], ganttObj.resources, true);
+        }
         this.parent.dataOperation.updateResourceUnit(resourceData);
         if (!isNullOrUndefined(rowResource)) {
             var count = void 0;
@@ -20586,7 +20871,26 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
         this.preTableCollection = [];
         for (var i = 0; i < flatData.length; i++) {
             var data = flatData[i];
-            if (data.hasChildRecords) {
+            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);
+            }
+            if (!this.isValidData) {
+                this.isValidData = true;
                 continue;
             }
             var taskId = this.parent.viewType === 'ResourceView' ? data.ganttProperties.taskId.toString()
@@ -20792,6 +21096,10 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
             if (inputElement) {
                 var fieldName = inputElement.id.replace(ganttObj.element.id, '');
                 var controlObj = div.querySelector('#' + ganttObj.element.id + fieldName).ej2_instances[0];
+                if (this.parent.columnByField[this.parent.taskFields.id].editType === "stringedit" && fieldName === this.parent.taskFields.id) {
+                    var valueString = controlObj.value.toString();
+                    controlObj.value = valueString;
+                }
                 var column = ganttObj.columnByField[fieldName];
                 if (!isNullOrUndefined(column.edit) && isNullOrUndefined(column.edit.params)) {
                     var read = column.edit.read;
@@ -20827,6 +21135,7 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
         this.parent.setRecordValue('duration', fromRecord.ganttProperties.duration, toRecord.ganttProperties, true);
         this.parent.setRecordValue('durationUnit', fromRecord.ganttProperties.durationUnit, toRecord.ganttProperties, true);
         this.parent.setRecordValue('work', fromRecord.ganttProperties.work, toRecord.ganttProperties, true);
+        this.parent.setRecordValue('type', fromRecord.ganttProperties.taskType, toRecord.ganttProperties, true);
         if (!isNullOrUndefined(this.parent.taskFields.startDate)) {
             this.parent.dataOperation.updateMappingData(this.rowData, this.parent.taskFields.startDate);
         }
@@ -20849,6 +21158,9 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
         if (!isNullOrUndefined(this.parent.taskFields.manual)) {
             this.parent.dataOperation.updateMappingData(this.rowData, this.parent.taskFields.manual);
         }
+        if (!isNullOrUndefined(this.parent.taskFields.type)) {
+            this.parent.dataOperation.updateMappingData(this.rowData, "type");
+        }
     };
     DialogEdit.prototype.updatePredecessorTab = function (preElement) {
         var gridObj = preElement.ej2_instances[0];
@@ -21090,8 +21402,7 @@ var ConnectorLineEdit = /** @__PURE__ @class */ (function () {
                     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 && parentGanttRecord.expanded === true) ||
-                        (childGanttRecord && childGanttRecord.expanded === true)) {
+                    if (parentGanttRecord || childGanttRecord) {
                         connectorObj =
                             this.parent.predecessorModule.updateConnectorLineObject(parentGanttRecord, childGanttRecord, predecessor);
                         if (!isNullOrUndefined(connectorObj)) {
@@ -21130,14 +21441,36 @@ var ConnectorLineEdit = /** @__PURE__ @class */ (function () {
     ConnectorLineEdit.prototype.idFromPredecessor = function (pre) {
         var preArray = pre.split(',');
         var preIdArray = [];
+        var values;
+        var match = [];
         for (var j = 0; j < preArray.length; j++) {
             var strArray = [];
-            for (var i = 0; i < preArray[j].length; i++) {
-                if (!isNullOrUndefined(preArray[j].charAt(i)) && parseInt(preArray[j].charAt(i), 10).toString() !== 'NaN') {
-                    strArray.push(preArray[j].charAt(i));
+            values = preArray[j].split('+');
+            if (preArray[j].indexOf('-') >= 0) {
+                values = preArray[j].split('-');
+                
+            }
+            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 (match.length === 1) {
+                            match = values[0].match(/(\d+|[A-z]+)/g);
+                        }
+                        strArray.push(match[0]);
+                    }
+                    else {
+                        if (values[0].length === 1 || values[0].length === 2) {
+                            strArray.push(values[0]);
+                        }
+                        else {
+                            strArray.push(values[0].slice(0, -2));
+                        }
+                    }
                 }
                 else {
-                    break;
+                    strArray.push(values[0]);
                 }
             }
             preIdArray.push((strArray.join('')));
@@ -21195,6 +21528,75 @@ var ConnectorLineEdit = /** @__PURE__ @class */ (function () {
         }
         return true;
     };
+    // Get the root parent of the record
+    ConnectorLineEdit.prototype.getRootParent = function (rec) {
+        var parentRec = rec;
+        if (rec.parentItem) {
+            parentRec = this.parent.flatData.filter(function (item) {
+                return item.uniqueID == rec.parentUniqueID;
+            })[0];
+            if (parentRec.parentItem) {
+                parentRec = this.getRootParent(parentRec);
+            }
+            return parentRec;
+        }
+        return parentRec;
+    };
+    // To check whether the predecessor drawn is valid for parent task
+    ConnectorLineEdit.prototype.validateParentPredecessor = function (fromRecord, toRecord) {
+        if (toRecord.hasChildRecords && !fromRecord.hasChildRecords) {
+            if (fromRecord.parentUniqueID === toRecord.uniqueID) {
+                return false;
+            }
+            else {
+                do {
+                    if (fromRecord.parentItem) {
+                        fromRecord = this.parent.flatData[this.parent.ids.indexOf(fromRecord.parentItem.taskId)];
+                        if (fromRecord.uniqueID === toRecord.uniqueID) {
+                            return false;
+                        }
+                    }
+                } while (fromRecord.parentItem);
+            }
+        }
+        else if (!toRecord.hasChildRecords && fromRecord.hasChildRecords) {
+            if (toRecord.parentUniqueID === fromRecord.uniqueID) {
+                return false;
+            }
+            else {
+                do {
+                    if (toRecord.parentItem) {
+                        toRecord = this.parent.flatData[this.parent.ids.indexOf(toRecord.parentItem.taskId)];
+                        if (toRecord.uniqueID === fromRecord.uniqueID) {
+                            return false;
+                        }
+                    }
+                } while (toRecord.parentItem);
+            }
+        }
+        else if (toRecord.hasChildRecords && fromRecord.hasChildRecords) {
+            if (toRecord.parentItem && fromRecord.parentItem) {
+                if (fromRecord.parentUniqueID === toRecord.uniqueID || fromRecord.uniqueID === toRecord.parentUniqueID) {
+                    return false;
+                }
+            }
+            else {
+                if (!toRecord.parentItem && fromRecord.parentItem) {
+                    var fromRootParent = this.parent.connectorLineEditModule.getRootParent(fromRecord);
+                    if (fromRootParent.uniqueID === toRecord.uniqueID) {
+                        return false;
+                    }
+                }
+                else if (toRecord.parentItem && !fromRecord.parentItem) {
+                    var toRootParent = this.parent.connectorLineEditModule.getRootParent(toRecord);
+                    if (toRootParent.uniqueID === fromRecord.uniqueID) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    };
     /**
      * To validate predecessor relations
      *
@@ -21212,10 +21614,12 @@ var ConnectorLineEdit = /** @__PURE__ @class */ (function () {
         if (!isNullOrUndefined(predecessorString) && predecessorString.length > 0) {
             predecessorIdArray = this.idFromPredecessor(predecessorString);
             var _loop_2 = function (count) {
-                //Check edited item has parent item in predecessor collection
-                var checkParent = this_2.checkParentRelation(ganttRecord, predecessorIdArray);
-                if (!checkParent) {
-                    return { value: false };
+                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
                 var tempIdArray = predecessorIdArray.slice(0);
@@ -22291,7 +22695,7 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                 this.parent.dataOperation.updateMappingData(ganttData, 'duration');
                 this.parent.dataOperation.updateMappingData(ganttData, 'endDate');
             }
-            else if (key === 'taskType') {
+            else if (key === tasks.type) {
                 ganttObj.setRecordValue('taskType', data[key], ganttData.ganttProperties, true);
                 //this.parent.dataOperation.updateMappingData(ganttData, 'taskType');
             }
@@ -22600,6 +23004,10 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                 }
                 this.parent.predecessorModule.validatePredecessor(ganttRecord, [], '');
             }
+            if (ganttRecord.hasChildRecords && this.parent.previousRecords[ganttRecord.uniqueID].ganttProperties.startDate &&
+                (args.action === "DrawConnectorLine" || args.action === "DialogEditing")) {
+                this.updateChildItems(ganttRecord);
+            }
             this.updateParentItemOnEditing();
         }
         /** Update parent up-to zeroth level */
@@ -23057,9 +23465,16 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
         }
         for (var index = 0; index < currentLength; index++) {
             var recordIndex = [];
-            var resourceID = parseInt(currentResource[index][this.parent.resourceFields.id], 10);
+            var resourceID = parseInt(currentResource[index][this.parent.resourceFields.id], 10).toString();
+            if (resourceID === "NaN") {
+                resourceID = currentResource[index][this.parent.resourceFields.id];
+            }
             for (var i = 0; i < prevResource.length; i++) {
-                if (parseInt(prevResource[i][this.parent.resourceFields.id], 10) === resourceID) {
+                var prevResourceID = parseInt(prevResource[i][this.parent.resourceFields.id], 10).toString();
+                if (prevResourceID === "NaN") {
+                    prevResourceID = prevResource[i][this.parent.resourceFields.id];
+                }
+                if (prevResourceID === resourceID) {
                     recordIndex.push(i);
                     break;
                 }
@@ -23071,7 +23486,11 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                 }
             }
             else {
-                prevResource.splice(parseInt(recordIndex[0].toString(), 10), 1);
+                var record1 = parseInt(recordIndex[0].toString(), 10);
+                if (record1.toString() === "NaN") {
+                    record1 = recordIndex[0].toString();
+                }
+                prevResource.splice(record1, 1);
             }
         }
         var prevLength = prevResource ? prevResource.length : 0;
@@ -23383,14 +23802,26 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
      */
     Edit$$1.prototype.deleteResourceRecords = function (selectedRecords) {
         var deleteRecords = [];
-        for (var i = 0; i < selectedRecords.length; i++) {
+        var _loop_1 = function (i) {
             if (selectedRecords[i].parentItem) {
                 var data = selectedRecords[i];
                 var ids = data.ganttProperties.sharedTaskUniqueIds;
                 for (var j = 0; j < ids.length; j++) {
-                    deleteRecords.push(this.parent.flatData[this.parent.ids.indexOf(ids[j].toString())]);
+                    deleteRecords.push(this_1.parent.flatData[this_1.parent.ids.indexOf(ids[j].toString())]);
                 }
+                deleteRecords.push(this_1.parent.flatData[this_1.parent.ids.indexOf(data.ganttProperties.rowUniqueID)]);
+            }
+            else {
+                var resourceParent = this_1.parent.flatData.filter(function (data) {
+                    return (parseInt(data.ganttProperties.taskId) == parseInt(selectedRecords[i].ganttProperties.taskId) &&
+                        data.hasChildRecords);
+                })[0];
+                deleteRecords.push(resourceParent);
             }
+        };
+        var this_1 = this;
+        for (var i = 0; i < selectedRecords.length; i++) {
+            _loop_1(i);
         }
         this.deleteRow(deleteRecords);
     };
@@ -23837,6 +24268,14 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
         eventArgs.modifiedTaskData = getTaskData(args.updatedRecordCollection, null, null, this.parent);
         setValue('action', args.action, eventArgs);
         this.parent.isOnDelete = false;
+        if (this.parent.viewType === 'ResourceView') {
+            var updateUnAssignedResources = eventArgs.data.filter(function (data) {
+                return !data.hasChildRecords;
+            });
+            for (var i = 0; i < updateUnAssignedResources.length; i++) {
+                this.checkWithUnassignedTask(updateUnAssignedResources[i]);
+            }
+        }
         this.parent.trigger('actionComplete', eventArgs);
         this.deletedTaskDetails = [];
         this.parent.initiateEditAction(false);
@@ -23848,12 +24287,34 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
      * @private
      */
     Edit$$1.prototype.getNewTaskId = function () {
-        var maxId = DataUtil.aggregates.max(this.parent.flatData, this.parent.taskFields.id);
-        if (!isNullOrUndefined(maxId)) {
-            return parseInt(maxId.toString(), 10) + 1;
+        var ids = this.parent.viewType === 'ResourceView' ? this.parent.getTaskIds() : this.parent.ids;
+        var maxId = ids.length;
+        var newTaskId = maxId + 1;
+        if (this.parent.viewType === 'ResourceView') {
+            if (ids.indexOf('T' + newTaskId) !== -1 || ids.indexOf('R' + newTaskId) !== -1) {
+                newTaskId = newTaskId + 1;
+                if (ids.indexOf('T' + newTaskId) !== -1 || ids.indexOf('R' + newTaskId) !== -1) {
+                    do {
+                        newTaskId = newTaskId + 1;
+                    } while (ids.indexOf('T' + newTaskId) !== -1 || ids.indexOf('R' + newTaskId) !== -1);
+                }
+            }
         }
         else {
-            return 1;
+            if (ids.indexOf(newTaskId.toString()) != -1) {
+                newTaskId = newTaskId + 1;
+                if (ids.indexOf(newTaskId.toString()) != -1) {
+                    do {
+                        newTaskId = newTaskId + 1;
+                    } while (ids.indexOf(newTaskId.toString()) != -1);
+                }
+            }
+        }
+        if (this.parent.columnByField[this.parent.taskFields.id].editType === "stringedit") {
+            return newTaskId = newTaskId.toString();
+        }
+        else {
+            return newTaskId;
         }
     };
     /**
@@ -23866,6 +24327,7 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
     Edit$$1.prototype.prepareNewlyAddedData = function (obj, rowPosition) {
         var taskModel = this.parent.taskFields;
         var id;
+        var newTaskIDmd;
         var ids = this.parent.ids;
         /*Validate Task Id of data*/
         if (obj[taskModel.id]) {
@@ -23873,7 +24335,13 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                 obj[taskModel.id] = null;
             }
             else {
-                obj[taskModel.id] = isNullOrUndefined(obj[taskModel.id]) ? null : parseInt(obj[taskModel.id], 10);
+                if (typeof (obj[taskModel.id]) === "string") {
+                    newTaskIDmd = obj[taskModel.id];
+                }
+                else {
+                    newTaskIDmd = parseInt(obj[taskModel.id], 10);
+                }
+                obj[taskModel.id] = isNullOrUndefined(newTaskIDmd) ? null : newTaskIDmd;
             }
         }
         if (!obj[taskModel.id]) {
@@ -24113,7 +24581,7 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                     recordIndex = currentItemIndex + dataChildCount + 1;
                     //Expand Add record's parent item for project view
                     if (!this.addRowSelectedItem.expanded && !this.parent.enableMultiTaskbar) {
-                        this.parent.expandByID(Number(this.addRowSelectedItem.ganttProperties.rowUniqueID));
+                        this.parent.expandByID(this.addRowSelectedItem.ganttProperties.rowUniqueID);
                     }
                     updatedCollectionIndex = currentViewData.indexOf(this.addRowSelectedItem) +
                         this.getVisibleChildRecordCount(this.addRowSelectedItem, 0, currentViewData) + 1;
@@ -24153,6 +24621,10 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
         /* Record collection update */
         flatRecords.splice(recordIndex, 0, record);
         currentViewData.splice(updatedCollectionIndex, 0, record);
+        if (this.parent.viewType === 'ResourceView' && typeof (record.ganttProperties.taskId) === "number") {
+            var taskString = record.ganttProperties.taskId;
+            ids.push(taskString.toString());
+        }
         ids.splice(recordIndex, 0, record.ganttProperties.rowUniqueID.toString());
         if (this.parent.viewType === 'ResourceView') {
             var taskId = record.level === 0 ? 'R' + record.ganttProperties.taskId : 'T' + record.ganttProperties.taskId;
@@ -24254,27 +24726,27 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                 }
             }
         }
-        var _loop_1 = function (i) {
-            var originalData = this_1.parent.modifiedRecords[i];
-            var treeIndex = this_1.parent.allowRowDragAndDrop ? 1 : 0;
-            var uniqueTaskID = this_1.parent.taskFields.id;
-            originalIndex = this_1.parent.currentViewData.findIndex(function (data) {
+        var _loop_2 = function (i) {
+            var originalData = this_2.parent.modifiedRecords[i];
+            var treeIndex = this_2.parent.allowRowDragAndDrop ? 1 : 0;
+            var uniqueTaskID = this_2.parent.taskFields.id;
+            originalIndex = this_2.parent.currentViewData.findIndex(function (data) {
                 return (data[uniqueTaskID] == originalData[uniqueTaskID]);
             });
-            if (this_1.parent.treeGrid.getRows()[originalIndex]) {
-                this_1.parent.treeGrid.renderModule.cellRender({
-                    data: originalData, cell: this_1.parent.treeGrid.getRows()[originalIndex].cells[this_1.parent.treeColumnIndex + treeIndex],
-                    column: this_1.parent.treeGrid.grid.getColumns()[this_1.parent.treeColumnIndex],
+            if (this_2.parent.treeGrid.getRows()[originalIndex]) {
+                this_2.parent.treeGrid.renderModule.cellRender({
+                    data: originalData, cell: this_2.parent.treeGrid.getRows()[originalIndex].cells[this_2.parent.treeColumnIndex + treeIndex],
+                    column: this_2.parent.treeGrid.grid.getColumns()[this_2.parent.treeColumnIndex],
                     requestType: 'rowDragAndDrop'
                 });
-                this_1.parent.treeGrid.renderModule.RowModifier({
-                    data: originalData, row: this_1.parent.treeGrid.getRows()[originalIndex], rowHeight: this_1.parent.rowHeight
+                this_2.parent.treeGrid.renderModule.RowModifier({
+                    data: originalData, row: this_2.parent.treeGrid.getRows()[originalIndex], rowHeight: this_2.parent.rowHeight
                 });
             }
         };
-        var this_1 = this, originalIndex;
+        var this_2 = this, originalIndex;
         for (var i = 0; i < this.parent.modifiedRecords.length; i++) {
-            _loop_1(i);
+            _loop_2(i);
         }
     };
     /**
@@ -24361,6 +24833,7 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
      */
     Edit$$1.prototype.addRecord = function (data, rowPosition, rowIndex) {
         var _this = this;
+        var tempTaskID = this.parent.taskFields.id;
         if (this.parent.editModule && this.parent.editSettings.allowAdding) {
             this.parent.isDynamicData = true;
             var cAddedRecord_1 = [];
@@ -24382,6 +24855,12 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
             args = this.constructTaskAddedEventArgs(cAddedRecord_1, this.parent.editedRecords, 'beforeAdd');
             this.parent.showSpinner();
             this.parent.trigger('actionBegin', args, function (args) {
+                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];
+                    }
+                }
                 if (!args.cancel) {
                     if (isRemoteData(_this.parent.dataSource)) {
                         var data_2 = _this.parent.dataSource;
@@ -25447,10 +25926,13 @@ var Filter$1 = /** @__PURE__ @class */ (function () {
         this.parent.on('actionComplete', this.actionComplete, this);
         this.parent.on('columnMenuOpen', this.columnMenuOpen, this);
     };
+    Filter$$1.prototype.wireEvents = function (a) {
+        EventHandler.add(document.getElementById(a), 'click', this.mouseClickHandler, this);
+    };
     Filter$$1.prototype.initiateFiltering = function (column) {
         var treeColumn = this.parent.getColumnByField(column.field, this.parent.treeGridModule.treeGridColumns);
         column.allowFiltering = column.allowFiltering === false ? false : true;
-        if (column.allowFiltering && this.parent.filterSettings.type === 'Menu' && !column.filter) {
+        if (column.allowFiltering && (this.parent.filterSettings.type === 'Menu' || this.parent.filterSettings.type === 'Excel') && !column.filter) {
             column.filter = { ui: this.getCustomFilterUi(column) };
         }
         if (treeColumn) {
@@ -25480,6 +25962,14 @@ var Filter$1 = /** @__PURE__ @class */ (function () {
         }
         return filterUI;
     };
+    Filter$$1.prototype.mouseClickHandler = function (e) {
+        if (closest(e.target, ".e-excelfilter")) {
+            this.parent.treeGrid.grid.notify("click", e);
+        }
+    };
+    Filter$$1.prototype.unWireEvents = function () {
+        EventHandler.remove(this.parent.element, 'click', this.mouseClickHandler);
+    };
     Filter$$1.prototype.getDatePickerFilter = function (columnName) {
         var _this = this;
         var parent = this.parent;
@@ -25601,6 +26091,15 @@ var Filter$1 = /** @__PURE__ @class */ (function () {
         }
     };
     Filter$$1.prototype.actionComplete = function (args) {
+        if (!isNullOrUndefined(args['filterModel'])) {
+            if (!isNullOrUndefined(args['filterModel']['dialogObj'])) {
+                if (!isNullOrUndefined(args['filterModel']['dialogObj']['element'])) {
+                    if (this.parent.filterSettings.type === 'Excel') {
+                        this.wireEvents(args['filterModel']['dialogObj']['element'].id);
+                    }
+                }
+            }
+        }
         if (args.requestType === filterAfterOpen) {
             if (this.parent.treeGrid.filterSettings.type === 'Menu') {
                 this.filterMenuElement = getValue('filterModel.dlgObj.element', args);
@@ -25618,12 +26117,15 @@ var Filter$1 = /** @__PURE__ @class */ (function () {
             if ((args.columnName === predecessor && isNullOrUndefined(getValue(predecessor, filterValues)))
                 || (args.columnName === resource && isNullOrUndefined(getValue(resource, filterValues)))) {
                 var element = this.filterMenuElement.querySelector('.e-dropdownlist');
-                var instanceObj = getValue('ej2_instances[0]', element);
-                instanceObj.index = 2;
-                instanceObj.dataBind();
+                var instanceObj = void 0;
+                if (!isNullOrUndefined(element)) {
+                    instanceObj = getValue('ej2_instances[0]', element);
+                    instanceObj.index = 2;
+                    instanceObj.dataBind();
+                }
             }
             else if (args.columnName === taskID && isNullOrUndefined(getValue(taskID, filterValues)) && this.parent.treeGrid.filterSettings.type === 'Menu') {
-                var element = this.filterMenuElement.querySelector('.e-numerictextbox');
+                var element = this.filterMenuElement.querySelector('.e-flmenu-input');
                 var instanceObj = getValue('ej2_instances[0]', element);
                 if (!isNullOrUndefined(instanceObj) && isNullOrUndefined(this.parent.columnByField[args.columnName].format)) {
                     instanceObj.format = 'n';
@@ -25631,45 +26133,9 @@ var Filter$1 = /** @__PURE__ @class */ (function () {
             }
         }
     };
-    Filter$$1.prototype.setPosition = function (li, ul) {
-        var gridPos = this.parent.element.getBoundingClientRect();
-        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;
-            }
-        }
-        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.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));
-            }
-        }
+        document.querySelector('#' + this.parent.treeGrid.grid.element.id).appendChild(element);
         if (this.parent.treeGrid.filterSettings.type === 'Menu') {
             element.querySelector('.e-valid-input').focus();
         }
@@ -25690,6 +26156,7 @@ var Filter$1 = /** @__PURE__ @class */ (function () {
      */
     Filter$$1.prototype.destroy = function () {
         this.removeEventListener();
+        this.unWireEvents();
     };
     return Filter$$1;
 }());
@@ -26705,7 +27172,7 @@ var Toolbar$3 = /** @__PURE__ @class */ (function () {
             var isDeleteSelected = gObj.selectionModule ? gObj.selectionModule.selectedRowIndexes.length > 0 ||
                 gObj.selectionModule.getSelectedRowCellIndexes().length > 0 ? true : false : false;
             // eslint-disable-next-line
-            edit.allowDeleting && isResouceParent && hasData && isDeleteSelected && !touchEdit ?
+            edit.allowDeleting && hasData && isDeleteSelected && !touchEdit ?
                 enableItems.push(gID + '_delete') : disableItems.push(gID + '_delete');
             if (gObj.editSettings.mode === 'Auto' && !isNullOrUndefined(gObj.editModule.cellEditModule)
                 && gObj.editModule.cellEditModule.isCellEdit) {
@@ -26818,7 +27285,6 @@ var NonWorkingDay = /** @__PURE__ @class */ (function () {
             this.nonworkingContainer = createElement('div', {
                 className: nonworkingContainer
             });
-            this.nonworkingContainer.setAttribute("role", "NonWorkingDays");
             this.parent.ganttChartModule.chartBodyContent.appendChild(this.nonworkingContainer);
         }
     };
@@ -27025,7 +27491,7 @@ var EventMarker$1 = /** @__PURE__ @class */ (function () {
                 this.eventMarkersContainer = createElement('div', {
                     className: eventMarkersContainer
                 });
-                this.eventMarkersContainer.setAttribute("role", "EventMarker");
+                this.eventMarkersContainer.setAttribute("role", "term");
                 this.parent.ganttChartModule.chartBodyContent.appendChild(this.eventMarkersContainer);
             }
             this.eventMarkersContainer.innerHTML = '';
@@ -27180,13 +27646,13 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
     CriticalPath.prototype.showCriticalPath = function (isCritical) {
         var modelIds = this.parent.ids;
         var totalRecords = this.parent.flatData;
-        if (isCritical && this.parent.flatData.length > 0 && !this.parent.enableMultiTaskbar) {
+        if (isCritical && this.parent.flatData.length > 0) {
             this.parent.enableCriticalPath = true;
             var parentRecords = this.parent.treeGrid.parentData;
             var checkEndDateTaskid = void 0;
             var checkEndDate = parentRecords[0].ganttProperties.endDate;
             var dateDifference = 0;
-            var checkBeyondEnddate = [];
+            var checkBeyondEnddate_1 = [];
             var totalPredecessorsCollection = [];
             var totalPredecessorsCollectionId = [];
             var predecessorIndex = 0;
@@ -27225,12 +27691,12 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
                 totalRecords[j].slack = dateDifference + ' ' + totalRecords[j].ganttProperties.durationUnit;
                 totalRecords[j].ganttProperties.slack = dateDifference + ' ' + totalRecords[j].ganttProperties.durationUnit;
                 if (totalRecords[j].ganttProperties.endDate >= checkEndDate) {
-                    checkBeyondEnddate.push(parseInt(totalRecords[j].ganttProperties.taskId, 10));
+                    checkBeyondEnddate_1.push(totalRecords[j].ganttProperties.taskId);
                 }
                 if (totalRecords[j].ganttProperties.predecessor) {
                     if (totalRecords[j].ganttProperties.predecessor.length !== 0) {
                         totalPredecessorsCollection.push(totalRecords[j]);
-                        totalPredecessorsCollectionId.push(parseInt(totalRecords[j].ganttProperties.taskId, 10));
+                        totalPredecessorsCollectionId.push((totalRecords[j].ganttProperties.taskId));
                     }
                 }
             }
@@ -27239,25 +27705,36 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
                     this.resourceCollectionIds[i] = this.parent.taskIds[i].slice(1);
                 }
             }
-            // seperate the predecessor connected taskes from the individual taskes that ends on total project end date
-            for (var k = 0; k < checkBeyondEnddate.length; k++) {
-                if (totalPredecessorsCollectionId.indexOf(checkBeyondEnddate[k]) === -1) {
-                    if (this.parent.viewType === 'ProjectView') {
-                        predecessorIndex = modelIds.indexOf(checkBeyondEnddate[k].toString());
+            var _loop_1 = function (k) {
+                if (totalPredecessorsCollectionId.indexOf(checkBeyondEnddate_1[k]) === -1) {
+                    if (this_1.parent.viewType === 'ProjectView') {
+                        predecessorIndex = modelIds.indexOf(checkBeyondEnddate_1[k].toString());
                     }
                     else {
-                        predecessorIndex = this.resourceCollectionIds.indexOf(checkBeyondEnddate[k].toString());
+                        var currentRecords = this_1.parent.currentViewData.filter(function (data) {
+                            return parseInt(data.ganttProperties.taskId) == checkBeyondEnddate_1[k];
+                        });
+                        for (var i = 0; i < currentRecords.length; i++) {
+                            if (!currentRecords[i].hasChildRecords && currentRecords[i].ganttProperties.endDate >= this_1.maxEndDate) {
+                                predecessorIndex = currentRecords[i].index;
+                            }
+                        }
                     }
                     if (totalRecords[predecessorIndex].ganttProperties.progress < 100) {
                         totalRecords[predecessorIndex].isCritical = true;
                         totalRecords[predecessorIndex].ganttProperties.isCritical = true;
                     }
                     totalRecords[predecessorIndex]['slack'] = 0 + ' ' + totalRecords[predecessorIndex].ganttProperties.durationUnit;
-                    taskBeyondEnddate.push(checkBeyondEnddate[k]);
+                    taskBeyondEnddate.push(checkBeyondEnddate_1[k]);
                 }
                 else {
-                    predecessorTaskBeyondEnddate.push(checkBeyondEnddate[k]);
+                    predecessorTaskBeyondEnddate.push(checkBeyondEnddate_1[k]);
                 }
+            };
+            var this_1 = this;
+            // seperate the predecessor connected taskes from the individual taskes that ends on total project end date
+            for (var k = 0; k < checkBeyondEnddate_1.length; k++) {
+                _loop_1(k);
             }
             var predecessorLength = totalPredecessorsCollection.length;
             var endTask = [];
@@ -27267,12 +27744,22 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
                 var from = -1;
                 var toPredecessor = -1;
                 var fromPredecessor = -1;
+                var tempTaskId = void 0;
                 var currentIndex = x;
                 var predecessor = totalPredecessorsCollection[x].ganttProperties.predecessor;
                 var individualPredecessorLength = totalPredecessorsCollection[x].ganttProperties.predecessor.length;
-                var taskid = (parseInt(totalPredecessorsCollection[x].ganttProperties.taskId, 10));
+                var taskid = ((totalPredecessorsCollection[x].ganttProperties.taskId));
                 for (var y = 0; y < individualPredecessorLength; y++) {
-                    if (parseInt(predecessor[y].from, 10) === taskid) {
+                    if (!isNaN(Number(predecessor[y].from)) && typeof (taskid) != "string") {
+                        tempTaskId = parseInt((predecessor[y].from), 10);
+                    }
+                    else if (!isNaN(Number(predecessor[y].from)) && typeof (taskid) === "string") {
+                        tempTaskId = predecessor[y].from;
+                    }
+                    else {
+                        tempTaskId = predecessor[y].from;
+                    }
+                    if (tempTaskId === taskid) {
                         if (to === -1) {
                             if (!predecessor[y].offset) {
                                 to = predecessor[y].to;
@@ -27294,7 +27781,16 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
                             }
                         }
                     }
-                    if (parseInt(predecessor[y].to, 10) === taskid) {
+                    if (!isNaN(Number(predecessor[y].to)) && typeof (taskid) != "string") {
+                        tempTaskId = parseInt((predecessor[y].to), 10);
+                    }
+                    else if (!isNaN(Number(predecessor[y].to)) && typeof (taskid) === "string") {
+                        tempTaskId = predecessor[y].to;
+                    }
+                    else {
+                        tempTaskId = predecessor[y].to;
+                    }
+                    if (tempTaskId === taskid) {
                         if (from === -1) {
                             if (!predecessor[y].offset) {
                                 from = predecessor[y].from;
@@ -27363,7 +27859,7 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
             this.detailPredecessorCollection = collection;
             this.predecessorCollectionTaskIds = collectionTaskId;
         }
-        if (isCritical === false && this.parent.flatData.length > 0 && !this.parent.enableMultiTaskbar) {
+        if (isCritical === false && this.parent.flatData.length > 0) {
             var pathIndex = void 0;
             this.parent.enableCriticalPath = false;
             for (var z = 0; z < this.criticalPathCollection.length; z++) {
@@ -27379,6 +27875,8 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
     CriticalPath.prototype.slackCalculation = function (fromDataObject, collection, collectionTaskId, checkEndDate, flatRecords, modelRecordIds) {
         var fromDateArray = fromDataObject[0]['fromdata'].split(',');
         var fromDataPredecessor = fromDataObject[0]['fromDataPredecessor'].split(',');
+        collectionTaskId = collectionTaskId.toString();
+        collectionTaskId = collectionTaskId.split(',');
         var fromDateArray1 = [];
         var fromTaskIdIndex;
         var indexFromTaskId;
@@ -27390,8 +27888,8 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
         var ffslack;
         for (var i = 0; i < fromDateArray.length; i++) {
             fromDateArray1 = fromDateArray[i].split(':');
-            fromTaskIdIndex = collectionTaskId.indexOf(parseInt(fromDateArray1[0], 10));
-            totaskId = collectionTaskId.indexOf(parseInt(fromDataObject[0]['todateID'], 10));
+            fromTaskIdIndex = collectionTaskId.indexOf((fromDateArray1[0].toString()));
+            totaskId = collectionTaskId.indexOf((fromDataObject[0]['todateID'].toString()));
             if (this.parent.viewType === 'ProjectView') {
                 indexFromTaskId = modelRecordIds.indexOf(fromDateArray1[0].toString());
                 indexToTaskId = modelRecordIds.indexOf(fromDataObject[0]['todateID'].toString());
@@ -27736,6 +28234,7 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
     CriticalPath.prototype.finalCriticalPath = function (collection, taskBeyondEnddate, flatRecords, modelRecordIds, checkEndDate) {
         var criticalPathIds = [];
         var index;
+        var predecessorFrom;
         for (var x = collection.length - 1; x >= 0; x--) {
             if (this.parent.viewType === 'ProjectView') {
                 index = modelRecordIds.indexOf(collection[x]['taskid'].toString());
@@ -27779,7 +28278,13 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
                     /* eslint-disable-next-line */
                     dateDifference = this.parent.dataOperation.getDuration(currentData.endDate, flatRecords[toID].ganttProperties.endDate, currentData.durationUnit, currentData.isAutoSchedule, currentData.isMilestone);
                 }
-                if (parseInt(predecessorLength[i].from, 10) === flatRecords[index][this.parent.taskFields.id] &&
+                if (typeof (flatRecords[index][this.parent.taskFields.id]) === 'number') {
+                    predecessorFrom = parseInt(predecessorLength[i].from, 10);
+                }
+                else {
+                    predecessorFrom = predecessorLength[i].from;
+                }
+                if (predecessorFrom === flatRecords[index][this.parent.taskFields.id] &&
                     flatRecords[toID].slack === noSlackValue && dateDifference <= 0) {
                     flatRecords[index].slack = noSlackValue;
                     flatRecords[index].ganttProperties.slack = noSlackValue;
@@ -27814,26 +28319,47 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
     CriticalPath.prototype.criticalConnectorLine = function (criticalPathIds, collection, condition, collectionTaskId) {
         var ganttChartElement = this.parent.ganttChartModule.chartElement;
         this.parent.removeCriticalPathStyles();
-        for (var i = 0; i < criticalPathIds.length; i++) {
-            var criticalData = void 0;
-            if (this.parent.viewType === 'ProjectView') {
-                criticalData = this.parent.flatData[this.parent.ids.indexOf(criticalPathIds[i].toString())];
+        var _loop_2 = function (i) {
+            var criticalData;
+            if (this_2.parent.viewType === 'ProjectView') {
+                criticalData = this_2.parent.currentViewData[this_2.parent.ids.indexOf(criticalPathIds[i].toString())];
             }
             else {
-                criticalData = this.parent.flatData[this.resourceCollectionIds.indexOf(criticalPathIds[i].toString())];
+                var currentRecords = this_2.parent.currentViewData.filter(function (data) {
+                    return (data.ganttProperties.taskId).toString() == criticalPathIds[i].toString();
+                });
+                for (var i_1 = 0; i_1 < currentRecords.length; i_1++) {
+                    if (currentRecords[i_1].ganttProperties.isCritical || currentRecords[i_1].ganttProperties.endDate >= this_2.maxEndDate) {
+                        criticalData = currentRecords[i_1];
+                    }
+                }
             }
-            var index = this.parent.currentViewData.indexOf(criticalData);
-            var element = this.parent.getRowByIndex(index);
+            var index = this_2.parent.currentViewData.indexOf(criticalData);
+            var element = this_2.parent.getRowByIndex(index);
             var taskClass = void 0;
-            var columnFields = this.parent.taskFields;
+            var columnFields = this_2.parent.taskFields;
+            if (criticalData.parentItem) {
+                var parentRecord = this_2.parent.currentViewData.filter(function (data) {
+                    return criticalData.parentItem.uniqueID == data.uniqueID;
+                });
+                var parentIndex = this_2.parent.currentViewData.indexOf(parentRecord[0]);
+                var parentElement = this_2.parent.getRowByIndex(parentIndex);
+                var parentTaskbarElement = parentElement.querySelectorAll('.e-taskbar-main-container');
+                for (var i_2 = 0; i_2 < parentTaskbarElement.length; i_2++) {
+                    if (parentTaskbarElement[i_2].getAttribute('rowuniqueid') == criticalData['rowUniqueID']) {
+                        addClass(parentTaskbarElement[i_2].querySelectorAll('.e-gantt-child-taskbar-inner-div'), criticalChildTaskBarInnerDiv);
+                    }
+                }
+            }
             /* eslint-disable-next-line */
-            if (this.parent.allowUnscheduledTasks && !criticalData[columnFields.startDate] && !criticalData[columnFields.endDate] && criticalData[columnFields.duration]) {
+            if (this_2.parent.allowUnscheduledTasks && !criticalData[columnFields.startDate] && !criticalData[columnFields.endDate] && criticalData[columnFields.duration]) {
                 taskClass = criticalUnscheduledTask;
             }
             else {
                 taskClass = criticalChildProgressBarInnerDiv;
             }
-            if (element) {
+            if (element && (this_2.parent.viewType === 'ProjectView' || (this_2.parent.viewType === 'ResourceView' &&
+                !criticalData.hasChildRecords))) {
                 if (element.getElementsByClassName('e-milestone-top')[0]) {
                     addClass(element.querySelectorAll('.e-milestone-top'), criticalMilestoneTop);
                 }
@@ -27847,19 +28373,32 @@ var CriticalPath = /** @__PURE__ @class */ (function () {
                     addClass(element.querySelectorAll('.e-gantt-child-progressbar-inner-div'), taskClass);
                 }
             }
+        };
+        var this_2 = this;
+        for (var i = 0; i < criticalPathIds.length; i++) {
+            _loop_2(i);
         }
         if (collection.length !== 0) {
             var index = 0;
             var currentdata = void 0;
             var checking = [];
             var checkint = void 0;
+            var values = void 0;
             for (var i = 0; i < this.criticalPathCollection.length; i++) {
                 index = collectionTaskId.indexOf(this.criticalPathCollection[i]);
                 currentdata = collection[index];
                 if (index !== -1 && currentdata['to']) {
                     checking = currentdata['to'].split(',');
                     for (var j = 0; j < checking.length; j++) {
-                        checkint = parseInt(checking[j], 10);
+                        values = checking[j].split('+');
+                        if (checking[j].indexOf('-') >= 0) {
+                            values = checking[j].split('-');
+                            
+                        }
+                        checkint = (values[0].replace(":", ""));
+                        if (typeof (criticalPathIds[j]) === "number") {
+                            checkint = parseInt(values[0], 10);
+                        }
                         if (criticalPathIds.indexOf(checkint) !== -1) {
                             var lineElement = this.parent.element.querySelectorAll('#ConnectorLineparent' +
                                 currentdata['taskid'] + 'child' + checkint);
@@ -27991,7 +28530,12 @@ var ContextMenu$2 = /** @__PURE__ @class */ (function () {
         }
         switch (this.item) {
             case 'TaskInformation':
-                this.parent.openEditDialog(Number(this.rowData.ganttProperties.rowUniqueID));
+                if (isNaN(Number(this.rowData.ganttProperties.rowUniqueID))) {
+                    this.parent.openEditDialog(this.rowData.ganttProperties.rowUniqueID);
+                }
+                else {
+                    this.parent.openEditDialog(Number(this.rowData.ganttProperties.rowUniqueID));
+                }
                 break;
             case 'Above':
             case 'Below':
@@ -28804,7 +29348,7 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
     };
     RowDD$$1.prototype.rowDragStartHelper = function (args) {
         this.parent.trigger('rowDragStartHelper', args);
-        if (this.parent.readOnly || this.parent.filterSettings.columns.length > 0) {
+        if (this.parent.readOnly) {
             args.cancel = true;
         }
         if (this.parent.viewType === 'ResourceView' && getValue('level', args.data[0]) === 0) {
@@ -28940,7 +29484,7 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
                         var uniqueTaskID_1 = this_1.parent.taskFields.id;
                         if (draggedRecord.index < droppedRecord.index) {
                             startIndex = draggedRecord.index;
-                            var _loop_2 = function (i_1) {
+                            var _loop_3 = function (i_1) {
                                 var currentData = this_1.parent.currentViewData.filter(function (e) {
                                     return e[uniqueTaskID_1] === ganttData_1[i_1][uniqueTaskID_1];
                                 })[0];
@@ -28950,14 +29494,14 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
                                 }
                             };
                             for (var i_1 = 0; i_1 < ganttData_1.length; i_1++) {
-                                var state_2 = _loop_2(i_1);
+                                var state_2 = _loop_3(i_1);
                                 if (state_2 === "break")
                                     break;
                             }
                         }
                         else {
                             startIndex = droppedRecord.index;
-                            var _loop_3 = function (i_2) {
+                            var _loop_4 = function (i_2) {
                                 var currentData = this_1.parent.currentViewData.filter(function (e) {
                                     return e[uniqueTaskID_1] === ganttData_1[i_2][uniqueTaskID_1];
                                 })[0];
@@ -28967,12 +29511,12 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
                                 }
                             };
                             for (var i_2 = 0; i_2 < ganttData_1.length; i_2++) {
-                                var state_3 = _loop_3(i_2);
+                                var state_3 = _loop_4(i_2);
                                 if (state_3 === "break")
                                     break;
                             }
                         }
-                        var _loop_4 = function (i_3) {
+                        var _loop_5 = function (i_3) {
                             if (!isNullOrUndefined(data_1[i_3])) {
                                 data_1[i_3].index = i_3;
                                 if (!isNullOrUndefined(data_1[i_3].parentItem)) {
@@ -28984,7 +29528,7 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
                             }
                         };
                         for (var i_3 = startIndex; i_3 <= endIndex; i_3++) {
-                            _loop_4(i_3);
+                            _loop_5(i_3);
                         }
                     }
                     gObj.rowDragAndDropModule.refreshDataSource();
@@ -29045,6 +29589,66 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
                         this.updateSharedResourceTask();
                     }
                 }
+                if (this.parent.taskFields.dependency) {
+                    var isValidPredecessor = true;
+                    var draggedParent = void 0;
+                    var toParent_1;
+                    if (draggedRecord.parentItem) {
+                        draggedParent = this.parent.currentViewData[this.parent.ids.indexOf(draggedRecord.parentItem.taskId)];
+                    }
+                    else {
+                        draggedParent = draggedRecord;
+                    }
+                    if (droppedRecord.parentItem) {
+                        toParent_1 = this.parent.currentViewData[this.parent.ids.indexOf(droppedRecord.parentItem.taskId)];
+                    }
+                    else {
+                        toParent_1 = droppedRecord;
+                    }
+                    var validateRecords = void 0;
+                    if (toParent_1.uniqueID === draggedParent.uniqueID || (draggedParent.parentItem &&
+                        toParent_1.uniqueID == this.parent.currentViewData[this.parent.ids.indexOf(draggedParent.parentItem.taskId)].uniqueID)) {
+                        validateRecords = this.parent.currentViewData.filter(function (data) {
+                            if ((data.ganttProperties.predecessor && data.ganttProperties.predecessor.length > 0)) {
+                                for (var i = 0; i < data.ganttProperties.predecessor.length; i++) {
+                                    return (parseInt(data.ganttProperties.predecessor[i].to) === parseInt(toParent_1.ganttProperties.taskId) ||
+                                        parseInt(data.ganttProperties.predecessor[i].from) === parseInt(toParent_1.ganttProperties.taskId));
+                                }
+                            }
+                            return null;
+                        });
+                        var predName = [];
+                        for (var i = 0; i < validateRecords.length; i++) {
+                            predName = [];
+                            if (validateRecords[i].ganttProperties.predecessor) {
+                                for (var k = 0; k < validateRecords[i].ganttProperties.predecessor.length; k++) {
+                                    if (parseInt(validateRecords[i].ganttProperties.taskId) !==
+                                        parseInt(validateRecords[i].ganttProperties.predecessor[k].from)) {
+                                        predName.push(validateRecords[i].ganttProperties.predecessor[k].from);
+                                    }
+                                    else {
+                                        predName.push(validateRecords[i].ganttProperties.predecessor[k].to);
+                                    }
+                                }
+                            }
+                            var _loop_2 = function (j) {
+                                var name_1 = predName[j].replace(/\D/g, '');
+                                var toRec = this_2.parent.currentViewData.filter(function (data) {
+                                    return parseInt(data.ganttProperties.taskId) == parseInt(name_1);
+                                });
+                                isValidPredecessor = this_2.parent.connectorLineEditModule.validateParentPredecessor(validateRecords[i], toRec[0]);
+                                if (!isValidPredecessor) {
+                                    this_2.parent.dataOperation['resetDependency'](validateRecords[i]);
+                                    this_2.parent.dataOperation['resetDependency'](toRec[0]);
+                                }
+                            };
+                            var this_2 = this;
+                            for (var j = 0; j < predName.length; j++) {
+                                _loop_2(j);
+                            }
+                        }
+                    }
+                }
                 // method to update the edited parent records
                 for (var j = 0; j < this.updateParentRecords.length; j++) {
                     this.parent.dataOperation.updateParentItems(this.updateParentRecords[j]);
@@ -29425,7 +30029,7 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
                 }
                 var idx = void 0;
                 var ganttData = dataSource.length > 0 && this.parent.viewType !== 'ResourceView' ?
-                    dataSource : this.parent.updatedRecords;
+                    dataSource : this.parent.flatData;
                 for (var i = 0; i < ganttData.length; i++) {
                     if (this.parent.viewType === 'ResourceView') {
                         if (ganttData[i].ganttProperties.rowUniqueID === deletedRow.ganttProperties.rowUniqueID) {
@@ -32984,215 +33588,217 @@ var PdfGanttPredecessor = /** @__PURE__ @class */ (function () {
         var childPageData;
         var parentY = 0;
         var childY = 0;
-        switch (this.type) {
-            case 'FS':
-                if (childTask.startPage > -1 && parentTask.endPage > -1) {
-                    startPage = pages[parentTask.endPage];
-                    endPage = pages[childTask.startPage];
-                    parentPageData = pdfGantt.pdfPageDetail[parentTask.endPage - pdfGantt.chartPageIndex];
-                    childPageData = pdfGantt.pdfPageDetail[childTask.startPage - pdfGantt.chartPageIndex];
-                    if (this.parentIndex < this.childIndex) {
-                        if (this.parentLeft < this.childLeft && this.childLeft > (this.parentLeft + this.parentWidth + 25)) {
-                            predecessorType = 'FSType1';
+        if (childTask && parentTask) {
+            switch (this.type) {
+                case 'FS':
+                    if (childTask.startPage > -1 && parentTask.endPage > -1) {
+                        startPage = pages[parentTask.endPage];
+                        endPage = pages[childTask.startPage];
+                        parentPageData = pdfGantt.pdfPageDetail[parentTask.endPage - pdfGantt.chartPageIndex];
+                        childPageData = pdfGantt.pdfPageDetail[childTask.startPage - pdfGantt.chartPageIndex];
+                        if (this.parentIndex < this.childIndex) {
+                            if (this.parentLeft < this.childLeft && this.childLeft > (this.parentLeft + this.parentWidth + 25)) {
+                                predecessorType = 'FSType1';
+                            }
+                            else {
+                                predecessorType = 'FSType2';
+                            }
                         }
                         else {
-                            predecessorType = 'FSType2';
+                            if (this.parentLeft < this.childLeft && this.childLeft > (this.parentLeft + this.parentWidth + 25)) {
+                                predecessorType = 'FSType3';
+                            }
+                            else {
+                                predecessorType = 'FSType4';
+                            }
                         }
                     }
                     else {
-                        if (this.parentLeft < this.childLeft && this.childLeft > (this.parentLeft + this.parentWidth + 25)) {
-                            predecessorType = 'FSType3';
-                        }
-                        else {
-                            predecessorType = 'FSType4';
-                        }
+                        return;
                     }
-                }
-                else {
-                    return;
-                }
-                break;
-            case 'SF':
-                if (childTask.endPage > -1 && parentTask.startPage > -1) {
-                    startPage = pages[parentTask.startPage];
-                    endPage = pages[childTask.endPage];
-                    parentPageData = pdfGantt.pdfPageDetail[parentTask.endPage - pdfGantt.chartPageIndex];
-                    childPageData = pdfGantt.pdfPageDetail[childTask.startPage - pdfGantt.chartPageIndex];
-                    if (this.parentIndex < this.childIndex) {
-                        if (this.parentLeft > this.childLeft + this.childWidth) {
-                            predecessorType = 'SFType1';
+                    break;
+                case 'SF':
+                    if (childTask.endPage > -1 && parentTask.startPage > -1) {
+                        startPage = pages[parentTask.startPage];
+                        endPage = pages[childTask.endPage];
+                        parentPageData = pdfGantt.pdfPageDetail[parentTask.endPage - pdfGantt.chartPageIndex];
+                        childPageData = pdfGantt.pdfPageDetail[childTask.startPage - pdfGantt.chartPageIndex];
+                        if (this.parentIndex < this.childIndex) {
+                            if (this.parentLeft > this.childLeft + this.childWidth) {
+                                predecessorType = 'SFType1';
+                            }
+                            else {
+                                predecessorType = 'SFType2';
+                            }
                         }
                         else {
-                            predecessorType = 'SFType2';
+                            if (this.parentLeft > this.childLeft + this.childWidth) {
+                                predecessorType = 'SFType3';
+                            }
+                            else {
+                                predecessorType = 'SFType4';
+                            }
                         }
                     }
                     else {
-                        if (this.parentLeft > this.childLeft + this.childWidth) {
-                            predecessorType = 'SFType3';
-                        }
-                        else {
-                            predecessorType = 'SFType4';
-                        }
+                        return;
                     }
-                }
-                else {
-                    return;
-                }
-                break;
-            case 'FF':
-                if (childTask.endPage > -1 && parentTask.endPage > -1) {
-                    startPage = pages[parentTask.endPage];
-                    endPage = pages[childTask.endPage];
-                    parentPageData = pdfGantt.pdfPageDetail[parentTask.endPage - pdfGantt.chartPageIndex];
-                    childPageData = pdfGantt.pdfPageDetail[childTask.endPage - pdfGantt.chartPageIndex];
-                    if (this.parentIndex < this.childIndex) {
-                        if ((this.childLeft + this.childWidth) >= (this.parentLeft + this.parentWidth)) {
-                            predecessorType = 'FFType1';
+                    break;
+                case 'FF':
+                    if (childTask.endPage > -1 && parentTask.endPage > -1) {
+                        startPage = pages[parentTask.endPage];
+                        endPage = pages[childTask.endPage];
+                        parentPageData = pdfGantt.pdfPageDetail[parentTask.endPage - pdfGantt.chartPageIndex];
+                        childPageData = pdfGantt.pdfPageDetail[childTask.endPage - pdfGantt.chartPageIndex];
+                        if (this.parentIndex < this.childIndex) {
+                            if ((this.childLeft + this.childWidth) >= (this.parentLeft + this.parentWidth)) {
+                                predecessorType = 'FFType1';
+                            }
+                            else {
+                                predecessorType = 'FFType2';
+                            }
                         }
                         else {
-                            predecessorType = 'FFType2';
+                            if ((this.childLeft + this.childWidth) >= (this.parentLeft + this.parentWidth)) {
+                                predecessorType = 'FFType3';
+                            }
+                            else {
+                                predecessorType = 'FFType4';
+                            }
                         }
                     }
                     else {
-                        if ((this.childLeft + this.childWidth) >= (this.parentLeft + this.parentWidth)) {
-                            predecessorType = 'FFType3';
-                        }
-                        else {
-                            predecessorType = 'FFType4';
-                        }
+                        return;
                     }
-                }
-                else {
-                    return;
-                }
-                break;
-            case 'SS':
-                if (childTask.startPage > -1 && parentTask.startPage > -1) {
-                    startPage = pages[parentTask.startPage];
-                    endPage = pages[childTask.startPage];
-                    parentPageData = pdfGantt.pdfPageDetail[parentTask.startPage - pdfGantt.chartPageIndex];
-                    childPageData = pdfGantt.pdfPageDetail[childTask.startPage - pdfGantt.chartPageIndex];
-                    if (this.parentIndex < this.childIndex) {
-                        if (this.parentLeft >= this.childLeft) {
-                            predecessorType = 'SSType1';
+                    break;
+                case 'SS':
+                    if (childTask.startPage > -1 && parentTask.startPage > -1) {
+                        startPage = pages[parentTask.startPage];
+                        endPage = pages[childTask.startPage];
+                        parentPageData = pdfGantt.pdfPageDetail[parentTask.startPage - pdfGantt.chartPageIndex];
+                        childPageData = pdfGantt.pdfPageDetail[childTask.startPage - pdfGantt.chartPageIndex];
+                        if (this.parentIndex < this.childIndex) {
+                            if (this.parentLeft >= this.childLeft) {
+                                predecessorType = 'SSType1';
+                            }
+                            else {
+                                predecessorType = 'SSType2';
+                            }
                         }
                         else {
-                            predecessorType = 'SSType2';
+                            if (this.parentLeft >= this.childLeft) {
+                                predecessorType = 'SSType3';
+                            }
+                            else {
+                                predecessorType = 'SSType4';
+                            }
                         }
                     }
                     else {
-                        if (this.parentLeft >= this.childLeft) {
-                            predecessorType = 'SSType3';
-                        }
-                        else {
-                            predecessorType = 'SSType4';
-                        }
+                        return;
                     }
-                }
-                else {
-                    return;
-                }
-                break;
-        }
-        var midPoint = Math.round((this.parent.rowHeight - 1) / 2.0);
-        midPoint = pixelToPoint(midPoint);
-        /* eslint-disable-next-line */
-        var point1, point2, point3, point4, point5, point6;
-        point1 = point2 = point3 = point4 = point5 = point6 = new PointF();
-        var parentTaskpoint = __assign$4({}, parentTask.taskStartPoint);
-        var childTaskpoint = __assign$4({}, childTask.taskStartPoint);
-        parentY = parentTaskpoint.y + parentPageData.startPoint.y;
-        childY = childTaskpoint.y + childPageData.startPoint.y;
-        var ffpoint1 = new PointF(pixelToPoint(this.parentLeft + this.parentWidth), parentY + midPoint);
-        var sspoint1 = new PointF(pixelToPoint(this.parentLeft) - 1, parentY + midPoint);
-        var ffpoint3 = new PointF(pixelToPoint(this.childLeft - 20), childY + midPoint);
-        var ffpoint4 = new PointF(pixelToPoint(this.childLeft - 6 - this.lineWidth) - 1, childY + midPoint);
-        var sspoint4 = new PointF(pixelToPoint(this.childLeft + this.childWidth + 6 + this.lineWidth) + 1, childY + midPoint);
-        switch (predecessorType) {
-            case 'FSType1':
-            case 'FSType3':
-                point1 = ffpoint1;
-                point2 = new PointF(pixelToPoint(this.childLeft - 20), parentY + midPoint);
-                point3 = ffpoint3;
-                point4 = ffpoint4;
-                this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint);
-                break;
-            case 'FSType2':
-                point1 = ffpoint1;
-                point2 = new PointF(point1.x + 10, parentY + midPoint);
-                point3 = new PointF(point1.x + 10, childY + 2);
-                point4 = new PointF(pixelToPoint(this.childLeft - 20), childY + 2);
-                point5 = ffpoint3;
-                point6 = ffpoint4;
-                this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint, point5, point6);
-                break;
-            case 'FSType4':
-                point1 = ffpoint1;
-                point2 = new PointF(point1.x + 10, parentY + midPoint);
-                point3 = new PointF(point1.x + 10, parentY + 2);
-                point4 = new PointF(pixelToPoint(this.childLeft - 20), parentY + 2);
-                point5 = ffpoint3;
-                point6 = ffpoint4;
-                this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint, point5, point6);
-                break;
-            case 'FFType1':
-            case 'FFType3':
-                point1 = new PointF(pixelToPoint(this.parentLeft + this.parentWidth) + 1, parentY + midPoint);
-                point2 = new PointF(pixelToPoint(this.childLeft + this.childWidth + 20), parentY + midPoint);
-                point3 = new PointF(point2.x, childY + midPoint);
-                point4 = sspoint4;
-                this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint);
-                break;
-            case 'FFType2':
-            case 'FFType4':
-                point1 = new PointF(pixelToPoint(this.parentLeft + this.parentWidth) + 1, parentY + midPoint);
-                point2 = new PointF(pixelToPoint(this.parentLeft + this.parentWidth + 20), parentY + midPoint);
-                point3 = new PointF(point2.x, childY + midPoint);
-                point4 = sspoint4;
-                this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint);
-                break;
-            case 'SSType1':
-            case 'SSType3':
-                point1 = sspoint1;
-                point2 = new PointF(pixelToPoint(this.childLeft - 20), parentY + midPoint);
-                point3 = new PointF(point2.x, childY + midPoint);
-                point4 = ffpoint4;
-                this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint);
-                break;
-            case 'SSType2':
-            case 'SSType4':
-                point1 = sspoint1;
-                point2 = new PointF(pixelToPoint(this.parentLeft - 20), parentY + midPoint);
-                point3 = new PointF(point2.x, childY + midPoint);
-                point4 = ffpoint4;
-                this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint);
-                break;
-            case 'SFType1':
-            case 'SFType3':
-                point1 = sspoint1;
-                point2 = new PointF(pixelToPoint(this.childLeft + this.childWidth + 20), parentY + midPoint);
-                point3 = new PointF(point2.x, childY + midPoint);
-                point4 = sspoint4;
-                this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint);
-                break;
-            case 'SFType2':
-                point1 = sspoint1;
-                point2 = new PointF(pixelToPoint(this.parentLeft - 20), parentY + midPoint);
-                point3 = new PointF(point2.x, childY + 2);
-                point4 = new PointF(pixelToPoint(this.childLeft + this.childWidth + 20), childY + 2);
-                point5 = new PointF(point4.x, childY + midPoint);
-                point6 = sspoint4;
-                this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint, point5, point6);
-                break;
-            case 'SFType4':
-                point1 = sspoint1;
-                point2 = new PointF(pixelToPoint(this.parentLeft - 20), parentY + midPoint);
-                point3 = new PointF(point2.x, parentY + 2);
-                point4 = new PointF(pixelToPoint(this.childLeft + this.childWidth + 20), parentY + 2);
-                point5 = new PointF(point4.x, childY + midPoint);
-                point6 = sspoint4;
-                this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint, point5, point6);
-                break;
+                    break;
+            }
+            var midPoint = Math.round((this.parent.rowHeight - 1) / 2.0);
+            midPoint = pixelToPoint(midPoint);
+            /* eslint-disable-next-line */
+            var point1 = void 0, point2 = void 0, point3 = void 0, point4 = void 0, point5 = void 0, point6 = void 0;
+            point1 = point2 = point3 = point4 = point5 = point6 = new PointF();
+            var parentTaskpoint = __assign$4({}, parentTask.taskStartPoint);
+            var childTaskpoint = __assign$4({}, childTask.taskStartPoint);
+            parentY = parentTaskpoint.y + parentPageData.startPoint.y;
+            childY = childTaskpoint.y + childPageData.startPoint.y;
+            var ffpoint1 = new PointF(pixelToPoint(this.parentLeft + this.parentWidth), parentY + midPoint);
+            var sspoint1 = new PointF(pixelToPoint(this.parentLeft) - 1, parentY + midPoint);
+            var ffpoint3 = new PointF(pixelToPoint(this.childLeft - 20), childY + midPoint);
+            var ffpoint4 = new PointF(pixelToPoint(this.childLeft - 6 - this.lineWidth) - 1, childY + midPoint);
+            var sspoint4 = new PointF(pixelToPoint(this.childLeft + this.childWidth + 6 + this.lineWidth) + 1, childY + midPoint);
+            switch (predecessorType) {
+                case 'FSType1':
+                case 'FSType3':
+                    point1 = ffpoint1;
+                    point2 = new PointF(pixelToPoint(this.childLeft - 20), parentY + midPoint);
+                    point3 = ffpoint3;
+                    point4 = ffpoint4;
+                    this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint);
+                    break;
+                case 'FSType2':
+                    point1 = ffpoint1;
+                    point2 = new PointF(point1.x + 10, parentY + midPoint);
+                    point3 = new PointF(point1.x + 10, childY + 2);
+                    point4 = new PointF(pixelToPoint(this.childLeft - 20), childY + 2);
+                    point5 = ffpoint3;
+                    point6 = ffpoint4;
+                    this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint, point5, point6);
+                    break;
+                case 'FSType4':
+                    point1 = ffpoint1;
+                    point2 = new PointF(point1.x + 10, parentY + midPoint);
+                    point3 = new PointF(point1.x + 10, parentY + 2);
+                    point4 = new PointF(pixelToPoint(this.childLeft - 20), parentY + 2);
+                    point5 = ffpoint3;
+                    point6 = ffpoint4;
+                    this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint, point5, point6);
+                    break;
+                case 'FFType1':
+                case 'FFType3':
+                    point1 = new PointF(pixelToPoint(this.parentLeft + this.parentWidth) + 1, parentY + midPoint);
+                    point2 = new PointF(pixelToPoint(this.childLeft + this.childWidth + 20), parentY + midPoint);
+                    point3 = new PointF(point2.x, childY + midPoint);
+                    point4 = sspoint4;
+                    this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint);
+                    break;
+                case 'FFType2':
+                case 'FFType4':
+                    point1 = new PointF(pixelToPoint(this.parentLeft + this.parentWidth) + 1, parentY + midPoint);
+                    point2 = new PointF(pixelToPoint(this.parentLeft + this.parentWidth + 20), parentY + midPoint);
+                    point3 = new PointF(point2.x, childY + midPoint);
+                    point4 = sspoint4;
+                    this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint);
+                    break;
+                case 'SSType1':
+                case 'SSType3':
+                    point1 = sspoint1;
+                    point2 = new PointF(pixelToPoint(this.childLeft - 20), parentY + midPoint);
+                    point3 = new PointF(point2.x, childY + midPoint);
+                    point4 = ffpoint4;
+                    this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint);
+                    break;
+                case 'SSType2':
+                case 'SSType4':
+                    point1 = sspoint1;
+                    point2 = new PointF(pixelToPoint(this.parentLeft - 20), parentY + midPoint);
+                    point3 = new PointF(point2.x, childY + midPoint);
+                    point4 = ffpoint4;
+                    this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint);
+                    break;
+                case 'SFType1':
+                case 'SFType3':
+                    point1 = sspoint1;
+                    point2 = new PointF(pixelToPoint(this.childLeft + this.childWidth + 20), parentY + midPoint);
+                    point3 = new PointF(point2.x, childY + midPoint);
+                    point4 = sspoint4;
+                    this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint);
+                    break;
+                case 'SFType2':
+                    point1 = sspoint1;
+                    point2 = new PointF(pixelToPoint(this.parentLeft - 20), parentY + midPoint);
+                    point3 = new PointF(point2.x, childY + 2);
+                    point4 = new PointF(pixelToPoint(this.childLeft + this.childWidth + 20), childY + 2);
+                    point5 = new PointF(point4.x, childY + midPoint);
+                    point6 = sspoint4;
+                    this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint, point5, point6);
+                    break;
+                case 'SFType4':
+                    point1 = sspoint1;
+                    point2 = new PointF(pixelToPoint(this.parentLeft - 20), parentY + midPoint);
+                    point3 = new PointF(point2.x, parentY + 2);
+                    point4 = new PointF(pixelToPoint(this.childLeft + this.childWidth + 20), parentY + 2);
+                    point5 = new PointF(point4.x, childY + midPoint);
+                    point6 = sspoint4;
+                    this.connectLines(startPage, endPage, point1, point2, point3, point4, childTask, midPoint, point5, point6);
+                    break;
+            }
         }
     };
     /**