@syncfusion/ej2-gantt 20.1.48 → 20.1.50

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.1.48
+*  version : 20.1.50
 *  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@20.1.47",
+  "_id": "@syncfusion/ej2-gantt@20.1.48",
   "_inBundle": false,
-  "_integrity": "sha512-60lkObo1sLVOuUOCasgszwBvryKWbHtCish7JIz4IlZ7aEOVHaZMzu84p839ay02/uIw5IKLnxcFY+SE5WW/pA==",
+  "_integrity": "sha512-exX12YVuBYKhsKh34tR0TsRYiuTEawpjZoVzbb6/ccK3K0yCSjkJjmO42cfYbmLH1zLI0RAFZ6wAa5jPTVfRNQ==",
   "_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-hotfix-new/@syncfusion/ej2-gantt/-/ej2-gantt-20.1.47.tgz",
-  "_shasum": "d0d50fd8f2502745938a6e16bfae7b01e97dbfa6",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-gantt/-/ej2-gantt-20.1.48.tgz",
+  "_shasum": "2379a558869377d6cd73d63d10ae81f2d52d730b",
   "_spec": "@syncfusion/ej2-gantt@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -35,18 +35,18 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.1.48",
-    "@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-dropdowns": "~20.1.50",
     "@syncfusion/ej2-grids": "~20.1.48",
     "@syncfusion/ej2-inputs": "~20.1.48",
     "@syncfusion/ej2-layouts": "~20.1.47",
     "@syncfusion/ej2-lists": "~20.1.47",
     "@syncfusion/ej2-navigations": "~20.1.48",
     "@syncfusion/ej2-popups": "~20.1.47",
-    "@syncfusion/ej2-richtexteditor": "~20.1.48",
+    "@syncfusion/ej2-richtexteditor": "~20.1.50",
     "@syncfusion/ej2-treegrid": "~20.1.48"
   },
   "deprecated": false,
@@ -75,6 +75,6 @@
     "url": "git+https://github.com/syncfusion/ej2-gantt.git"
   },
   "typings": "index.d.ts",
-  "version": "20.1.48",
+  "version": "20.1.50",
   "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/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/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;
                 }
@@ -175,6 +175,9 @@ var ChartRows = /** @class */ (function (_super) {
                 labelString = labelString === 'isCustomTemplate' ? this.parent.labelSettings.taskLabel : labelString;
             }
             if (labelString !== 'null') {
+                if (this.getTaskLabel(this.parent.labelSettings.taskLabel) === 'isCustomTemplate') {
+                    labelString = '';
+                }
                 if (isNaN(parseInt(labelString))) {
                     taskLabel = '<span class="' + cls.taskLabel + '" style="line-height:' +
                         (this.taskBarHeight - 1) + 'px; text-align: left;' +
@@ -212,7 +215,16 @@ 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];
+                    templateElement.appendChild(tempDiv);
+                    progressDiv[0].appendChild(templateElement);
+                    var childLabel = this.parent.labelSettings.taskLabel;
+                    if (progressDiv[0].querySelectorAll('.e-task-label')[0].textContent !== '' &&
+                        !this.isTemplate(childLabel))
+                        progressDiv[0].querySelectorAll('.e-task-label')[0].children[0].remove();
+                    if (progressDiv[0].querySelectorAll('.e-task-label')[0].textContent == '' &&
+                        childLabel && !childLabel['elementRef'])
+                        progressDiv[0].querySelectorAll('.e-task-label')[0].textContent = childLabel;
                 }
                 if (!isNullOrUndefined(taskbarInnerDiv) && taskbarInnerDiv.length > 0) {
                     taskbarInnerDiv[0].appendChild([].slice.call(progressDiv)[0]);
@@ -786,10 +798,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;
                 }
@@ -799,23 +811,35 @@ var ChartRows = /** @class */ (function (_super) {
                 labelString = labelString === 'isCustomTemplate' ? this.parent.labelSettings.taskLabel : labelString;
             }
             if (labelString !== 'null') {
+                if (this.getTaskLabel(this.parent.labelSettings.taskLabel) === 'isCustomTemplate') {
+                    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];
+                labelElement.appendChild(div);
+                progressBarInnerDiv[0].appendChild(labelElement);
+                var parentLabel = this.parent.labelSettings.taskLabel;
+                if (progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent !== '' &&
+                    !this.isTemplate(parentLabel))
+                    progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].children[0].remove();
+                if (progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent == '' &&
+                    parentLabel && !parentLabel['elementRef'])
+                    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 +1667,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();