gantt-task-react-powern 0.4.88 → 0.4.95

package/dist/index.js

@@ -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
@@ -2960,8 +2960,8 @@ var Gantt = function Gantt(_ref) {
     if (leafTasks.length > 0 && primaryPath.length === 0 && secondaryPath.length === 0) {
       setHasCircularDeps(true);
     } else {
-      if (hasCircularDeps && localStorage.getItem('hideCircularDepsAlert') === 'true') {
-        localStorage.removeItem('hideCircularDepsAlert');
+      if (hasCircularDeps && localStorage.getItem("hideCircularDepsAlert") === "true") {
+        localStorage.removeItem("hideCircularDepsAlert");
       }
 
       setHasCircularDeps(false);
@@ -3113,7 +3113,7 @@ var Gantt = function Gantt(_ref) {
     var alert = document.getElementById("alert-container");
 
     if (checkbox.checked) {
-      localStorage.setItem('hideCircularDepsAlert', 'true');
+      localStorage.setItem("hideCircularDepsAlert", "true");
       alert.style.display = "None";
     }
   };
@@ -3266,7 +3266,7 @@ var Gantt = function Gantt(_ref) {
     taskLabelRenderer: taskLabelRenderer,
     onMultiSelect: onMultiSelect
   };
-  return React__default.createElement("div", null, hasCircularDeps && localStorage.getItem('hideCircularDepsAlert') !== 'true' && React__default.createElement("div", {
+  return React__default.createElement("div", null, hasCircularDeps && localStorage.getItem("hideCircularDepsAlert") !== "true" && React__default.createElement("div", {
     id: "alert-container",
     className: styles$9.alertContainer + " " + styles$9.warning
   }, React__default.createElement("input", {
@@ -3415,19 +3415,59 @@ function getCriticalPaths(leafTasks) {
     secondaryLeaf = taskMap[secondaryLeaf].next;
   }
 
+  console.debug([primaryPath, secondaryPath]);
   return [primaryPath, secondaryPath];
 }
 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 j = 0; j < dependents.length; j++) {
-    var newDependentEnd = taskMap[dependents[j]].end;
+  for (var _iterator = _createForOfIteratorHelperLoose(dependents), _step; !(_step = _iterator()).done;) {
+    var _dependentTask$depend;
 
-    if (newDependentEnd > taskMap[taskID].end) {
-      taskMap[taskID].next = dependents[j];
-      taskMap[taskID].end = newDependentEnd;
+    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;
+        }
+
+        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;
+
+      case "SF":
+        if (taskMap[depID].start > taskMap[taskID].end) {
+          taskMap[taskID].next = depID;
+          taskMap[taskID].end = taskMap[depID].start;
+        }
+
+        break;
     }
   }
 }