gantt-task-react-powern 0.4.50 → 0.4.52

package/dist/index.js

@@ -106,27 +106,27 @@ var startOfDate = function startOfDate(date, scale) {
   return newDate;
 };
 var ganttDateRange = function ganttDateRange(tasks, viewMode, preStepsCount) {
-  var _tasks$, _tasks$2;
+  var _tasks$, _tasks$2, _tasks$3, _tasks$4;
 
-  var newStartDate = ((_tasks$ = tasks[0]) === null || _tasks$ === void 0 ? void 0 : _tasks$.start) || new Date();
-  var newEndDate = ((_tasks$2 = tasks[0]) === null || _tasks$2 === void 0 ? void 0 : _tasks$2.start) || new Date();
+  var newStartDate = ((_tasks$ = tasks[0]) === null || _tasks$ === void 0 ? void 0 : _tasks$.start.getTime()) !== 0 ? ((_tasks$2 = tasks[0]) === null || _tasks$2 === void 0 ? void 0 : _tasks$2.start) || new Date() : new Date();
+  var newEndDate = ((_tasks$3 = tasks[0]) === null || _tasks$3 === void 0 ? void 0 : _tasks$3.end.getTime()) !== 0 ? ((_tasks$4 = tasks[0]) === null || _tasks$4 === void 0 ? void 0 : _tasks$4.end) || new Date() : new Date();
 
   for (var _iterator = _createForOfIteratorHelperLoose(tasks), _step; !(_step = _iterator()).done;) {
     var task = _step.value;
 
-    if (task.start < newStartDate) {
+    if (task.start && task.start.getTime() !== 0 && task.start < newStartDate) {
       newStartDate = task.start;
     }
 
-    if (task.end > newEndDate) {
+    if (task.end && task.end.getTime() !== 0 && task.end > newEndDate) {
       newEndDate = task.end;
     }
 
-    if (task.actualStart < newStartDate) {
+    if (task.actualStart && task.actualStart.getTime() !== 0 && task.actualStart < newStartDate) {
       newStartDate = task.actualStart;
     }
 
-    if (task.actualEnd > newEndDate) {
+    if (task.actualEnd && task.actualEnd.getTime() !== 0 && task.actualEnd > newEndDate) {
       newEndDate = task.actualEnd;
     }
   }
@@ -348,6 +348,7 @@ var localeDateStringCache = {};
 
 var toLocaleDateStringFactory = function toLocaleDateStringFactory(locale) {
   return function (date, dateTimeOptions) {
+    if (!date || date.getTime() === 0) return "";
     var key = date.toString();
     var lds = localeDateStringCache[key];
 
@@ -1212,8 +1213,16 @@ var Arrow = function Arrow(_ref) {
 };
 
 var drownPathAndTriangle = function drownPathAndTriangle(taskFrom, taskTo, rowHeight, taskHeight, arrowIndent) {
-  var taskToStart = Math.min(taskTo.x1, taskTo.actualx1);
-  var taskFromEnd = Math.max(taskFrom.x2, taskFrom.actualx2);
+  var taskToStart, taskFromEnd;
+
+  if (taskTo.x1 >= 0 && taskTo.actualx1 >= 0) {
+    taskToStart = Math.min(taskTo.x1, taskTo.actualx1);
+  } else if (taskTo.x1 >= 0) taskToStart = taskTo.x1;else if (taskTo.actualx1 >= 0) taskToStart = taskTo.actualx1;else taskToStart = 0;
+
+  if (taskFrom.x2 >= 0 && taskFrom.actualx2 >= 0) {
+    taskFromEnd = Math.min(taskFrom.x2, taskFrom.actualx2);
+  } else if (taskFrom.x2 >= 0) taskFromEnd = taskFrom.x2;else if (taskFrom.actualx2 >= 0) taskFromEnd = taskFrom.actualx2;else taskFromEnd = 0;
+
   var indexCompare = taskFrom.index > taskTo.index ? -1 : 1;
   var taskToEndPosition = taskTo.y + taskHeight / 2;
   var taskFromEndPosition = taskFromEnd + arrowIndent * 2;
@@ -1287,26 +1296,21 @@ var convertToBar = function convertToBar(task, index, dates, columnWidth, rowHei
   var progressEndWidth;
 
   if (rtl) {
-    x2 = taskXCoordinateRTL(task.start, dates, columnWidth);
-    x1 = taskXCoordinateRTL(task.end, dates, columnWidth);
-    actualx1 = taskXCoordinateRTL(task.actualStart, dates, columnWidth);
-    actualx2 = taskXCoordinateRTL(task.actualEnd, dates, columnWidth);
+    x2 = task.start ? taskXCoordinateRTL(task.start, dates, columnWidth) : -1;
+    x1 = task.end ? taskXCoordinateRTL(task.end, dates, columnWidth) : -1;
+    actualx1 = task.actualStart ? taskXCoordinateRTL(task.actualStart, dates, columnWidth) : -1;
+    actualx2 = task.actualEnd ? taskXCoordinateRTL(task.actualEnd, dates, columnWidth) : -1;
   } else {
-    x1 = taskXCoordinate(task.start, dates, columnWidth);
-    x2 = taskXCoordinate(task.end, dates, columnWidth);
-    actualx1 = taskXCoordinate(task.actualStart, dates, columnWidth);
-    actualx2 = taskXCoordinate(task.actualEnd, dates, columnWidth);
+    x1 = task.start ? taskXCoordinate(task.start, dates, columnWidth) : -1;
+    x2 = task.end ? taskXCoordinate(task.end, dates, columnWidth) : -1;
+    actualx1 = task.actualStart ? taskXCoordinate(task.actualStart, dates, columnWidth) : -1;
+    actualx2 = task.actualEnd ? taskXCoordinate(task.actualEnd, dates, columnWidth) : -1;
   }
 
-  progressStartWidth = Math.abs(actualx1 - x1);
-  progressEndWidth = Math.abs(actualx2 - x2);
+  progressStartWidth = actualx1 && x1 ? Math.abs(actualx1 - x1) : -1;
+  progressEndWidth = actualx2 && x2 ? Math.abs(actualx2 - x2) : -1;
   var typeInternal = task.type;
 
-  if (typeInternal === "task" && x2 - x1 < handleWidth * 2) {
-    typeInternal = "smalltask";
-    x2 = x1 + handleWidth * 2;
-  }
-
   var _progressWithByParams = progressWithByParams(actualx1, actualx2, task.progress, rtl),
       progressWidth = _progressWithByParams[0],
       progressX = _progressWithByParams[1];
@@ -1343,10 +1347,10 @@ 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 = taskXCoordinate(task.start, dates, columnWidth);
+  var x = task.start && task.end ? taskXCoordinate(task.start, dates, columnWidth) : 0;
   var y = taskYCoordinate(index, rowHeight, taskHeight);
-  var x1 = x - taskHeight * 0.5;
-  var x2 = x + taskHeight * 0.5;
+  var x1 = task.start && task.end ? x - taskHeight * 0.5 : 0;
+  var x2 = task.start && task.end ? x + taskHeight * 0.5 : 0;
   var rotatedHeight = taskHeight / 1.414;
 
   var styles = _extends({
@@ -1383,6 +1387,11 @@ var taskXCoordinate = function taskXCoordinate(xDate, dates, columnWidth) {
   var index = dates.findIndex(function (d) {
     return d.getTime() >= xDate.getTime();
   }) - 1;
+
+  if (index < 0) {
+    return 0;
+  }
+
   var remainderMillis = xDate.getTime() - dates[index].getTime();
   var percentOfInterval = remainderMillis / (dates[index + 1].getTime() - dates[index].getTime());
   var x = index * columnWidth + percentOfInterval * columnWidth;
@@ -1401,13 +1410,13 @@ var taskYCoordinate = function taskYCoordinate(index, rowHeight, taskHeight) {
 };
 
 var progressWithByParams = function progressWithByParams(taskX1, taskX2, progress, rtl) {
-  var progressWidth = (taskX2 - taskX1) * progress * 0.01;
+  var progressWidth = taskX2 > 0 && taskX1 > 0 ? (taskX2 - taskX1) * progress * 0.01 : 0;
   var progressX;
 
   if (rtl) {
-    progressX = taskX2 - progressWidth;
+    progressX = taskX2 > 0 ? taskX2 - progressWidth : 0;
   } else {
-    progressX = taskX1;
+    progressX = taskX1 > 0 ? taskX1 : 0;
   }
 
   return [progressWidth, progressX];
@@ -1781,95 +1790,108 @@ var Bar = function Bar(_ref) {
       isSelected = _ref.isSelected;
   var progressPoint = getProgressPoint(+!rtl * task.progressWidth + task.progressX, task.y, task.height);
   var handleHeight = task.height / 2 - 1;
-  if (type == "planned") return React__default.createElement("g", {
-    className: styles$6.barWrapper,
-    tabIndex: 0
-  }, React__default.createElement(BarDisplay, {
-    x: task.x1,
-    y: task.y,
-    type: type,
-    startProgressWidth: task.progressStartWidth,
-    endProgressWidth: task.progressEndWidth,
-    width: task.x2 - task.x1,
-    height: task.height / 2,
-    progressX: task.progressX,
-    progressWidth: task.progressWidth,
-    barCornerRadius: task.barCornerRadius,
-    styles: task.styles,
-    isSelected: isSelected,
-    onMouseDown: function onMouseDown(e) {
-      isDateChangeable && onEventStart("move", task, e, "planned");
-    }
-  }), React__default.createElement("g", {
-    className: "handleGroup"
-  }, isDateChangeable && React__default.createElement("g", null, React__default.createElement(BarDateHandle, {
-    x: task.x1 + 1,
-    y: task.y + 1,
-    width: task.handleWidth,
-    height: handleHeight,
-    barCornerRadius: task.barCornerRadius,
-    onMouseDown: function onMouseDown(e) {
-      onEventStart("start", task, e, "planned");
-    }
-  }), React__default.createElement(BarDateHandle, {
-    x: task.x2 - task.handleWidth - 1,
-    y: task.y + 1,
-    width: task.handleWidth,
-    height: handleHeight,
-    barCornerRadius: task.barCornerRadius,
-    onMouseDown: function onMouseDown(e) {
-      onEventStart("end", task, e, "planned");
-    }
-  })), isProgressChangeable && React__default.createElement(BarProgressHandle, {
-    progressPoint: progressPoint,
-    onMouseDown: function onMouseDown(e) {
-      onEventStart("progress", task, e, "planned");
-    }
-  })));else return React__default.createElement("g", {
-    className: styles$6.barWrapper,
-    tabIndex: 0
-  }, React__default.createElement(BarDisplay, {
-    x: task.actualx1,
-    y: task.y + task.height / 2,
-    type: type,
-    startProgressWidth: task.progressStartWidth,
-    endProgressWidth: task.progressEndWidth,
-    width: task.actualx2 - task.actualx1,
-    height: task.height / 2,
-    progressX: task.progressX,
-    progressWidth: task.progressWidth,
-    barCornerRadius: task.barCornerRadius,
-    styles: task.styles,
-    isSelected: isSelected,
-    onMouseDown: function onMouseDown(e) {
-      isDateChangeable && onEventStart("move", task, e, "actual");
-    }
-  }), React__default.createElement("g", {
-    className: "handleGroup"
-  }, isDateChangeable && React__default.createElement("g", null, React__default.createElement(BarDateHandle, {
-    x: task.actualx1 + 1,
-    y: task.y + task.height / 2 + 1,
-    width: task.handleWidth,
-    height: handleHeight,
-    barCornerRadius: task.barCornerRadius,
-    onMouseDown: function onMouseDown(e) {
-      onEventStart("start", task, e, "actual");
-    }
-  }), React__default.createElement(BarDateHandle, {
-    x: task.actualx2 - task.handleWidth - 1,
-    y: task.y + task.height / 2 + 1,
-    width: task.handleWidth,
-    height: handleHeight,
-    barCornerRadius: task.barCornerRadius,
-    onMouseDown: function onMouseDown(e) {
-      onEventStart("end", task, e, "actual");
-    }
-  })), isProgressChangeable && React__default.createElement(BarProgressHandle, {
-    progressPoint: progressPoint,
-    onMouseDown: function onMouseDown(e) {
-      onEventStart("progress", task, e, "actual");
-    }
-  })));
+
+  if (type == "planned") {
+    if (task.x1 && task.x2) return React__default.createElement("g", {
+      className: styles$6.barWrapper,
+      tabIndex: 0
+    }, React__default.createElement(BarDisplay, {
+      x: task.x1,
+      y: task.y,
+      type: type,
+      startProgressWidth: task.progressStartWidth,
+      endProgressWidth: task.progressEndWidth,
+      width: task.x2 - task.x1,
+      height: task.height / 2,
+      progressX: task.progressX,
+      progressWidth: task.progressWidth,
+      barCornerRadius: task.barCornerRadius,
+      styles: task.styles,
+      isSelected: isSelected,
+      onMouseDown: function onMouseDown(e) {
+        isDateChangeable && onEventStart("move", task, e, "planned");
+      }
+    }), React__default.createElement("g", {
+      className: "handleGroup"
+    }, isDateChangeable && React__default.createElement("g", null, React__default.createElement(BarDateHandle, {
+      x: task.x1 + 1,
+      y: task.y + 1,
+      width: task.handleWidth,
+      height: handleHeight,
+      barCornerRadius: task.barCornerRadius,
+      onMouseDown: function onMouseDown(e) {
+        onEventStart("start", task, e, "planned");
+      }
+    }), React__default.createElement(BarDateHandle, {
+      x: task.x2 - task.handleWidth - 1,
+      y: task.y + 1,
+      width: task.handleWidth,
+      height: handleHeight,
+      barCornerRadius: task.barCornerRadius,
+      onMouseDown: function onMouseDown(e) {
+        onEventStart("end", task, e, "planned");
+      }
+    })), isProgressChangeable && React__default.createElement(BarProgressHandle, {
+      progressPoint: progressPoint,
+      onMouseDown: function onMouseDown(e) {
+        onEventStart("progress", task, e, "planned");
+      }
+    })));else return React__default.createElement("g", {
+      className: styles$6.barWrapper,
+      tabIndex: 0
+    });
+  } else if (task.actualx1 && task.actualx2) {
+    return React__default.createElement("g", {
+      className: styles$6.barWrapper,
+      tabIndex: 0
+    }, React__default.createElement(BarDisplay, {
+      x: task.actualx1,
+      y: task.y + task.height / 2,
+      type: type,
+      startProgressWidth: task.progressStartWidth,
+      endProgressWidth: task.progressEndWidth,
+      width: task.actualx2 - task.actualx1,
+      height: task.height / 2,
+      progressX: task.progressX,
+      progressWidth: task.progressWidth,
+      barCornerRadius: task.barCornerRadius,
+      styles: task.styles,
+      isSelected: isSelected,
+      onMouseDown: function onMouseDown(e) {
+        isDateChangeable && onEventStart("move", task, e, "actual");
+      }
+    }), React__default.createElement("g", {
+      className: "handleGroup"
+    }, isDateChangeable && React__default.createElement("g", null, React__default.createElement(BarDateHandle, {
+      x: task.actualx1 + 1,
+      y: task.y + task.height / 2 + 1,
+      width: task.handleWidth,
+      height: handleHeight,
+      barCornerRadius: task.barCornerRadius,
+      onMouseDown: function onMouseDown(e) {
+        onEventStart("start", task, e, "actual");
+      }
+    }), React__default.createElement(BarDateHandle, {
+      x: task.actualx2 - task.handleWidth - 1,
+      y: task.y + task.height / 2 + 1,
+      width: task.handleWidth,
+      height: handleHeight,
+      barCornerRadius: task.barCornerRadius,
+      onMouseDown: function onMouseDown(e) {
+        onEventStart("end", task, e, "actual");
+      }
+    })), isProgressChangeable && React__default.createElement(BarProgressHandle, {
+      progressPoint: progressPoint,
+      onMouseDown: function onMouseDown(e) {
+        onEventStart("progress", task, e, "actual");
+      }
+    })));
+  } else {
+    return React__default.createElement("g", {
+      className: styles$6.barWrapper,
+      tabIndex: 0
+    });
+  }
 };
 
 var BarSmall = function BarSmall(_ref) {
@@ -2017,11 +2039,23 @@ var TaskItem = function TaskItem(props) {
         break;
 
       default:
-        setTaskItem([React__default.createElement(Bar, Object.assign({}, props, {
-          type: "planned"
-        })), React__default.createElement(Bar, Object.assign({}, props, {
-          type: "actual"
-        }))]);
+        {
+          var _taskItem = [];
+
+          if (task.x1 && task.x2) {
+            _taskItem.push(React__default.createElement(Bar, Object.assign({}, props, {
+              type: "planned"
+            })));
+          }
+
+          if (task.actualx1 && task.actualx2) {
+            _taskItem.push(React__default.createElement(Bar, Object.assign({}, props, {
+              type: "actual"
+            })));
+          }
+
+          setTaskItem(_taskItem);
+        }
         break;
     }
   }, [task, isSelected]);
@@ -2310,7 +2344,18 @@ var TaskGanttContent = function TaskGanttContent(_ref) {
     className: "content"
   }, React__default.createElement("g", {
     className: "arrows"
-  }, tasks.map(function (task) {
+  }, tasks.map(function (_task) {
+    var task = _task.start.getTime() > 0 && _task.end.getTime() > 0 ? _task : undefined;
+
+    if (!task) {
+      return React__default.createElement("g", {
+        key: _task.id,
+        style: {
+          height: taskHeight
+        }
+      });
+    }
+
     return task.barChildren.map(function (child) {
       var _task$criticalPathArr, _task$criticalPathArr2;
 
@@ -2331,7 +2376,18 @@ var TaskGanttContent = function TaskGanttContent(_ref) {
     className: "bar",
     fontFamily: fontFamily,
     fontSize: fontSize
-  }, tasks.map(function (task) {
+  }, tasks.map(function (_task) {
+    var task = _task.start.getTime() > 0 && _task.end.getTime() > 0 ? _task : undefined;
+
+    if (!task) {
+      return React__default.createElement("g", {
+        key: _task.id,
+        style: {
+          height: taskHeight
+        }
+      });
+    }
+
     return React__default.createElement(TaskItem, {
       task: task,
       arrowIndent: arrowIndent,
@@ -2646,7 +2702,7 @@ var Gantt = function Gantt(_ref) {
           return t.id === changedTask.id;
         });
 
-        if (prevStateTask && (prevStateTask.start.getTime() !== changedTask.start.getTime() || prevStateTask.end.getTime() !== changedTask.end.getTime() || prevStateTask.actualStart.getTime() !== changedTask.actualStart.getTime() || prevStateTask.actualEnd.getTime() !== changedTask.actualEnd.getTime() || prevStateTask.progress !== changedTask.progress)) {
+        if (prevStateTask && (prevStateTask.start.getTime() >= 0 && prevStateTask.start.getTime() !== changedTask.start.getTime() || prevStateTask.end.getTime() >= 0 && prevStateTask.end.getTime() !== changedTask.end.getTime() || (prevStateTask.actualStart.getTime() >= 0 && prevStateTask.actualStart.getTime()) !== changedTask.actualStart.getTime() || prevStateTask.actualEnd.getTime() >= 0 && prevStateTask.actualEnd.getTime() !== changedTask.actualEnd.getTime() || prevStateTask.progress !== changedTask.progress)) {
           var newTaskList = barTasks.map(function (t) {
             return t.id === changedTask.id ? changedTask : t;
           });