@syncfusion/ej2-gantt 21.1.37 → 21.1.41

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 21.1.37
+*  version : 21.1.41
 *  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@21.1.35",
+  "_id": "@syncfusion/ej2-gantt@21.1.38",
   "_inBundle": false,
-  "_integrity": "sha512-cP3lpOL2eAFZ2Q5R5P46k7Xp3VWmuu0bOXLdfi0RWJv9cv3ltd9gXByn3FwqoKVbDnHqTcMsfLqIbkDTkHXWEQ==",
+  "_integrity": "sha512-mG35i/xS8soHV61BHzK07yFe9rxWl3ubEOVZKB/oLV6xaUYnu6oUy8ggzePCuxcVBh5SfJ+Zvx8sgtr9Xjzgng==",
   "_location": "/@syncfusion/ej2-gantt",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-gantt",
     "/@syncfusion/ej2-vue-gantt"
   ],
-  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-gantt/-/ej2-gantt-21.1.35.tgz",
-  "_shasum": "a4de85ffeb4e0c788b3a33571de043639daa60bd",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-gantt/-/ej2-gantt-21.1.38.tgz",
+  "_shasum": "32d68324bade49301890fb65cf019d4904462d33",
   "_spec": "@syncfusion/ej2-gantt@*",
   "_where": "/jenkins/workspace/elease-automation_release_21.1.1/packages/included",
   "author": {
@@ -35,20 +35,20 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~21.1.37",
+    "@syncfusion/ej2-base": "~21.1.40",
     "@syncfusion/ej2-buttons": "~21.1.37",
-    "@syncfusion/ej2-calendars": "~21.1.37",
-    "@syncfusion/ej2-data": "~21.1.37",
-    "@syncfusion/ej2-dropdowns": "~21.1.37",
-    "@syncfusion/ej2-grids": "~21.1.37",
-    "@syncfusion/ej2-inputs": "~21.1.37",
+    "@syncfusion/ej2-calendars": "~21.1.41",
+    "@syncfusion/ej2-data": "~21.1.38",
+    "@syncfusion/ej2-dropdowns": "~21.1.41",
+    "@syncfusion/ej2-grids": "~21.1.41",
+    "@syncfusion/ej2-inputs": "~21.1.39",
     "@syncfusion/ej2-layouts": "~21.1.37",
-    "@syncfusion/ej2-lists": "~21.1.37",
-    "@syncfusion/ej2-navigations": "~21.1.37",
+    "@syncfusion/ej2-lists": "~21.1.41",
+    "@syncfusion/ej2-navigations": "~21.1.39",
     "@syncfusion/ej2-notifications": "~21.1.37",
-    "@syncfusion/ej2-popups": "~21.1.37",
-    "@syncfusion/ej2-richtexteditor": "~21.1.37",
-    "@syncfusion/ej2-treegrid": "~21.1.37"
+    "@syncfusion/ej2-popups": "~21.1.41",
+    "@syncfusion/ej2-richtexteditor": "~21.1.41",
+    "@syncfusion/ej2-treegrid": "~21.1.41"
   },
   "deprecated": false,
   "description": "Essential JS 2 Gantt Component",
@@ -73,6 +73,6 @@
     "url": "git+https://github.com/syncfusion/ej2-gantt.git"
   },
   "typings": "index.d.ts",
-  "version": "21.1.37",
+  "version": "21.1.41",
   "sideEffects": false
 }

package/src/gantt/actions/column-menu.d.ts

