gantt-task-react-powern 0.4.87 → 0.4.94

package/dist/index.js

@@ -1569,7 +1569,7 @@ var convertToBar = function convertToBar(task, index, dates, columnWidth, rowHei
 };
 
 var convertToMilestone = function convertToMilestone(task, index, dates, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, milestoneBackgroundColor, milestoneBackgroundSelectedColor) {
-  var x = task.start && task.end ? taskXCoordinate(task.start, dates, columnWidth) : 0;
+  var x = task.start && task.end ? taskXCoordinate(task.end, dates, columnWidth) : 0;
   var y = taskYCoordinate(index, rowHeight, taskHeight);
   var x1 = task.start && task.end ? x - taskHeight * 0.5 : 0;
   var x2 = task.start && task.end ? x + taskHeight * 0.5 : 0;
@@ -2020,7 +2020,7 @@ var Bar = function Bar(_ref) {
   var handleHeight = task.height / 2 - 1;
 
   if (type == "planned") {
-    if ((task === null || task === void 0 ? void 0 : task.x1) >= 0 && (task === null || task === void 0 ? void 0 : task.x2) >= 0) return React__default.createElement("g", {
+    if ((task === null || task === void 0 ? void 0 : task.x1) >= 0 && (task === null || task === void 0 ? void 0 : task.x2) > 0) return React__default.createElement("g", {
       className: styles$6.barWrapper,
       tabIndex: 0
     }, React__default.createElement(BarDisplay, {
@@ -2068,7 +2068,7 @@ var Bar = function Bar(_ref) {
       className: styles$6.barWrapper,
       tabIndex: 0
     });
-  } else if ((task === null || task === void 0 ? void 0 : task.actualx1) >= 0 && (task === null || task === void 0 ? void 0 : task.actualx2) >= 0) {
+  } else if ((task === null || task === void 0 ? void 0 : task.actualx1) >= 0 && (task === null || task === void 0 ? void 0 : task.actualx2) > 0) {
     return React__default.createElement("g", {
       className: styles$6.barWrapper,
       tabIndex: 0
@@ -2186,7 +2186,10 @@ var Milestone = function Milestone(_ref) {
     transform: transform,
     className: styles$7.milestoneBackground,
     onMouseDown: function onMouseDown(e) {
-      isDateChangeable && onEventStart("move", task, e);
+      isDateChangeable && onEventStart("move", task, e, "planned");
+    },
+    onDoubleClick: function onDoubleClick(e) {
+      onEventStart("dblclick", task, e);
     }
   }));
 };
@@ -2619,6 +2622,21 @@ var TaskGanttContent = function TaskGanttContent(_ref) {
   }, tasks.map(function (_task) {
     var task = _task.start.getTime() > 0 && _task.end.getTime() > 0 || _task.actualStart.getTime() > 0 && _task.actualEnd.getTime() > 0 ? _task : undefined;
 
+    if (!task && _task.typeInternal === "milestone") {
+      return React__default.createElement(Milestone, {
+        task: _task,
+        arrowIndent: arrowIndent,
+        taskHeight: taskHeight,
+        isProgressChangeable: false,
+        isDateChangeable: false,
+        isDelete: !_task.isDisabled,
+        onEventStart: handleBarEventStart,
+        key: _task.id,
+        isSelected: !!selectedTask && _task.id === selectedTask.id,
+        rtl: rtl
+      });
+    }
+
     if (!task) {
       return React__default.createElement("g", {
         key: _task.id,
@@ -3402,14 +3420,53 @@ function getCriticalPaths(leafTasks) {
 function computeCriticalPath(taskID, taskMap) {
   var task = taskMap[taskID].task;
   var dependents = taskMap[taskID].dependents;
+  taskMap[taskID].start = task.start.getTime();
   taskMap[taskID].end = task.end.getTime();
+  var start = taskMap[taskID].start;
+
+  for (var _iterator = _createForOfIteratorHelperLoose(dependents), _step; !(_step = _iterator()).done;) {
+    var _dependentTask$depend;
+
+    var depID = _step.value;
+    var dependentTask = taskMap[depID].task;
+    var dependency = (_dependentTask$depend = dependentTask.dependencies) === null || _dependentTask$depend === void 0 ? void 0 : _dependentTask$depend.find(function (d) {
+      return d.id === taskID;
+    });
+    if (!dependency) continue;
+
+    switch (dependency.type) {
+      case "FS":
+        if (taskMap[depID].end > taskMap[taskID].end) {
+          taskMap[taskID].next = depID;
+          taskMap[taskID].end = taskMap[depID].end;
+        }
 
-  for (var j = 0; j < dependents.length; j++) {
-    var newDependentEnd = taskMap[dependents[j]].end;
+        break;
+
+      case "SS":
+        if (taskMap[depID].start > start) {
+          taskMap[taskID].next = depID;
+          start = taskMap[depID].start;
+          taskMap[taskID].end = taskMap[depID].end;
+        }
+
+        break;
+
+      case "FF":
+        if (taskMap[depID].end > taskMap[taskID].end) {
+          taskMap[taskID].next = depID;
+          taskMap[taskID].end = taskMap[depID].end;
+        }
+
+        break;
 
-    if (newDependentEnd > taskMap[taskID].end) {
-      taskMap[taskID].next = dependents[j];
-      taskMap[taskID].end = newDependentEnd;
+      case "SF":
+        if (taskMap[depID].start > taskMap[taskID].end) {
+          taskMap[taskID].next = depID;
+          taskMap[taskID].end = taskMap[depID].start;
+        }
+
+        break;
     }
   }
 }