gantt-task-react-powern 0.6.31 → 0.6.32

package/dist/index.modern.js

@@ -2047,8 +2047,8 @@ var drawPathAndTriangle = function drawPathAndTriangle(taskFrom, taskTo, rowHeig
 
     if (t.actualSegments && t.actualSegments.length > 0) return t.actualSegments[0].x1;
     var candidates = [];
-    if (t.x1 !== undefined && t.x1 >= 0) candidates.push(t.x1);
-    if (t.actualx1 !== undefined && t.actualx1 >= 0) candidates.push(t.actualx1);
+    if (t.x2 > t.x1) candidates.push(t.x1);
+    if (t.actualx2 > t.actualx1) candidates.push(t.actualx1);
     return candidates.length > 0 ? Math.min.apply(Math, candidates) : 0;
   };
 
@@ -2061,8 +2061,8 @@ var drawPathAndTriangle = function drawPathAndTriangle(taskFrom, taskTo, rowHeig
 
     if (t.actualSegments && t.actualSegments.length > 0) return t.actualSegments[t.actualSegments.length - 1].x2;
     var candidates = [];
-    if (t.x2 !== undefined && t.x2 >= 0) candidates.push(t.x2);
-    if (t.actualx2 !== undefined && t.actualx2 >= 0) candidates.push(t.actualx2);
+    if (t.x2 > t.x1) candidates.push(t.x2);
+    if (t.actualx2 > t.actualx1) candidates.push(t.actualx2);
     return candidates.length > 0 ? Math.max.apply(Math, candidates) : 0;
   };
 
