gantt-task-react-powern 0.4.24 → 0.4.25

package/dist/index.js

@@ -1878,7 +1878,8 @@ var Project = function Project(_ref) {
     height: task.height,
     rx: task.barCornerRadius,
     ry: task.barCornerRadius,
-    className: styles$8.projectBackground
+    className: styles$8.projectBackground,
+    stroke: task.styles.criticalPathColor
   }), React__default.createElement("rect", {
     x: task.progressX,
     width: task.progressWidth,
@@ -1886,7 +1887,8 @@ var Project = function Project(_ref) {
     height: task.height,
     ry: task.barCornerRadius,
     rx: task.barCornerRadius,
-    fill: processColor
+    fill: processColor,
+    stroke: task.styles.criticalPathColor
   }), React__default.createElement("rect", {
     fill: barColor,
     x: task.x1,
@@ -1895,15 +1897,18 @@ var Project = function Project(_ref) {
     height: task.height / 2,
     rx: task.barCornerRadius,
     ry: task.barCornerRadius,
-    className: styles$8.projectTop
+    className: styles$8.projectTop,
+    stroke: task.styles.criticalPathColor
   }), React__default.createElement("polygon", {
     className: styles$8.projectTop,
     points: projectLeftTriangle,
-    fill: barColor
+    fill: barColor,
+    stroke: task.styles.criticalPathColor
   }), React__default.createElement("polygon", {
     className: styles$8.projectTop,
     points: projectRightTriangle,
-    fill: barColor
+    fill: barColor,
+    stroke: task.styles.criticalPathColor
   }));
 };
 
@@ -2525,6 +2530,7 @@ var Gantt = function Gantt(_ref) {
         primaryPath = _getCriticalPaths[0],
         secondaryPath = _getCriticalPaths[1];
 
+    uncolorAll(tasks);
     colorPath(secondaryPath, "#00ff00", tasks);
     colorPath(primaryPath, "#ff0000", tasks);
     setBarTasks(convertToBarTasks(filteredTasks, newDates, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, rtl, barProgressColor, barProgressSelectedColor, barBackgroundColor, barBackgroundSelectedColor, projectProgressColor, projectProgressSelectedColor, projectBackgroundColor, projectBackgroundSelectedColor, milestoneBackgroundColor, milestoneBackgroundSelectedColor));
@@ -2795,18 +2801,40 @@ var Gantt = function Gantt(_ref) {
     return [].concat(longestPath, [task]);
   }
 
+  function uncolorAll(tasks) {
+    tasks.forEach(function (task) {
+      if (task.styles) delete task.styles.criticalPathColor;
+      delete task.criticalPathArrows;
+    });
+  }
+
   function colorPath(path, color, tasks) {
     for (var i = 0; i < path.length; i++) {
-      for (var j = 0; j < tasks.length; j++) {
-        if (path[i].id.startsWith(tasks[j].id + ".") || path[i].id === tasks[j].id) {
-          var _tasks$j$styles;
+      var longestIDLength = 0;
+      var longestTask = void 0;
 
-          var _styles = (_tasks$j$styles = tasks[j].styles) != null ? _tasks$j$styles : {};
+      for (var j = 0; j < tasks.length; j++) {
+        if (path[i].id === tasks[j].id) {
+          longestTask = tasks[j];
+          break;
+        }
 
-          _styles.criticalPathColor = color;
-          tasks[j].styles = _styles;
+        if (path[i].id.startsWith(tasks[j].id + ".") && tasks[j].id.length > longestIDLength) {
+          longestIDLength = tasks[j].id.length;
+          longestTask = tasks[j];
         }
       }
+
+      if (longestTask) {
+        var _longestTask$styles;
+
+        console.log("Colored " + longestTask.id + " " + color);
+
+        var _styles = (_longestTask$styles = longestTask.styles) != null ? _longestTask$styles : {};
+
+        _styles.criticalPathColor = color;
+        longestTask.styles = _styles;
+      }
     }
 
     var _loop = function _loop(_i) {