gantt-task-react-powern 0.4.86 → 0.4.88

package/dist/index.js

@@ -1384,7 +1384,15 @@ var drawPathAndTriangle = function drawPathAndTriangle(taskFrom, taskTo, rowHeig
   var verticalOffset = indexCompare * (rowHeight / 2);
 
   var minX = function minX(t) {
-    return Math.min(t.x1 || 0, t.actualx1 || 0);
+    if (t.x1 && t.actualx1) {
+      return Math.min(t.x1, t.actualx1);
+    } else if (t.x1) {
+      return t.x1;
+    } else if (t.actualx1) {
+      return t.actualx1;
+    } else {
+      return 0;
+    }
   };
 
   var maxX = function maxX(t) {
@@ -1561,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;
@@ -1879,7 +1887,10 @@ function getChildren(taskList, task) {
 
   if (task.type !== "project") {
     tasks = taskList.filter(function (t) {
-      return t.dependencies && t.dependencies.indexOf(task.id) !== -1;
+      return t.dependencies && t.dependencies.map(function (_ref) {
+        var id = _ref.id;
+        return id;
+      }).indexOf(task.id) !== -1;
     });
   } else {
     tasks = taskList.filter(function (t) {
@@ -2175,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);
     }
   }));
 };
@@ -2608,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,
@@ -2928,8 +2957,6 @@ var Gantt = function Gantt(_ref) {
         primaryPath = _getCriticalPaths[0],
         secondaryPath = _getCriticalPaths[1];
 
-    console.debug(primaryPath, secondaryPath);
-
     if (leafTasks.length > 0 && primaryPath.length === 0 && secondaryPath.length === 0) {
       setHasCircularDeps(true);
     } else {