@syncfusion/ej2-gantt 23.1.44 → 23.2.5

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

@@ -270,7 +270,7 @@ class DateProcessor {
                     if (!this.parent.includeWeekend) {
                         const tempDate = new Date(cloneStartDate.getTime());
                         cloneStartDate = this.getNextWorkingDay(cloneStartDate);
-                        if (tempDate.getTime() !== cloneStartDate.getTime()) {
+                        if (tempDate.getTime() !== cloneStartDate.getTime() && !validateAsMilestone) {
                             this.setTime(startTime, cloneStartDate);
                         }
                     }
@@ -7410,10 +7410,9 @@ class Timeline {
                 const validEndLeft = this.parent.dataOperation.getTaskLeft(validEndDate, false);
                 let isChanged;
                 let taskbarModule = this.parent.editModule.taskbarEditModule;
-                if (!isNullOrUndefined(maxStartLeft) && ((minStartDate < this.timelineStartDate) ||
-                    (!isNullOrUndefined(taskbarModule)) && (!isNullOrUndefined(taskbarModule.taskBarEditAction)
-                        && taskbarModule.taskBarEditAction !== 'ProgressResizing' &&
-                        taskbarModule.taskBarEditAction !== 'RightResizing')) && (maxStartLeft < this.bottomTierCellWidth || maxStartLeft <= validStartLeft)) {
+                if (!isNullOrUndefined(maxStartLeft) && ((!isNullOrUndefined(taskbarModule)) && (!isNullOrUndefined(taskbarModule.taskBarEditAction)
+                    && taskbarModule.taskBarEditAction !== 'ProgressResizing' &&
+                    taskbarModule.taskBarEditAction !== 'RightResizing' && taskbarModule.taskBarEditAction !== 'LeftResizing')) && (maxStartLeft < this.bottomTierCellWidth || maxStartLeft <= validStartLeft)) {
                     isChanged = 'prevTimeSpan';
                     minStartDate = minStartDate > this.timelineStartDate ? this.timelineStartDate : minStartDate;
                 }
@@ -7675,7 +7674,9 @@ class GanttTreeGrid {
         this.parent.treeGrid.loadChildOnDemand = this.parent.loadChildOnDemand;
         this.parent.treeGrid['isFromGantt'] = true;
         this.parent.treeGrid.parentIdMapping = this.parent.taskFields.parentID;
-        this.parent.treeGrid.idMapping = this.parent.taskFields.id;
+        if (this.parent.taskFields.parentID) {
+            this.parent.treeGrid.idMapping = this.parent.taskFields.id;
+        }
         this.parent.treeGrid.showColumnMenu = this.parent.showColumnMenu;
         this.parent.treeGrid.enableCollapseAll = this.parent.collapseAllParentTasks;
         this.parent.treeGrid.columnMenuItems = this.parent.columnMenuItems;
@@ -7716,7 +7717,7 @@ class GanttTreeGrid {
             toolbarHeight = this.parent.toolbarModule.element.offsetHeight;
         }
         this.parent.treeGrid.height =
-            this.parent.element.getElementsByClassName('e-chart-scroll-container e-content')[0]['offsetHeight'] - 19;
+            this.parent.element.getElementsByClassName('e-chart-scroll-container e-content')[0]['offsetHeight'] - (this.parent.flatData.length == 0 ? 0 : 19);
     }
     getContentDiv() {
         return this.treeGridElement.querySelector('.e-content');
@@ -8370,7 +8371,7 @@ class GanttTreeGrid {
      */
     composeIDColumn(column) {
         const isProjectView = this.parent.viewType === 'ProjectView';
-        const lengthDataSource = this.parent.dataSource['length'];
+        const lengthDataSource = this.parent.dataSource ? this.parent.dataSource['length'] : 0;
         let taskIDName;
         column.isPrimaryKey = isProjectView ? true : false;
         if (this.parent.isLocaleChanged) {
@@ -15502,6 +15503,7 @@ let Gantt = class Gantt extends Component {
                     this.treeGridModule.treeGridColumns = [];
                     this.treeGridModule.validateGanttColumns();
                     this.treeGrid.columns = this.treeGridModule.treeGridColumns;
+                    this.treeGrid.grid.columns = this.treeGridModule.treeGridColumns;
                     this.chartRowsModule.initiateTemplates();
                     this.timelineModule.updateChartByNewTimeline();
                     break;
@@ -25456,7 +25458,15 @@ class Edit$2 {
         if (args.action && args.action === 'DrawConnectorLine') {
             eventArgs.action = 'DrawConnectorLine';
         }
+        const ganttObj = this.parent;
+        const currentBaselineStart = Object.assign({}, eventArgs.data.ganttProperties.baselineStartDate);
+        const currentBaselineEnd = Object.assign({}, eventArgs.data.ganttProperties.baselineEndDate);
         this.parent.trigger('actionBegin', eventArgs, (eventArg) => {
+            if (currentBaselineStart != eventArg.data["ganttProperties"].baselineStartDate
+                || currentBaselineEnd != eventArg.data["ganttProperties"].baselineEndDate) {
+                ganttObj.setRecordValue('baselineLeft', ganttObj.dataOperation.calculateBaselineLeft(eventArg.data['ganttProperties']), eventArg.data['ganttProperties'], true);
+                ganttObj.setRecordValue('baselineWidth', ganttObj.dataOperation.calculateBaselineWidth(eventArg.data['ganttProperties']), eventArg.data['ganttProperties'], true);
+            }
             if (!isNullOrUndefined(this.parent.loadingIndicator) && this.parent.loadingIndicator.indicatorType === "Shimmer") {
                 this.parent.showMaskRow();
             }
@@ -29350,6 +29360,9 @@ class Toolbar$3 {
         this.toolbar.isReact = this.parent.isReact;
         this.toolbar.on('render-react-toolbar-template', this.addReactToolbarPortals, this);
         this.toolbar.appendTo(this.element);
+        if (this.parent.treeGrid.grid && this.parent.isReact) {
+            this.parent.treeGrid.grid.portals = this.parent.portals;
+        }
         const cancelItem = this.element.querySelector('#' + this.parent.element.id + '_cancel');
         const updateItem = this.element.querySelector('#' + this.parent.element.id + '_update');
         if (cancelItem) {
@@ -35165,10 +35178,10 @@ class ExportHelper {
             this.parent.predecessorModule.createConnectorLinesCollection();
             this.parent.updatedConnectorLineCollection.forEach((data) => {
                 const predecessor = this.gantt.predecessor.add();
-                predecessor.parentLeft = pointToPixel(data.parentLeft);
-                predecessor.childLeft = pointToPixel(data.childLeft);
-                predecessor.parentWidth = pointToPixel(data.parentWidth);
-                predecessor.childWidth = pointToPixel(data.childWidth);
+                predecessor.parentLeft = data.parentLeft;
+                predecessor.childLeft = data.childLeft;
+                predecessor.parentWidth = data.parentWidth;
+                predecessor.childWidth = data.childWidth;
                 predecessor.parentIndex = data.parentIndex;
                 predecessor.childIndex = data.childIndex;
                 predecessor.rowHeight = data.rowHeight;
@@ -35251,8 +35264,8 @@ class ExportHelper {
         flatData.forEach((data) => {
             const taskbar = this.gantt.taskbar.add();
             const ganttProp = data.ganttProperties;
-            taskbar.left = pointToPixel(ganttProp.left);
-            taskbar.width = pointToPixel(ganttProp.width);
+            taskbar.left = ganttProp.left;
+            taskbar.width = ganttProp.width;
             if (taskbar.left < 0) {
                 taskbar.width = taskbar.width + taskbar.left;
                 taskbar.left = 0;
@@ -35293,8 +35306,8 @@ class ExportHelper {
             taskbar.isMilestone = ganttProp.isMilestone;
             taskbar.baselineStartDate = ganttProp.baselineStartDate;
             taskbar.baselineEndDate = ganttProp.baselineEndDate;
-            taskbar.baselineLeft = pointToPixel(ganttProp.baselineLeft);
-            taskbar.baselineWidth = pointToPixel(ganttProp.baselineWidth);
+            taskbar.baselineLeft = ganttProp.baselineLeft;
+            taskbar.baselineWidth = ganttProp.baselineWidth;
             taskbar.milestoneColor = new PdfColor(this.ganttStyle.taskbar.milestoneColor);
             taskbar.isParentTask = data.hasChildRecords;
             if (ganttProp.isMilestone) {
@@ -35310,9 +35323,9 @@ class ExportHelper {
                 taskbar.taskLabel = data[this.parent.labelSettings.taskLabel].toString();
             }
             const reduceLeft = ganttProp.isMilestone ? Math.floor(this.parent.chartRowsModule.taskBarHeight / 2) + 33 : 33; // 33 indicates default timeline cell width
-            taskbar.rightTaskLabel.left = pointToPixel(ganttProp.left) + pointToPixel(ganttProp.width) + reduceLeft; // right label left value
+            taskbar.rightTaskLabel.left = ganttProp.left + ganttProp.width + reduceLeft; // right label left value
             taskbar.fontFamily = this.ganttStyle.fontFamily;
-            taskbar.progressWidth = pointToPixel(ganttProp.progressWidth);
+            taskbar.progressWidth = ganttProp.progressWidth;
             taskbar.labelColor = new PdfColor(this.ganttStyle.label.fontColor);
             taskbar.progressFontColor = new PdfColor(this.ganttStyle.taskbar.progressFontColor);
             if (taskbar.isParentTask) {
@@ -35687,7 +35700,8 @@ class PdfGanttTaskbarCollection {
         //code for while current pdf page is exceed
         if (yPoint > pageSize.height) {
             page = this.GetNextPage(page);
-            page['contentWidth'] = pointToPixel(detail.endPoint - detail.startPoint);
+            page['contentWidth'] = (this.parent.pdfExportModule && this.parent.pdfExportModule.helper.exportProps && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings &&
+                this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth) ? pointToPixel(detail.endPoint - detail.startPoint) : detail.endPoint - detail.startPoint;
             taskGraphics = page.graphics;
             startPoint.y = 0;
             if (this.parent.pdfExportModule.gantt.enableHeader) {
@@ -35715,7 +35729,7 @@ class PdfGanttTaskbarCollection {
         progressFormat.alignment = PdfTextAlignment.Right;
         let isLabelString = false;
         let updatedWidth;
-        if (/^[a-zA-Z]/.test(this.taskLabel)) {
+        if (!isNullOrUndefined(this.taskLabel) && (/^[a-zA-Z]/.test(this.taskLabel))) {
             isLabelString = true;
             progressFormat.alignment = PdfTextAlignment.Left;
         }
@@ -35781,7 +35795,6 @@ class PdfGanttTaskbarCollection {
                         taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight + pixelToPoint(taskbar.height + 3), pixelToPoint(this.baselineWidth), pixelToPoint(this.baselineHeight));
                     }
                     taskGraphics.drawRectangle(taskbarPen, taskBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth) + 0.5, startPoint.y + adjustHeight, pixelToPoint(renderWidth), pixelToPoint(taskbar.height));
-                    taskbar.width = taskbar.width - renderWidth;
                     if (this.isScheduledTask) {
                         let progressBoundsWidth = 0;
                         if (this.progressWidth <= renderWidth) {
@@ -36067,7 +36080,8 @@ class PdfTimeline {
      * @returns {void}
      */
     drawTimeline(page, startPoint, detail) {
-        let remainWidth = pointToPixel(Math.floor(detail.totalWidth));
+        let remainWidth = (this.parent.pdfExportModule && this.parent.pdfExportModule.helper.exportProps && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings &&
+            this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth) ? pointToPixel(Math.floor(detail.totalWidth)) : Math.floor(detail.totalWidth);
         let renderWidth = 0;
         this.topTierPoint.x = startPoint.x;
         this.topTierPoint.y = startPoint.y;
@@ -36095,7 +36109,8 @@ class PdfTimeline {
                 //Primary header Event Arguments
                 /* eslint-disable-next-line */
                 this.triggerQueryTimelinecell(page, this.topTierPoint.x, this.topTierPoint.y, this.topTierHeight, renderWidth, pHeader.value, true);
-                this.topTierPoint.x += renderWidth;
+                this.topTierPoint.x += (this.parent.pdfExportModule && this.parent.pdfExportModule.helper.exportProps && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings &&
+                    this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth) ? renderWidth : pixelToPoint(renderWidth);
                 remainWidth -= renderWidth;
                 if (isCompleted) {
                     this.topTierIndex++;
@@ -36121,7 +36136,8 @@ class PdfTimeline {
                 //Secondary header Event Arguments
                 /* eslint-disable-next-line */
                 this.triggerQueryTimelinecell(page, this.bottomTierPoint.x, this.bottomTierPoint.y, this.bottomTierHeight, width, secondHeader.value, false);
-                this.bottomTierPoint.x = this.bottomTierPoint.x + width;
+                this.bottomTierPoint.x = (this.parent.pdfExportModule && this.parent.pdfExportModule.helper.exportProps && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings &&
+                    this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth) ? this.bottomTierPoint.x + width : this.bottomTierPoint.x + pixelToPoint(width);
                 remainWidth -= width;
                 secondHeader.completedWidth = width;
                 if (isCompleted) {
@@ -36152,7 +36168,8 @@ class PdfTimeline {
                     //Primary header Event Arguments
                     /* eslint-disable-next-line */
                     this.triggerQueryTimelinecell(page, this.topTierPoint.x, this.topTierPoint.y, this.topTierHeight, pHeader.completedWidth, pHeader.value, true);
-                    this.topTierPoint.x += pHeader.completedWidth;
+                    this.topTierPoint.x += (this.parent.pdfExportModule && this.parent.pdfExportModule.helper.exportProps && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings &&
+                        this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth) ? pHeader.completedWidth : pixelToPoint(pHeader.completedWidth);
                 }
             }
         }
@@ -36165,7 +36182,8 @@ class PdfTimeline {
                     //Secondary header Event Arguments
                     /* eslint-disable-next-line */
                     this.triggerQueryTimelinecell(page, this.bottomTierPoint.x, this.bottomTierPoint.y, this.bottomTierHeight, secondHeader.width, secondHeader.value, false);
-                    this.bottomTierPoint.x = this.bottomTierPoint.x + secondHeader.width;
+                    this.bottomTierPoint.x = (this.parent.pdfExportModule && this.parent.pdfExportModule.helper.exportProps && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings &&
+                        this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth) ? this.bottomTierPoint.x + secondHeader.width : this.bottomTierPoint.x + pixelToPoint(secondHeader.width);
                 }
             }
         }
@@ -36212,7 +36230,8 @@ class PdfTimeline {
         const e = eventArgs.timelineCell;
         const rectPen = new PdfPen(eventArgs.timelineCell.borderColor);
         const rectBrush = new PdfSolidBrush(eventArgs.timelineCell.backgroundColor);
-        graphics.drawRectangle(rectPen, rectBrush, x, y, width, pixelToPoint(height));
+        graphics.drawRectangle(rectPen, rectBrush, x, y, (this.parent.pdfExportModule && this.parent.pdfExportModule.helper.exportProps && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings &&
+            this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth) ? width : pixelToPoint(width), pixelToPoint(height));
         if (!isTopTier && (this.parent.gridLines == "Both" || this.parent.gridLines == "Vertical")) {
             graphics.drawRectangle(rectPen, rectBrush, x, y + pixelToPoint(height), width, page.getClientSize().height);
         }
@@ -36731,10 +36750,12 @@ class PdfGantt extends PdfTreeGrid {
             }
             const detail = {};
             const range = [];
-            const convertedWidth = pixelToPoint(this.chartHeader.bottomTierCellWidth);
+            const convertedWidth = (this.parent.pdfExportModule && this.parent.pdfExportModule.helper.exportProps && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings &&
+                this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth) ? pixelToPoint(this.chartHeader.bottomTierCellWidth) : this.chartHeader.bottomTierCellWidth;
             let width = 0;
             if (this.chartHeader.bottomTierCellWidth !== 0) {
-                width = (Math.floor(pageWidth / convertedWidth) * convertedWidth);
+                width = (this.parent.pdfExportModule && this.parent.pdfExportModule.helper.exportProps && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings &&
+                    this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth) ? (Math.floor(pageWidth / convertedWidth) * convertedWidth) : (Math.floor(pageWidth / convertedWidth) * convertedWidth) + 5;
             }
             range[0] = point;
             if (headerWidth - point <= width) {
@@ -36850,7 +36871,8 @@ class PdfGantt extends PdfTreeGrid {
         let pageData;
         this.headerDetails.forEach((detail, index) => {
             const page = this.result.page.section.getPages()[this.startPageIndex];
-            page['contentWidth'] = pointToPixel(this.headerDetails[index].endPoint - this.headerDetails[index].startPoint);
+            page['contentWidth'] = (this.parent.pdfExportModule && this.parent.pdfExportModule.helper.exportProps && this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings &&
+                this.parent.pdfExportModule.helper.exportProps.fitToWidthSettings.isFitToWidth) ? pointToPixel(this.headerDetails[index].endPoint - this.headerDetails[index].startPoint) : this.headerDetails[index].endPoint - this.headerDetails[index].startPoint;
             this.chartHeader.drawTimeline(page, this.startPoint, detail);
             taskbarPoint.y = taskbarPoint.y + pixelToPoint(this.parent.timelineModule.isSingleTier ? 45 : 60); // headerHeight
             pageStartX = taskbarPoint.x;