@syncfusion/ej2-gantt 20.2.36 → 20.2.43

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);
@@ -400,7 +400,7 @@ class DateProcessor {
             if (hour > this.parent.defaultEndTime) {
                 this.setTime(this.parent.defaultEndTime, cloneDate);
             }
-            else if (hour <= this.parent.defaultStartTime && !ganttProp.isMilestone) {
+            else if (hour <= this.parent.defaultStartTime && !isNullOrUndefined(ganttProp) && !ganttProp.isMilestone) {
                 cloneDate.setDate(cloneDate.getDate() - 1);
                 this.setTime(this.parent.defaultEndTime, cloneDate);
             }
@@ -1466,7 +1466,13 @@ class DateProcessor {
             }
             sortDates(taskRange);
             if (!minStartDate || !maxEndDate) {
-                minStartDate = isNullOrUndefined(minStartDate) ? this.getDateFromFormat(new Date()) : minStartDate;
+                if (!minStartDate) {
+                    minStartDate = isNullOrUndefined(minStartDate) ? this.getDateFromFormat(new Date()) : minStartDate;
+                    minStartDate.setHours(0, 0, 0, 0);
+                }
+                else {
+                    minStartDate = isNullOrUndefined(minStartDate) ? this.getDateFromFormat(new Date()) : minStartDate;
+                }
                 maxEndDate = this.getDateFromFormat(new Date(minStartDate.getTime()));
                 maxEndDate.setDate(maxEndDate.getDate() + 20);
             }
@@ -4816,6 +4822,9 @@ class GanttChart {
      * @private
      */
     expandedGanttRow(args) {
+        if (isNullOrUndefined(args['gridRow']) && this.parent.enableVirtualization) {
+            return;
+        }
         const record = getValue('data', args);
         if (this.isExpandCollapseFromChart) {
             this.expandCollapseChartRows('expand', getValue('chartRow', args), record, null);
@@ -5023,6 +5032,23 @@ class GanttChart {
             $target.closest('.e-chart-row') ? $target.closest('.e-chart-row').rowIndex : -1;
         const isTab = (e.action === 'tab') ? true : false;
         const nextElement = this.getNextElement($target, isTab, isInEditedState);
+        this.tempNextElement = nextElement;
+        if (!isNullOrUndefined(nextElement['cellIndex'])) {
+            if (this.parent.allowRowDragAndDrop) {
+                this.childrenIndex = nextElement['cellIndex'];
+                this.nextElementIndex = nextElement['cellIndex'] - 1;
+            }
+            else {
+                this.childrenIndex = nextElement['cellIndex'];
+                this.nextElementIndex = nextElement['cellIndex'];
+            }
+            if (!this.parent.ganttColumns[this.nextElementIndex]['allowEditing'] && this.parent.ganttColumns[this.nextElementIndex]['field'] !== this.parent.taskFields.id) {
+                this.isEditableElement = true;
+            }
+            else {
+                this.isEditableElement = false;
+            }
+        }
         if (nextElement === 'noNextRow') {
             this.manageFocus($target, 'remove', true);
             return;
@@ -5070,7 +5096,8 @@ class GanttChart {
                     this.parent.treeGrid.grid.notify('key-pressed', e);
                 }
             }
-            if (!isNullOrUndefined(isInEditedState) && !this.parent.editModule.cellEditModule.isCellEdit) {
+            if (!(this.parent.editModule && this.parent.editModule.cellEditModule
+                && !isNullOrUndefined(this.parent.editModule.cellEditModule.editedColumn))) {
                 if (nextElement) {
                     if ($target.classList.contains('e-rowcell')) {
                         this.manageFocus($target, 'remove', false);
@@ -5548,8 +5575,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 +5592,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 +6750,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;
             }
@@ -6887,6 +6933,7 @@ class GanttTreeGrid {
     }
     composeProperties() {
         this.parent.treeGrid.showColumnMenu = this.parent.showColumnMenu;
+        this.parent.treeGrid.enableCollapseAll = this.parent.collapseAllParentTasks;
         this.parent.treeGrid.columnMenuItems = this.parent.columnMenuItems;
         this.parent.treeGrid.childMapping = isNullOrUndefined(this.parent.taskFields.child) ? '' : this.parent.taskFields.child;
         this.parent.treeGrid.treeColumnIndex = this.parent.treeColumnIndex;
@@ -9617,6 +9664,12 @@ class ChartRows extends DateProcessor {
             }
             const dataId = this.parent.viewType === 'ProjectView' ? data.ganttProperties.taskId : data.ganttProperties.rowUniqueID;
             this.parent.treeGrid.grid.setRowData(dataId, data);
+            let nextEditableElement = this.parent.ganttChartModule.tempNextElement;
+            if (this.parent.ganttChartModule.isEditableElement && nextEditableElement) {
+                this.parent.treeGrid.grid.focusModule.focus();
+                addClass([this.parent.treeGrid.getRows()[tr['ariaRowIndex']].children[this.parent.ganttChartModule.childrenIndex]], 'e-focused');
+                this.parent.ganttChartModule.tempNextElement = null;
+            }
             const row = this.parent.treeGrid.grid.getRowObjectFromUID(this.parent.treeGrid.grid.getDataRows()[index].getAttribute('data-uid'));
             row.data = data;
         }
@@ -11807,7 +11860,7 @@ class Tooltip$1 {
         if (ganttData) {
             data = ganttData.ganttProperties;
             taskName = !isNullOrUndefined(data.taskName) ? '<tr class = "e-gantt-tooltip-rowcell"><td colspan="3">' +
-                data.taskName + '</td></tr>' : '';
+                (this.parent.disableHtmlEncode ? data.taskName.replace(/</g, "&lt;").replace(/>/g, "&gt;") : data.taskName) + '</td></tr>' : '';
         }
         switch (elementType) {
             case 'milestone':
@@ -21259,7 +21312,7 @@ class Edit$2 {
                     if (column.field === this.parent.taskFields.id) {
                         this.updateIDColumnEditParams(column);
                     }
-                    else if (column.field === this.parent.taskFields.progress) {
+                    else if (column.field === this.parent.taskFields.progress && isNullOrUndefined(column.edit)) {
                         this.updateProgessColumnEditParams(column);
                     }
                     else if (column.field === this.parent.taskFields.resourceInfo) {
@@ -23222,6 +23275,7 @@ class Edit$2 {
         eventArgs.modifiedRecords = args.updatedRecordCollection;
         eventArgs.modifiedTaskData = getTaskData(args.updatedRecordCollection, null, null, this.parent);
         setValue('action', args.action, eventArgs);
+        this.parent.isOnDelete = false;
         this.parent.trigger('actionComplete', eventArgs);
         this.deletedTaskDetails = [];
         this.parent.initiateEditAction(false);
@@ -27535,7 +27589,7 @@ class ContextMenu$2 {
             let rowIndex = -1;
             if (args.gridRow) {
                 // eslint-disable-next-line
-                rowIndex = parseInt(args.gridRow.getAttribute('aria-rowindex'), 0);
+                rowIndex = parseInt(args.gridRow.getAttribute('data-rowindex'), 0);
             }
             else if (args.chartRow) {
                 // eslint-disable-next-line
@@ -28164,7 +28218,7 @@ class RowDD$1 {
             ganttDragelem.remove();
         }
         const gridRow = closest(args.target, '.e-row');
-        const dropIndex = gridRow ? parseInt(gridRow.getAttribute('aria-rowindex'), 10) : args.dropIndex;
+        const dropIndex = gridRow ? parseInt(gridRow.getAttribute('data-rowindex'), 10) : args.dropIndex;
         args.dropIndex = dropIndex;
         args.dropRecord = this.parent.updatedRecords[args.dropIndex];
         this.parent.trigger('rowDrop', args);
@@ -28473,6 +28527,7 @@ class RowDD$1 {
         const proxy = this.parent;
         let tempDataSource;
         let idx;
+        const ganttFields = this.parent.taskFields;
         if (this.parent.dataSource instanceof DataManager) {
             tempDataSource = getValue('dataOperation.dataArray', this.parent);
         }
@@ -28481,7 +28536,12 @@ class RowDD$1 {
         }
         if (tempDataSource.length > 0 && (!isNullOrUndefined(droppedRecord) && !droppedRecord.parentItem)) {
             for (let i = 0; i < Object.keys(tempDataSource).length; i++) {
-                if (tempDataSource[i][this.parent.taskFields.child] === droppedRecord.taskData[this.parent.taskFields.child]) {
+                if (!isNullOrUndefined(droppedRecord.taskData[ganttFields.child]) &&
+                    tempDataSource[i][ganttFields.child] === droppedRecord.taskData[ganttFields.child]) {
+                    idx = i;
+                }
+                else if (isNullOrUndefined(droppedRecord.taskData[ganttFields.child]) &&
+                    droppedRecord.taskData[ganttFields.id] === tempDataSource[i][ganttFields.id]) {
                     idx = i;
                 }
             }