gantt-task-react-powern 0.4.26 → 0.4.28

package/dist/index.js

@@ -2748,9 +2748,18 @@ var Gantt = function Gantt(_ref) {
   };
 
   function topologicalOrderingHelper(taskID, taskMap, sortedTaskList) {
-    if (!taskMap[taskID]) return false;
+    if (!taskMap[taskID]) {
+      console.log("Dependency on nonleaf " + taskID);
+      return true;
+    }
+
     if (taskMap[taskID].finished) return true;
-    if (taskMap[taskID].started) return false;
+
+    if (taskMap[taskID].started) {
+      console.log("Cycle involving " + taskID);
+      return false;
+    }
+
     taskMap[taskID].started = true;
     var task = taskMap[taskID].task;
     if (task.dependencies) for (var i = 0; i < task.dependencies.length; i++) {
@@ -2771,22 +2780,24 @@ var Gantt = function Gantt(_ref) {
       };
     }
 
+    var sortedTaskList = [];
+
     for (var _i = 0; _i < leafTasks.length; _i++) {
-      taskMap[leafTasks[_i].id].dependents = [];
+      var successVal = topologicalOrderingHelper(leafTasks[_i].id, taskMap, sortedTaskList);
+      if (!successVal) return [[], []];
     }
 
     for (var _i2 = 0; _i2 < leafTasks.length; _i2++) {
-      var task = leafTasks[_i2];
-      if (task.dependencies) for (var j = 0; j < task.dependencies.length; j++) {
-        taskMap[task.dependencies[j]].dependents.push(task.id);
-      }
+      taskMap[leafTasks[_i2].id].dependents = [];
     }
 
-    var sortedTaskList = [];
-
     for (var _i3 = 0; _i3 < leafTasks.length; _i3++) {
-      var successVal = topologicalOrderingHelper(leafTasks[_i3].id, taskMap, sortedTaskList);
-      if (!successVal) return [[], []];
+      var task = leafTasks[_i3];
+      if (task.dependencies) for (var j = 0; j < task.dependencies.length; j++) {
+        var _taskMap$task$depende;
+
+        (_taskMap$task$depende = taskMap[task.dependencies[j]]) === null || _taskMap$task$depende === void 0 ? void 0 : _taskMap$task$depende.dependents.push(task.id);
+      }
     }
 
     for (var _i4 = sortedTaskList.length - 1; _i4 >= 0; _i4--) {
@@ -2797,7 +2808,7 @@ var Gantt = function Gantt(_ref) {
     var primaryDuration = 0;
 
     for (var _i5 = 0; _i5 < sortedTaskList.length; _i5++) {
-      var newDuration = taskMap[sortedTaskList[_i5]].end - leafTasks[_i5].start.getTime();
+      var newDuration = taskMap[sortedTaskList[_i5]].end - taskMap[sortedTaskList[_i5]].task.start.getTime();
 
       if (primaryDuration < newDuration) {
         primaryLeaf = sortedTaskList[_i5];
@@ -2819,7 +2830,7 @@ var Gantt = function Gantt(_ref) {
     for (var _i6 = 0; _i6 < sortedTaskList.length; _i6++) {
       if (taskMap[sortedTaskList[_i6]].excluded) continue;
 
-      var _newDuration = taskMap[sortedTaskList[_i6]].end - leafTasks[_i6].start.getTime();
+      var _newDuration = taskMap[sortedTaskList[_i6]].end - taskMap[sortedTaskList[_i6]].task.start.getTime();
 
       if (secondaryDuration < _newDuration) {
         secondaryLeaf = sortedTaskList[_i6];