@syncfusion/ej2-gantt 20.1.47 → 20.1.51

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.1.47
+*  version : 20.1.51
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-gantt@*",
-  "_id": "@syncfusion/ej2-gantt@19.10.10",
+  "_id": "@syncfusion/ej2-gantt@20.1.50",
   "_inBundle": false,
-  "_integrity": "sha512-kJWTMNP/9/2FtwxZ6khAoLriF7D+LPHkkeCwBLOYy2+QaggPgOyqD6Kxf+EUvIcy88okK5d+aRAVfm35iY0dzg==",
+  "_integrity": "sha512-RfhzWOGmO7XGQ5xseJGGbRAHhgqv6rLAiVWSKxNeYLjNkY3vjj7j8aoyH9OGIAjAI8lX3ZAr6BOtIXpYwhnwlQ==",
   "_location": "/@syncfusion/ej2-gantt",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-gantt",
     "/@syncfusion/ej2-vue-gantt"
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-release/@syncfusion/ej2-gantt/-/ej2-gantt-19.10.10.tgz",
-  "_shasum": "8340614ed1ccd8ec22e6082223b54f2226d905d1",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-gantt/-/ej2-gantt-20.1.50.tgz",
+  "_shasum": "527cab5ce59fce5ee5719e30d9970507cd0cf5cf",
   "_spec": "@syncfusion/ej2-gantt@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -35,19 +35,19 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.1.47",
-    "@syncfusion/ej2-buttons": "~20.1.47",
+    "@syncfusion/ej2-base": "~20.1.50",
+    "@syncfusion/ej2-buttons": "~20.1.50",
     "@syncfusion/ej2-calendars": "~20.1.47",
     "@syncfusion/ej2-data": "~20.1.47",
-    "@syncfusion/ej2-dropdowns": "~20.1.47",
-    "@syncfusion/ej2-grids": "~20.1.47",
-    "@syncfusion/ej2-inputs": "~20.1.47",
+    "@syncfusion/ej2-dropdowns": "~20.1.51",
+    "@syncfusion/ej2-grids": "~20.1.51",
+    "@syncfusion/ej2-inputs": "~20.1.48",
     "@syncfusion/ej2-layouts": "~20.1.47",
     "@syncfusion/ej2-lists": "~20.1.47",
-    "@syncfusion/ej2-navigations": "~20.1.47",
+    "@syncfusion/ej2-navigations": "~20.1.51",
     "@syncfusion/ej2-popups": "~20.1.47",
-    "@syncfusion/ej2-richtexteditor": "~20.1.47",
-    "@syncfusion/ej2-treegrid": "~20.1.47"
+    "@syncfusion/ej2-richtexteditor": "~20.1.51",
+    "@syncfusion/ej2-treegrid": "~20.1.51"
   },
   "deprecated": false,
   "description": "Essential JS 2 Gantt Component",
@@ -75,6 +75,6 @@
     "url": "git+https://github.com/syncfusion/ej2-gantt.git"
   },
   "typings": "index.d.ts",
-  "version": "20.1.47",
+  "version": "20.1.51",
   "sideEffects": false
 }

package/src/gantt/actions/dialog-edit.js

