@syncfusion/ej2-gantt 20.2.36 → 20.2.38

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

@@ -238,7 +238,7 @@ class DateProcessor {
             this.setTime(this.parent.defaultStartTime, cloneStartDate);
         }
         else if (hour < this.parent.defaultStartTime && validateAsMilestone) {
-            this.setTime(this.parent.defaultEndTime, cloneStartDate);
+            this.setTime(this.parent.defaultStartTime, cloneStartDate);
         }
         else if ((hour === this.parent.defaultEndTime && (!ganttProp || !validateAsMilestone)) || hour > this.parent.defaultEndTime) {
             cloneStartDate.setDate(cloneStartDate.getDate() + 1);
@@ -4816,6 +4816,9 @@ class GanttChart {
      * @private
      */
     expandedGanttRow(args) {
+        if (isNullOrUndefined(args['gridRow'])) {
+            return;
+        }
         const record = getValue('data', args);
         if (this.isExpandCollapseFromChart) {
             this.expandCollapseChartRows('expand', getValue('chartRow', args), record, null);
@@ -5548,8 +5551,8 @@ class Timeline {
             }
         }
         const newTimeline = extend({}, {}, zoomingLevel, true);
-        this.roundOffDateToZoom(this.parent.cloneProjectStartDate, true, perDayWidth, newTimeline.bottomTier.unit);
-        this.roundOffDateToZoom(this.parent.cloneProjectEndDate, false, perDayWidth, newTimeline.bottomTier.unit);
+        this.roundOffDateToZoom(this.parent.cloneProjectStartDate, true, perDayWidth, newTimeline.bottomTier.unit, zoomingLevel);
+        this.roundOffDateToZoom(this.parent.cloneProjectEndDate, false, perDayWidth, newTimeline.bottomTier.unit, zoomingLevel);
         const numberOfCells = this.calculateNumberOfTimelineCells(newTimeline);
         const scrollHeight = this.parent.ganttChartModule.scrollElement.offsetHeight - 17; //17 is horizontal scrollbar width
         const contentHeight = this.parent.ganttChartModule.chartBodyContent.offsetHeight;
@@ -5565,24 +5568,40 @@ class Timeline {
         this.parent.trigger('actionBegin', args);
         this.changeTimelineSettings(newTimeline);
     }
-    roundOffDateToZoom(date, isStartDate, perDayWidth, tierMode) {
-        const width = tierMode === 'Month' || tierMode === 'Year' ? 60 : 20;
-        const roundOffTime = (width / perDayWidth) * (24 * 60 * 60 * 1000);
+    bottomTierCellWidthCalc(mode, zoomLevel, date) {
+        let convertedMilliSeconds;
+        switch (mode) {
+            case 'Minutes':
+                convertedMilliSeconds = zoomLevel.bottomTier.count * (60 * 1000);
+                break;
+            case 'Hour':
+                convertedMilliSeconds = zoomLevel.bottomTier.count * (60 * 60 * 1000);
+                break;
+            case 'Week':
+                convertedMilliSeconds = zoomLevel.bottomTier.count * (7 * 24 * 60 * 60 * 1000);
+                break;
+            case 'Day':
+                convertedMilliSeconds = zoomLevel.bottomTier.count * (24 * 60 * 60 * 1000);
+                break;
+            case 'Month':
+                const daysInMonth = new Date(date.getFullYear(), date.getMonth() + 1, 0).getDate();
+                convertedMilliSeconds = zoomLevel.bottomTier.count * (60 * 60 * 24 * daysInMonth * 1000);
+                break;
+            case 'Year':
+                const daysInYear = (date.getFullYear() % 400 === 0 || (date.getFullYear() % 100 !== 0 && date.getFullYear() % 4 === 0)) ? 366 : 365;
+                convertedMilliSeconds = zoomLevel.bottomTier.count * (60 * 60 * 24 * daysInYear * 1000);
+                break;
+        }
+        return convertedMilliSeconds;
+    }
+    roundOffDateToZoom(date, isStartDate, perDayWidth, tierMode, zoomingLevel) {
+        const roundOffTime = this.bottomTierCellWidthCalc(tierMode, zoomingLevel, date);
         if (isStartDate) {
             date.setTime(date.getTime() - roundOffTime);
         }
         else {
             date.setTime(date.getTime() + roundOffTime);
         }
-        if (tierMode === 'Hour') {
-            date.setMinutes(isStartDate ? -120 : 120);
-        }
-        else if (tierMode === 'Minutes') {
-            date.setSeconds(isStartDate ? -120 : 120);
-        }
-        else {
-            date.setHours(isStartDate ? -48 : 48, 0, 0, 0);
-        }
     }
     calculateNumberOfTimelineCells(newTimeline) {
         const numberOfDays = Math.abs((this.parent.cloneProjectEndDate.getTime() -
@@ -6707,7 +6726,10 @@ class Timeline {
             if (type === 'prevTimeSpan' && isFrom === 'publicMethod') {
                 this.parent.ganttChartModule.updateScrollLeft(0);
             }
-            else if ((type === 'nextTimeSpan' && isFrom === 'publicMethod') || (type === 'nextTimeSpan' && isFrom === 'TaskbarEditing')) {
+            else if (type === 'nextTimeSpan' && isFrom === 'publicMethod') {
+                this.parent.ganttChartModule.updateScrollLeft(this.parent.timelineModule.totalTimelineWidth);
+            }
+            else if (type === 'nextTimeSpan' && isFrom === 'TaskbarEditing') {
                 let currentScrollLeft = document.getElementsByClassName('e-chart-scroll-container e-content')[0].scrollLeft;
                 this.parent.element.querySelector('.e-timeline-header-container').scrollLeft = currentScrollLeft;
             }