@@ -3584,7 +3584,12 @@ var TaskGanttContent = function TaskGanttContent(_ref) {
 
   var getArrows = function getArrows(isCritical, criticalPathType) {
     return tasks.flatMap(function (_task) {
-      var _live = ganttEvent.changedTask && ganttEvent.changedTask.id === _task.id ? ganttEvent.changedTask : _task;
+      var a = ganttEvent.action;
+      var isDraggingThis = (a === "move" || a === "start" || a === "end" || a === "progress") && !!ganttEvent.changedTask && ganttEvent.changedTask.id === _task.id;
+
+      var _live = isDraggingThis ? _extends({}, ganttEvent.changedTask, {
+        y: _task.y
+      }) : _task;
 
       var task = _live.start.getTime() > 0 && _live.end.getTime() > 0 ? _live : undefined;
 
@@ -3593,13 +3598,16 @@ var TaskGanttContent = function TaskGanttContent(_ref) {
       }
 
       return task.barChildren.map(function (child) {
-        if (task.x2 > task.x1 || task.actualx2 > task.actualx1) {
+        var taskTo = tasks[child.index];
+        var fromDrawable = task.x2 > task.x1 || task.actualx2 > task.actualx1;
+        var toDrawable = !!taskTo && (taskTo.x2 > taskTo.x1 || taskTo.actualx2 > taskTo.actualx1);
+
+        if (fromDrawable && toDrawable) {
           var _task$criticalPathArr;
 
           var criticalTask = (_task$criticalPathArr = task.criticalPathArrows) === null || _task$criticalPathArr === void 0 ? void 0 : _task$criticalPathArr.find(function (arrow) {
-            return arrow.taskId === tasks[child.index].id && (!!arrow.criticalPathType ? arrow.criticalPathType === criticalPathType : !criticalPathType);
+            return arrow.taskId === taskTo.id && (!!arrow.criticalPathType ? arrow.criticalPathType === criticalPathType : !criticalPathType);
           });
-          var taskTo = tasks[child.index];
           var yFrom = task.y + taskHeight / 2;
           var yTo = taskTo.y + taskHeight / 2;
           var minY = Math.min(yFrom, yTo);
@@ -3611,9 +3619,9 @@ var TaskGanttContent = function TaskGanttContent(_ref) {
 
           if (!!criticalTask === isCritical) {
             return React.createElement(Arrow, {
-              key: "Arrow from " + task.id + " to " + tasks[child.index].id + (isCritical ? "-critical" : ""),
+              key: "Arrow from " + task.id + " to " + taskTo.id + (isCritical ? "-critical" : ""),
               taskFrom: task,
-              taskTo: tasks[child.index],
+              taskTo: taskTo,
               rowHeight: rowHeight,
               dependencyType: child.dependencyType,
               taskHeight: taskHeight,
@@ -4033,17 +4041,46 @@ var Gantt = function Gantt(_ref) {
   useEffect(function () {
     if (columnWidthProp != null) return;
     if (svgContainerWidth <= 0) return;
+    var minVisible = VIEW_MODE_DEFAULT_VISIBLE_COUNT[viewMode];
+    if (!minVisible) return;
+    var maxVisible = VIEW_MODE_MAX_VISIBLE_COUNT[viewMode];
+    var prevViewMode = computedForViewModeRef.current;
+
+    if (prevViewMode != null && prevViewMode !== viewMode && computedColumnWidth != null) {
+      var visible = svgContainerWidth / computedColumnWidth;
+      var oldMin = VIEW_MODE_DEFAULT_VISIBLE_COUNT[prevViewMode];
+      var oldMax = VIEW_MODE_MAX_VISIBLE_COUNT[prevViewMode];
+      var _next = computedColumnWidth;
+
+      if (maxVisible && oldMin != null && oldMax != null && oldMax > oldMin) {
+        var t = Math.min(1, Math.max(0, (visible - oldMin) / (oldMax - oldMin)));
+        var targetVisible = minVisible + t * (maxVisible - minVisible);
+        _next = Math.floor(svgContainerWidth / targetVisible);
+      } else if (visible < minVisible) {
+        _next = Math.floor(svgContainerWidth / minVisible);
+      } else if (maxVisible && visible > maxVisible) {
+        _next = Math.ceil(svgContainerWidth / maxVisible);
+      }
+
+      _next = Math.max(20, _next);
+      computedForViewModeRef.current = viewMode;
+      userResizedRef.current = true;
+
+      if (_next !== computedColumnWidth) {
+        setComputedColumnWidth(_next);
+      }
+
+      return;
+    }
+
     var alreadySnappedForView = computedForViewModeRef.current === viewMode && computedColumnWidth != null;
     if (userResizedRef.current && alreadySnappedForView) return;
-    var target = VIEW_MODE_DEFAULT_VISIBLE_COUNT[viewMode];
-    if (!target) return;
-    var next = Math.max(20, Math.floor(svgContainerWidth / target));
+    var next = Math.max(20, Math.floor(svgContainerWidth / minVisible));
+    computedForViewModeRef.current = viewMode;
 
     if (next !== computedColumnWidth) {
       setComputedColumnWidth(next);
     }
-
-    computedForViewModeRef.current = viewMode;
   }, [viewMode, svgContainerWidth, columnWidthProp, computedColumnWidth]);
   var columnWidth = (_ref3 = columnWidthProp != null ? columnWidthProp : computedColumnWidth) != null ? _ref3 : 60;
   var effectiveColumnWidth = useMemo(function () {
@@ -4328,7 +4365,7 @@ var Gantt = function Gantt(_ref) {
   };
 
   var handleScrollX = function handleScrollX(event) {
-    if (scrollX !== event.currentTarget.scrollLeft) {
+    if (scrollX !== event.currentTarget.scrollLeft && !ignoreScrollEvent) {
       setScrollX(event.currentTarget.scrollLeft);
       setIgnoreScrollEvent(true);
     } else {
@@ -4638,6 +4675,9 @@ function topologicalOrderingHelper(taskID, taskMap, sortedTaskList) {
   return true;
 }
 function getCriticalPaths(leafTasks) {
+  leafTasks = leafTasks.filter(function (t) {
+    return t.type !== "milestone" && (t.start.getTime() !== 0 || t.end.getTime() !== 0);
+  });
   var taskMap = {};
 
   for (var i = 0; i < leafTasks.length; i++) {
@@ -4820,28 +4860,26 @@ function computeCriticalPath(taskID, taskMap) {
           taskMap[taskID].paths[1].visited = false;
         }
       }
-
-      if (paths.length === 0) {
-        var immediateChildDuration = taskMap[taskID].end - taskMap[taskID].start + depDuration - overlap - offTime;
-
-        if (taskMap[taskID].paths.length < 2) {
-          taskMap[taskID].paths.push({
-            duration: immediateChildDuration,
-            task: dependents[j],
-            parent: taskID,
-            visited: false
-          });
-        } else if (immediateChildDuration > taskMap[taskID].paths[0].duration) {
-          taskMap[taskID].paths[0].duration = immediateChildDuration;
-          taskMap[taskID].paths[0].task = dependents[j];
-          taskMap[taskID].paths[0].parent = taskID;
-          taskMap[taskID].paths[0].visited = false;
-        } else if (immediateChildDuration > taskMap[taskID].paths[1].duration) {
-          taskMap[taskID].paths[1].duration = immediateChildDuration;
-          taskMap[taskID].paths[1].task = dependents[j];
-          taskMap[taskID].paths[1].parent = taskID;
-          taskMap[taskID].paths[1].visited = false;
-        }
+    } else {
+      var immediateChildDuration = taskMap[taskID].end - taskMap[taskID].start + depDuration - overlap - offTime;
+
+      if (taskMap[taskID].paths.length < 2) {
+        taskMap[taskID].paths.push({
+          duration: immediateChildDuration,
+          task: dependents[j],
+          parent: taskID,
+          visited: false
+        });
+      } else if (immediateChildDuration > taskMap[taskID].paths[0].duration) {
+        taskMap[taskID].paths[0].duration = immediateChildDuration;
+        taskMap[taskID].paths[0].task = dependents[j];
+        taskMap[taskID].paths[0].parent = taskID;
+        taskMap[taskID].paths[0].visited = false;
+      } else if (immediateChildDuration > taskMap[taskID].paths[1].duration) {
+        taskMap[taskID].paths[1].duration = immediateChildDuration;
+        taskMap[taskID].paths[1].task = dependents[j];
+        taskMap[taskID].paths[1].parent = taskID;
+        taskMap[taskID].paths[1].visited = false;
       }
     }
   }