@@ -364,6 +364,13 @@ var DialogEdit = /** @class */ (function () {
         dialogModel.target = document.body;
         dialogModel.close = this.dialogClose.bind(this);
         dialogModel.closeOnEscape = true;
+        dialogModel.beforeClose = function (args) {
+            if (args.closedBy == "escape") {
+                if (args.event.name == "key-pressed" && args.event.target.nodeName == 'INPUT') {
+                    args.cancel = true;
+                }
+            }
+        };
         dialogModel.open = function (args) {
             var dialogElement = getValue('element', args);
             var generalTabElement = dialogElement.querySelector('#' + _this.parent.element.id + 'GeneralTabContainer');
@@ -650,6 +657,8 @@ var DialogEdit = /** @class */ (function () {
         }
         else if (id === ganttObj.element.id + 'NotesTabContainer') {
             document.getElementById(id).ej2_instances[0].refresh();
+            var notesTabElement = document.querySelector('#' + this.parent.element.id + 'NotesTabContainer');
+            notesTabElement.style.overflow = 'scroll';
         }
         else if (id === ganttObj.element.id + 'SegmentsTabContainer') {
             if (isNullOrUndefined(this.beforeOpenArgs.rowData.ganttProperties.startDate)) {

package/src/gantt/actions/filter.js

@@ -185,11 +185,13 @@ var Filter = /** @class */ (function () {
         // ...
     };
     Filter.prototype.closeFilterOnContextClick = function (element) {
+        var datePickerElement = document.querySelector('body > div.e-datepicker');
+        var dateTimePickerElement = document.querySelector('body > div.e-datetimepicker');
         if (this.filterMenuElement && document.body.contains(this.filterMenuElement)) {
             var ganttElement = closest(element, '#' + this.parent.element.id)
                 || element.querySelector('#' + this.parent.element.id);
-            if ((!(this.filterMenuElement.contains(element)) && !isNullOrUndefined(ganttElement)) || element.nodeName === 'HTML'
-                || ((element.nodeName === 'DIV') && (!element.classList.contains('e-day')))) {
+            if ((!(this.filterMenuElement.contains(element)) && !isNullOrUndefined(ganttElement)) || (!(this.filterMenuElement.contains(element)) && (isNullOrUndefined(datePickerElement))
+                && (isNullOrUndefined(dateTimePickerElement)) && ((element.nodeName === 'DIV') || (element.nodeName === 'HTML')))) {
                 remove(this.filterMenuElement);
                 this.parent.treeGrid.grid.notify('filter-menu-close', { isOpen: false });
                 this.filterMenuElement = null;

package/src/gantt/actions/rowdragdrop.js

@@ -149,10 +149,12 @@ var RowDD = /** @class */ (function () {
             }
         }
         if (!args.cancel) {
-            args.cancel = true;
             args.requestType = 'beforeDrop';
             this.parent.trigger('actionBegin', args);
-            this.dropRows(args, true); // method to update the data collections based on drop action
+            if (!args.cancel) {
+                this.dropRows(args, true); // method to update the data collections based on drop action
+                args.cancel = true;
+            }
         }
     };
     RowDD.prototype.dropRows = function (args, isByMethod) {

package/src/gantt/base/gantt-chart.js

@@ -212,7 +212,7 @@ var GanttChart = /** @class */ (function () {
         var emptydivHeight = 36;
         var emptyHeight = this.parent.contentHeight === 0 ? this.parent.flatData.length > 1 ? emptydivHeight : 0 : this.parent.contentHeight;
         var contentElement = this.parent.element.getElementsByClassName('e-chart-scroll-container e-content')[0];
-        if (emptyHeight >= contentElement['offsetHeight']) {
+        if (emptyHeight >= contentElement['offsetHeight'] || this.parent.height === 'auto') {
             this.chartBodyContent.style.height = formatUnit(emptyHeight);
         }
         else {

package/src/gantt/base/gantt.d.ts

@@ -108,6 +108,8 @@ export declare class Gantt extends Component<HTMLElement> implements INotifyProp
     /** @hidden */
     ganttHeight: number;
     /** @hidden */
+    initialChartRowElements: NodeListOf<Element>;
+    /** @hidden */
     ganttWidth: number;
     /** @hidden */
     predecessorModule: Dependency;

package/src/gantt/base/gantt.js

@@ -821,6 +821,7 @@ var Gantt = /** @class */ (function (_super) {
             this.getCurrentRecords(args);
         }
         this.notify('recordsUpdated', {});
+        this.initialChartRowElements = this.ganttChartModule.getChartRows();
         this.isLoad = false;
         this.trigger('dataBound', args);
     };

package/src/gantt/base/tree-grid.js

@@ -261,7 +261,7 @@ var GanttTreeGrid = /** @class */ (function () {
         return eventArgs;
     };
     GanttTreeGrid.prototype.treeActionComplete = function (args) {
-        var updatedArgs = extend({}, args, true);
+        var updatedArgs = extend({}, args);
         if (getValue('requestType', args) === 'sorting') {
             this.parent.notify('updateModel', {});
             deleteObject(updatedArgs, 'isFrozen');

package/src/gantt/export/export-helper.js

@@ -257,6 +257,9 @@ var ExportHelper = /** @class */ (function () {
             if (data[_this.parent.labelSettings.rightLabel]) {
                 taskbar.rightTaskLabel.value = data[_this.parent.labelSettings.rightLabel].toString();
             }
+            if (data[_this.parent.labelSettings.taskLabel]) {
+                taskbar.taskLabel = data[_this.parent.labelSettings.taskLabel].toString();
+            }
             var reduceLeft = ganttProp.isMilestone ? Math.floor(_this.parent.chartRowsModule.taskBarHeight / 2) + 33 : 33; // 33 indicates default timeline cell width
             taskbar.rightTaskLabel.left = ganttProp.left + ganttProp.width + reduceLeft; // right label left value
             taskbar.fontFamily = _this.ganttStyle.fontFamily;

package/src/gantt/export/pdf-taskbar.d.ts

@@ -73,6 +73,7 @@ export declare class PdfGanttTaskbarCollection {
      * @private
      */
     rightTaskLabel: TaskLabel;
+    taskLabel: string;
     startPage: number;
     endPage: number;
     isStartPoint: boolean;

package/src/gantt/export/pdf-taskbar.js

@@ -79,6 +79,9 @@ var PdfGanttTaskbarCollection = /** @class */ (function () {
         var progressFormat = new PdfStringFormat();
         progressFormat.lineAlignment = PdfVerticalAlignment.Middle;
         progressFormat.alignment = PdfTextAlignment.Right;
+        if (/^[a-zA-Z]/.test(this.taskLabel)) {
+            progressFormat.alignment = PdfTextAlignment.Left;
+        }
         var pageIndex = -1;
         if (!taskbar.isMilestone) {
             var taskbarPen = new PdfPen(taskbar.taskBorderColor);
@@ -100,10 +103,10 @@ var PdfGanttTaskbarCollection = /** @class */ (function () {
                 }
                 else {
                     taskGraphics.drawRectangle(taskbarPen, taskBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth) + 0.5, startPoint.y + adjustHeight, pixelToPoint(taskbar.width), pixelToPoint(taskbar.height));
-                    if (this.progress > 0 && this.progressWidth > 0 && this.isScheduledTask) {
+                    if (this.isScheduledTask) {
                         taskGraphics.drawRectangle(progressPen, progressBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth) + 0.5, startPoint.y + adjustHeight, pixelToPoint(taskbar.progressWidth), pixelToPoint(taskbar.height));
-                        if (!isNullOrUndefined(this.parent.taskFields.progress) && !isNullOrUndefined(this.parent.labelSettings.taskLabel)) {
-                            taskGraphics.drawString(this.progress.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth), startPoint.y + adjustHeight, pixelToPoint(this.progressWidth), pixelToPoint(this.height), progressFormat);
+                        if (!isNullOrUndefined(this.parent.labelSettings.taskLabel) && !isNullOrUndefined(this.taskLabel)) {
+                            taskGraphics.drawString(this.taskLabel.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth), startPoint.y + adjustHeight, pixelToPoint(this.progressWidth), pixelToPoint(this.height), progressFormat);
                         }
                     }
                 }
@@ -125,7 +128,7 @@ var PdfGanttTaskbarCollection = /** @class */ (function () {
                 }
                 else {
                     taskGraphics.drawRectangle(taskbarPen, taskBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth) + 0.5, startPoint.y + adjustHeight, pixelToPoint(renderWidth), pixelToPoint(taskbar.height));
-                    if (this.progress > 0 && this.progressWidth > 0 && this.isScheduledTask) {
+                    if (this.isScheduledTask) {
                         var progressBoundsWidth = 0;
                         if (this.progressWidth <= renderWidth) {
                             progressBoundsWidth = this.progressWidth;
@@ -135,8 +138,8 @@ var PdfGanttTaskbarCollection = /** @class */ (function () {
                         }
                         taskGraphics.drawRectangle(progressPen, progressBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth) + 0.5, startPoint.y + adjustHeight, pixelToPoint(progressBoundsWidth), pixelToPoint(taskbar.height));
                         this.progressWidth -= progressBoundsWidth;
-                        if (this.progressWidth === 0 && this.progress !== 0 && this.parent.labelSettings.taskLabel) {
-                            taskGraphics.drawString(this.progress.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth), (startPoint.y + adjustHeight), pixelToPoint(progressBoundsWidth), pixelToPoint(this.height), progressFormat);
+                        if (this.parent.labelSettings.taskLabel && !isNullOrUndefined(this.taskLabel)) {
+                            taskGraphics.drawString(this.taskLabel.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth), (startPoint.y + adjustHeight), pixelToPoint(progressBoundsWidth), pixelToPoint(this.height), progressFormat);
                         }
                     }
                 }
@@ -153,8 +156,8 @@ var PdfGanttTaskbarCollection = /** @class */ (function () {
                 taskGraphics.drawRectangle(taskbarPen, taskBrush, startPoint.x + pixelToPoint(taskbar.left + 0.5), startPoint.y + adjustHeight, pixelToPoint(taskbar.width), pixelToPoint(taskbar.height));
                 if (this.isScheduledTask) {
                     taskGraphics.drawRectangle(progressPen, progressBrush, startPoint.x + pixelToPoint(taskbar.left + 0.5), startPoint.y + adjustHeight, pixelToPoint(taskbar.progressWidth), pixelToPoint(taskbar.height));
-                    if (this.progressWidth === 0 && this.progress !== 0) {
-                        taskGraphics.drawString(this.progress.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left), (startPoint.y + adjustHeight), pixelToPoint(this.progressWidth), pixelToPoint(this.height), progressFormat);
+                    if (!isNullOrUndefined(this.taskLabel)) {
+                        taskGraphics.drawString(this.taskLabel.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left), (startPoint.y + adjustHeight), pixelToPoint(this.progressWidth), pixelToPoint(this.height), progressFormat);
                     }
                 }
                 this.isCompleted = true;
@@ -168,7 +171,7 @@ var PdfGanttTaskbarCollection = /** @class */ (function () {
                     this.isStartPoint = true;
                 }
                 taskGraphics.drawRectangle(taskbarPen, taskBrush, startPoint.x + pixelToPoint(taskbar.left) + 0.5, startPoint.y + adjustHeight, pixelToPoint(detail.totalWidth), pixelToPoint(taskbar.height));
-                if (this.progress > 0 && this.progressWidth > 0 && this.isScheduledTask) {
+                if (this.isScheduledTask) {
                     var progressBoundsWidth = 0;
                     if (this.progressWidth <= detail.totalWidth) {
                         progressBoundsWidth = this.progressWidth;
@@ -178,8 +181,8 @@ var PdfGanttTaskbarCollection = /** @class */ (function () {
                     }
                     taskGraphics.drawRectangle(progressPen, progressBrush, startPoint.x + pixelToPoint(taskbar.left) + 0.5, startPoint.y + adjustHeight, pixelToPoint(progressBoundsWidth), pixelToPoint(taskbar.height));
                     this.progressWidth -= progressBoundsWidth;
-                    if (this.progressWidth === 0 && this.progress !== 0) {
-                        taskGraphics.drawString(this.progress.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left), (startPoint.y + adjustHeight), pixelToPoint(progressBoundsWidth), pixelToPoint(this.height), progressFormat);
+                    if (!isNullOrUndefined(this.taskLabel)) {
+                        taskGraphics.drawString(this.taskLabel.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left), (startPoint.y + adjustHeight), pixelToPoint(progressBoundsWidth), pixelToPoint(this.height), progressFormat);
                     }
                 }
                 this.isCompleted = false;

package/src/gantt/renderer/chart-rows.js

@@ -162,10 +162,10 @@ var ChartRows = /** @class */ (function (_super) {
                     'border-bottom-right-radius:' + this.getBorderRadius(data.ganttProperties) + 'px;">' +
                     '</div>');
             }
+            var tempDiv = createElement('div');
             if (this.taskLabelTemplateFunction && !isNullOrUndefined(progressDiv) && progressDiv.length > 0) {
                 var taskLabelTemplateNode = this.taskLabelTemplateFunction(extend({ index: i }, data), this.parent, 'TaskLabelTemplate', this.getTemplateID('TaskLabelTemplate'), false, undefined, progressDiv[0]);
                 if (taskLabelTemplateNode && taskLabelTemplateNode.length > 0) {
-                    var tempDiv = createElement('div');
                     tempDiv.appendChild(taskLabelTemplateNode[0]);
                     labelString = tempDiv.innerHTML;
                 }
@@ -174,7 +174,10 @@ var ChartRows = /** @class */ (function (_super) {
                 labelString = this.getTaskLabel(this.parent.labelSettings.taskLabel);
                 labelString = labelString === 'isCustomTemplate' ? this.parent.labelSettings.taskLabel : labelString;
             }
-            if (labelString !== 'null') {
+            if (labelString.indexOf('null') === -1) {
+                if (this.getTaskLabel(this.parent.labelSettings.taskLabel) === 'isCustomTemplate' && !this.isTemplate(this.parent.labelSettings.taskLabel)) {
+                    labelString = '';
+                }
                 if (isNaN(parseInt(labelString))) {
                     taskLabel = '<span class="' + cls.taskLabel + '" style="line-height:' +
                         (this.taskBarHeight - 1) + 'px; text-align: left;' +
@@ -212,7 +215,18 @@ var ChartRows = /** @class */ (function (_super) {
                 (isNullOrUndefined(data.ganttProperties.segments) || (!isNullOrUndefined(data.ganttProperties.segments) &&
                     data.ganttProperties.segments.length === 0))) {
                 if (template !== '' && !isNullOrUndefined(progressDiv) && progressDiv.length > 0) {
-                    progressDiv[0].appendChild([].slice.call(this.createDivElement(template))[0]);
+                    var templateElement = this.createDivElement(template)[0];
+                    var childLabel = this.parent.labelSettings.taskLabel;
+                    if (childLabel && childLabel['elementRef'])
+                        templateElement.appendChild(tempDiv);
+                    progressDiv[0].appendChild(templateElement);
+                    if (progressDiv[0].querySelectorAll('.e-task-label')[0].textContent !== '' &&
+                        !this.isTemplate(childLabel) &&
+                        progressDiv[0].querySelectorAll('.e-task-label')[0].children[0])
+                        progressDiv[0].querySelectorAll('.e-task-label')[0].children[0].remove();
+                    if (progressDiv[0].querySelectorAll('.e-task-label')[0].textContent == '' &&
+                        childLabel && !childLabel['elementRef'] && tempDiv.innerHTML != '')
+                        progressDiv[0].querySelectorAll('.e-task-label')[0].textContent = childLabel;
                 }
                 if (!isNullOrUndefined(taskbarInnerDiv) && taskbarInnerDiv.length > 0) {
                     taskbarInnerDiv[0].appendChild([].slice.call(progressDiv)[0]);
@@ -786,10 +800,10 @@ var ChartRows = /** @class */ (function (_super) {
                 'width:' + data.ganttProperties.progressWidth + 'px;' +
                 'border-top-right-radius:' + this.getBorderRadius(data) + 'px;' +
                 'border-bottom-right-radius:' + this.getBorderRadius(data) + 'px;height:100%;"></div>');
+            var div = createElement('div');
             if (this.taskLabelTemplateFunction) {
                 var parentTaskLabelNode = this.taskLabelTemplateFunction(extend({ index: i }, data), this.parent, 'TaskLabelTemplate', this.getTemplateID('TaskLabelTemplate'), false, undefined, progressBarInnerDiv[0]);
                 if (parentTaskLabelNode && parentTaskLabelNode.length > 0) {
-                    var div = createElement('div');
                     div.appendChild(parentTaskLabelNode[0]);
                     labelString = div.innerHTML;
                 }
@@ -798,24 +812,38 @@ var ChartRows = /** @class */ (function (_super) {
                 labelString = this.getTaskLabel(this.parent.labelSettings.taskLabel);
                 labelString = labelString === 'isCustomTemplate' ? this.parent.labelSettings.taskLabel : labelString;
             }
-            if (labelString !== 'null') {
+            if (labelString.indexOf('null') === -1) {
+                if (this.getTaskLabel(this.parent.labelSettings.taskLabel) === 'isCustomTemplate' && !this.isTemplate(this.parent.labelSettings.taskLabel)) {
+                    labelString = '';
+                }
                 if (isNaN(parseInt(labelString))) {
-                    labelDiv = this.createDivElement('<span class="' + cls.taskLabel + '" style="line-height:' +
+                    labelDiv = '<span class="' + cls.taskLabel + '" style="line-height:' +
                         (this.taskBarHeight - 1) + 'px; text-align: left;' +
                         'display:' + 'inline-block;' +
                         'width:' + (data.ganttProperties.width - 10) + 'px; height:' +
-                        this.taskBarHeight + 'px;">' + labelString + '</span>');
+                        this.taskBarHeight + 'px;">' + labelString + '</span>';
                 }
                 else {
-                    labelDiv = this.createDivElement('<span class="' +
+                    labelDiv = '<span class="' +
                         cls.taskLabel + '" style="line-height:' +
                         (this.taskBarHeight - 1) + 'px;' + (this.parent.viewType === 'ResourceView' ? 'display:inline-flex;' : '') +
                         (this.parent.viewType === 'ResourceView' ? 'width:' + (data.ganttProperties.width - 10) : '') + 'px; height:' +
                         (this.taskBarHeight - 1) + 'px;' + (this.parent.viewType === 'ResourceView' ? 'display: inline-flex;' : '') +
                         (this.parent.viewType === 'ResourceView' ? 'width:' + (data.ganttProperties.width - 10) : '') + 'px; height:' +
-                        this.taskBarHeight + 'px;">' + labelString + '</span>');
+                        this.taskBarHeight + 'px;">' + labelString + '</span>';
                 }
-                progressBarInnerDiv[0].appendChild([].slice.call(labelDiv)[0]);
+                var labelElement = this.createDivElement(labelDiv)[0];
+                var parentLabel = this.parent.labelSettings.taskLabel;
+                if (parentLabel && parentLabel['elementRef'])
+                    labelElement.appendChild(div);
+                progressBarInnerDiv[0].appendChild(labelElement);
+                if (progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent !== '' &&
+                    !this.isTemplate(parentLabel) &&
+                    progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].children[0])
+                    progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].children[0].remove();
+                if (progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent == '' &&
+                    parentLabel && !parentLabel['elementRef'] && div.innerHTML != '')
+                    progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent = parentLabel;
             }
             var milestoneTemplate = '<div class="' + cls.parentMilestone + '" style="position:absolute;">' +
                 '<div class="' + cls.parentMilestoneTop + '" style="border-right-width:' +
@@ -1643,6 +1671,18 @@ var ChartRows = /** @class */ (function (_super) {
     };
     ChartRows.prototype.getResourceParent = function (record) {
         var chartRows = this.parent.ganttChartModule.getChartRows();
+        //Below code is for rendering taskbartemplate in resource view with multi taskbar
+        if (this.parent.initialChartRowElements) {
+            for (var j = 0; j <= this.parent.initialChartRowElements.length; j++) {
+                if (!isNullOrUndefined(chartRows[j])) {
+                    if (!isNullOrUndefined(chartRows[j].childNodes[0].childNodes[1].childNodes[2]) &&
+                        !isNullOrUndefined(this.parent.initialChartRowElements[j].childNodes[0].childNodes[1].childNodes[2])) {
+                        // eslint-disable-next-line
+                        chartRows[j].childNodes[0].childNodes[1].childNodes[2]['innerHTML'] = this.parent.initialChartRowElements[j].childNodes[0].childNodes[1].childNodes[2]['innerHTML'];
+                    }
+                }
+            }
+        }
         this.templateData = record;
         var parentTrNode = this.getTableTrNode();
         var leftLabelNode = this.leftLabelContainer();

package/src/gantt/renderer/nonworking-day.d.ts

@@ -7,6 +7,7 @@ export declare class NonWorkingDay {
     nonworkingContainer: HTMLElement;
     private holidayContainer;
     private weekendContainer;
+    private weekendWidthUpdated;
     constructor(gantt: Gantt);
     /**
      * Method append nonworking container

package/src/gantt/renderer/nonworking-day.js

@@ -2,6 +2,7 @@ import { createElement, formatUnit, remove, isNullOrUndefined } from '@syncfusio
 import * as cls from '../base/css-constants';
 var NonWorkingDay = /** @class */ (function () {
     function NonWorkingDay(gantt) {
+        this.weekendWidthUpdated = false;
         this.parent = gantt;
         this.nonworkingContainer = null;
         this.holidayContainer = null;
@@ -141,6 +142,14 @@ var NonWorkingDay = /** @class */ (function () {
                     width = this.parent.dataOperation.getTaskWidth(start, tempEnd);
                     isFirstCell = false;
                 }
+                var sDate = new Date(startDate);
+                sDate.setDate(sDate.getDate() + 1);
+                if (sDate.getTimezoneOffset() != this.parent.timelineModule.timelineStartDate.getTimezoneOffset() && !this.weekendWidthUpdated) {
+                    if (this.parent.timelineModule.bottomTier == 'Hour' && this.parent.timelineSettings.bottomTier.count === 1) {
+                        width = width - this.parent.timelineSettings.timelineUnitSize;
+                        this.weekendWidthUpdated = true;
+                    }
+                }
                 var weekendDiv = createElement('div', {
                     className: cls.weekend, styles: "left:" + left + "px;width:" + width + "px;height:100%;"
                 });

package/src/gantt/renderer/timeline.js

@@ -818,7 +818,7 @@ var Timeline = /** @class */ (function () {
             // PDf export collection
             var timelineCell = {};
             timelineCell.startDate = new Date(startDate.getTime());
-            if (mode === 'Month' && tier === 'bottomTier' && ((this.parent.currentZoomingLevel.level === 5) || (this.parent.currentZoomingLevel.level === 6)) && scheduleDateCollection.length === 0) {
+            if (mode === 'Month' && tier === 'bottomTier' && (count != 1) && scheduleDateCollection.length === 0) {
                 isFirstCell = true;
             }
             parentTr = this.getHeaterTemplateString(new Date(startDate.toString()), mode, tier, false, count, timelineCell, isFirstCell);
@@ -832,6 +832,10 @@ var Timeline = /** @class */ (function () {
             }
             isFirstCell = false;
             startDate.setTime(newTime);
+            if (startDate.getHours() === 5 && count === 2 && tier === 'bottomTier' &&
+                this.parent.timelineSettings.bottomTier.unit === 'Hour') {
+                startDate.setTime(startDate.getTime() - (1000 * 60 * 60));
+            }
             if (startDate >= endDate) {
                 /* eslint-disable-next-line */
                 parentTr = this.getHeaterTemplateString(scheduleDateCollection[scheduleDateCollection.length - 1], mode, tier, true, count, timelineCell);
@@ -952,12 +956,12 @@ var Timeline = /** @class */ (function () {
     Timeline.prototype.checkDate = function (firstDay, lastDay, increment, count) {
         var date = new Date(firstDay.getTime());
         date.setTime(date.getTime() + increment);
-        if (((date.getTime() - lastDay.getTime()) / (1000 * 60 * 60)) != count && (firstDay.getTimezoneOffset() !== date.getTimezoneOffset())) {
+        if (count !== 1 && ((date.getTime() - lastDay.getTime()) / (1000 * 60 * 60)) != count && (firstDay.getTimezoneOffset() !== date.getTimezoneOffset())) {
             var diffCount = count - (date.getTime() - lastDay.getTime()) / (1000 * 60 * 60);
             if (!this.parent.isInDst(date)) {
                 increment += (1000 * 60 * 60 * diffCount);
             }
-            else if (this.parent.isInDst(date)) {
+            else if (this.parent.isInDst(date) && count !== 2) {
                 increment -= (1000 * 60 * 60 * diffCount);
             }
         }