gantt-task-react-powern 0.4.4 → 0.4.7

package/dist/components/other/arrow.d.ts

@@ -7,6 +7,7 @@ declare type ArrowProps = {
     taskHeight: number;
     arrowIndent: number;
     rtl: boolean;
+    arrowColor: string;
 };
 export declare const Arrow: React.FC<ArrowProps>;
 export {};

package/dist/components/task-item/bar/bar-display.d.ts

@@ -18,6 +18,7 @@ declare type BarDisplayProps = {
         backgroundSelectedColor: string;
         progressColor: string;
         progressSelectedColor: string;
+        criticalPathColor?: string;
     };
     onMouseDown: (event: React.MouseEvent<SVGPolygonElement, MouseEvent>) => void;
 };

package/dist/index.js

@@ -118,11 +118,15 @@ var ganttDateRange = function ganttDateRange(tasks, viewMode, preStepsCount) {
     if (task.end > newEndDate) {
       newEndDate = task.end;
     }
-  }
 
-  newStartDate = addToDate(newStartDate, -1, "year");
-  newEndDate = addToDate(newEndDate, 1, "year");
-  console.log(newStartDate, newEndDate);
+    if (task.actualStart < newStartDate) {
+      newStartDate = task.actualStart;
+    }
+
+    if (task.actualEnd > newEndDate) {
+      newEndDate = task.actualEnd;
+    }
+  }
 
   switch (viewMode) {
     case exports.ViewMode.Year:
@@ -1064,7 +1068,8 @@ var Arrow = function Arrow(_ref) {
       rowHeight = _ref.rowHeight,
       taskHeight = _ref.taskHeight,
       arrowIndent = _ref.arrowIndent,
-      rtl = _ref.rtl;
+      rtl = _ref.rtl,
+      arrowColor = _ref.arrowColor;
   var path;
   var trianglePoints;
 
@@ -1085,9 +1090,11 @@ var Arrow = function Arrow(_ref) {
   }, React__default.createElement("path", {
     strokeWidth: "1.5",
     d: path,
-    fill: "none"
+    fill: "none",
+    stroke: arrowColor
   }), React__default.createElement("polygon", {
-    points: trianglePoints
+    points: trianglePoints,
+    fill: arrowColor
   }));
 };
 
@@ -1258,9 +1265,11 @@ var convertToMilestone = function convertToMilestone(task, index, dates, columnW
 };
 
 var taskXCoordinate = function taskXCoordinate(xDate, dates, columnWidth) {
+  console.log(dates);
   var index = dates.findIndex(function (d) {
     return d.getTime() >= xDate.getTime();
   }) - 1;
+  console.log(index);
   var remainderMillis = xDate.getTime() - dates[index].getTime();
   var percentOfInterval = remainderMillis / (dates[index + 1].getTime() - dates[index].getTime());
   var x = index * columnWidth + percentOfInterval * columnWidth;
@@ -1560,8 +1569,6 @@ var sortTasks = function sortTasks(taskA, taskB) {
   }
 };
 
-var styles$6 = {"barWrapper":"_KxSXS","barHandle":"_3w_5u","barBackground":"_31ERP"};
-
 var BarDisplay = function BarDisplay(_ref) {
   var x = _ref.x,
       y = _ref.y,
@@ -1594,7 +1601,8 @@ var BarDisplay = function BarDisplay(_ref) {
     ry: barCornerRadius,
     rx: barCornerRadius,
     fill: getBarColor(),
-    className: styles$6.barBackground
+    strokeWidth: 2,
+    stroke: styles.criticalPathColor
   }), React__default.createElement("rect", {
     x: actualX1,
     width: actualX2 - actualX1,
@@ -1614,6 +1622,8 @@ var BarDisplay = function BarDisplay(_ref) {
   }));
 };
 
+var styles$6 = {"barWrapper":"_KxSXS","barHandle":"_3w_5u","barBackground":"_31ERP"};
+
 var BarDateHandle = function BarDateHandle(_ref) {
   var x = _ref.x,
       y = _ref.y,
@@ -1887,7 +1897,6 @@ var TaskGanttContent = function TaskGanttContent(_ref) {
       timeStep = _ref.timeStep,
       svg = _ref.svg,
       taskHeight = _ref.taskHeight,
-      arrowColor = _ref.arrowColor,
       arrowIndent = _ref.arrowIndent,
       fontFamily = _ref.fontFamily,
       fontSize = _ref.fontSize,
@@ -2105,9 +2114,7 @@ var TaskGanttContent = function TaskGanttContent(_ref) {
   return React__default.createElement("g", {
     className: "content"
   }, React__default.createElement("g", {
-    className: "arrows",
-    fill: arrowColor,
-    stroke: arrowColor
+    className: "arrows"
   }, tasks.map(function (task) {
     return task.barChildren.map(function (child) {
       return React__default.createElement(Arrow, {
@@ -2117,7 +2124,8 @@ var TaskGanttContent = function TaskGanttContent(_ref) {
         rowHeight: rowHeight,
         taskHeight: taskHeight,
         arrowIndent: arrowIndent,
-        rtl: rtl
+        rtl: rtl,
+        arrowColor: task.styles.criticalPathColor || "#808080"
       });
     });
   })), React__default.createElement("g", {