@@ -1,6 +1,7 @@
 import { Gantt } from '../base/gantt';
 /**
  * Configures columnMenu collection in Gantt.
+ * @hidden
  */
 export declare class ColumnMenu {
     private parent;

package/src/gantt/actions/column-menu.js

@@ -1,6 +1,7 @@
 import { TreeGrid, ColumnMenu as TreeGridColumnMenu } from '@syncfusion/ej2-treegrid';
 /**
  * Configures columnMenu collection in Gantt.
+ * @hidden
  */
 var ColumnMenu = /** @class */ (function () {
     function ColumnMenu(parent) {

package/src/gantt/actions/context-menu.js

@@ -281,7 +281,7 @@ var ContextMenu = /** @class */ (function () {
             splitTaskDuration = Math.ceil(currentTaskDifference / this.parent.timelineSettings.timelineUnitSize);
             splitTaskDuration -= 1;
         }
-        var contextMenuClickDate = this.parent.dataOperation.getEndDate(startDate, splitTaskDuration, this.rowData.ganttProperties.durationUnit, this.rowData, false);
+        var contextMenuClickDate = this.parent.dataOperation.getEndDate(startDate, splitTaskDuration, (this.parent.timelineSettings.bottomTier.unit !== "None") ? this.parent.timelineSettings.bottomTier.unit.toLocaleLowerCase() : this.parent.timelineSettings.topTier.unit.toLocaleLowerCase(), this.rowData, false);
         return contextMenuClickDate;
     };
     ContextMenu.prototype.contextMenuBeforeOpen = function (args) {

package/src/gantt/actions/critical-path.d.ts

@@ -1,5 +1,6 @@
 import { Gantt } from '../base/gantt';
 import { IGanttData } from '../base/interface';
+/** @hidden */
 export declare class CriticalPath {
     private parent;
     detailPredecessorCollection: object[];

package/src/gantt/actions/critical-path.js

@@ -1,6 +1,7 @@
 import { isNullOrUndefined } from '@syncfusion/ej2-base';
 import { addClass } from '@syncfusion/ej2-base';
 import * as cls from '../base/css-constants';
+/** @hidden */
 var CriticalPath = /** @class */ (function () {
     function CriticalPath(parent) {
         this.resourceCollectionIds = [];

package/src/gantt/actions/dependency.js

@@ -477,7 +477,7 @@ var Dependency = /** @class */ (function () {
                 this.dateValidateModule.calculateEndDate(childGanttRecord);
             }
             this.parent.dataOperation.updateWidthLeft(childGanttRecord);
-            if (!this.parent.isLoad && childGanttRecord.parentItem && this.parent.isInPredecessorValidation &&
+            if (!this.parent.isLoad && !this.parent.isFromOnPropertyChange && 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);

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

@@ -1860,6 +1860,7 @@ var DialogEdit = /** @class */ (function () {
     DialogEdit.prototype.renderNotesTab = function (itemName) {
         var ganttObj = this.parent;
         var inputModel = this.beforeOpenArgs[itemName];
+        inputModel.enableHtmlSanitizer = this.parent.enableHtmlSanitizer;
         var ganttProp = this.editedRecord.ganttProperties;
         var divElement = this.createDivElement('', ganttObj.element.id + '' + itemName + 'TabContainer');
         RichTextEditor.Inject(RTEToolbar, Link, HtmlEditor, QuickToolbar, Count);

package/src/gantt/actions/edit.js

@@ -1124,7 +1124,13 @@ var Edit = /** @class */ (function () {
                 }
                 else if (isNullOrUndefined(previousData)) {
                     calcEndDate = previousStartDate;
-                    this.calculateDateByRoundOffDuration(childRecords[i], calcEndDate);
+                    var initialData = this.parent.initialLoadData[childRecords[i].index];
+                    if (this.parent.isLoad) {
+                        this.calculateDateByRoundOffDuration(initialData, calcEndDate);
+                    }
+                    else {
+                        this.calculateDateByRoundOffDuration(childRecords[i], calcEndDate);
+                    }
                     if (this.parent.isOnEdit && this.validatedChildItems.indexOf(childRecords[i]) === -1) {
                         this.validatedChildItems.push(childRecords[i]);
                     }

package/src/gantt/actions/keyboard.js

@@ -62,6 +62,7 @@ var FocusModule = /** @class */ (function () {
                     if (ganttObj.selectedRowIndex === ganttObj.flatData.indexOf(currentSelectingRecord)) {
                         return;
                     }
+                    ganttObj.selectionModule.selectRow(ganttObj.flatData.indexOf(currentSelectingRecord), false, true);
                 }
                 break;
             case 'downArrow':

package/src/gantt/base/date-processor.js

@@ -400,10 +400,10 @@ var DateProcessor = /** @class */ (function () {
      */
     DateProcessor.prototype.getDurationAsSeconds = function (duration, durationUnit) {
         var value = 0;
-        if (!durationUnit || durationUnit === 'day') {
+        if (!durationUnit || durationUnit.toLocaleLowerCase() === 'day') {
             value = this.parent.secondsPerDay * duration;
         }
-        else if (durationUnit === 'hour') {
+        else if (durationUnit.toLocaleLowerCase() === 'hour') {
             value = duration * 3600;
         }
         else {

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

@@ -500,6 +500,12 @@ export interface GanttModel extends ComponentModel{
      */
     timelineSettings?: TimelineSettingsModel;
 
+    /**
+     * Configure zooming levels of Gantt Timeline
+     * @default []
+     */
+    zoomingLevels?: ZoomTimelineSettings[];
+
     /**
      * Configures the sort settings of the Gantt.
      * {% codeBlock src='gantt/sortSettings/index.md' %}{% endcodeBlock %}

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

@@ -93,6 +93,7 @@ export declare class Gantt extends Component<HTMLElement> implements INotifyProp
     scrollLeftValue: any;
     isToolBarClick: any;
     isLocaleChanged: boolean;
+    initialLoadData: Object;
     previousGanttColumns: ColumnModel[];
     /** @hidden */
     topBottomHeader: any;
@@ -736,6 +737,7 @@ export declare class Gantt extends Component<HTMLElement> implements INotifyProp
     timelineSettings: TimelineSettingsModel;
     /**
      * Configure zooming levels of Gantt Timeline
+     * @default []
      */
     zoomingLevels: ZoomTimelineSettings[];
     /**

package/src/gantt/base/gantt.js

@@ -220,7 +220,9 @@ var Gantt = /** @class */ (function (_super) {
             contextMenu: 'shift+F10' //F Key
         };
         this.focusModule = new FocusModule(this);
-        this.zoomingLevels = this.getZoomingLevels();
+        if (this.zoomingLevels.length === 0) {
+            this.zoomingLevels = this.getZoomingLevels();
+        }
         this.resourceFieldsMapping();
         if (isNullOrUndefined(this.resourceFields.unit)) { //set resourceUnit as unit if not mapping
             this.resourceFields.unit = 'unit';
@@ -726,6 +728,9 @@ var Gantt = /** @class */ (function (_super) {
      * @private
      */
     Gantt.prototype.renderGantt = function (isChange) {
+        if (isChange) {
+            this.isFromOnPropertyChange = isChange;
+        }
         // predecessor calculation
         if (this.predecessorModule && this.taskFields.dependency) {
             this.predecessorModule['parentIds'] = [];
@@ -740,7 +745,6 @@ var Gantt = /** @class */ (function (_super) {
             this.timelineModule.validateTimelineProp();
         }
         if (isChange) {
-            this.isFromOnPropertyChange = isChange;
             if (this.enableValidation) {
                 this.dataOperation.updateGanttData();
             }
@@ -1427,6 +1431,14 @@ var Gantt = /** @class */ (function (_super) {
                     this.chartRowsModule.refreshGanttRows();
                     this.isLoad = false;
                     break;
+                case 'dayWorkingTime':
+                    this.isLoad = true;
+                    this.dataOperation.reUpdateGanttData();
+                    this.treeGrid.refreshColumns();
+                    this.chartRowsModule.initiateTemplates();
+                    this.chartRowsModule.refreshGanttRows();
+                    this.isLoad = false;
+                    break;
                 case 'addDialogFields':
                 case 'editDialogFields':
                     if (this.editModule && this.editModule.dialogModule) {
@@ -1506,7 +1518,6 @@ var Gantt = /** @class */ (function (_super) {
                 case 'readOnly':
                 case 'viewType':
                 case 'taskFields':
-                case 'dayWorkingTime':
                 case 'allowTaskbarDragAndDrop':
                 case 'allowTaskbarOverlap':
                 case 'allowParentDependency':
@@ -3493,6 +3504,9 @@ var Gantt = /** @class */ (function (_super) {
     __decorate([
         Complex({}, TimelineSettings)
     ], Gantt.prototype, "timelineSettings", void 0);
+    __decorate([
+        Property([])
+    ], Gantt.prototype, "zoomingLevels", void 0);
     __decorate([
         Complex({}, SortSettings)
     ], Gantt.prototype, "sortSettings", void 0);

package/src/gantt/base/task-processor.d.ts

@@ -187,7 +187,7 @@ export declare class TaskProcessor extends DateProcessor {
      * @returns {number} .
      * @private
      */
-    getTaskWidth(startDate: Date, endDate: Date): number;
+    getTaskWidth(startDate: Date, endDate: Date, ganttData?: ITaskData): number;
     /**
      * Get task left value
      *

package/src/gantt/base/task-processor.js

@@ -213,6 +213,7 @@ var TaskProcessor = /** @class */ (function (_super) {
      */
     TaskProcessor.prototype.prepareDataSource = function (data) {
         this.prepareRecordCollection(data, 0);
+        this.parent.initialLoadData = extend({}, {}, this.parent.flatData, true);
         // Method to maintain the shared task uniqueIds
         if (this.parent.viewType === 'ResourceView') {
             this.calculateSharedTaskUniqueIds();
@@ -1041,7 +1042,7 @@ var TaskProcessor = /** @class */ (function (_super) {
             return 0;
         }
         else {
-            return this.getTaskWidth(sDate, eDate);
+            return this.getTaskWidth(sDate, eDate, ganttProp);
         }
     };
     TaskProcessor.prototype.getTaskbarHeight = function () {
@@ -1155,13 +1156,29 @@ var TaskProcessor = /** @class */ (function (_super) {
      * @returns {number} .
      * @private
      */
-    TaskProcessor.prototype.getTaskWidth = function (startDate, endDate) {
+    TaskProcessor.prototype.getTaskWidth = function (startDate, endDate, ganttData) {
         var sDate = new Date(startDate.getTime());
         var eDate = new Date(endDate.getTime());
         var tierMode = this.parent.timelineModule.bottomTier !== 'None' ? this.parent.timelineModule.bottomTier :
             this.parent.timelineModule.topTier;
+        var isValid = false;
+        var modifiedsDate = new Date(startDate.getTime());
+        var hour = 0;
+        if (ganttData && ganttData.durationUnit == 'hour') {
+            modifiedsDate = new Date(modifiedsDate.getTime() + ganttData.duration * 60 * 60 * 1000);
+        }
+        if (ganttData && ganttData.durationUnit == 'minute') {
+            modifiedsDate = new Date(modifiedsDate.getTime() + ganttData.duration * 60 * 60 * 60 * 1000);
+        }
+        for (var i = 0; i < this.parent.dayWorkingTime.length; i++) {
+            hour = hour + this.parent.dayWorkingTime[i].to - this.parent.dayWorkingTime[i].from;
+        }
+        var dateDiff = modifiedsDate.getTime() - sDate.getTime();
         if (tierMode === 'Day') {
-            if (this.getSecondsInDecimal(sDate) === this.parent.defaultStartTime) {
+            if ((Math.floor((dateDiff / (1000 * 60 * 60)) % 24) >= hour || dateDiff === 0)) {
+                isValid = true;
+            }
+            if (this.getSecondsInDecimal(sDate) === this.parent.defaultStartTime && isValid) {
                 sDate.setHours(0, 0, 0, 0);
             }
             if (this.getSecondsInDecimal(eDate) === this.parent.defaultEndTime) {
@@ -1171,11 +1188,19 @@ var TaskProcessor = /** @class */ (function (_super) {
                 eDate.setHours(0, 0, 0, 0);
             }
         }
+        else {
+            isValid = true;
+        }
         if ((sDate).getTime() === (eDate).getTime()) {
             return (this.parent.perDayWidth);
         }
         else {
-            return ((this.getTimeDifference(sDate, eDate) / (1000 * 60 * 60 * 24)) * this.parent.perDayWidth);
+            if (isValid) {
+                return ((this.getTimeDifference(sDate, eDate) / (1000 * 60 * 60 * 24)) * this.parent.perDayWidth);
+            }
+            else {
+                return ((this.getTimeDifference(sDate, eDate) / (1000 * 60 * 60 * hour)) * this.parent.perDayWidth);
+            }
         }
     };
     /**
@@ -1457,17 +1482,15 @@ var TaskProcessor = /** @class */ (function (_super) {
         else {
             hierarchicalData = this.parent.dataSource;
         }
-        this.parent.flatData.map(function (data) {
-            hierarchicalData.map(function (record) {
-                if (data.ganttProperties.taskId === record[_this.parent.taskFields.id]) {
-                    if (!isNullOrUndefined(_this.parent.taskFields.startDate)) {
-                        task[_this.parent.taskFields.endDate] = record[_this.parent.taskFields.endDate];
-                    }
-                    if (!isNullOrUndefined(_this.parent.taskFields.endDate)) {
-                        task[_this.parent.taskFields.endDate] = record[_this.parent.taskFields.endDate];
-                    }
+        hierarchicalData.map(function (record) {
+            if (task.ganttProperties.taskId === record[_this.parent.taskFields.id]) {
+                if (!isNullOrUndefined(_this.parent.taskFields.startDate)) {
+                    task[_this.parent.taskFields.startDate] = record[_this.parent.taskFields.startDate];
                 }
-            });
+                if (!isNullOrUndefined(_this.parent.taskFields.endDate)) {
+                    task[_this.parent.taskFields.endDate] = record[_this.parent.taskFields.endDate];
+                }
+            }
         });
     };
     TaskProcessor.prototype.getWorkInHour = function (work, workUnit) {
@@ -2222,12 +2245,7 @@ var TaskProcessor = /** @class */ (function (_super) {
                 durationInDay = (childGanttRecord.ganttProperties.duration / (this.parent.secondsPerDay / 60));
                 break;
             default:
-                if (childGanttRecord.ganttProperties.duration < 1) {
-                    durationInDay = (childGanttRecord.ganttProperties.duration / (this.parent.secondsPerDay / 3600));
-                }
-                else {
-                    durationInDay = childGanttRecord.ganttProperties.duration;
-                }
+                durationInDay = childGanttRecord.ganttProperties.duration;
         }
         if (childGanttRecord.hasChildRecords) {
             setValue('totalProgress', childGanttRecord.ganttProperties.totalProgress, progressValues);
@@ -2326,7 +2344,7 @@ var TaskProcessor = /** @class */ (function (_super) {
                     else {
                         taskCount = childLength - milestoneCount;
                     }
-                    var parentProgress = (taskCount > 0 && totalDuration > 0) ? (totalProgress / totalDuration) : 0;
+                    var parentProgress = (taskCount > 0 && totalDuration > 0) ? Number((totalProgress / totalDuration).toFixed(2)) : 0;
                     var parentProp = parentData.ganttProperties;
                     var milestone = (taskCount === 0) && minStartDate && maxEndDate &&
                         minStartDate.getTime() === maxEndDate.getTime() ? true : false;

package/src/gantt/export/pdf-base/pdf-borders.d.ts

@@ -4,6 +4,7 @@
 import { PdfPen } from '@syncfusion/ej2-pdf-export';
 /**
  * `PdfBorders` class used represents the cell border of the PDF grid.
+ * @hidden
  */
 export declare class PdfBorders {
     /**
@@ -86,6 +87,7 @@ export declare class PdfBorders {
      */
     constructor();
 }
+/** @hidden */
 export declare class PdfPaddings {
     /**
      * The `left` padding.

package/src/gantt/export/pdf-base/pdf-borders.js

@@ -4,6 +4,7 @@
 import { PdfPen, PdfDashStyle, PdfColor } from '@syncfusion/ej2-pdf-export';
 /**
  * `PdfBorders` class used represents the cell border of the PDF grid.
+ * @hidden
  */
 var PdfBorders = /** @class */ (function () {
     // Constructor
@@ -133,6 +134,7 @@ var PdfBorders = /** @class */ (function () {
     return PdfBorders;
 }());
 export { PdfBorders };
+/** @hidden */
 var PdfPaddings = /** @class */ (function () {
     function PdfPaddings(left, right, top, bottom) {
         /**

package/src/gantt/export/pdf-base/pdf-grid-table.d.ts

@@ -3,9 +3,7 @@ import { PdfTreeGrid } from '../pdf-treegrid';
 import { RectangleF } from '@syncfusion/ej2-pdf-export';
 import { PdfGraphics } from '@syncfusion/ej2-pdf-export';
 import { PdfStringFormat, PdfStringLayoutResult } from '@syncfusion/ej2-pdf-export';
-/**
- *
- */
+/**@hidden*/
 export declare class PdfTreeGridCell {
     /**
      * Gets or sets the parent `row`.

package/src/gantt/export/pdf-base/pdf-grid-table.js

@@ -3,9 +3,7 @@ import { isNullOrUndefined } from '@syncfusion/ej2-base';
 import { RectangleF, PdfTextAlignment, PdfBorderOverlapStyle, PointF, PdfDashStyle, PdfLineCap, PdfSolidBrush, PdfStandardFont } from '@syncfusion/ej2-pdf-export';
 import { SizeF, PdfFontStyle } from '@syncfusion/ej2-pdf-export';
 import { PdfStringFormat, PdfStringLayouter } from '@syncfusion/ej2-pdf-export';
-/**
- *
- */
+/**@hidden*/
 var PdfTreeGridCell = /** @class */ (function () {
     function PdfTreeGridCell(row) {
         this.cellWidth = 0;

package/src/gantt/models/column.d.ts

@@ -102,8 +102,8 @@ export declare class Column {
     /**
      * It is used to change display value with the given format and does not affect the original data.
      * Gets the format from the user which can be standard or custom
-     * [`number`](../../../common/internationalization/#number-formatting)
-     * and [`date`](../../../common/internationalization/#formatting) formats.
+     * [`number`](https://ej2.syncfusion.com/documentation/common/internationalization/#number-formatting)
+     * and [`date`](https://ej2.syncfusion.com/documentation/common/internationalization/#date-formatting) formats.
      *
      * @default null
      * @aspType string
@@ -303,8 +303,8 @@ export interface ColumnModel {
     /**
      * It is used to change display value with the given format and does not affect the original data.
      * Gets the format from the user which can be standard or custom
-     * [`number`](../../../common/internationalization/#number-formatting)
-     * and [`date`](../../../common/internationalization/#formatting) formats.
+     * [`number`](https://ej2.syncfusion.com/documentation/common/internationalization/#number-formatting)
+     * and [`date`](https://ej2.syncfusion.com/documentation/common/internationalization/#date-formatting) formats.
      *
      * @default null
      * @aspType string

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

@@ -1412,7 +1412,6 @@ var ChartRows = /** @class */ (function (_super) {
         }
         if (this.templateData.hasChildRecords) {
             var parentTaskbarTemplateNode = this.getParentTaskbarNode(i, taskbarContainerNode);
-            var milestoneTemplateNode = this.getMilestoneNode(i, taskbarContainerNode);
             if (!this.templateData.ganttProperties.isAutoSchedule) {
                 var manualTaskbar = this.getManualTaskbar();
                 if (!isNullOrUndefined(manualTaskbar[0])) {
@@ -1427,9 +1426,6 @@ var ChartRows = /** @class */ (function (_super) {
             if (parentTaskbarTemplateNode && parentTaskbarTemplateNode.length > 0) {
                 taskbarContainerNode[0].appendChild([].slice.call(parentTaskbarTemplateNode)[0]);
             }
-            else if (milestoneTemplateNode && milestoneTemplateNode.length > 0) {
-                taskbarContainerNode[0].appendChild([].slice.call(milestoneTemplateNode)[0]);
-            }
             if (this.parent.renderBaseline && this.templateData.ganttProperties.baselineStartDate &&
                 this.templateData.ganttProperties.baselineEndDate) {
                 taskBaselineTemplateNode = ((this.templateData.ganttProperties.baselineStartDate.getTime() === this.templateData.ganttProperties.baselineEndDate.getTime()) || ((!isNullOrUndefined(this.templateData.ganttProperties.baselineStartDate) && !isNullOrUndefined(this.templateData.ganttProperties.startDate) && (this.templateData.ganttProperties.baselineStartDate.getTime() === this.templateData.ganttProperties.startDate.getTime()))
@@ -1939,7 +1935,9 @@ var ChartRows = /** @class */ (function (_super) {
                 this.parent.ganttChartModule.tempNextElement = null;
             }
             var row = this.parent.treeGrid.grid.getRowObjectFromUID(this.parent.treeGrid.grid.getDataRows()[index].getAttribute('data-uid'));
-            row.data = data;
+            if (!isNullOrUndefined(row)) {
+                row.data = data;
+            }
         }
     };
     ChartRows.prototype.getResourceParent = function (record) {

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

@@ -168,12 +168,14 @@ var NonWorkingDay = /** @class */ (function () {
     };
     NonWorkingDay.prototype.updateHolidayLabelHeight = function () {
         var height = this.parent.getContentHeight();
+        var gantttable = document.getElementById("ganttContainer");
         // eslint-disable-next-line
         var toolbarHeight = 0;
         if (!isNullOrUndefined(this.parent.toolbarModule) && !isNullOrUndefined(this.parent.toolbarModule.element)) {
             toolbarHeight = this.parent.toolbarModule.element.offsetHeight;
         }
-        var viewportHeight = this.parent.ganttHeight - toolbarHeight - this.parent.ganttChartModule.chartTimelineContainer.offsetHeight;
+        var viewportHeight = (this.parent.height === 'auto') ? gantttable.offsetHeight - toolbarHeight - this.parent.ganttChartModule.chartTimelineContainer.offsetHeight :
+            this.parent.ganttHeight - toolbarHeight - this.parent.ganttChartModule.chartTimelineContainer.offsetHeight;
         var top = (viewportHeight < height) ? viewportHeight / 2 : height / 2;
         var labels = this.holidayContainer.querySelectorAll('.' + cls.holidayLabel);
         for (var i = 0; i < labels.length; i++) {

package/src/gantt/renderer/timeline.js

@@ -156,7 +156,10 @@ var Timeline = /** @class */ (function () {
      */
     Timeline.prototype.changeTimelineSettings = function (newTimeline) {
         var _this = this;
-        if (!this.isZoomIn) {
+        if (this.isZoomToFit) {
+            this.isSingleTier = this.customTimelineSettings.topTier.unit === 'None' || this.customTimelineSettings.bottomTier.unit === 'None' ? true : false;
+        }
+        else if (!this.isZoomIn) {
             this.isSingleTier = newTimeline.topTier.unit === 'None' || newTimeline.bottomTier.unit === 'None' ? true : false;
         }
         var skipProperty = this.isSingleTier ?

package/styles/bootstrap-dark.css

@@ -1275,6 +1275,7 @@
   outline: 1px solid;
   outline-offset: 2px;
 }
+
 .e-gantt-dialog .e-tab .e-tab-header {
   padding-left: 12px;
 }

package/styles/bootstrap.css

@@ -1418,6 +1418,7 @@
   outline: 1px solid;
   outline-offset: 2px;
 }
+
 .e-gantt-dialog .e-tab .e-tab-header {
   padding-left: 12px;
 }

package/styles/bootstrap4.css

@@ -1602,6 +1602,7 @@
   outline: 1px solid;
   outline-offset: 2px;
 }
+
 .e-gantt-dialog .e-tab .e-tab-header {
   padding-left: 12px;
 }

package/styles/bootstrap5-dark.css

@@ -1318,6 +1318,7 @@
   outline: 1px solid;
   outline-offset: 2px;
 }
+
 .e-gantt-dialog .e-tab .e-tab-header {
   padding-left: 12px;
 }

package/styles/bootstrap5.css

@@ -1318,6 +1318,7 @@
   outline: 1px solid;
   outline-offset: 2px;
 }
+
 .e-gantt-dialog .e-tab .e-tab-header {
   padding-left: 12px;
 }

package/styles/fabric-dark.css

@@ -1230,6 +1230,7 @@
   outline: 1px solid;
   outline-offset: 2px;
 }
+
 .e-gantt-dialog .e-tab .e-tab-header {
   padding-left: 13px;
 }

package/styles/fabric.css

@@ -1228,6 +1228,7 @@
   outline: 1px solid;
   outline-offset: 2px;
 }
+
 .e-gantt-dialog .e-tab .e-tab-header {
   padding-left: 13px;
 }

package/styles/fluent-dark.css

@@ -1301,9 +1301,6 @@
   outline: 1px solid;
   outline-offset: 2px;
 }
-.e-gantt .e-dialog.e-filter-popup .e-footer-content {
-  padding-top: 0;
-}
 
 .e-gantt-dialog .e-tab .e-tab-header {
   padding-left: 0px;

package/styles/fluent.css

@@ -1301,9 +1301,6 @@
   outline: 1px solid;
   outline-offset: 2px;
 }
-.e-gantt .e-dialog.e-filter-popup .e-footer-content {
-  padding-top: 0;
-}
 
 .e-gantt-dialog .e-tab .e-tab-header {
   padding-left: 0px;

package/styles/gantt/_layout.scss

@@ -1320,14 +1320,6 @@
         outline-offset: 2px;
       }
     }
-    .e-dialog.e-filter-popup {
-      .e-footer-content {
-        
-        @if ($skin-name =='FluentUI') {
-          padding-top: 0;
-        }
-      }
-    }
   }
   
   .e-gantt-dialog .e-tab .e-tab-header {